From 328512c9d93b04d5f189c997cc92ae49f783bf89 Mon Sep 17 00:00:00 2001
From: Keshav Nangare <keshav.nangare@mindstix.com>
Date: Thu, 23 Apr 2020 22:32:39 +0530
Subject: [PATCH 1/2] Fixed target namespce issue in application schema and
 soap-ui test.

---
 .../org/opengis/cite/iso19136/general/GeneralSchemaTests.java | 2 +-
 src/test/resources/soapui/ets-gml32-soapui-project.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java b/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
index 44e1bc2..3c303cb 100644
--- a/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
+++ b/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
@@ -199,7 +199,7 @@ URI getApplicationNamespaceName(Set<URI> schemaLocations) {
 				Attribute targetNS = docElem.getAttributeByName(new QName(
 						"targetNamespace"));
 				if (null != targetNS
-						&& !targetNS.equals("http://www.opengis.net/gml/3.2")) {
+						&& !targetNS.getValue().contains("http://www.opengis.net/gml/3.2") && !targetNS.getValue().contains("http://www.opengis.net/wfs/2.0")) {
 					tns = targetNS.getValue();
 					break;
 				}
diff --git a/src/test/resources/soapui/ets-gml32-soapui-project.xml b/src/test/resources/soapui/ets-gml32-soapui-project.xml
index e59c8dd..c4f493c 100644
--- a/src/test/resources/soapui/ets-gml32-soapui-project.xml
+++ b/src/test/resources/soapui/ets-gml32-soapui-project.xml
@@ -31,7 +31,7 @@
           </con:assertion>
           <con:assertion type="Simple Contains" id="22cf9feb-0c51-49a3-9966-0f65761e01b3" name="Contains test suite">
             <con:configuration>
-              <token>Conformance Test Suite - OGC Web Map Service 1.3.0</token>
+              <token>GML (ISO 19136:2007) Conformance Test Suite, Version 3.2.1</token>
               <ignoreCase>false</ignoreCase>
               <useRegEx>false</useRegEx>
             </con:configuration>
@@ -262,7 +262,7 @@ declare namespace cite="http://cite.opengeospatial.org/";
     </con:property>
     <con:property>
       <con:name>iut</con:name>
-      <con:value>http://cite.deegree.org/deegree-webservices-3.4.0/services/gml321?service=WFS&amp;request=GetFeature&amp;Version=2.0.0&amp;typenames=app:Autos</con:value>
+      <con:value>http://cite.deegree.org/deegree-webservices-3.4.5/services/gml321?service=WFS&amp;request=GetFeature&amp;Version=2.0.0&amp;typenames=app:Autos</con:value>
     </con:property>
     <con:property>
       <con:name>tests.passed</con:name>

From 0ff17538de78d85a7b64b62b73c916654710e30d Mon Sep 17 00:00:00 2001
From: Keshav Nangare <keshav.nangare@mindstix.com>
Date: Thu, 14 May 2020 20:48:45 +0530
Subject: [PATCH 2/2] Reverted changes made in issue#46.

---
 .../opengis/cite/iso19136/general/GeneralSchemaTests.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java b/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
index 3c303cb..3f5ed47 100644
--- a/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
+++ b/src/main/java/org/opengis/cite/iso19136/general/GeneralSchemaTests.java
@@ -178,8 +178,8 @@ AppSchemaInfo getSchemaInfo() {
 	/**
 	 * Determines the target namespace of a GML application schema, which is
 	 * assumed to be the first schema found to have a target namespace name that
-	 * is <strong>not</strong> referring to http://www.opengis.net/gml/3.2.
-	 *  If a URI cannot be dereferenced it is skipped.
+	 * is <strong>not</strong> in the opengis.net domain. If a URI cannot be
+	 * dereferenced it is skipped.
 	 * 
 	 * @param schemaLocations
 	 *            A {@literal Set<URI>} of schema references.
@@ -199,7 +199,7 @@ URI getApplicationNamespaceName(Set<URI> schemaLocations) {
 				Attribute targetNS = docElem.getAttributeByName(new QName(
 						"targetNamespace"));
 				if (null != targetNS
-						&& !targetNS.getValue().contains("http://www.opengis.net/gml/3.2") && !targetNS.getValue().contains("http://www.opengis.net/wfs/2.0")) {
+						&& !targetNS.getValue().contains("opengis.net")) {
 					tns = targetNS.getValue();
 					break;
 				}