sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1823029 - in /sis/branches/ISO-19115-3/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/ sis-m...
Date Sat, 03 Feb 2018 14:32:52 GMT
Author: desruisseaux
Date: Sat Feb  3 14:32:52 2018
New Revision: 1823029

URL: http://svn.apache.org/viewvc?rev=1823029&view=rev
Log:
Move XSD URLs directly in the @XmlSchema annotation.
Since each of those URL is used at only one place, there is no big advantage to declare them
as constants.
JUnit tests at this revision are known to fail; they will be fixed before merge.

Modified:
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
    sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -91,9 +91,11 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_ACQUISITION, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MAC, xmlns = {
-    @XmlNs(prefix = "mac", namespaceURI = Namespaces.MAC),      // Metadata for Acquisition
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common Classes
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mac/1.0/mac.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MAC,
+           xmlns = {
+                @XmlNs(prefix = "mac", namespaceURI = Namespaces.MAC),      // Metadata for
Acquisition
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common
Classes
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -136,7 +138,6 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -91,10 +91,12 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_CITATION, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.CIT, xmlns = {
-    @XmlNs(prefix = "cit", namespaceURI = Namespaces.CIT),      // Citation and responsible
party information
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.CIT,
+           xmlns = {
+                @XmlNs(prefix = "cit", namespaceURI = Namespaces.CIT),      // Citation and
responsible party information
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -131,7 +133,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -68,9 +68,11 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_CONSTRAINT, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MCO, xmlns = {
-    @XmlNs(prefix = "mco", namespaceURI = Namespaces.MCO),      // Metadata for Constraints
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common Classes
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MCO,
+           xmlns = {
+                @XmlNs(prefix = "mco", namespaceURI = Namespaces.MCO),      // Metadata for
Constraints
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common
Classes
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -91,7 +93,6 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -85,11 +85,13 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_CONTENT, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MRC, xmlns = {
-    @XmlNs(prefix = "mrc", namespaceURI = Namespaces.MRC),      // Metadata for Resource
Content
-    @XmlNs(prefix = "lan", namespaceURI = Namespaces.LAN),      // Language localization
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRC,
+           xmlns = {
+                @XmlNs(prefix = "mrc", namespaceURI = Namespaces.MRC),      // Metadata for
Resource Content
+                @XmlNs(prefix = "lan", namespaceURI = Namespaces.LAN),      // Language localization
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -127,7 +129,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -74,11 +74,13 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_DISTRIBUTION, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MRD, xmlns = {
-    @XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),      // Metadata for Resource
Distribution
-    @XmlNs(prefix = "mdt", namespaceURI = Namespaces.MDT),      // Metadata for Data Transfer
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRD,
+           xmlns = {
+                @XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),      // Metadata for
Resource Distribution
+                @XmlNs(prefix = "mdt", namespaceURI = Namespaces.MDT),      // Metadata for
Data Transfer
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -111,7 +113,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -140,9 +140,11 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_EXTENT, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.GEX, xmlns = {
-    @XmlNs(prefix = "gex", namespaceURI = Namespaces.GEX),      // Geospatial Extent
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common Classes
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.GEX,
+           xmlns = {
+                @XmlNs(prefix = "gex", namespaceURI = Namespaces.GEX),      // Geospatial
Extent
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC)       // Metadata Common
Classes
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -171,7 +173,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.gml.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -100,13 +100,15 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_IDENTIFICATION, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MRI, xmlns = {
-    @XmlNs(prefix = "mri",  namespaceURI = Namespaces.MRI),        // Metadata for Resource
Identification
-    @XmlNs(prefix = "srv",  namespaceURI = Namespaces.SRV),        // Metadata for Services
2.0
-    @XmlNs(prefix = "lan",  namespaceURI = Namespaces.LAN),        // Language localization
-    @XmlNs(prefix = "mcc",  namespaceURI = Namespaces.MCC),        // Metadata Common Classes
-    @XmlNs(prefix = "gmd",  namespaceURI = LegacyNamespaces.GMD),  // Metadata ISO 19139:2007
-    @XmlNs(prefix = "srv1", namespaceURI = LegacyNamespaces.SRV)   // Metadata for Services
1.0
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mri/1.0/mri.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRI,
+           xmlns = {
+                @XmlNs(prefix = "mri",  namespaceURI = Namespaces.MRI),        // Metadata
for Resource Identification
+                @XmlNs(prefix = "srv",  namespaceURI = Namespaces.SRV),        // Metadata
for Services 2.0
+                @XmlNs(prefix = "lan",  namespaceURI = Namespaces.LAN),        // Language
localization
+                @XmlNs(prefix = "mcc",  namespaceURI = Namespaces.MCC),        // Metadata
Common Classes
+                @XmlNs(prefix = "gmd",  namespaceURI = LegacyNamespaces.GMD),  // Metadata
ISO 19139:2007
+                @XmlNs(prefix = "srv1", namespaceURI = LegacyNamespaces.SRV)   // Metadata
for Services 1.0
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -164,7 +166,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.gts.*;
 import org.apache.sis.internal.jaxb.code.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -70,11 +70,13 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_LINEAGE, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MRL, xmlns = {
-    @XmlNs(prefix = "mrl", namespaceURI = Namespaces.MRL),      // Metadata for Resource
Lineage
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD),
-    @XmlNs(prefix = "gmi", namespaceURI = LegacyNamespaces.GMI)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRL,
+           xmlns = {
+                @XmlNs(prefix = "mrl", namespaceURI = Namespaces.MRL),      // Metadata for
Resource Lineage
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD),
+                @XmlNs(prefix = "gmi", namespaceURI = LegacyNamespaces.GMI)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -106,6 +108,5 @@ import javax.xml.bind.annotation.adapter
 
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -67,10 +67,12 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_MAINTENANCE, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MMI, xmlns = {
-    @XmlNs(prefix = "mmi", namespaceURI = Namespaces.MMI),      // Metadata for Maintenance
Information
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MMI,
+           xmlns = {
+                @XmlNs(prefix = "mmi", namespaceURI = Namespaces.MMI),      // Metadata for
Maintenance Information
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -102,7 +104,6 @@ import javax.xml.bind.annotation.adapter
 
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.gts.TM_PeriodDuration;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -86,15 +86,17 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location = Schemas.METADATA_XSD_BASE, elementFormDefault = XmlNsForm.QUALIFIED,
namespace = Namespaces.MDB, xmlns = {
-    @XmlNs(prefix = "mdb", namespaceURI = Namespaces.MDB),      // Metadata Base
-    @XmlNs(prefix = "mpc", namespaceURI = Namespaces.MPC),      // Metadata for Portrayal
Catalog
-    @XmlNs(prefix = "mas", namespaceURI = Namespaces.MAS),      // Metadata for Application
Schema
-    @XmlNs(prefix = "mex", namespaceURI = Namespaces.MEX),      // Metadata with Schema Extensions
-    @XmlNs(prefix = "lan", namespaceURI = Namespaces.LAN),      // Language localization
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC),      // Data Quality Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MDB,
+           xmlns = {
+                @XmlNs(prefix = "mdb", namespaceURI = Namespaces.MDB),      // Metadata Base
+                @XmlNs(prefix = "mpc", namespaceURI = Namespaces.MPC),      // Metadata for
Portrayal Catalog
+                @XmlNs(prefix = "mas", namespaceURI = Namespaces.MAS),      // Metadata for
Application Schema
+                @XmlNs(prefix = "mex", namespaceURI = Namespaces.MEX),      // Metadata with
Schema Extensions
+                @XmlNs(prefix = "lan", namespaceURI = Namespaces.LAN),      // Language localization
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC),      // Data Quality
Common Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -143,7 +145,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -114,13 +114,15 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_QUALITY, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MDQ, xmlns = {
-    @XmlNs(prefix = "mdq", namespaceURI = Namespaces.MDQ),      // Metadata for Data Quality
-    @XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),      // Metadata for Resource
Distribution
-    @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC),      // Data Quality Common Classes
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD),
-    @XmlNs(prefix = "gmi", namespaceURI = LegacyNamespaces.GMI)
+@XmlSchema(location="http://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MDQ,
+           xmlns = {
+                @XmlNs(prefix = "mdq", namespaceURI = Namespaces.MDQ),      // Metadata for
Data Quality
+                @XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),      // Metadata for
Resource Distribution
+                @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC),      // Data Quality
Common Classes
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD),
+                @XmlNs(prefix = "gmi", namespaceURI = LegacyNamespaces.GMI)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -160,7 +162,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -88,10 +88,12 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location=Schemas.METADATA_XSD_SPATIAL, elementFormDefault=XmlNsForm.QUALIFIED,
namespace=Namespaces.MSR, xmlns = {
-    @XmlNs(prefix = "msr", namespaceURI = Namespaces.MSR),      // Metadata for Spatial Representation
-    @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common Classes
-    @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC)       // Data Quality Common Classes
+@XmlSchema(location="http://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd",
+           elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MSR,
+           xmlns = {
+                @XmlNs(prefix = "msr", namespaceURI = Namespaces.MSR),      // Metadata for
Spatial Representation
+                @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),      // Metadata Common
Classes
+                @XmlNs(prefix = "dqc", namespaceURI = Namespaces.DQC)       // Data Quality
Common Classes
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
@@ -126,7 +128,6 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.gco.*;
 import org.apache.sis.internal.jaxb.code.*;
 import org.apache.sis.internal.jaxb.metadata.*;

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java?rev=1823029&r1=1823028&r2=1823029&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
[UTF-8] Sat Feb  3 14:32:52 2018
@@ -48,28 +48,6 @@ package org.apache.sis.internal.jaxb;
  */
 public final class Schemas {
     /**
-     * The XSD definition for Geographic Markup Language (GML) objects.
-     */
-    public static final String GML_XSD = "http://schemas.opengis.net/gml/3.2.1/gml.xsd";
-
-    /**
-     * The XSD definition for the root of ISO 19115-3 metadata objects.
-     * Most metadata XSD paths start with {@value #METADATA_ROOT}, but not all.
-     */
-    public static final String METADATA_XSD_BASE           = "http://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd",
-                               METADATA_XSD_SPATIAL        = "http://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd",
-                               METADATA_XSD_QUALITY        = "http://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd",
-                               METADATA_XSD_MAINTENANCE    = "http://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd",
-                               METADATA_XSD_LINEAGE        = "http://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd",
-                               METADATA_XSD_IDENTIFICATION = "http://standards.iso.org/iso/19115/-3/mri/1.0/mri.xsd",
-                               METADATA_XSD_EXTENT         = "http://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd",
-                               METADATA_XSD_DISTRIBUTION   = "http://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd",
-                               METADATA_XSD_CONTENT        = "http://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd",
-                               METADATA_XSD_CONSTRAINT     = "http://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd",
-                               METADATA_XSD_CITATION       = "http://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd",
-                               METADATA_XSD_ACQUISITION    = "http://standards.iso.org/iso/19115/-3/mac/1.0/mac.xsd";
-
-    /**
      * The root directory of ISO 19115 metadata schemas.
      * This is the schema used by default in Apache SIS.
      */



Mime
View raw message