Merge pull request #2 from agueganno/fix-schemas

Includes the new XLink - Fix the SLD schema.
orbisgis · Dec 12, 2012 · c5d6b20 · c5d6b20
2 parents 2bf221b + cfc11e6
commit c5d6b20
Show file tree

Hide file tree

Showing 58 changed files with 2,172 additions and 1,518 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,22 +5,22 @@
         <groupId>org.orbisgis.schemas</groupId>
         <artifactId>ogc-custom</artifactId>
         <name>Custom OGC schemas</name>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <packaging>jar</packaging>
         <url>http://www.orbisgis.org</url>
         <distributionManagement>
                 <repository>
                         <id>IRSTV</id>
                         <name>IRSTV repository</name>
-                        <url>scp://ateliersig@repo.orbisgis.org:/var/www/repo.orbisgis.org</url>
+                        <url>scp://irstv@repo.orbisgis.org:/var/www/repo.orbisgis.org</url>
                 </repository>
         </distributionManagement>
         <build>
                 <plugins>
                         <plugin>
                                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                                 <artifactId>maven-jaxb2-plugin</artifactId>
-                                <version>0.8.1</version>
+                                <version>0.8.2</version>
                                 <executions>
                                         <execution>
                                                 <goals>

diff --git a/src/main/resources/binding.xjb b/src/main/resources/binding.xjb
@@ -178,4 +178,28 @@
                         <jaxb:package name="net.opengis.wfs._2_1"/>
                 </jaxb:schemaBindings>
         </jaxb:bindings>
