Updated code to BIMserver 1.4 (having a dejavu here)

opensourceBIM · Apr 23, 2015 · 4dc4b75 · 4dc4b75
1 parent 58032fd
commit 4dc4b75
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 66 deletions.
diff --git a/COBieBIMServerShared/.classpath b/COBieBIMServerShared/.classpath
@@ -1,34 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="/BimServer/lib/logging/log4j-1.2.16.jar" sourcepath="/BimServer/libsrc/log4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/COBieSheetXMLData.jar" sourcepath="src/org/bimserver/cobie"/>
-	<classpathentry exported="true" kind="lib" path="lib/xelem_src.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xelem.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/COBieCompare.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/COBieMergeIDM.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/COBieSerializerSettings.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xom-1.2.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="/BimServer/lib/commons/commons-collections-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="/BimServer/lib/commons/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="/BimServer/lib/cxf/xmlbeans-2.6.0.jar"/>
-	<classpathentry kind="lib" path="/BimServer/lib/commons/commons-beanutils-1.8.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/sqlite-jdbc-3.7.2.jar" sourcepath="C:/Users/RDITLACB/.m2/repository/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lcie.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-excelant-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-scratchpad-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/SpiderWebs.jar"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Ifc"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/COBieShared"/>
-	<classpathentry exported="true" kind="lib" path="/BimServer/lib/guava-18.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="lib/COBieSheetXMLData.jar" sourcepath="src/org/bimserver/cobie"/>
+	<classpathentry exported="true" kind="lib" path="lib/xelem_src.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xelem.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/COBieCompare.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/COBieMergeIDM.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/COBieSerializerSettings.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xom-1.2.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="/BimServer/lib/cxf/xmlbeans-2.6.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/sqlite-jdbc-3.7.2.jar" sourcepath="C:/Users/RDITLACB/.m2/repository/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lcie.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-3.9-20121203.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-excelant-3.9-20121203.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-scratchpad-3.9-20121203.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/SpiderWebs.jar"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Ifc"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/COBieShared"/>
+	<classpathentry kind="lib" path="/Shared/lib/commons/commons-io-1.4.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/COBieBIMServerShared/src/org/erdc/cobie/shared/bimserver/ResourceManager.java b/COBieBIMServerShared/src/org/erdc/cobie/shared/bimserver/ResourceManager.java
@@ -13,7 +13,7 @@
 import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.cxf.helpers.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.bimserver.plugins.PluginContext;
 import org.bimserver.plugins.VirtualFile;
 import org.bimserver.plugins.classloaders.EclipsePluginClassloader;

diff --git a/...verShared/src/org/erdc/cobie/shared/bimserver/cobietab/deserialization/COBieIfcModel.java b/...verShared/src/org/erdc/cobie/shared/bimserver/cobietab/deserialization/COBieIfcModel.java
@@ -1247,4 +1247,7 @@ public boolean containsDocument(DocumentType document)
         return documentKeyToOid.containsKey(new KeyedDocumentType(document).getCOBieSheetXMLDataElementKey());
     }
 
+	@Override
+	public void load(IdEObject idEObject) {
+	}
 }
diff --git a/...red/src/org/erdc/cobie/shared/bimserver/cobietab/serialization/COBieTabXMLSerializer.java b/...red/src/org/erdc/cobie/shared/bimserver/cobietab/serialization/COBieTabXMLSerializer.java
@@ -65,14 +65,4 @@ protected void writeCOBIE(OutputStream outputStream)
 		}
 
 	}
-
-	@Override
-	protected boolean write(OutputStream outputStream,
-			ProgressReporter progressReporter) throws SerializerException 
-	{
-		write(outputStream);
-		return true;
-		///TODO: redirect all the logger messages to progressReporter
-	}
-
-}
+}
diff --git a/...ed/src/org/erdc/cobie/shared/bimserver/ifc/serialization/BIMServerCOBieTabSerializer.java b/...ed/src/org/erdc/cobie/shared/bimserver/ifc/serialization/BIMServerCOBieTabSerializer.java
@@ -145,9 +145,14 @@ public final void setCOBie(COBIEDocument cobie)
         cobieDocument = cobie;
     }
 
-    public final boolean write(OutputStream outputStream) throws SerializerException
+    public final boolean write(OutputStream outputStream)
     {
-        return write(outputStream, null);
+        try {
+			return write(outputStream, null);
+		} catch (SerializerException e) {
+			e.printStackTrace();
+		}
+        return false;
     }
 
     protected abstract void writeCOBIE(OutputStream outputStream) throws SerializerException;

diff --git a/COBiePlugins_Public/plugin/plugin.xml b/COBiePlugins_Public/plugin/plugin.xml
@@ -1,72 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PluginDescriptor>
+	<dependencies>
+		<Dependency path="COBieShared"></Dependency>
+		<Dependency path="COBieBIMServerShared"></Dependency>
+	</dependencies>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.objectidms.ObjectIDMPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.idm.COBieIDMPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.objectidms.ObjectIDMPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.idm.COBieIDMWithoutProxyObjectsPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.objectidms.ObjectIDMPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.idm.BPieIDMPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.objectidms.ObjectIDMPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.idm.BAMieIDMPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieLiteSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieSheetXMLDataSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.AsInstalledEquipmentSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 		<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.ProductTypeWarrantySerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieCheckSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieCheckDesignSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieSpaceTypeComponentReportPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieSpatialDecompReportPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.SystemReportPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.serializers.COBieZoneReportPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.deserializers.DeserializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.deserializers.COBieDeserializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.deserializers.DeserializerPlugin</interfaceClass>
 		<implementationClass>org.erdc.cobie.plugins.deserializers.COBieSheetXMLDataDeserializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
-</PluginDescriptor>
-
+</PluginDescriptor>
diff --git a/...ns_Public/src/org/erdc/cobie/plugins/serializers/COBieSpaceTypeComponentReportPlugin.java b/...ns_Public/src/org/erdc/cobie/plugins/serializers/COBieSpaceTypeComponentReportPlugin.java
@@ -93,7 +93,6 @@ protected COBieSerializerPluginInfo getCOBieSerializerInfo()
 
 	@Override
 	public Set<Schema> getSupportedSchemas() {
-		// TODO Auto-generated method stub
-		return null;
+		return Schema.IFC2X3TC1.toSet();
 	}
 }
diff --git a/COBieToolkit/.classpath b/COBieToolkit/.classpath
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="expander"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Utils"/>
-	<classpathentry kind="lib" path="lib/forms-1.3.0.jar" sourcepath="lib/forms-1.3.0-src.zip"/>
-	<classpathentry kind="lib" path="lib/xelem_src.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/xelem.jar"/>
-	<classpathentry kind="lib" path="lib/COBieSerializerSettings.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/COBieBIMServerShared"/>
-	<classpathentry kind="lib" path="lib/COBieSheetXMLData.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="expander"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/forms-1.3.0.jar" sourcepath="lib/forms-1.3.0-src.zip"/>
+	<classpathentry kind="lib" path="lib/xelem_src.3.0.jar"/>
+	<classpathentry kind="lib" path="lib/xelem.jar"/>
+	<classpathentry kind="lib" path="lib/COBieSerializerSettings.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/COBieBIMServerShared"/>
+	<classpathentry kind="lib" path="lib/COBieSheetXMLData.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>