File type fix

jyrkioraskari · Jun 7, 2022 · fa417fd · fa417fd
1 parent 15fc82a
commit fa417fd
Show file tree

Hide file tree

Showing 25 changed files with 219 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # mvdXML Checker
-version 2.54.0
+version 2.54.1
 
 Jyrki Oraskari
 

diff --git a/mvdXMLChecker/pom.xml b/mvdXMLChecker/pom.xml
@@ -17,6 +17,6 @@
   <version>${mvdxml_check_project.version}</version>
 
   <properties>
-     <mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+     <mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 </properties>
 </project>
diff --git a/mvdXMLCheckerCommon/.classpath b/mvdXMLCheckerCommon/.classpath
@@ -29,5 +29,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/mvdXMLCheckerCommon/.settings/org.eclipse.wst.common.component b/mvdXMLCheckerCommon/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
     <wb-module deploy-name="mvdXMLCheckerCore">
+
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+
     </wb-module>
+
 </project-modules>
diff --git a/mvdXMLCheckerCommon/pom.xml b/mvdXMLCheckerCommon/pom.xml
@@ -9,7 +9,7 @@
 	<version>${mvdxml_check_project.version}</version>
 
 	<properties>
-		<mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+		<mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>

diff --git a/mvdXMLCheckerCore1dot1/.classpath b/mvdXMLCheckerCore1dot1/.classpath
@@ -24,5 +24,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/mvdXMLCheckerCore1dot1/.settings/org.eclipse.wst.common.component b/mvdXMLCheckerCore1dot1/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
     <wb-module deploy-name="mvdXMLCheckerCore">
+
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+
     </wb-module>
+
 </project-modules>
diff --git a/mvdXMLCheckerCore1dot1/pom.xml b/mvdXMLCheckerCore1dot1/pom.xml
@@ -8,7 +8,7 @@
 	<version>${mvdxml_check_project.version}</version>
 
 	<properties>
-		<mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+		<mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>

diff --git a/mvdXMLCheckerCore1dot2/.classpath b/mvdXMLCheckerCore1dot2/.classpath
@@ -24,5 +24,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/mvdXMLCheckerCore1dot2/.settings/org.eclipse.wst.common.component b/mvdXMLCheckerCore1dot2/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
     <wb-module deploy-name="mvdXMLCheckerCore">
+
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+
     </wb-module>
+
 </project-modules>
diff --git a/mvdXMLCheckerCore1dot2/pom.xml b/mvdXMLCheckerCore1dot2/pom.xml
@@ -8,7 +8,7 @@
 	<version>${mvdxml_check_project.version}</version>
 
 	<properties>
-		<mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+		<mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>

diff --git a/mvdXMLCheckerCore1underscore1/.classpath b/mvdXMLCheckerCore1underscore1/.classpath
@@ -24,5 +24,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/mvdXMLCheckerCore1underscore1/.settings/org.eclipse.wst.common.component b/mvdXMLCheckerCore1underscore1/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
     <wb-module deploy-name="mvdXMLCheckerCore1underscore1">
+
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+
     </wb-module>
+
 </project-modules>
diff --git a/mvdXMLCheckerCore1underscore1/pom.xml b/mvdXMLCheckerCore1underscore1/pom.xml
@@ -8,7 +8,7 @@
 	<version>${mvdxml_check_project.version}</version>
 
 	<properties>
-		<mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+		<mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>

diff --git a/mvdXMLCheckerOpenAPI/.settings/org.eclipse.wst.common.component b/mvdXMLCheckerOpenAPI/.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">
-
+
+
 
 
 
@@ -9,7 +10,8 @@
 
 
     <wb-module deploy-name="mvdXMLChecker">
-
+
+
 
 
 
@@ -19,7 +21,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
 
 
 
@@ -29,7 +32,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-
+
+
 
 
 
@@ -39,19 +43,20 @@
 
 
         <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module archiveName="mvdXMLCheckerCore1dot1-2.54.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1dot1/mvdXMLCheckerCore1dot1">
