diff --git a/IFCtoLBD-Desktop_Java_12_win10_installation.zip b/IFCtoLBD-Desktop_Java_12_win10_installation.zip
deleted file mode 100644
index 61596350..00000000
Binary files a/IFCtoLBD-Desktop_Java_12_win10_installation.zip and /dev/null differ
diff --git a/IFCtoLBD-Desktop_Java_8.jar b/IFCtoLBD-Desktop_Java_8.jar
deleted file mode 100644
index 8b8540f2..00000000
Binary files a/IFCtoLBD-Desktop_Java_8.jar and /dev/null differ
diff --git a/IFCtoLBD-Desktop_Java_8_win10_installation.zip b/IFCtoLBD-Desktop_Java_8_win10_installation.zip
deleted file mode 100644
index 4876948e..00000000
Binary files a/IFCtoLBD-Desktop_Java_8_win10_installation.zip and /dev/null differ
diff --git a/IFCtoLBDGeometry/pom.xml b/IFCtoLBDGeometry/pom.xml
index 4f5ae099..f9752681 100644
--- a/IFCtoLBDGeometry/pom.xml
+++ b/IFCtoLBDGeometry/pom.xml
@@ -74,5 +74,5 @@
- 2.3
+ 2.6
\ No newline at end of file
diff --git a/IFCtoLBDGeometry/src/main/java/de/rwth_aachen/dc/lbd/IFCBoundingBoxes.java b/IFCtoLBDGeometry/src/main/java/de/rwth_aachen/dc/lbd/IFCBoundingBoxes.java
index 75fb37a2..4b82d7a1 100644
--- a/IFCtoLBDGeometry/src/main/java/de/rwth_aachen/dc/lbd/IFCBoundingBoxes.java
+++ b/IFCtoLBDGeometry/src/main/java/de/rwth_aachen/dc/lbd/IFCBoundingBoxes.java
@@ -32,33 +32,33 @@ public BoundingBox getBoundingBox(String guid) {
BoundingBox boundingBox = null;
IfcOpenShellEntityInstance renderEngineInstance;
- renderEngineInstance = renderEngineModel.getInstancesByGuid().get(guid);
+ renderEngineInstance = renderEngineModel.getInstanceFromGUID(guid);
if (renderEngineInstance == null) {
return null;
}
IfcGeomServerClientEntity geometry = renderEngineInstance.generateGeometry();
- if (geometry != null && geometry.getIndices().length > 0) {
- boundingBox = new BoundingBox();
- double[] tranformationMatrix = new double[16];
- if (renderEngineInstance.getTransformationMatrix() != null) {
- tranformationMatrix = renderEngineInstance.getTransformationMatrix();
- tranformationMatrix = Matrix.changeOrientation(tranformationMatrix);
- } else {
- Matrix.setIdentityM(tranformationMatrix, 0);
- }
-
- float[] vertices=geometry.getPositions();
- for (int i = 0; i < geometry.getPositions().length; i+=3) {
- processExtends(boundingBox, tranformationMatrix, vertices[i],vertices[i+1],vertices[i+2]);
- }
- }
+ if (geometry != null && geometry.getIndices().length > 0) {
+ boundingBox = new BoundingBox();
+ double[] tranformationMatrix = new double[16];
+ if (renderEngineInstance.getTransformationMatrix() != null) {
+ tranformationMatrix = renderEngineInstance.getTransformationMatrix();
+ tranformationMatrix = Matrix.changeOrientation(tranformationMatrix);
+ } else {
+ Matrix.setIdentityM(tranformationMatrix, 0);
+ }
+
+ float[] vertices = geometry.getPositions();
+ for (int i = 0; i < geometry.getPositions().length; i += 3) {
+ processExtends(boundingBox, tranformationMatrix, vertices[i], vertices[i + 1], vertices[i + 2]);
+ }
+ }
return boundingBox;
}
private IfcOpenShellModel getRenderEngineModel(File ifcFile) throws RenderEngineException, IOException {
String ifcGeomServerLocation = OperatingSystemCopyOf_IfcGeomServer.getIfcGeomServer();
- System.out.println("ifcGeomServerLocation: "+ifcGeomServerLocation);
+ System.out.println("ifcGeomServerLocation: " + ifcGeomServerLocation);
Path ifcGeomServerLocationPath = Paths.get(ifcGeomServerLocation);
IfcOpenShellEngine ifcOpenShellEngine = new IfcOpenShellEngine(ifcGeomServerLocationPath, false, false);
System.out.println("init");
@@ -66,22 +66,22 @@ private IfcOpenShellModel getRenderEngineModel(File ifcFile) throws RenderEngine
System.out.println("init done");
FileInputStream ifcFileInputStream = new FileInputStream(ifcFile);
- System.out.println("ifcFile: "+ifcFile);
+ System.out.println("ifcFile: " + ifcFile);
IfcOpenShellModel model = ifcOpenShellEngine.openModel(ifcFileInputStream);
System.out.println("IfcOpenShell opens ifc: " + ifcFile.getAbsolutePath());
-
+
model.generateGeneralGeometry();
return model;
}
- private void processExtends(BoundingBox boundingBox, double[] transformationMatrix, double x, double y, double z) {
- double[] result = new double[4];
- Matrix.multiplyMV(result, 0, transformationMatrix, 0, new double[] { x, y, z, 1 }, 0);
- x = result[0];
- y = result[1];
- z = result[2];
- Point3d point = new Point3d(x / 1000, y / 1000, z / 1000);
- boundingBox.add(point);
- }
+ private void processExtends(BoundingBox boundingBox, double[] transformationMatrix, double x, double y, double z) {
+ double[] result = new double[4];
+ Matrix.multiplyMV(result, 0, transformationMatrix, 0, new double[] { x, y, z, 1 }, 0);
+ x = result[0];
+ y = result[1];
+ z = result[2];
+ Point3d point = new Point3d(x / 1000, y / 1000, z / 1000);
+ boundingBox.add(point);
+ }
}
\ No newline at end of file
diff --git a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcGeomServerClient.java b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcGeomServerClient.java
index 7cf07469..01d426a9 100644
--- a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcGeomServerClient.java
+++ b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcGeomServerClient.java
@@ -751,7 +751,14 @@ public IfcGeomServerClientEntity getNext() throws RenderEngineException {
askForMore();
return e.getEntity();
- } catch (IOException e) {
+ }
+ // JO 2020
+ catch (java.io.EOFException e) {
+ // Do nothing.The file is read!
+ return null;
+ }
+ catch (IOException e) {
+ e.printStackTrace();
terminate();
return null;
}
diff --git a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEngine.java b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEngine.java
index c36568f6..11cafeeb 100644
--- a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEngine.java
+++ b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEngine.java
@@ -47,7 +47,9 @@
import java.io.InputStream;
import java.nio.file.Path;
+import org.bimserver.plugins.renderengine.RenderEngine;
import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEngineModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEnginePlugin.java b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEnginePlugin.java
index 1d76b181..0d2c821c 100644
--- a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEnginePlugin.java
+++ b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEnginePlugin.java
@@ -53,7 +53,9 @@
import org.bimserver.models.store.StoreFactory;
import org.bimserver.plugins.PluginConfiguration;
import org.bimserver.plugins.PluginContext;
+import org.bimserver.plugins.renderengine.RenderEngine;
import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEnginePlugin;
import org.bimserver.plugins.renderengine.VersionInfo;
import org.bimserver.shared.exceptions.PluginException;
import org.slf4j.Logger;
diff --git a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellModel.java b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellModel.java
index c8c86d56..6009e59a 100644
--- a/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellModel.java
+++ b/IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellModel.java
@@ -48,9 +48,15 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collection;
import java.util.HashMap;
+import org.bimserver.plugins.renderengine.EntityNotFoundException;
import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEngineFilter;
+import org.bimserver.plugins.renderengine.RenderEngineInstance;
+import org.bimserver.plugins.renderengine.RenderEngineModel;
+import org.bimserver.plugins.renderengine.RenderEngineSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,8 +66,8 @@ public class IfcOpenShellModel {
private InputStream ifcInputStream;
private HashMap instancesById;
- private HashMap instancesByGuid;
-
+ private HashMap instancesByGUID;
+
private IfcGeomServerClient client;
public IfcOpenShellModel(IfcGeomServerClient client, InputStream ifcInputStream) throws RenderEngineException, IOException {
@@ -92,17 +98,19 @@ public void close() throws RenderEngineException {
public void generateGeneralGeometry() throws RenderEngineException {
// We keep track of instances ourselves
instancesById = new HashMap();
- instancesByGuid = new HashMap();
+ instancesByGUID = new HashMap();
final double t0 = (double) System.nanoTime();
while (client.hasNext()) {
IfcGeomServerClientEntity next = client.getNext();
- // Store the instance in our dictionary
+ if(next==null) // JO 2020
+ break;
IfcOpenShellEntityInstance instance = new IfcOpenShellEntityInstance(next);
+ System.out.println("GEN GEOM: "+next.getGuid());
+ // Store the instance in our dictionary
instancesById.put(next.getId(), instance);
- instancesByGuid.put(next.getGuid(), instance);
- System.out.println(next.getGuid());
+ instancesByGUID.put(next.getGuid(), instance);
}
final double t1 = (double) System.nanoTime();
@@ -110,7 +118,7 @@ public void generateGeneralGeometry() throws RenderEngineException {
LOGGER.debug(String.format("Took %.2f seconds to obtain representations for %d entities", (t1-t0) / 1.E9, instancesById.size()));
}
- public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) throws RenderEngineException {
+ public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) {
if ( instancesById.containsKey(oid) ) {
return instancesById.get(oid);
} else {
@@ -121,9 +129,11 @@ public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) throws Rende
return null;
}
}
-
- public HashMap getInstancesByGuid() {
- return instancesByGuid;
+ public IfcOpenShellEntityInstance getInstanceFromGUID(String guid) {
+ if ( instancesByGUID.containsKey(guid) ) {
+ return instancesByGUID.get(guid);
+ } else {
+ return null;
+ }
}
-
}
\ No newline at end of file
diff --git a/IFCtoLBD_OpenAPI.war b/IFCtoLBD_OpenAPI.war
deleted file mode 100644
index dbe5b524..00000000
Binary files a/IFCtoLBD_OpenAPI.war and /dev/null differ
diff --git a/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component b/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component
index d4ce5d37..d31619b7 100644
--- a/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component
+++ b/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,10 @@
-
+
+ uses
+
+
uses
diff --git a/IFCtoLBD_OpenAPI/pom.xml b/IFCtoLBD_OpenAPI/pom.xml
index c37f371a..50321335 100644
--- a/IFCtoLBD_OpenAPI/pom.xml
+++ b/IFCtoLBD_OpenAPI/pom.xml
@@ -5,7 +5,7 @@
4.0.0
de.rwth-aachen.dc.ifctolbd
IFCtoLBD_OpenAPI
- 2.4
+ 2.6
war
IFCtoLBD OpenAPI Interface
@@ -128,7 +128,7 @@
io.github.jyrkioraskari
IFCtoLBD
- 2.4
+ 2.6
diff --git a/IFCtoLBD_Python/jars/FastInfoset-1.2.16.jar b/IFCtoLBD_Python/jars/FastInfoset-1.2.16.jar
new file mode 100644
index 00000000..6e91f1ce
Binary files /dev/null and b/IFCtoLBD_Python/jars/FastInfoset-1.2.16.jar differ
diff --git a/IFCtoLBD_Python/jars/IFCtoLBD-2.4.jar b/IFCtoLBD_Python/jars/IFCtoLBD-2.4.jar
deleted file mode 100644
index 7726a6b6..00000000
Binary files a/IFCtoLBD_Python/jars/IFCtoLBD-2.4.jar and /dev/null differ
diff --git a/IFCtoLBD_Python/jars/IFCtoLBD-2.6.jar b/IFCtoLBD_Python/jars/IFCtoLBD-2.6.jar
new file mode 100644
index 00000000..a88e54be
Binary files /dev/null and b/IFCtoLBD_Python/jars/IFCtoLBD-2.6.jar differ
diff --git a/IFCtoLBD_Python/jars/IFCtoRDF-0.5J-SNAPSHOT.jar b/IFCtoLBD_Python/jars/IFCtoRDF-0.5J-SNAPSHOT.jar
deleted file mode 100644
index 91802d73..00000000
Binary files a/IFCtoLBD_Python/jars/IFCtoRDF-0.5J-SNAPSHOT.jar and /dev/null differ
diff --git a/IFCtoLBD_Python/jars/ST4-4.0.8.jar b/IFCtoLBD_Python/jars/ST4-4.0.8.jar
new file mode 100644
index 00000000..144828ba
Binary files /dev/null and b/IFCtoLBD_Python/jars/ST4-4.0.8.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-api-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-api-1.0.2.v20150114.jar
new file mode 100644
index 00000000..c8adbaa2
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-api-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-connector-basic-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-connector-basic-1.0.2.v20150114.jar
new file mode 100644
index 00000000..b5d7735a
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-connector-basic-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-impl-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-impl-1.0.2.v20150114.jar
new file mode 100644
index 00000000..f7643151
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-impl-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-spi-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-spi-1.0.2.v20150114.jar
new file mode 100644
index 00000000..59c0935d
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-spi-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-transport-file-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-transport-file-1.0.2.v20150114.jar
new file mode 100644
index 00000000..d37626f6
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-transport-file-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-transport-http-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-transport-http-1.0.2.v20150114.jar
new file mode 100644
index 00000000..c778db61
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-transport-http-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/aether-util-1.0.2.v20150114.jar b/IFCtoLBD_Python/jars/aether-util-1.0.2.v20150114.jar
new file mode 100644
index 00000000..fce3fff8
Binary files /dev/null and b/IFCtoLBD_Python/jars/aether-util-1.0.2.v20150114.jar differ
diff --git a/IFCtoLBD_Python/jars/antlr-2.7.7.jar b/IFCtoLBD_Python/jars/antlr-2.7.7.jar
new file mode 100644
index 00000000..5e5f14b3
Binary files /dev/null and b/IFCtoLBD_Python/jars/antlr-2.7.7.jar differ
diff --git a/IFCtoLBD_Python/jars/antlr-3.5.2.jar b/IFCtoLBD_Python/jars/antlr-3.5.2.jar
new file mode 100644
index 00000000..12b61401
Binary files /dev/null and b/IFCtoLBD_Python/jars/antlr-3.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/antlr-complete-3.5.2.jar b/IFCtoLBD_Python/jars/antlr-complete-3.5.2.jar
new file mode 100644
index 00000000..260de763
Binary files /dev/null and b/IFCtoLBD_Python/jars/antlr-complete-3.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/antlr-runtime-3.5.2.jar b/IFCtoLBD_Python/jars/antlr-runtime-3.5.2.jar
new file mode 100644
index 00000000..d48e3e86
Binary files /dev/null and b/IFCtoLBD_Python/jars/antlr-runtime-3.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/aopalliance-1.0.jar b/IFCtoLBD_Python/jars/aopalliance-1.0.jar
new file mode 100644
index 00000000..578b1a0c
Binary files /dev/null and b/IFCtoLBD_Python/jars/aopalliance-1.0.jar differ
diff --git a/IFCtoLBD_Python/jars/buildingsmartlibrary-1.0.13.jar b/IFCtoLBD_Python/jars/buildingsmartlibrary-1.0.13.jar
new file mode 100644
index 00000000..96c53e88
Binary files /dev/null and b/IFCtoLBD_Python/jars/buildingsmartlibrary-1.0.13.jar differ
diff --git a/IFCtoLBD_Python/jars/cdi-api-1.0.jar b/IFCtoLBD_Python/jars/cdi-api-1.0.jar
new file mode 100644
index 00000000..fe240f6f
Binary files /dev/null and b/IFCtoLBD_Python/jars/cdi-api-1.0.jar differ
diff --git a/IFCtoLBD_Python/jars/commonj.sdo-2.1.1.jar b/IFCtoLBD_Python/jars/commonj.sdo-2.1.1.jar
new file mode 100644
index 00000000..7c85ca19
Binary files /dev/null and b/IFCtoLBD_Python/jars/commonj.sdo-2.1.1.jar differ
diff --git a/IFCtoLBD_Python/jars/commons-lang-2.6.jar b/IFCtoLBD_Python/jars/commons-lang-2.6.jar
new file mode 100644
index 00000000..98467d3a
Binary files /dev/null and b/IFCtoLBD_Python/jars/commons-lang-2.6.jar differ
diff --git a/IFCtoLBD-Desktop_Java_12.jar b/IFCtoLBD_Python/jars/fastutil-8.2.2.jar
similarity index 50%
rename from IFCtoLBD-Desktop_Java_12.jar
rename to IFCtoLBD_Python/jars/fastutil-8.2.2.jar
index 5648dfd4..2ef21da0 100644
Binary files a/IFCtoLBD-Desktop_Java_12.jar and b/IFCtoLBD_Python/jars/fastutil-8.2.2.jar differ
diff --git a/IFCtoLBD_Python/jars/gmbal-4.0.0.jar b/IFCtoLBD_Python/jars/gmbal-4.0.0.jar
new file mode 100644
index 00000000..9932c84b
Binary files /dev/null and b/IFCtoLBD_Python/jars/gmbal-4.0.0.jar differ
diff --git a/IFCtoLBD_Python/jars/guice-4.0-no_aop.jar b/IFCtoLBD_Python/jars/guice-4.0-no_aop.jar
new file mode 100644
index 00000000..6b09fa0f
Binary files /dev/null and b/IFCtoLBD_Python/jars/guice-4.0-no_aop.jar differ
diff --git a/IFCtoLBD_Python/jars/gunit-3.5.2.jar b/IFCtoLBD_Python/jars/gunit-3.5.2.jar
new file mode 100644
index 00000000..27e81170
Binary files /dev/null and b/IFCtoLBD_Python/jars/gunit-3.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/ha-api-3.1.12.jar b/IFCtoLBD_Python/jars/ha-api-3.1.12.jar
new file mode 100644
index 00000000..b76d9a76
Binary files /dev/null and b/IFCtoLBD_Python/jars/ha-api-3.1.12.jar differ
diff --git a/IFCtoLBD_Python/jars/hamcrest-core-1.1.jar b/IFCtoLBD_Python/jars/hamcrest-core-1.1.jar
new file mode 100644
index 00000000..e5149be7
Binary files /dev/null and b/IFCtoLBD_Python/jars/hamcrest-core-1.1.jar differ
diff --git a/IFCtoLBD_Python/jars/httpmime-4.5.7.jar b/IFCtoLBD_Python/jars/httpmime-4.5.7.jar
new file mode 100644
index 00000000..b4c5e303
Binary files /dev/null and b/IFCtoLBD_Python/jars/httpmime-4.5.7.jar differ
diff --git a/IFCtoLBD_Python/jars/ifcplugins-0.0.99.jar b/IFCtoLBD_Python/jars/ifcplugins-0.0.99.jar
new file mode 100644
index 00000000..29818648
Binary files /dev/null and b/IFCtoLBD_Python/jars/ifcplugins-0.0.99.jar differ
diff --git a/IFCtoLBD_Python/jars/istack-commons-runtime-3.0.8.jar b/IFCtoLBD_Python/jars/istack-commons-runtime-3.0.8.jar
new file mode 100644
index 00000000..8f37e950
Binary files /dev/null and b/IFCtoLBD_Python/jars/istack-commons-runtime-3.0.8.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.activation-api-1.2.1.jar b/IFCtoLBD_Python/jars/jakarta.activation-api-1.2.1.jar
new file mode 100644
index 00000000..bbfb52ff
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.activation-api-1.2.1.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.annotation-api-1.3.4.jar b/IFCtoLBD_Python/jars/jakarta.annotation-api-1.3.4.jar
new file mode 100644
index 00000000..be216be9
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.annotation-api-1.3.4.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.jws-api-1.1.1.jar b/IFCtoLBD_Python/jars/jakarta.jws-api-1.1.1.jar
new file mode 100644
index 00000000..498d1295
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.jws-api-1.1.1.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.mail-api-1.6.3.jar b/IFCtoLBD_Python/jars/jakarta.mail-api-1.6.3.jar
new file mode 100644
index 00000000..9eed7395
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.mail-api-1.6.3.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.persistence-api-2.2.2.jar b/IFCtoLBD_Python/jars/jakarta.persistence-api-2.2.2.jar
new file mode 100644
index 00000000..fd4bbd9b
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.persistence-api-2.2.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.xml.bind-api-2.3.2.jar b/IFCtoLBD_Python/jars/jakarta.xml.bind-api-2.3.2.jar
new file mode 100644
index 00000000..b16236d5
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.xml.bind-api-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.xml.soap-api-1.4.1.jar b/IFCtoLBD_Python/jars/jakarta.xml.soap-api-1.4.1.jar
new file mode 100644
index 00000000..832765ce
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.xml.soap-api-1.4.1.jar differ
diff --git a/IFCtoLBD_Python/jars/jakarta.xml.ws-api-2.3.2.jar b/IFCtoLBD_Python/jars/jakarta.xml.ws-api-2.3.2.jar
new file mode 100644
index 00000000..af82d8aa
Binary files /dev/null and b/IFCtoLBD_Python/jars/jakarta.xml.ws-api-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/java-getopt-1.0.13.jar b/IFCtoLBD_Python/jars/java-getopt-1.0.13.jar
new file mode 100644
index 00000000..237ce912
Binary files /dev/null and b/IFCtoLBD_Python/jars/java-getopt-1.0.13.jar differ
diff --git a/IFCtoLBD_Python/jars/javassist-3.24.1-GA.jar b/IFCtoLBD_Python/jars/javassist-3.24.1-GA.jar
new file mode 100644
index 00000000..3c7686d7
Binary files /dev/null and b/IFCtoLBD_Python/jars/javassist-3.24.1-GA.jar differ
diff --git a/IFCtoLBD_Python/jars/javax.inject-1.jar b/IFCtoLBD_Python/jars/javax.inject-1.jar
new file mode 100644
index 00000000..b2a9d0bf
Binary files /dev/null and b/IFCtoLBD_Python/jars/javax.inject-1.jar differ
diff --git a/IFCtoLBD_Python/jars/javax.json-1.0.4.jar b/IFCtoLBD_Python/jars/javax.json-1.0.4.jar
new file mode 100644
index 00000000..09967d81
Binary files /dev/null and b/IFCtoLBD_Python/jars/javax.json-1.0.4.jar differ
diff --git a/IFCtoLBD_Python/jars/javax.servlet-api-3.1.0.jar b/IFCtoLBD_Python/jars/javax.servlet-api-3.1.0.jar
new file mode 100644
index 00000000..6b14c3d2
Binary files /dev/null and b/IFCtoLBD_Python/jars/javax.servlet-api-3.1.0.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxb-jxc-2.3.2.jar b/IFCtoLBD_Python/jars/jaxb-jxc-2.3.2.jar
new file mode 100644
index 00000000..6f02d95e
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxb-jxc-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxb-runtime-2.3.2.jar b/IFCtoLBD_Python/jars/jaxb-runtime-2.3.2.jar
new file mode 100644
index 00000000..62f87196
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxb-runtime-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxb-xjc-2.3.2.jar b/IFCtoLBD_Python/jars/jaxb-xjc-2.3.2.jar
new file mode 100644
index 00000000..6e630040
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxb-xjc-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxws-eclipselink-plugin-2.3.2.jar b/IFCtoLBD_Python/jars/jaxws-eclipselink-plugin-2.3.2.jar
new file mode 100644
index 00000000..071782b5
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxws-eclipselink-plugin-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxws-rt-2.3.2.jar b/IFCtoLBD_Python/jars/jaxws-rt-2.3.2.jar
new file mode 100644
index 00000000..12945f98
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxws-rt-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jaxws-tools-2.3.2.jar b/IFCtoLBD_Python/jars/jaxws-tools-2.3.2.jar
new file mode 100644
index 00000000..3c7ab378
Binary files /dev/null and b/IFCtoLBD_Python/jars/jaxws-tools-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/jsr250-api-1.0.jar b/IFCtoLBD_Python/jars/jsr250-api-1.0.jar
new file mode 100644
index 00000000..c1f29bf8
Binary files /dev/null and b/IFCtoLBD_Python/jars/jsr250-api-1.0.jar differ
diff --git a/IFCtoLBD_Python/jars/junit-4.10.jar b/IFCtoLBD_Python/jars/junit-4.10.jar
new file mode 100644
index 00000000..954851e6
Binary files /dev/null and b/IFCtoLBD_Python/jars/junit-4.10.jar differ
diff --git a/IFCtoLBD_Python/jars/management-api-3.2.1.jar b/IFCtoLBD_Python/jars/management-api-3.2.1.jar
new file mode 100644
index 00000000..f31e725f
Binary files /dev/null and b/IFCtoLBD_Python/jars/management-api-3.2.1.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-aether-provider-3.3.9.jar b/IFCtoLBD_Python/jars/maven-aether-provider-3.3.9.jar
new file mode 100644
index 00000000..9f081209
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-aether-provider-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-artifact-3.3.9.jar b/IFCtoLBD_Python/jars/maven-artifact-3.3.9.jar
new file mode 100644
index 00000000..eaf7d4db
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-artifact-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-builder-support-3.3.9.jar b/IFCtoLBD_Python/jars/maven-builder-support-3.3.9.jar
new file mode 100644
index 00000000..905c6ae7
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-builder-support-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-core-3.3.9.jar b/IFCtoLBD_Python/jars/maven-core-3.3.9.jar
new file mode 100644
index 00000000..337f62a6
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-core-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-model-3.3.9.jar b/IFCtoLBD_Python/jars/maven-model-3.3.9.jar
new file mode 100644
index 00000000..cb0e15c3
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-model-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-model-builder-3.3.9.jar b/IFCtoLBD_Python/jars/maven-model-builder-3.3.9.jar
new file mode 100644
index 00000000..c2e36413
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-model-builder-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-plugin-api-3.3.9.jar b/IFCtoLBD_Python/jars/maven-plugin-api-3.3.9.jar
new file mode 100644
index 00000000..4418b5cf
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-plugin-api-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-repository-metadata-3.3.9.jar b/IFCtoLBD_Python/jars/maven-repository-metadata-3.3.9.jar
new file mode 100644
index 00000000..d1129e06
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-repository-metadata-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-settings-3.3.9.jar b/IFCtoLBD_Python/jars/maven-settings-3.3.9.jar
new file mode 100644
index 00000000..b3e2dc21
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-settings-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/maven-settings-builder-3.3.9.jar b/IFCtoLBD_Python/jars/maven-settings-builder-3.3.9.jar
new file mode 100644
index 00000000..dd2d4007
Binary files /dev/null and b/IFCtoLBD_Python/jars/maven-settings-builder-3.3.9.jar differ
diff --git a/IFCtoLBD_Python/jars/mimepull-1.9.11.jar b/IFCtoLBD_Python/jars/mimepull-1.9.11.jar
new file mode 100644
index 00000000..99a4aba0
Binary files /dev/null and b/IFCtoLBD_Python/jars/mimepull-1.9.11.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.commands-3.9.700.jar b/IFCtoLBD_Python/jars/org.eclipse.core.commands-3.9.700.jar
new file mode 100644
index 00000000..b6de50e7
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.commands-3.9.700.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.contenttype-3.7.800.jar b/IFCtoLBD_Python/jars/org.eclipse.core.contenttype-3.7.800.jar
new file mode 100644
index 00000000..21ff456c
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.contenttype-3.7.800.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.expressions-3.7.0.jar b/IFCtoLBD_Python/jars/org.eclipse.core.expressions-3.7.0.jar
new file mode 100644
index 00000000..c43c3792
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.expressions-3.7.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.filesystem-1.7.700.jar b/IFCtoLBD_Python/jars/org.eclipse.core.filesystem-1.7.700.jar
new file mode 100644
index 00000000..7a5f80e8
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.filesystem-1.7.700.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.jobs-3.10.800.jar b/IFCtoLBD_Python/jars/org.eclipse.core.jobs-3.10.800.jar
new file mode 100644
index 00000000..040e6f48
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.jobs-3.10.800.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.13.800.jar b/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.13.800.jar
new file mode 100644
index 00000000..b973bccf
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.13.800.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.8.101.v20130717-0806.jar b/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.8.101.v20130717-0806.jar
new file mode 100644
index 00000000..e38ec8a9
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.resources-3.8.101.v20130717-0806.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.runtime-3.19.0.jar b/IFCtoLBD_Python/jars/org.eclipse.core.runtime-3.19.0.jar
new file mode 100644
index 00000000..e064a076
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.runtime-3.19.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.core.variables-3.4.800.jar b/IFCtoLBD_Python/jars/org.eclipse.core.variables-3.4.800.jar
new file mode 100644
index 00000000..b3608b92
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.core.variables-3.4.800.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.debug.core-3.16.0.jar b/IFCtoLBD_Python/jars/org.eclipse.debug.core-3.16.0.jar
new file mode 100644
index 00000000..dea92858
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.debug.core-3.16.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.emf.codegen-2.14.0.jar b/IFCtoLBD_Python/jars/org.eclipse.emf.codegen-2.14.0.jar
new file mode 100644
index 00000000..c6b94b99
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.emf.codegen-2.14.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.emf.codegen.ecore-2.15.0.jar b/IFCtoLBD_Python/jars/org.eclipse.emf.codegen.ecore-2.15.0.jar
new file mode 100644
index 00000000..f7f449e4
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.emf.codegen.ecore-2.15.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.emf.common-2.15.0.jar b/IFCtoLBD_Python/jars/org.eclipse.emf.common-2.15.0.jar
new file mode 100644
index 00000000..a7e307df
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.emf.common-2.15.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.emf.ecore-2.15.0.jar b/IFCtoLBD_Python/jars/org.eclipse.emf.ecore-2.15.0.jar
new file mode 100644
index 00000000..82d658e3
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.emf.ecore-2.15.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.emf.ecore.xmi-2.15.0.jar b/IFCtoLBD_Python/jars/org.eclipse.emf.ecore.xmi-2.15.0.jar
new file mode 100644
index 00000000..47aafcbb
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.emf.ecore.xmi-2.15.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.equinox.app-1.5.0.jar b/IFCtoLBD_Python/jars/org.eclipse.equinox.app-1.5.0.jar
new file mode 100644
index 00000000..cb455ab0
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.equinox.app-1.5.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.equinox.common-3.13.0.jar b/IFCtoLBD_Python/jars/org.eclipse.equinox.common-3.13.0.jar
new file mode 100644
index 00000000..d30595d7
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.equinox.common-3.13.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.equinox.preferences-3.8.0.jar b/IFCtoLBD_Python/jars/org.eclipse.equinox.preferences-3.8.0.jar
new file mode 100644
index 00000000..7d5185e0
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.equinox.preferences-3.8.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.equinox.registry-3.9.0.jar b/IFCtoLBD_Python/jars/org.eclipse.equinox.registry-3.9.0.jar
new file mode 100644
index 00000000..1e095c0e
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.equinox.registry-3.9.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.14.0.v20171206-0802.jar b/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.14.0.v20171206-0802.jar
new file mode 100644
index 00000000..406c66af
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.14.0.v20171206-0802.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.23.0.jar b/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.23.0.jar
new file mode 100644
index 00000000..6890a5d1
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.jdt.core-3.23.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.jdt.debug-3.16.0.jar b/IFCtoLBD_Python/jars/org.eclipse.jdt.debug-3.16.0.jar
new file mode 100644
index 00000000..fb975bf3
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.jdt.debug-3.16.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.jdt.launching-3.18.0.jar b/IFCtoLBD_Python/jars/org.eclipse.jdt.launching-3.18.0.jar
new file mode 100644
index 00000000..2c7808ce
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.jdt.launching-3.18.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.osgi-3.16.0.jar b/IFCtoLBD_Python/jars/org.eclipse.osgi-3.16.0.jar
new file mode 100644
index 00000000..e7ec07e7
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.osgi-3.16.0.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.persistence.asm-2.7.4.jar b/IFCtoLBD_Python/jars/org.eclipse.persistence.asm-2.7.4.jar
new file mode 100644
index 00000000..f31d43b8
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.persistence.asm-2.7.4.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.persistence.core-2.7.4.jar b/IFCtoLBD_Python/jars/org.eclipse.persistence.core-2.7.4.jar
new file mode 100644
index 00000000..3094d09b
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.persistence.core-2.7.4.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.persistence.moxy-2.7.4.jar b/IFCtoLBD_Python/jars/org.eclipse.persistence.moxy-2.7.4.jar
new file mode 100644
index 00000000..6e659285
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.persistence.moxy-2.7.4.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.persistence.sdo-2.7.4.jar b/IFCtoLBD_Python/jars/org.eclipse.persistence.sdo-2.7.4.jar
new file mode 100644
index 00000000..72659953
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.persistence.sdo-2.7.4.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.sisu.inject-0.3.2.jar b/IFCtoLBD_Python/jars/org.eclipse.sisu.inject-0.3.2.jar
new file mode 100644
index 00000000..f9251b1a
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.sisu.inject-0.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.sisu.plexus-0.3.2.jar b/IFCtoLBD_Python/jars/org.eclipse.sisu.plexus-0.3.2.jar
new file mode 100644
index 00000000..e82b9bca
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.sisu.plexus-0.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/org.eclipse.text-3.10.300.jar b/IFCtoLBD_Python/jars/org.eclipse.text-3.10.300.jar
new file mode 100644
index 00000000..985deca9
Binary files /dev/null and b/IFCtoLBD_Python/jars/org.eclipse.text-3.10.300.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-asm-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-asm-4.0.1.jar
new file mode 100644
index 00000000..f60d38f0
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-asm-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-basic-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-basic-4.0.1.jar
new file mode 100644
index 00000000..54bf19b3
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-basic-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-basic-tools-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-basic-tools-4.0.1.jar
new file mode 100644
index 00000000..09e7b2c2
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-basic-tools-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-dynamic-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-dynamic-4.0.1.jar
new file mode 100644
index 00000000..b65a6c4e
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-dynamic-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-tf-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-tf-4.0.1.jar
new file mode 100644
index 00000000..f8fded7a
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-tf-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/pfl-tf-tools-4.0.1.jar b/IFCtoLBD_Python/jars/pfl-tf-tools-4.0.1.jar
new file mode 100644
index 00000000..3f60376b
Binary files /dev/null and b/IFCtoLBD_Python/jars/pfl-tf-tools-4.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-cipher-1.4.jar b/IFCtoLBD_Python/jars/plexus-cipher-1.4.jar
new file mode 100644
index 00000000..9227205c
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-cipher-1.4.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-classworlds-2.5.2.jar b/IFCtoLBD_Python/jars/plexus-classworlds-2.5.2.jar
new file mode 100644
index 00000000..2560b3ff
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-classworlds-2.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-component-annotations-1.6.jar b/IFCtoLBD_Python/jars/plexus-component-annotations-1.6.jar
new file mode 100644
index 00000000..22e433d9
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-component-annotations-1.6.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-interpolation-1.21.jar b/IFCtoLBD_Python/jars/plexus-interpolation-1.21.jar
new file mode 100644
index 00000000..8a681ef3
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-interpolation-1.21.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-sec-dispatcher-1.3.jar b/IFCtoLBD_Python/jars/plexus-sec-dispatcher-1.3.jar
new file mode 100644
index 00000000..9dc9f64b
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-sec-dispatcher-1.3.jar differ
diff --git a/IFCtoLBD_Python/jars/plexus-utils-3.0.22.jar b/IFCtoLBD_Python/jars/plexus-utils-3.0.22.jar
new file mode 100644
index 00000000..24997661
Binary files /dev/null and b/IFCtoLBD_Python/jars/plexus-utils-3.0.22.jar differ
diff --git a/IFCtoLBD_Python/jars/pluginbase-1.5.182.jar b/IFCtoLBD_Python/jars/pluginbase-1.5.182.jar
new file mode 100644
index 00000000..11499e7b
Binary files /dev/null and b/IFCtoLBD_Python/jars/pluginbase-1.5.182.jar differ
diff --git a/IFCtoLBD_Python/jars/policy-2.7.6.jar b/IFCtoLBD_Python/jars/policy-2.7.6.jar
new file mode 100644
index 00000000..56b0e31c
Binary files /dev/null and b/IFCtoLBD_Python/jars/policy-2.7.6.jar differ
diff --git a/IFCtoLBD_Python/jars/protobuf-java-2.6.1.jar b/IFCtoLBD_Python/jars/protobuf-java-2.6.1.jar
new file mode 100644
index 00000000..0fcd8089
Binary files /dev/null and b/IFCtoLBD_Python/jars/protobuf-java-2.6.1.jar differ
diff --git a/IFCtoLBD_Python/jars/saaj-impl-1.5.1.jar b/IFCtoLBD_Python/jars/saaj-impl-1.5.1.jar
new file mode 100644
index 00000000..fb57675e
Binary files /dev/null and b/IFCtoLBD_Python/jars/saaj-impl-1.5.1.jar differ
diff --git a/IFCtoLBD_Python/jars/sdo-eclipselink-plugin-2.3.2.jar b/IFCtoLBD_Python/jars/sdo-eclipselink-plugin-2.3.2.jar
new file mode 100644
index 00000000..6bf266f8
Binary files /dev/null and b/IFCtoLBD_Python/jars/sdo-eclipselink-plugin-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/shared-1.5.182.jar b/IFCtoLBD_Python/jars/shared-1.5.182.jar
new file mode 100644
index 00000000..64eaa282
Binary files /dev/null and b/IFCtoLBD_Python/jars/shared-1.5.182.jar differ
diff --git a/IFCtoLBD_Python/jars/slf4j-api-1.6.2.jar b/IFCtoLBD_Python/jars/slf4j-api-1.6.2.jar
new file mode 100644
index 00000000..621f5149
Binary files /dev/null and b/IFCtoLBD_Python/jars/slf4j-api-1.6.2.jar differ
diff --git a/IFCtoLBD_Python/jars/slf4j-api-1.7.6.jar b/IFCtoLBD_Python/jars/slf4j-api-1.7.6.jar
deleted file mode 100644
index 19aaf376..00000000
Binary files a/IFCtoLBD_Python/jars/slf4j-api-1.7.6.jar and /dev/null differ
diff --git a/IFCtoLBD_Python/jars/stax-api-1.0.1.jar b/IFCtoLBD_Python/jars/stax-api-1.0.1.jar
new file mode 100644
index 00000000..d9a16651
Binary files /dev/null and b/IFCtoLBD_Python/jars/stax-api-1.0.1.jar differ
diff --git a/IFCtoLBD_Python/jars/stax-ex-1.8.1.jar b/IFCtoLBD_Python/jars/stax-ex-1.8.1.jar
new file mode 100644
index 00000000..a200db53
Binary files /dev/null and b/IFCtoLBD_Python/jars/stax-ex-1.8.1.jar differ
diff --git a/IFCtoLBD_Python/jars/stax2-api-4.1.jar b/IFCtoLBD_Python/jars/stax2-api-4.1.jar
new file mode 100644
index 00000000..118ed33c
Binary files /dev/null and b/IFCtoLBD_Python/jars/stax2-api-4.1.jar differ
diff --git a/IFCtoLBD_Python/jars/streambuffer-1.5.7.jar b/IFCtoLBD_Python/jars/streambuffer-1.5.7.jar
new file mode 100644
index 00000000..efc9a680
Binary files /dev/null and b/IFCtoLBD_Python/jars/streambuffer-1.5.7.jar differ
diff --git a/IFCtoLBD_Python/jars/stringtemplate-3.2.1.jar b/IFCtoLBD_Python/jars/stringtemplate-3.2.1.jar
new file mode 100644
index 00000000..d0e11b71
Binary files /dev/null and b/IFCtoLBD_Python/jars/stringtemplate-3.2.1.jar differ
diff --git a/IFCtoLBD_Python/jars/txw2-2.3.2.jar b/IFCtoLBD_Python/jars/txw2-2.3.2.jar
new file mode 100644
index 00000000..0d5ac012
Binary files /dev/null and b/IFCtoLBD_Python/jars/txw2-2.3.2.jar differ
diff --git a/IFCtoLBD_Python/jars/vecmath-1.5.2.jar b/IFCtoLBD_Python/jars/vecmath-1.5.2.jar
new file mode 100644
index 00000000..55fc1632
Binary files /dev/null and b/IFCtoLBD_Python/jars/vecmath-1.5.2.jar differ
diff --git a/IFCtoLBD_Python/jars/woodstox-core-5.1.0.jar b/IFCtoLBD_Python/jars/woodstox-core-5.1.0.jar
new file mode 100644
index 00000000..e34f2923
Binary files /dev/null and b/IFCtoLBD_Python/jars/woodstox-core-5.1.0.jar differ
diff --git a/IFCtoLBD_Python/jars/xmlbeans-2.6.0.jar b/IFCtoLBD_Python/jars/xmlbeans-2.6.0.jar
new file mode 100644
index 00000000..d1b66271
Binary files /dev/null and b/IFCtoLBD_Python/jars/xmlbeans-2.6.0.jar differ
diff --git a/IFCtoRDF/src/main/java/be/ugent/IfcSpfParser.java b/IFCtoRDF/src/main/java/be/ugent/IfcSpfParser.java
index 0de29553..eb71d707 100644
--- a/IFCtoRDF/src/main/java/be/ugent/IfcSpfParser.java
+++ b/IFCtoRDF/src/main/java/be/ugent/IfcSpfParser.java
@@ -1,11 +1,21 @@
package be.ugent;
-import com.buildingsmart.tech.ifcowl.vo.IFCVO;
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
-import java.util.*;
+import com.buildingsmart.tech.ifcowl.vo.IFCVO;
public class IfcSpfParser {
@@ -16,7 +26,7 @@ public class IfcSpfParser {
private static final Logger LOG = LoggerFactory.getLogger(RDFWriter.class);
- public IfcSpfParser(InputStream inputStream){
+ public IfcSpfParser(InputStream inputStream) {
this.inputStream = inputStream;
}
@@ -65,73 +75,73 @@ private void parseIfcLineStatement(String line) {
char ch = line.charAt(i);
switch (state) {
case 0:
- if (ch == '=') {
- ifcvo.setLineNum(toLong(sb.toString()));
- sb.setLength(0);
- state++;
- continue;
- } else if (Character.isDigit(ch))
- sb.append(ch);
+ if (ch == '=') {
+ ifcvo.setLineNum(toLong(sb.toString()));
+ sb.setLength(0);
+ state++;
+ continue;
+ } else if (Character.isDigit(ch))
+ sb.append(ch);
break;
case 1: // (
- if (ch == '(') {
- ifcvo.setName(sb.toString());
- sb.setLength(0);
- state++;
- continue;
- } else if (ch == ';') {
- ifcvo.setName(sb.toString());
- sb.setLength(0);
- state = Integer.MAX_VALUE;
- } else if (!Character.isWhitespace(ch))
- sb.append(ch);
+ if (ch == '(') {
+ ifcvo.setName(sb.toString());
+ sb.setLength(0);
+ state++;
+ continue;
+ } else if (ch == ';') {
+ ifcvo.setName(sb.toString());
+ sb.setLength(0);
+ state = Integer.MAX_VALUE;
+ } else if (!Character.isWhitespace(ch))
+ sb.append(ch);
break;
case 2: // (... line started and doing (...
- if (ch == '\'') {
- state++;
- }
- if (ch == '(') {
- listStack.push(current);
- LinkedList