New version

jyrkioraskari · Feb 9, 2024 · e430e2c · e430e2c
1 parent ab204ec
commit e430e2c
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 48 deletions.
diff --git a/IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.component b/IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
 
 
 
@@ -32,7 +33,8 @@
 
 
     <wb-module deploy-name="IFCProps2ExcelOnline-2.43.4">
-
+
+
 
 
 
@@ -65,7 +67,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
 
 
 
@@ -98,7 +101,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-
+
+
 
 
 
@@ -131,7 +135,8 @@
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-
+
+
 
 
 
@@ -164,27 +169,20 @@
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
-
-        <dependent-module archiveName="ifc-to-lbd-2.43.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
 
+
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
+        <dependent-module archiveName="ifc-to-lbd-2.43.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
             <dependency-type>uses</dependency-type>
-
         </dependent-module>
-
         <dependent-module archiveName="idc_to_lbd_geometry-2.43.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
-
             <dependency-type>uses</dependency-type>
-
         </dependent-module>
-
         <dependent-module archiveName="ifc2rdf-1.3.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFC2RDF/IFC2RDF">
-
             <dependency-type>uses</dependency-type>
-
         </dependent-module>
-
+
+
 
 
 
@@ -217,7 +215,8 @@
 
 
         <property name="java-output-path" value="/mvdXMLOnlineChecker/target/classes"/>
-
+
+
 
 
 
@@ -250,7 +249,8 @@
 
 
         <property name="component.exclusion.patterns" value="WEB-INF/classes/VAADIN/widgetsets/WEB-INF/**"/>
-
+
+
 
 
 
@@ -275,7 +275,8 @@
 
 
         <property name="context-root" value="IFCProps2ExcelOnline"/>
-
+
+
 
 
 
@@ -308,7 +309,8 @@
 
 
     </wb-module>
-
+
+
 
 
 

diff --git a/IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.project.facet.core.xml b/IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,5 +4,5 @@
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.1"/>
   <installed facet="java" version="17"/>
-  <installed facet="jst.web" version="3.1"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>
diff --git a/IFCProps2ExcelOnline/pom.xml b/IFCProps2ExcelOnline/pom.xml
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.4</version>
+			<version>2.43.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>

diff --git a/IFCtoLBD/.classpath b/IFCtoLBD/.classpath
@@ -31,13 +31,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>

diff --git a/IFCtoLBD/pom.xml b/IFCtoLBD/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jyrkioraskari</groupId>
 	<artifactId>ifc-to-lbd</artifactId>
-	<version>2.43.4</version>
+	<version>2.43.5</version>
 	<name>IFC to LBD Converter</name>
 	<licenses>
 		<license>

diff --git a/IFCtoLBD/src/license/THIRD-PARTY.properties b/IFCtoLBD/src/license/THIRD-PARTY.properties
@@ -56,5 +56,5 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Fri Feb 02 10:05:21 CET 2024
+#Fri Feb 09 16:02:29 CET 2024
 gnu.getopt--java-getopt--1.0.13=
diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/utils/RDFUtils.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/utils/RDFUtils.java
@@ -132,8 +132,14 @@ public static void readInOntologyTTL(Model model, String ontology_file, EventBus
                     if (in == null)
                         in = IFCtoLBDConverter.class.getResourceAsStream(ontology_file);  // Java 9  module version
 
-                    if (in == null)
+                    try
+                    {
+                      if (in == null)
         				in = ClassLoader.getSystemResources("ifcOWL/"+ontology_file).nextElement().openStream(); // the module (Java 9 ) version 
+                    }
+                    catch (Exception e) {
+						System.err.println(e.getMessage());
+					}
 
                 } catch (Exception e) {
                     eventBus.post(new IFCtoLBD_SystemStatusEvent("Error : " + e.getMessage()));

diff --git a/IFCtoLBD_Desktop/pom.xml b/IFCtoLBD_Desktop/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.4</version>
+			<version>2.43.5</version>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/IFCtoLBD_Desktop_2023/pom.xml b/IFCtoLBD_Desktop_2023/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.4</version>
+			<version>2.43.5</version>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component b/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
+
 
 
 
@@ -28,7 +30,9 @@
 
 
     <wb-module deploy-name="IFCtoLBD_OpenAPI">
-
+
+
+
 
 
 
@@ -57,7 +61,9 @@
 
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
+
 
 
 
@@ -86,7 +92,9 @@
 
 
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-
+
+
+
 
 
 
@@ -115,7 +123,7 @@
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="ifc-to-lbd-2.43.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
+        <dependent-module archiveName="ifc-to-lbd-2.43.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="idc_to_lbd_geometry-2.43.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
@@ -124,7 +132,9 @@
         <dependent-module archiveName="ifc2rdf-1.3.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFC2RDF/IFC2RDF">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-
+
+
+
 
 
 
@@ -153,7 +163,9 @@
 
 
         <property name="context-root" value="IFCtoLBD_OpenAPI"/>
-
+
+
+
 
 
 
@@ -182,7 +194,9 @@
 
 
         <property name="java-output-path" value="/IFCtoLBD_OpenAPI/target/classes"/>
-
+
+
+
 
 
 
@@ -211,7 +225,9 @@
 
 
     </wb-module>
-
+
+
+
 
 
 

diff --git a/IFCtoLBD_OpenAPI/pom.xml b/IFCtoLBD_OpenAPI/pom.xml
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.4</version>
+			<version>2.43.5</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.jena/apache-jena-libs -->

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # IFCtoLBD
-Version 2.43.4
+Version 2.43.5
 
 Contributors: Jyrki Oraskari, Mathias Bonduel, Kris McGlinn, Anna Wagner, Pieter Pauwels, Ville Kukkonen, Simon Steyskaland, Joel Lehtonen, Maxime Lefrançois, and Lewis John McGibbney.
 

diff --git a/maven_demo/.classpath b/maven_demo/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/maven_demo/.settings/org.eclipse.jdt.core.prefs b/maven_demo/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17
diff --git a/maven_demo/README.txt b/maven_demo/README.txt
@@ -2,4 +2,9 @@ Since GitHub dows not allow to publish an open Maven repository, please, just se
 a message and ask for a token and add it to the pom.xml file.
 
 
-oraskari at ip . rwth-aachen . de
+oraskari at ip . rwth-aachen . de
+
+Install:
+maven install
+
+and under Eclipse: Maven Update Project
diff --git a/maven_demo/pom.xml b/maven_demo/pom.xml
@@ -14,7 +14,7 @@
     <repositories>       
         <repository>
          <id>github</id>
-         <url>https://jyrkioraskari:SECRETTOKEN@maven.pkg.github.com/jyrkioraskari/IFCtoLBD</url>
+         <url>https://jyrkioraskari:SECRETKEY@maven.pkg.github.com/jyrkioraskari/IFCtoLBD</url>
           <snapshots>
             <enabled>true</enabled>
           </snapshots>
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.4</version>
+			<version>2.43.5</version>
 		</dependency>
 		<dependency>
 			<groupId>de.rwth-aachen.lbd</groupId>

diff --git a/maven_demo/src/main/java/Example1.java b/maven_demo/src/main/java/Example1.java
@@ -7,6 +7,12 @@
 
 public class Example1 {
 
+	/* 
+	 * In Eclipse:
+	 * maven install
+	 * and then Maven Update Project
+	 */
+
 	public static void main(String[] args) {
 		URL ifcFileUrl = ClassLoader.getSystemResource("Duplex_A.ifc");
 		try {