+        <dependent-module archiveName="mvdXMLCheckerCore1dot1-2.54.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1dot1/mvdXMLCheckerCore1dot1">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="mvdXMLCheckerCommon-2.54.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCommon/mvdXMLCheckerCommon">
+        <dependent-module archiveName="mvdXMLCheckerCommon-2.54.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCommon/mvdXMLCheckerCommon">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="mvdXMLCheckerCore1dot2-2.54.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1dot2/mvdXMLCheckerCore1dot2">
+        <dependent-module archiveName="mvdXMLCheckerCore1dot2-2.54.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1dot2/mvdXMLCheckerCore1dot2">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="mvdXMLCheckerCore1underscore1-2.54.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1underscore1/mvdXMLCheckerCore1underscore1">
+        <dependent-module archiveName="mvdXMLCheckerCore1underscore1-2.54.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mvdXMLCheckerCore1underscore1/mvdXMLCheckerCore1underscore1">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-
+
+
 
 
 
@@ -61,7 +66,8 @@
 
 
         <property name="java-output-path" value="/mvdXMLCheckerOpenAPI/build/classes"/>
-
+
+
 
 
 
@@ -71,7 +77,8 @@
 
 
         <property name="context-root" value="mvdXMLChecker"/>
-
+
+
 
 
 
@@ -81,7 +88,8 @@
 
 
     </wb-module>
-
+
+
 
 
 

diff --git a/mvdXMLCheckerOpenAPI/pom.xml b/mvdXMLCheckerOpenAPI/pom.xml
@@ -10,7 +10,7 @@
 	<name>mvdXMLChecker OpenAPI Interface</name>
 
 	<properties>
-		<mvdxml_check_project.version>2.54.0</mvdxml_check_project.version>
+		<mvdxml_check_project.version>2.54.1</mvdxml_check_project.version>
 		<jersey2.version>2.30</jersey2.version>
 		<jaxrs.version>2.1.1</jaxrs.version>
 		<tomcat.version>7.0.69</tomcat.version>

diff --git a/...CheckerOpenAPI/src/main/java/de/rwth_aachen/dc/mvd/ifcvalidator/rest/IfcValidatorAPI.java b/...CheckerOpenAPI/src/main/java/de/rwth_aachen/dc/mvd/ifcvalidator/rest/IfcValidatorAPI.java
@@ -1,4 +1,5 @@
 package de.rwth_aachen.dc.mvd.ifcvalidator.rest;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,10 +12,9 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.xml.bind.JAXBException;
 
 import org.apache.commons.io.IOUtils;
@@ -29,7 +29,6 @@
 import de.rwth_aachen.dc.mvd.mvdxml1dot2.checker.MvdXMLv1dot2Check;
 import de.rwth_aachen.dc.mvd.mvdxml1underscore1.checker.MvdXMLv1undescore1Check;
 
-
 @Path("/")
 public class IfcValidatorAPI {
 
@@ -42,7 +41,6 @@ public class IfcValidatorAPI {
 	}
     }
 
