fixed schema validation with external xsds

update to version 3.14.1

CityDoctorParent/CityDoctorCheckResult/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.14.0</version>
+		<version>3.14.1</version>
 	</parent>
 	<artifactId>CityDoctorCheckResult</artifactId>
 	<dependencies>

CityDoctorParent/CityDoctorEdge/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.14.0</version>
+		<version>3.14.1</version>
 	</parent>
 	<artifactId>CityDoctorEdge</artifactId>
 	<dependencies>

CityDoctorParent/CityDoctorModel/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.14.0</version>
+		<version>3.14.1</version>
 	</parent>
 	<properties>
 		<versionString>${project.version}-${git.commit.id.abbrev}</versionString>

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java

@@ -62,7 +62,6 @@ import org.citygml4j.xml.reader.CityGMLInputFactory;
 import org.citygml4j.xml.reader.CityGMLReadException;
 import org.citygml4j.xml.reader.CityGMLReader;
 import org.citygml4j.xml.reader.FeatureInfo;
-import org.citygml4j.xml.schema.CityGMLSchemaHandler;
 import org.citygml4j.xml.writer.CityGMLChunkWriter;
 import org.citygml4j.xml.writer.CityGMLOutputFactory;
 import org.citygml4j.xml.writer.CityGMLWriteException;
@@ -76,7 +75,10 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
+import org.xmlobjects.schema.SchemaHandler;
 import org.xmlobjects.schema.SchemaHandlerException;
+import org.xmlobjects.stream.XMLReader;
+import org.xmlobjects.stream.XMLReaderFactory;
 
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
@@ -124,7 +126,7 @@ public class CityGmlParser {
 		System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
 		FACTORY = SAXParserFactory.newInstance();
 		try {
-			FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+			FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
 		} catch (SAXNotRecognizedException | SAXNotSupportedException | ParserConfigurationException e) {
 			logger.catching(e);
 		}
@@ -526,7 +528,8 @@ public class CityGmlParser {
 			handler = new GMLValidationHandler();
 		}
 		try {
-			CityGMLSchemaHandler schemaHandler = context.getDefaultSchemaHandler();
+			SchemaHandler schemaHandler = new ValidationSchemaHandler(context.getDefaultSchemaHandler());
+            readAdditionalSchemaDefinitions(context, file, schemaHandler);
 			Source[] schemas = schemaHandler.getSchemas();
 			SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 			schemaFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
@@ -540,6 +543,17 @@ public class CityGmlParser {
 		}
 	}
 
+	private static void readAdditionalSchemaDefinitions(CityGMLContext context, Path file, SchemaHandler schemaHandler)
+			throws CityGmlParseException {
+		try (XMLReader reader = XMLReaderFactory.newInstance(context.getXMLObjects())
+		        .withSchemaHandler(schemaHandler)
+		        .createReader(file)) {
+		    reader.nextTag();
+		} catch (Exception e) {
+		    throw new CityGmlParseException("Failed to read file " + file.toAbsolutePath() + ".", e);
+		}
+	}
+
 	private static void drainCityModel(CityDoctorModel model, CityGmlConsumer cityObjectConsumer) {
 		drainCityObjectList(model.getBuildings(), cityObjectConsumer);
 		drainCityObjectList(model.getBridges(), cityObjectConsumer);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ValidationSchemaHandler.java

+package de.hft.stuttgart.citydoctor2.parser;
+
+import org.xmlobjects.schema.SchemaHandler;
+
+public class ValidationSchemaHandler extends SchemaHandler {
+
+	ValidationSchemaHandler(SchemaHandler other) {
+		copy(other);
+	}
+}

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.14.0</version>
+		<version>3.14.1</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

CityDoctorParent/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hft.stuttgart</groupId>
 	<artifactId>CityDoctorParent</artifactId>
-	<version>3.14.0</version>
+	<version>3.14.1</version>
 	<packaging>pom</packaging>
 	<name>CityDoctorParent</name>
 	<properties>
@@ -103,12 +103,12 @@
 			<dependency>
 				<groupId>org.citygml4j</groupId>
 				<artifactId>citygml4j-core</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.citygml4j</groupId>
 				<artifactId>citygml4j-xml</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>de.hft.stuttgart</groupId>