Preparing 2.3.0 release.

highsource · Jul 5, 2015 · b4acd88 · b4acd88
1 parent e81abb1
commit b4acd88
Show file tree

Hide file tree

Showing 85 changed files with 51,044 additions and 50,965 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,90 @@
 {
-        "name": "ogc-schemas",
+	"name": "ogc-schemas",
         "homepage": "https://github.com/highsource/ogc-schemas",
         "authors": [
                 "Alexey Valikov"
         ],
         "description": "Jsonix mappings for OGC Schemas.",
+	"main": [
+		"scripts/lib/ARML_2_0.js",
+		"scripts/lib/CSW_2_0_2.js",
+		"scripts/lib/DC_1_1.js",
+		"scripts/lib/DCT.js",
+		"scripts/lib/Filter_1_0_0.js",
+		"scripts/lib/Filter_1_1_0.js",
+		"scripts/lib/Filter_2_0.js",
+		"scripts/lib/GML_2_1_2.js",
+		"scripts/lib/GML_3_1_1.js",
+		"scripts/lib/GML_3_2_0.js",
+		"scripts/lib/GML_3_2_1.js",
+		"scripts/lib/GMLCOV_1_0.js",
+		"scripts/lib/SMIL_2_0.js",
+		"scripts/lib/SMIL_2_0_Language.js",
+		"scripts/lib/IC_2_0.js",
+		"scripts/lib/IC_2_1.js",
+		"scripts/lib/ISO19139_GCO_20070417.js",
+		"scripts/lib/ISO19139_GMD_20070417.js",
+		"scripts/lib/ISO19139_GMX_20070417.js",
+		"scripts/lib/ISO19139_GSR_20070417.js",
+		"scripts/lib/ISO19139_GSS_20070417.js",
+		"scripts/lib/ISO19139_GTS_20070417.js",
+		"scripts/lib/ISO19139_GCO_20060504.js",
+		"scripts/lib/ISO19139_GMD_20060504.js",
+		"scripts/lib/ISO19139_GMX_20060504.js",
+		"scripts/lib/ISO19139_GSR_20060504.js",
+		"scripts/lib/ISO19139_GSS_20060504.js",
+		"scripts/lib/ISO19139_GTS_20060504.js",
+		"scripts/lib/ISO19139_SRV_20060504.js",
+		"scripts/lib/KML_2_2_0.js",
+		"scripts/lib/Atom_1_0.js",
+		"scripts/lib/xAL_2_0.js",
+		"scripts/lib/OM_1_0_0.js",
+		"scripts/lib/OM_2_0.js",
+		"scripts/lib/OWC_0_3_1.js",
+		"scripts/lib/OWS_1_0_0.js",
+		"scripts/lib/OWS_1_1_0.js",
+		"scripts/lib/OWS_2_0.js",
+		"scripts/lib/Sampling_1_0_0.js",
+		"scripts/lib/Sampling_2_0.js",
+		"scripts/lib/SamplingSpatial_2_0.js",
+		"scripts/lib/SE_1_1_0.js",
+		"scripts/lib/SensorML_1_0_1.js",
+		"scripts/lib/SensorML_2_0.js",
+		"scripts/lib/SLD_1_0_0.js",
+		"scripts/lib/SLD_1_0_0_GeoServer.js",
+		"scripts/lib/SLD_1_1_0.js",
+		"scripts/lib/SPS_2_0.js",
+		"scripts/lib/SOS_1_0_0.js",
+		"scripts/lib/SOS_1_0_0_Filter.js",
+		"scripts/lib/SOS_2_0.js",
+		"scripts/lib/SWE_1_0_1.js",
+		"scripts/lib/SWE_2_0.js",
+		"scripts/lib/SWES_2_0.js",
+		"scripts/lib/WSN_T_1.js",
+		"scripts/lib/WAMI_1_0_0.js",
+		"scripts/lib/WAMI_1_0_1.js",
+		"scripts/lib/WAMI_Common_1_0_1.js",
+		"scripts/lib/WAMI_1_0_2.js",
+		"scripts/lib/WAMI_Common_1_0_0.js",
+		"scripts/lib/WaterML_2_0.js",
+		"scripts/lib/WCS_1_0_0.js",
+		"scripts/lib/WCS_1_1.js",
+		"scripts/lib/WCS_2_0.js",
+		"scripts/lib/WFS_1_0_0.js",
+		"scripts/lib/WFS_1_1_0.js",
+		"scripts/lib/WFS_2_0.js",
+		"scripts/lib/WMC_1_0_0.js",
+		"scripts/lib/WMC_1_1_0.js",
+		"scripts/lib/WMS_1_0_0.js",
+		"scripts/lib/WMS_1_1_0.js",
+		"scripts/lib/WMS_1_1_1.js",
+		"scripts/lib/WMS_1_3_0.js",
+		"scripts/lib/WMS_1_3_0_Exceptions.js",
+		"scripts/lib/WMSC_1_1_1.js",
+		"scripts/lib/WMTS_1_0.js",
+		"scripts/lib/WPS_1_0_0.js",
+		"scripts/lib/WPS_2_0.js"
+	],
         "keywords": [
                 "json",
                 "xml",
@@ -60,9 +140,11 @@
         "license": "BSD-2-Clause",
         "ignore": [
                 ".settings",
+                "arml",
                 "context",
                 "csw",
                 "demos",
+                "dist",
                 "dtd-parent",
                 "filter",
                 "gml",
@@ -74,24 +156,34 @@
                 "owc",
                 "ows",
                 "sampling",
+                "samplingSpatial",
                 "schema-parent",
                 "schemas",
-                "scripts/tests/",
+                "scripts/node_modules",
+                "scripts/src",
+		"scripts/target",
+                "scripts/tests",
+                "scripts/pom.xml",
                 "scripts/*.*",
+                "se",
                 "sensorML",
                 "sld",
                 "sos",
                 "sps",
                 "sweCommon",
                 "swes",
                 "wami",
+                "waterml",
                 "wcs",
                 "wfs",
                 "wms",
                 "wmts",
                 "wps",
                 ".*",
+                "full-build-1.6.bat",
+                "qrelease.bat",
                 "README.md",
+                "TODO.md",
                 "pom.xml",
                 "release.bat"
         ]

diff --git a/pom.xml b/pom.xml
@@ -107,9 +107,9 @@
 		<jaxb2-basics.version>0.9.4</jaxb2-basics.version>
 		<jaxb.version>2.2.11</jaxb.version>
 		<maven-jaxb2-plugin.version>0.12.3</maven-jaxb2-plugin.version>
-		<w3c-schemas.version>1.1.0</w3c-schemas.version>
-		<jsonix-schema-compiler.version>2.3.3</jsonix-schema-compiler.version>
-		<jsonix.version>2.2.1</jsonix.version>
+		<w3c-schemas.version>1.2.1</w3c-schemas.version>
+		<jsonix-schema-compiler.version>2.3.6</jsonix-schema-compiler.version>
+		<jsonix.version>2.3.0</jsonix.version>
 	</properties> 
 	<dependencies>
 		<dependency>

diff --git a/schemas/src/main/resources/geoserver/sld/StyledLayerDescriptor.xsd b/schemas/src/main/resources/geoserver/sld/StyledLayerDescriptor.xsd
@@ -6,9 +6,9 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified">
   <xsd:import namespace="http://www.w3.org/1999/xlink"
-              schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
+              schemaLocation="../xlink/1.0.0/xlinks.xsd"/>
   <xsd:import namespace="http://www.opengis.net/ogc"
-              schemaLocation="http://schemas.opengis.net/filter/1.0.0/filter.xsd"/>
+              schemaLocation="../filter/1.0.0/filter.xsd"/>
 
 <!-- *********************************************************************** -->
   <xsd:annotation>
@@ -146,7 +146,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:complexType>
-      <xsd:attributeGroup ref="xlink:simpleAttrs"/>
+      <xsd:attributeGroup ref="xlink:simpleLink"/>
     </xsd:complexType>
   </xsd:element>
 

diff --git a/schemas/src/main/resources/ogc/context/1.0.0/collection.xsd b/schemas/src/main/resources/ogc/context/1.0.0/collection.xsd
@@ -8,7 +8,6 @@
 -->
 <xs:schema targetNamespace="http://www.opengis.net/context" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:context="http://www.opengis.net/context" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2">
 	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:include schemaLocation="context.xsd"/>
 	<xs:element name="ViewContextCollection" type="context:ViewContextCollectionType"/>
 	<xs:complexType name="ViewContextCollectionType">
 		<xs:sequence>
@@ -29,9 +28,7 @@
 			<xs:element name="OnlineResource" type="context:OnlineResourceType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<!--
 	<xs:complexType name="OnlineResourceType">
 		<xs:attributeGroup ref="xlink:simpleAttrs"/>
 	</xs:complexType>
-	-->
 </xs:schema>
diff --git a/schemas/src/main/resources/ogc/gml/3.1.1/base/temporal.xsd b/schemas/src/main/resources/ogc/gml/3.1.1/base/temporal.xsd
@@ -325,16 +325,6 @@
 			<enumeration value="unknown"/>
 		</restriction>
 	</simpleType>
-	<!-- ===================================== -->
-	<simpleType name="TimeDurationType">
-		<annotation>
-			<documentation xml:lang="en">
-      Base type for describing temporal length or distance. The value space is further 
-      constrained by subtypes that conform to the ISO 8601 or ISO 11404 standards.
-      </documentation>
-		</annotation>
-		<union memberTypes="duration decimal"/>
-	</simpleType>
 	<!-- ================================================================== -->
 	<!-- ==== Convenience properties ==== -->
 	<!-- ================================================================== -->

diff --git a/schemas/src/main/resources/ogc/ows/2.0/owsAdditionalParameters.xsd b/schemas/src/main/resources/ogc/ows/2.0/owsAdditionalParameters.xsd
@@ -53,13 +53,13 @@
   <!-- ========================================================== -->
   <complexType name="AdditionalParametersType">
     <complexContent>
-      <restriction base="ows:AdditionalParametersBaseType">
+      <extension base="ows:AdditionalParametersBaseType">
         <sequence>
           <element ref="ows:AdditionalParameter"
                    minOccurs="0"
                    maxOccurs="unbounded" />
         </sequence>
-      </restriction>
+      </extension>
     </complexContent>
   </complexType>
   <!-- ========================================================== -->

diff --git a/schemas/src/main/resources/ogc/sweCommon/1.0.0/aggregateTypes.xsd b/schemas/src/main/resources/ogc/sweCommon/1.0.0/aggregateTypes.xsd
@@ -139,7 +139,7 @@
 		<xs:annotation>
 			<xs:documentation>Use to point or include data values inline</xs:documentation>
 		</xs:annotation>
-		<xs:complexContent mixed="true">
+		<xs:complexContent>
 			<xs:extension base="xs:anyType">
 				<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
 			</xs:extension>

diff --git a/schemas/src/main/resources/ogc/sweCommon/1.0.1/aggregateTypes.xsd b/schemas/src/main/resources/ogc/sweCommon/1.0.1/aggregateTypes.xsd
@@ -138,7 +138,7 @@
 		<xs:annotation>
 			<xs:documentation>Use to point or include data values inline</xs:documentation>
 		</xs:annotation>
-		<xs:complexContent mixed="true">
+		<xs:complexContent>
 			<xs:extension base="xs:anyType">
 				<xs:attribute name="recordCount" type="xs:positiveInteger"/>
 				<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>

diff --git a/schemas/src/main/resources/ogc/sweCommon/2.0/basic_types.xsd b/schemas/src/main/resources/ogc/sweCommon/2.0/basic_types.xsd
@@ -78,7 +78,7 @@ It is also required that the symbol be an identifier for a unit of measure as sp
 	</complexType>
 	<!-- ================================================= -->
 	<complexType name="EncodedValuesPropertyType">
-		<complexContent mixed="true">
+		<complexContent>
 			<extension base="anyType">
 			  <attributeGroup ref="swe:AssociationAttributeGroup"/>
 			</extension>

diff --git a/schemas/src/main/resources/ogc/wcs/1.0.0/describeCoverage.xsd b/schemas/src/main/resources/ogc/wcs/1.0.0/describeCoverage.xsd
@@ -41,7 +41,7 @@
 	<xs:include schemaLocation="./wcsAll.xsd"/>
 	<xs:include schemaLocation="./wcsCapabilities.xsd"/>
 	<xs:include schemaLocation="./values.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/wcs/1.0.0/gml4wcs.xsd"/>
 	<!-- ==============================================================
        elements and types
 	============================================================== -->

diff --git a/schemas/src/main/resources/ogc/wcs/1.0.0/getCoverage.xsd b/schemas/src/main/resources/ogc/wcs/1.0.0/getCoverage.xsd
@@ -40,7 +40,7 @@
 	========================================================== -->
 	<xs:include schemaLocation="./wcsAll.xsd"/>
 	<xs:include schemaLocation="./describeCoverage.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/wcs/1.0.0/gml4wcs.xsd"/>
 	<!-- ==============================================================
        elements and types
 	============================================================== -->

diff --git a/schemas/src/main/resources/ogc/wcs/1.0.0/owsBase.xsd b/schemas/src/main/resources/ogc/wcs/1.0.0/owsBase.xsd
@@ -38,7 +38,7 @@
 	<!-- ==============================================================
            includes and imports
 	============================================================== -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/wcs/1.0.0/gml4wcs.xsd"/>
 	<!-- ============================================================
 		 Elements and types		
 	============================================================== -->

diff --git a/schemas/src/main/resources/ogc/wcs/1.0.0/wcsCapabilities.xsd b/schemas/src/main/resources/ogc/wcs/1.0.0/wcsCapabilities.xsd
@@ -45,7 +45,7 @@
     <!-- ========= includes and imports ================================ -->
     <xs:include schemaLocation="./wcsAll.xsd"/>
     <xs:include schemaLocation="./owsBase.xsd"/>
-    <xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+    <xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/wcs/1.0.0/gml4wcs.xsd"/>
     <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
     <!-- ==============================================================       elements and types	============================================================== -->
     <xs:element name="GetCapabilities">