-
     /**
      * Checks the validity the validity of the given IFC Step file content against
      * the referred mvdXML. Provides a JSON result.
@@ -88,8 +86,7 @@ private void execute_check(MvdXMLCheckerResultsReportBean issueReportBean, File
 	    // mvdXML 1.1
 	    issueReportBean.setMessage("a valid mvdXML 1.1 file");
 	    IssueReport issueReport = MvdXMLv1dot1Check.check(tempIfcFile.toPath(), tempMvdxmlFile.getAbsolutePath());
-	    if (issueReport != null)
-	    {
+	    if (issueReport != null) {
 		issueReportBean.getIssues().addAll(issueReport.getIssues());
 		issueReportBean.getElement_check_results().addAll(issueReport.getElementCheckResults());
 		issueReportBean.getGeneral_comments().addAll(issueReport.getGeneral_comments());
@@ -100,8 +97,7 @@ private void execute_check(MvdXMLCheckerResultsReportBean issueReportBean, File
 	if (MvdXMLVersionCheck.checkMvdXMLSchemaVersion(tempMvdxmlFile.getAbsolutePath(), "http://buildingsmart-tech.org/mvd/XML/1.2")) {
 	    issueReportBean.setMessage("a mvdXML 1.2 file");
 	    IssueReport issueReport = MvdXMLv1dot2Check.check(tempIfcFile.toPath(), tempMvdxmlFile.getAbsolutePath());
-	    if (issueReport != null)
-	    {
+	    if (issueReport != null) {
 		issueReportBean.getIssues().addAll(issueReport.getIssues());
 		issueReportBean.getElement_check_results().addAll(issueReport.getElementCheckResults());
 		issueReportBean.getGeneral_comments().addAll(issueReport.getGeneral_comments());
@@ -111,12 +107,11 @@ private void execute_check(MvdXMLCheckerResultsReportBean issueReportBean, File
 	    if (MvdXMLVersionCheck.checkMvdXMLSchemaVersion(tempMvdxmlFile.getAbsolutePath(), "http://buildingsmart-tech.org/mvdXML/mvdXML1-1")) {
 		issueReportBean.setMessage("a mvdXML 1_1 file");
 		IssueReport issueReport = MvdXMLv1undescore1Check.check(tempIfcFile.toPath(), tempMvdxmlFile.getAbsolutePath());
-		if (issueReport != null)
-		    {
-			issueReportBean.getIssues().addAll(issueReport.getIssues());
-			issueReportBean.getElement_check_results().addAll(issueReport.getElementCheckResults());
-			issueReportBean.getGeneral_comments().addAll(issueReport.getGeneral_comments());
-		    }
+		if (issueReport != null) {
+		    issueReportBean.getIssues().addAll(issueReport.getIssues());
+		    issueReportBean.getElement_check_results().addAll(issueReport.getElementCheckResults());
+		    issueReportBean.getGeneral_comments().addAll(issueReport.getGeneral_comments());
+		}
 	    } else
 		issueReportBean.setMessage("Error: Unknown mvdXML version");
 	}
@@ -160,19 +155,19 @@ public Response check(@FormDataParam("mvdXMLfile") InputStream mvdXMLfile, @Form
 	    }
 
 	    final File final_BCFZipFile = tempBCFZipFile;
-	    StreamingOutput fileStream = new StreamingOutput() {
-		@Override
-		public void write(java.io.OutputStream output) throws IOException, WebApplicationException {
-		    try {
-			byte[] data = Files.readAllBytes(final_BCFZipFile.toPath());
-			output.write(data);
-			output.flush();
-		    } catch (Exception e) {
-			throw new WebApplicationException("File Not Found !!");
-		    }
-		}
-	    };
-	    return Response.ok(fileStream, MediaType.APPLICATION_OCTET_STREAM).header("content-disposition", "attachment; filename = result.bcfzip").build();
+	    /*
+	     * StreamingOutput fileStream = new StreamingOutput() {
+	     * 
+	     * @Override public void write(java.io.OutputStream output) throws IOException,
+	     * WebApplicationException { try { byte[] data =
+	     * Files.readAllBytes(final_BCFZipFile.toPath()); output.write(data);
+	     * output.flush(); } catch (Exception e) { throw new
+	     * WebApplicationException("File Not Found !!"); } } };
+	     */
+
+	    ResponseBuilder response = Response.ok((Object) final_BCFZipFile);
+	    response.header("Content-Disposition", "attachment; filename=\"result.bcfzip\"");
+	    return response.build();
 	} catch (Exception e) {
 	    e.printStackTrace();
 	    issueReportBean.setCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -214,5 +209,4 @@ private File execute_check(File tempBCFZipFile, File tempIfcFile, File tempMvdxm
 	return tempBCFZipFile;
     }
 
-
 }
diff --git a/mvdXMLCommandLineChecker/.classpath b/mvdXMLCommandLineChecker/.classpath
@@ -24,5 +24,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>