+	<!--XLink needs some bindings : there is an attribute named -->
+	<!--title that is used many times :-( -->
+	<jaxb:bindings schemaLocation="http://www.w3.org/1999/xlink.xsd" node="/xs:schema">
+		<jaxb:bindings node="//xs:attributeGroup[@name='locatorAttrs']">
+			<jaxb:bindings node=".//xs:attribute[@ref='xlink:title']">
+				<jaxb:property name="LocatorAttrsTitle"/>
+			</jaxb:bindings>
+		</jaxb:bindings>
+		<jaxb:bindings node="//xs:group[@name='locatorModel']">
+			<jaxb:bindings node=".//xs:element[@ref='xlink:title']">
+				<jaxb:property name="LocatorModelTitle"/>
+			</jaxb:bindings>
+		</jaxb:bindings>
+		<jaxb:bindings node="//xs:attributeGroup[@name='arcAttrs']">
+			<jaxb:bindings node=".//xs:attribute[@ref='xlink:title']">
+				<jaxb:property name="ArcAttrsTitle"/>
+			</jaxb:bindings>
+		</jaxb:bindings>
+		<jaxb:bindings node="//xs:group[@name='arcModel']">
+			<jaxb:bindings node=".//xs:element[@ref='xlink:title']">
+				<jaxb:property name="ArcModelTitle"/>
+			</jaxb:bindings>
+		</jaxb:bindings>
+	</jaxb:bindings>
 </jaxb:bindings>
diff --git a/src/main/resources/filter/2.1/expr.xsd b/src/main/resources/filter/2.1/expr.xsd
@@ -4,16 +4,18 @@
    xmlns:fes="http://www.opengis.net/fes/2.1"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>
 
+   <xsd:include schemaLocation="filterAll.xsd"/>
+
    <xsd:element name="expression" abstract="true"/>
 
    <xsd:element name="ValueReference" type="xsd:string"

diff --git a/src/main/resources/filter/2.1/filter.xsd b/src/main/resources/filter/2.1/filter.xsd
@@ -4,16 +4,17 @@
    xmlns:fes="http://www.opengis.net/fes/2.1"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>
 
+   <xsd:include schemaLocation="filterAll.xsd"/>
    <xsd:include schemaLocation="expr.xsd"/>
    <xsd:include schemaLocation="query.xsd"/>
    <xsd:include schemaLocation="filterCapabilities.xsd"/>

diff --git a/src/main/resources/filter/2.1/filterAll.xsd b/src/main/resources/filter/2.1/filterAll.xsd
@@ -4,15 +4,15 @@
    xmlns:fes="http://www.opengis.net/fes/2.1"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          This XML Schema document includes and imports, directly or indirectly,
          all the XML Schema defined by the Filter Encoding Standard.
 
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>

diff --git a/src/main/resources/filter/2.1/filterCapabilities.xsd b/src/main/resources/filter/2.1/filterCapabilities.xsd
@@ -6,18 +6,19 @@
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    xmlns:xml="http://www.w3.org/XML/1998/namespace"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          This XML Schema defines OGC query filter capabilities documents.
 
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>
 
+   <xsd:include schemaLocation="filterAll.xsd"/>
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
                schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 

diff --git a/src/main/resources/filter/2.1/query.xsd b/src/main/resources/filter/2.1/query.xsd
@@ -4,16 +4,18 @@
    xmlns:fes="http://www.opengis.net/fes/2.1"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>
 
+   <xsd:include schemaLocation="filterAll.xsd"/>
+
    <xsd:element name="AbstractQueryExpression"
                 type="fes:AbstractQueryExpressionType" abstract="true"/>
    <xsd:complexType name="AbstractQueryExpressionType" abstract="true">

diff --git a/src/main/resources/filter/2.1/sort.xsd b/src/main/resources/filter/2.1/sort.xsd
@@ -4,16 +4,17 @@
    xmlns:fes="http://www.opengis.net/fes/2.1"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="2.0.0">
+   version="2.0.1">
 
    <xsd:annotation>
       <xsd:documentation>
          Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+         Copyright (c) 2010 Open Geospatial Consortium.
          To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
       </xsd:documentation>
    </xsd:annotation>
 
+   <xsd:include schemaLocation="filterAll.xsd"/>
    <xsd:include schemaLocation="query.xsd"/>
    <xsd:include schemaLocation="expr.xsd"/>
 

diff --git a/src/main/resources/gml/3.1.1/base/basicTypes.xsd b/src/main/resources/gml/3.1.1/base/basicTypes.xsd
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
   <annotation>
     <appinfo source="urn:opengis:specification:gml:schema-xsd:basicTypes:3.1.1">basicTypes.xsd</appinfo>
     <documentation>
-    Generic simpleContent components for use in GML 
-    Copyright (c) 2005 OGC, All Rights Reserved.
-	For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr
+    Generic simpleContent components for use in GML
+
+    GML is an OGC Standard.
+    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
     </documentation>
   </annotation>
+  <include schemaLocation="gml.xsd"/>
   <!-- =========================================================== -->
   <simpleType name="NullEnumeration">
     <annotation>

diff --git a/src/main/resources/gml/3.1.1/base/coordinateOperations.xsd b/src/main/resources/gml/3.1.1/base/coordinateOperations.xsd
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1" xml:lang="en">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
 	<annotation>
 		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateOperations:3.1.1"/>
 		<documentation>How to encode coordinate operation definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate operations, including Transformations, Conversions, and other specific subtypes of operations. 
-		Copyright (c) 2002-2005 OGC, All Rights Reserved. For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr
+
 		This schema encodes the Coordinate Operation (CC_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. </documentation>
+		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
+
+		GML is an OGC Standard.
+		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
 	<!-- ======================================================
        includes and imports
 	====================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="referenceSystems.xsd"/>
 	<include schemaLocation="dataQuality.xsd"/>
 	<!-- ======================================================

diff --git a/src/main/resources/gml/3.1.1/base/coordinateReferenceSystems.xsd b/src/main/resources/gml/3.1.1/base/coordinateReferenceSystems.xsd
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1" xml:lang="en">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
 	<annotation>
 		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateReferenceSystems:3.1.1"/>
 		<documentation>How to encode coordinate reference system definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate reference systems, including the specific subtypes of coordinate reference systems. 
-		Copyright (c) 2002-2005 OGC, All Rights Reserved. For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr
 		This schema encodes the Coordinate Reference System (SC_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates, with the exception of the abstract "SC_CRS" class. The "SC_CRS" class is encoded in referenceSystems.xsd, to eliminate the (circular) references from coordinateOperations.xsd to coordinateReferenceSystems.xsd. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. </documentation>
+		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. 
+
+		GML is an OGC Standard.
+		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
 	<!-- ======================================================
        includes and imports
 	====================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="coordinateSystems.xsd"/>
 	<include schemaLocation="datums.xsd"/>
 	<include schemaLocation="coordinateOperations.xsd"/>

diff --git a/src/main/resources/gml/3.1.1/base/coordinateSystems.xsd b/src/main/resources/gml/3.1.1/base/coordinateSystems.xsd
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1" xml:lang="en">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
 	<annotation>
 		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateSystems:3.1.1"/>
 		<documentation>How to encode coordinate system definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate systems, including the specific subtypes of coordinate systems. 
-		Copyright (c) 2002-2005 OGC, All Rights Reserved. For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr
 		This schema encodes the Coordinate System (CS_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. </documentation>
+		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
+
+		GML is an OGC Standard.
+		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
 	<!-- ======================================================
        includes and imports
 	====================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="referenceSystems.xsd"/>
 	<!-- ======================================================
        elements and types

diff --git a/src/main/resources/gml/3.1.1/base/coverage.xsd b/src/main/resources/gml/3.1.1/base/coverage.xsd
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
 	<annotation>
 		<appinfo source="urn:opengis:specification:gml:schema-xsd:coverage:3.1.1">coverage.xsd</appinfo>
-		<documentation xml:lang="en">GML Coverage schema. 
-        Copyright (c) 2005 OGC, All Rights Reserved.
-	For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr</documentation>
+		<documentation xml:lang="en">GML Coverage schema.
+
+			GML is an OGC Standard.
+			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
 	<!-- ==============================================================
        includes and imports
 	============================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="feature.xsd"/>
 	<include schemaLocation="valueObjects.xsd"/>
 	<include schemaLocation="grids.xsd"/>

diff --git a/src/main/resources/gml/3.1.1/base/dataQuality.xsd b/src/main/resources/gml/3.1.1/base/dataQuality.xsd
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1" xml:lang="en">
+<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
 	<annotation>
 		<appinfo source="urn:opengis:specification:gml:schema-xsd:dataQuality:3.1.1"/>
 		<documentation>How to encode positional data quality information. Builds on units.xsd to encode the data needed to describe the positional accuracy of coordinate operations. 
-		Copyright (c) 2002-2005 OGC, All Rights Reserved. For conditions, see OGC Software Notice http://www.opengeospatial.org/about/?page=ipr
 		This schema encodes the Data Quality (DQ) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. </documentation>
+		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. 
+
+		GML is an OGC Standard.
+		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
 	<!-- ======================================================
        includes and imports
 	====================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="units.xsd"/>
 	<!-- ======================================================
        elements and types