sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1819779 [2/2] - in /sis/branches/ISO-19115-3: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/ core/sis-metadata/src/main/java/org/apache/sis/internal/j...
Date Mon, 01 Jan 2018 17:46:51 GMT
Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -181,7 +181,7 @@ public class DefaultObjective extends IS
      *
      * <div class="note"><b>XML note:</b>
      * The {@code <gmd:identifier>} element marshalled to XML will exclude all the above cited identifiers,
-     * for ISO 19139 compliance. Those identifiers will appear in other XML elements or attributes.</div>
+     * for compliance with ISO 19115 model. Those identifiers will appear in other XML elements or attributes.</div>
      *
      * @return identification of the objective.
      */

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -56,7 +56,7 @@ import static org.apache.sis.internal.me
  * The ISO 19115 model provides specific attributes for the {@linkplain #getISBN() ISBN} and
  * {@linkplain #getISSN() ISSN} codes. However the SIS library handles those codes like any
  * other identifiers. Consequently the ISBN and ISSN codes are included in the collection
- * returned by {@link #getIdentifiers()}, except at XML marshalling time (for ISO 19139 compliance).
+ * returned by {@link #getIdentifiers()}, except at XML marshalling time (for ISO 19115-3 compliance).
  *
  * <div class="section">Limitations</div>
  * <ul>
@@ -366,7 +366,7 @@ public class DefaultCitation extends ISO
      *
      * <div class="note"><b>XML note:</b>
      * The {@code <gmd:identifier>} element marshalled to XML will exclude all the above cited identifiers,
-     * for ISO 19139 compliance. Those identifiers will appear in other XML elements or attributes.</div>
+     * for ISO 19115-3 compliance. Those identifiers will appear in other XML elements or attributes.</div>
      *
      * @return the identifiers, or an empty collection if none.
      *

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -76,11 +76,10 @@ import org.apache.sis.internal.metadata.
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(name = "CI_Telephone_Type", propOrder = {
-    "number",
-    "numberType",
-    // Legacy ISO 19139:2007 attributes.
-    "voices",
-    "facsimiles"
+    "number",           // New in ISO 19115:2014
+    "numberType",       // Ibid.
+    "voices",           // Legacy ISO 19115:2003
+    "facsimiles"        // Ibid.
 })
 @XmlRootElement(name = "CI_Telephone")
 public class DefaultTelephone extends ISOMetadata implements Telephone {

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=1819779&r1=1819778&r2=1819779&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] Mon Jan  1 17:46:50 2018
@@ -66,7 +66,7 @@
  * Apache SIS provides a unified view of all metadata identifiers. This view includes the citation
  * {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation#getISBN() ISBN} and
  * {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation#getISSN() ISSN} codes,
- * except at XML marshalling time (for ISO 19139 compliance).
+ * except at XML marshalling time (for ISO 19115-3 compliance).
  * See {@link org.apache.sis.xml.IdentifierMap} for more information.
  *
  * <div class="section">Null values, nil objects and collections</div>

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -65,10 +65,10 @@ import org.apache.sis.internal.jaxb.meta
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(name = "MD_CoverageDescription_Type", propOrder = {
     "attributeDescription",
-    "processingLevelCode",          // ISO 19115-3
-    "attributeGroup",               // ISO 19115-3
-    "contentType",                  // ISO 19139:2007
-    "dimensions",                   // ISO 19139:2007
+    "processingLevelCode",          // New in ISO 19115:2014
+    "attributeGroup",               // Ibid.
+    "contentType",                  // Legacy ISO 19115:2003
+    "dimensions",                   // Ibid.
     "rangeElementDescriptions"
 })
 @XmlRootElement(name = "MD_CoverageDescription")

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -60,8 +60,8 @@ import org.apache.sis.internal.jaxb.gco.
 @TitleProperty(name = "sequenceIdentifier")
 @XmlType(name = "MD_RangeDimension_Type", propOrder = {
     "sequenceIdentifier",
-    "description",          // ISO 19115-3
-    "descriptor",           // ISO 19139:2007 (legacy)
+    "description",          // New in ISO 19115:2014
+    "descriptor",           // Legacy ISO 19115:2003
     "name"
 })
 @XmlRootElement(name = "MD_RangeDimension")

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -257,7 +257,7 @@ public class DefaultCoupledResource exte
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * For JAXB marshalling of ISO 19139:2007 document only.
+     * For JAXB marshalling of ISO 19139:2007 document only (XML based on legacy ISO 19115:2003 model).
      */
     @XmlElement(name = "operationName", namespace = Namespaces.SRV)
     private String getOperationName() {
@@ -271,9 +271,9 @@ public class DefaultCoupledResource exte
     }
 
     /**
-     * For JAXB unmarhalling of ISO 19119 document only. Sets {@link #operation} to a temporary
-     * {@link OperationName} placeholder. That temporary instance will be replaced by the real
-     * one when the enclosing {@link DefaultServiceIdentification} is unmarshalled.
+     * For JAXB unmarhalling of ISO 19139:2007 document only. Sets {@link #operation} to a temporary
+     * {@link OperationName} placeholder. That temporary instance will be replaced by the real one
+     * when the enclosing {@link DefaultServiceIdentification} is unmarshalled.
      */
     @SuppressWarnings("unused")
     private void setOperationName(final String name) {

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -316,7 +316,8 @@ public class DefaultDataIdentification e
     }
 
     /**
-     * Returns the locale to marshal if the XML document is to be written in ISO 19139:2007 format.
+     * Returns the locale to marshal if the XML document is to be written
+     * according the legacy ISO 19115:2003 model.
      */
     @XmlElement(name = "language", namespace = LegacyNamespaces.GMD, required = true)
     @XmlJavaTypeAdapter(LocaleAdapter.class)

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=1819779&r1=1819778&r2=1819779&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] Mon Jan  1 17:46:50 2018
@@ -56,7 +56,7 @@
  * </td></tr></table>
  *
  * <div class="section">Localization</div>
- * When a metadata object is marshalled as an ISO 19139 compliant XML document, the marshaller
+ * When a metadata object is marshalled as an ISO 19115-3 compliant XML document, the marshaller
  * {@link org.apache.sis.xml.XML#LOCALE} property will be used for the localization of every
  * {@link org.opengis.util.InternationalString} and {@link org.opengis.util.CodeList} instances,
  * <strong>except</strong> if the object to be marshalled is an instance of

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -103,7 +103,7 @@
  * </ul>
  *
  * <div class="section">How Metadata are marshalled</div>
- * The ISO 19139 standard defines how ISO 19115 metadata shall be represented in XML.
+ * The ISO 19115-3 standard defines how ISO 19115-1 metadata shall be represented in XML.
  * The SIS library supports XML marshalling and unmarshalling with JAXB annotations.
  *
  * <p>Only the implementation classes defined in the {@link org.apache.sis.metadata.iso} packages and sub-packages

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -288,12 +288,12 @@ public final strictfp class AllMetadataT
         final String rootName = type.getAnnotation(UML.class).identifier();
         switch (rootName) {
             // Following prefix was changed in ISO 19115 corrigendum,
-            // but ISO 19139 still use the old prefix.
+            // but ISO 19139:2007 still use the old prefix.
             case "SV_ServiceIdentification": {
                 return "MD_ServiceIdentification_Type";
             }
             // Following prefix was changed in ISO 19115:2014,
-            // but ISO 19139 still use the old prefix.
+            // but ISO 19139:2007 still use the old prefix.
             case "MD_Scope": {
                 return "DQ_Scope_Type";
             }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -132,7 +132,7 @@ public final class MarshallingTest exten
             parent.getIdentifiers().add(parentId);
             md.setParentMetadata(parent);
         }
-        // mdb:metadataScope (hierarchyLevel and hierarchyLevelName in ISO 19139)
+        // mdb:metadataScope (hierarchyLevel and hierarchyLevelName in legacy ISO 19115:2003 model)
         md.getMetadataScopes().add(new DefaultMetadataScope(ScopeCode.DATASET, "hierarchyLevelName"));
         final DefaultOnlineResource onlineResource;
         {
@@ -172,7 +172,7 @@ public final class MarshallingTest exten
             md.setContacts(Arrays.asList(new DefaultResponsibility(Role.POINT_OF_CONTACT, null, org),
                                          new DefaultResponsibility(Role.POINT_OF_CONTACT, null, individual2)));
         }
-        // Date info (date stamp in ISO 19139)
+        // Date info (date stamp in legacy ISO 19115:2003 model)
         final Collection<CitationDate> dateInfo = Collections.singleton(new DefaultCitationDate(new Date(), DateType.CREATION));
         md.setDateInfo(dateInfo);
         {
@@ -371,7 +371,7 @@ public final class MarshallingTest exten
             associatedResources = Collections.singleton(associatedResource);
             dataId.setAssociatedResources(associatedResources);
         }
-        dataId.setLanguages(languages);     // Locales (ISO 19115-3) a.k.a Languages and CharacterSets (ISO 19139)
+        dataId.setLanguages(languages);     // Locales (ISO 19115:2014) a.k.a Languages and CharacterSets (ISO 19115:2003)
         dataId.setCharacterSets(charSets);
         dataId.setEnvironmentDescription (new SimpleInternationalString("environmentDescription"));
         dataId.setSupplementalInformation(new SimpleInternationalString("supplementalInformation"));
@@ -465,7 +465,7 @@ public final class MarshallingTest exten
     }
 
     /**
-     * Tests marshalling of a document based on ISO 19115:2014 model.
+     * Tests marshalling of an ISO 19115-3 document (based on ISO 19115:2014 model).
      *
      * @throws URISyntaxException if an error occurred while creating the metadata object.
      * @throws JAXBException if an error occurred while marshalling the document.

Modified: sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -21,11 +21,11 @@ import org.opengis.metadata.Identifier;
 
 
 /**
- * JAXB adapter mapping the GeoAPI {@link Identifier} to an implementation class that can
- * be marshalled. See the package documentation for more information about JAXB and interfaces.
+ * JAXB adapter mapping the GeoAPI {@link Identifier} to an implementation class that can be marshalled.
+ * See the package documentation for more information about JAXB and interfaces.
  *
  * <p>Note that a class of the same name is defined in the {@link org.apache.sis.internal.jaxb.metadata}
- * package, which serve the same purpose (wrapping exactly the same interface) but using the ISO 19139
+ * package, which serve the same purpose (wrapping exactly the same interface) but using the ISO 19139:2007
  * syntax instead. The ISO 19139 syntax represents the code and codespace as XML elements, while in this
  * GML representation the code is a XML value and the codespace is a XML attribute.</p>
  *

Modified: sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.crs.De
 /**
  * JAXB adapter for {@link VerticalCRS}, in order to integrate the value in an element
  * complying with OGC/ISO standard. Note that the CRS is formatted using the GML schema,
- * not the ISO 19139 one.
+ * not the ISO 19139:2007 one.
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -96,8 +96,8 @@ public final class Context extends Marsh
     private static final int CLEAR_SEMAPHORE = 0x20;
 
     /**
-     * Whether we are (un)marshalling legacy metadata as defined in 2003 (ISO 19139).
-     * If this flag is not set, then we assume latest metadata as defined in 2014 (ISO 19115:2014).
+     * Whether we are (un)marshalling legacy metadata as defined in 2003 model (ISO 19139:2007).
+     * If this flag is not set, then we assume latest metadata as defined in 2014 model (ISO 19115-3).
      */
     public static final int LEGACY_METADATA = 0x40;
 
@@ -138,7 +138,7 @@ public final class Context extends Marsh
     private final TimeZone timezone;
 
     /**
-     * The base URL of ISO 19139 (or other standards) schemas. The valid values
+     * The base URL of ISO 19115-3 (or other standards) schemas. The valid values
      * are documented in the {@link org.apache.sis.xml.XML#SCHEMAS} property.
      */
     private final Map<String,String> schemas;
@@ -398,7 +398,7 @@ public final class Context extends Marsh
     }
 
     /**
-     * Returns the base URL of ISO 19139 (or other standards) schemas.
+     * Returns the base URL of ISO 19115-3 (or other standards) schemas.
      * The valid values are documented in the {@link org.apache.sis.xml.XML#SCHEMAS} property.
      * If the returned value is not empty, then this method guarantees it ends with {@code '/'}.
      *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -33,14 +33,14 @@ package org.apache.sis.internal.jaxb;
 public enum FilterByVersion {
     /**
      * {@code accept() == true} if marshalling of an ISO 19139:2007 document in in progress,
-     * or if no marshalling in underway.
+     * or if no marshalling in underway. Those documents are based on ISO 19115:2003 model.
      */
     LEGACY_METADATA(Context.MARSHALLING | Context.LEGACY_METADATA,
                     Context.MARSHALLING),
 
     /**
-     * {@code accept() == true} if marshalling of an ISO 19139:2014 document in in progress,
-     * or if no marshalling in underway.
+     * {@code accept() == true} if marshalling of an ISO 19115-3 document in in progress,
+     * or if no marshalling in underway. Those documents are based on ISO 19115:2014 model.
      */
     CURRENT_METADATA(Context.MARSHALLING | Context.LEGACY_METADATA,
                      Context.MARSHALLING | Context.LEGACY_METADATA);

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -60,7 +60,7 @@ public final class LegacyNamespaces {
     public static final String GML = "http://www.opengis.net/gml";
 
     /**
-     * The <code>{@value}</code> URL, used in ISO 19139.
+     * The <code>{@value}</code> URL, used in ISO 19139:2007.
      * The usual prefix for this namespace is {@code "gmd"}.
      */
     public static final String GMD = "http://www.isotc211.org/2005/gmd";
@@ -72,20 +72,20 @@ public final class LegacyNamespaces {
     public static final String GMI = "http://www.isotc211.org/2005/gmi";
 
     /**
-     * The <code>{@value}</code> URL, used in ISO 19139.
+     * The <code>{@value}</code> URL, used in ISO 19139:2007.
      * The usual prefix for this namespace is {@code "gmx"}.
      */
     public static final String GMX = "http://www.isotc211.org/2005/gmx";
 
     /**
-     * The <code>{@value}</code> URL, used in ISO 19139.
+     * The <code>{@value}</code> URL, used in ISO 19139:2007.
      * The usual prefix for this namespace is {@code "gco"}.
      * Replaced by {@link org.apache.sis.xml.Namespaces#GCO}.
      */
     public static final String GCO = "http://www.isotc211.org/2005/gco";
 
     /**
-     * The <code>{@value}</code> URL, used in ISO 19139.
+     * The <code>{@value}</code> URL, used in ISO 19139:2007.
      * The usual prefix for this namespace is {@code "srv"}.
      * Replaced by {@link org.apache.sis.xml.Namespaces#SRV}.
      */
@@ -99,7 +99,7 @@ public final class LegacyNamespaces {
     public static final String GFC = "http://www.isotc211.org/2005/gfc";
 
     /**
-     * The <code>{@value}</code> URL, used in ISO 19139.
+     * The <code>{@value}</code> URL, used in ISO 19139:2007.
      * The usual prefix for this namespace is {@code "gts"}.
      */
     public static final String GTS = "http://www.isotc211.org/2005/gts";

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -41,7 +41,7 @@ import org.apache.sis.xml.IdentifierSpac
  * <p>There is two kinds of non-marshalled identifiers:</p>
  *
  * <ul>
- *   <li>The XML attributes declared by ISO 19139 specification in the {@code gco:PropertyType}
+ *   <li>The XML attributes declared by ISO 19115-3 specification in the {@code gco:PropertyType}
  *       element: {@code gml:id}, {@code gco:uuid} and {@code xlink:href}. Those attributes are
  *       not part of the ISO 19115 specification. Those authorities are declared in the
  *       {@link IdentifierSpace} interfaces.</li>
@@ -109,7 +109,7 @@ public final class NonMarshalledAuthorit
 
     /**
      * Returns the first marshallable identifier from the given collection. This method omits
-     * "special" identifiers (ISO 19139 attributes, ISBN codes...), which are recognized by
+     * "special" identifiers (ISO 19115-3 attributes, ISBN codes...), which are recognized by
      * the implementation class of their authority.
      *
      * <p>This method is used for implementation of {@code getIdentifier()} methods (singular form)
@@ -132,9 +132,8 @@ public final class NonMarshalledAuthorit
 
     /**
      * Sets the given identifier in the given collection. This method removes all identifiers
-     * that are not ISO 19139 identifiers before to adds the given one in the collection. This
-     * method is used when the given collection is expected to contains only one ISO 19115
-     * identifier.
+     * that are not ISO 19115-3 identifiers before to adds the given one in the collection.
+     * This method is used when the given collection is expected to contains only one ISO 19115-1 identifier.
      *
      * <p>This method is used for implementation of {@code setIdentifier(Identifier)} methods
      * in public metadata objects.</p>

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=1819779&r1=1819778&r2=1819779&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] Mon Jan  1 17:46:50 2018
@@ -88,7 +88,7 @@ public final class Schemas {
     public static final String METADATA_ROOT = "http://standards.iso.org/iso/19115/";
 
     /**
-     * The root directory of ISO 19139 metadata schemas.
+     * The root directory of ISO 19115-3 metadata schemas.
      * This is sometime used as an alternative to {@link #METADATA_ROOT_OLD}.
      */
     @Deprecated

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.gmd.
 
 
 /**
- * JAXB adapter in order to wrap the string value with a {@code <gco:CharacterString>} element,
- * for ISO-19139 compliance. A {@link CharSequenceAdapter} can handle the following types:
+ * JAXB adapter wrapping the string value in a {@code <gco:CharacterString>} element, for ISO 19115-3 compliance.
+ * A {@link CharSequenceAdapter} can handle the following types:
  *
  * <ul>
  *   <li>{@link InternationalString}, which may be mapped to {@link PT_FreeText} elements.</li>

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType
 
 /**
  * Surrounds boolean value by {@code <gco:Boolean>}.
- * The ISO-19139 standard requires most types to be surrounded by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -63,7 +63,7 @@ public final class GO_Boolean extends Pr
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the boolean value we want to surround by an element representing its type.
      * @return an adaptation of the boolean value, that is to say a boolean value surrounded

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -43,7 +43,7 @@ import org.apache.sis.util.resources.Mes
 
 /**
  * JAXB wrapper for string value in a {@code <gco:CharacterString>}, {@code <gmx:Anchor>},
- * {@code <gmx:FileName>} or {@code <gmx:MimeFileType>} element, for ISO-19139 compliance.
+ * {@code <gmx:FileName>} or {@code <gmx:MimeFileType>} element, for ISO 19139:2007 compliance.
  *
  * <p>{@code FileName} and {@code MimeFileType} are possible substitutions for {@code CharacterString}.
  * They make sense only in {@link org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic} or

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -29,7 +29,7 @@ import org.apache.sis.internal.jaxb.XmlU
 
 /**
  * JAXB adapter wrapping the date value in a {@code <gco:Date>} or {@code <gco:DateTime>} element,
- * for ISO-19139 compliance. Only one of {@code Date} or {@code DateTime} field shall be non-null.
+ * for ISO 19115-3 compliance. Only one of {@code Date} or {@code DateTime} field shall be non-null.
  * At marshalling time, the choice is performed depending on whatever the given date contains
  * hour, minute or seconds information different than zero.
  *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType
 
 /**
  * Surrounds double values by {@code <gco:Decimal>}.
- * The ISO-19139 standard requires most types to be surrounded by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * <div class="section">Relationship with {@code GO_Real}</div>
  * This adapter is identical to {@link GO_Real} except for the element name, which is {@code "Decimal"} instead
@@ -72,7 +72,7 @@ public final class GO_Decimal extends Pr
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the double value we want to surround by an element representing its type.
      * @return an adaptation of the double value, that is to say a double value surrounded

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlSche
 
 /**
  * Surrounds float values by {@code <gco:Decimal>}.
- * The ISO-19139 standard requires most types to be surrounded by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * @author  Cédric Briançon (Geomatys)
  * @version 0.4
@@ -59,7 +59,7 @@ public final class GO_Decimal32 extends
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the float value we want to surround by an element representing its type.
      * @return an adaptation of the float value, that is to say a float value surrounded

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -83,7 +83,7 @@ public final class GO_Distance extends X
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about {@code measures}.
+     * ISO 19115-3 standard and its requirements about {@code measures}.
      *
      * @param  value  the double value we want to integrate into a {@code <gco:Distance>} element.
      * @return an adaptation of the double value, that is to say a double value surrounded

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType
 
 /**
  * Wraps integer values in {@code <gco:Integer>} element.
- * The ISO-19139 standard requires most types to be wrapped by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -65,7 +65,7 @@ public class GO_Integer extends Property
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the integer value we want to wrap in an element representing its type.
      * @return a wrapper for the integer value, that is to say an integer value wrapped

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlSche
 
 /**
  * Surrounds long values by {@code <gco:Integer>}.
- * The ISO-19139 standard requires most types to be surrounded by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * @author  Cédric Briançon (Geomatys)
  * @version 0.4
@@ -59,7 +59,7 @@ public final class GO_Integer64 extends
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the integer value we want to surround by an element representing its type.
      * @return an adaptation of the integer value, that is to say a integer value surrounded

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -83,7 +83,7 @@ public final class GO_Measure extends Xm
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about {@code measures}.
+     * ISO 19115-3 standard and its requirements about {@code measures}.
      *
      * @param  value  the double value we want to wrap into a {@code <gco:Measure>} element.
      * @return a double value wrapped by {@code <gco:Measure>} element with an {@code uom} attribute.

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType
 
 /**
  * Wraps double values in {@code <gco:Real>} element.
- * The ISO-19139 standard requires most types to be wrapped by an element representing the value type.
+ * The ISO 19115-3 standard requires most types to be wrapped by an element representing the value type.
  * The JAXB default behavior is to marshal primitive Java types directly, without such wrapper element.
- * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19139.
+ * The role of this class is to add the {@code <gco:…>} wrapper element required by ISO 19115-3.
  *
  * <div class="section">Relationship with {@code GO_Decimal}</div>
  * This adapter is identical to {@link GO_Decimal} except for the element name, which is {@code "Real"}
@@ -67,7 +67,7 @@ public class GO_Real extends PropertyTyp
 
     /**
      * Allows JAXB to change the result of the marshalling process, according to the
-     * ISO-19139 standard and its requirements about primitive types.
+     * ISO 19115-3 standard and its requirements about primitive types.
      *
      * @param  value  the double value we want to wrap in an element representing its type.
      * @return a wrapper for the double value, that is to say a double value wrapped

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -23,7 +23,7 @@ import org.apache.sis.internal.jaxb.Cont
 
 
 /**
- * JAXB adapter wrapping a URI value with a {@code <gmx:FileName>} element, for ISO-19139 compliance.
+ * JAXB adapter wrapping a URI value with a {@code <gmx:FileName>} element, for ISO 19139:2007 compliance.
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -30,9 +30,9 @@
  *
  * <ul class="verbose">
  *   <li><b>JAXB adapters for primitive types.</b><br>
- *   JAXB can write directly Java primitive type at marshalling time "as is". However ISO-19139
- *   requires those values to be surrounded by elements representing the data type. The role of
- *   these adapters is to add these elements around the value.</li>
+ *   JAXB can write directly Java primitive type at marshalling time "as is". However ISO 19115-3
+ *   requires those values to be wrapped by elements representing the data type.  A role of these
+ *   adapters is to add these elements around the value.</li>
  *
  *   <li><b>JAXB adapters for <cite>unit of measure</cite></b> as specified in the ISO-19103 specifications.<br>
  *   For example, a measure marshalled with JAXB will be formatted like {@code <gco:Measure uom="m">220.0</gco:Measure>}.</li>
@@ -51,13 +51,13 @@
  * <ul class="verbose">
  *   <li><code>org.apache.sis.<b>metadata.iso</b></code> public packages:
  *   <ul>
- *     <li>Implement the ISO 19139 {@code Foo_Type}, where <var>Foo</var> is the ISO name of a class.</li>
+ *     <li>Implement the ISO 19115-3 {@code Foo_Type}, where <var>Foo</var> is the ISO name of a class.</li>
  *     <li>Contains the {@code gco:ObjectIdentification} group of attributes ({@code id}, {@code uuid}).</li>
  *     <li>Conceptually could have been subclasses of {@code ObjectIdentification} defined in this package.</li>
  *   </ul></li>
  *   <li><code>org.apache.sis.<b>internal.jaxb</b></code> private packages:
  *   <ul>
- *     <li>Implement the ISO 19139 {@code Foo_PropertyType} as subclasses of the {@link org.apache.sis.internal.jaxb.gco.PropertyType} class.</li>
+ *     <li>Implement the ISO 19115-3 {@code Foo_PropertyType} as subclasses of the {@link org.apache.sis.internal.jaxb.gco.PropertyType} class.</li>
  *     <li>Contains the {@code gco:ObjectReference} group of attributes ({@code xlink}, {@code uuidref}).</li>
  *     <li>Attributes are declared in the {@link org.apache.sis.internal.jaxb.gco.ObjectReference} Java class.</li>
  *    </ul></li>

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -24,9 +24,9 @@ import org.apache.sis.internal.jaxb.Filt
 
 
 /**
- * An adapter for {@link CodeList}, in order to implement the ISO-19139 standard. This object
- * wraps a {@link CodeListUID}, which contain {@link CodeListUID#codeList codeList} and
- * {@link CodeListUID#codeListValue codeListValue} attributes. The result looks like below:
+ * An adapter for {@link CodeList}, in order to implement the ISO 19115-3 standard.
+ * This object wraps a {@link CodeListUID}, which contain {@link CodeListUID#codeList codeList}
+ * and {@link CodeListUID#codeListValue codeListValue} attributes. The result looks like below:
  *
  * {@preformat xml
  *   <dateType>
@@ -64,7 +64,7 @@ public abstract class CodeListAdapter<Va
     }
 
     /**
-     * Creates a wrapper for a {@link CodeList}, in order to handle the format specified in ISO-19139.
+     * Creates a wrapper for a {@link CodeList}, in order to handle the format specified in ISO 19115-3.
      *
      * @param  value  the value of {@link CodeList} to be marshalled.
      */

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -30,7 +30,7 @@ import org.apache.sis.internal.jaxb.Sche
 
 
 /**
- * Stores information about {@link CodeList} in order to marshal in the way defined by ISO-19139.
+ * Stores information about {@link CodeList} in order to marshal in the way defined by ISO 19115-3.
  * This class provides the {@link #codeList} and {@link #codeListValue} attributes to be marshalled.
  * Those attributes should be unique for each code.
  *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -30,9 +30,9 @@ import org.apache.sis.xml.Namespaces;
 
 
 /**
- * JAXB wrapper for {@link Locale}, in order to integrate the value in an element respecting
- * the ISO-19139 standard. See package documentation for more information about the handling
- * of {@code CodeList} in ISO-19139.
+ * JAXB wrapper for {@link Locale}
+ * in order to wrap the value in an XML element as specified by ISO 19115-3 standard.
+ * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3.
  *
  * <p>This adapter formats the locale like below:</p>
  *
@@ -55,7 +55,7 @@ import org.apache.sis.xml.Namespaces;
 public final class Country extends GO_CharacterString {
     /**
      * The country using a {@link org.opengis.util.CodeList}-like format.
-     * This was called "Country" in ISO 19139 and has been renamed "CountryCode" in ISO 19115-3
+     * This was called "Country" in ISO 19139:2007 and has been renamed "CountryCode" in ISO 19115-3
      */
     private CodeListUID identifier;
 
@@ -101,7 +101,7 @@ public final class Country extends GO_Ch
     }
 
     /**
-     * Gets the value of the Country code using ISO 19139 element name.
+     * Gets the value of the Country code using ISO 19139:2007 element name.
      */
     @XmlElement(name = "Country", namespace = LegacyNamespaces.GMD)
     private CodeListUID getCountry() {
@@ -109,7 +109,7 @@ public final class Country extends GO_Ch
     }
 
     /**
-     * Sets the value of the Country code in ISO 19139 element name.
+     * Sets the value of the Country code in ISO 19139:2007 element name.
      */
     @SuppressWarnings("unused")
     private void setCountry(CodeListUID newValue) {

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -22,7 +22,7 @@ import org.apache.sis.util.iso.Types;
 
 
 /**
- * An adapter for {@link Enum}, in order to implement the ISO-19139 standard.
+ * An adapter for {@link Enum}, in order to implement the ISO 19115-3 standard.
  * Example:
  *
  * {@preformat xml

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -24,9 +24,8 @@ import org.apache.sis.internal.jaxb.Cont
 
 
 /**
- * JAXB adapter wrapping a URI in a {@code <gmd:URL>} element, for ISO-19139 compliance.
- * Note that while this object is called {@code "URL"}, we actually use the {@link URI}
- * Java object.
+ * JAXB adapter wrapping a URI in a {@code <gmd:URL>} element, for ISO 19139:2007 compliance.
+ * Note that while this object is called {@code "URL"}, we actually use the {@link URI} Java object.
  *
  * @author  Cédric Briançon (Geomatys)
  * @version 0.3

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -26,9 +26,9 @@ import org.apache.sis.xml.Namespaces;
 
 
 /**
- * JAXB wrapper for {@link Locale}, in order to integrate the value in an element respecting
- * the ISO-19139 standard. See package documentation for more information about the handling
- * of {@code CodeList} in ISO-19139.
+ * JAXB wrapper for {@link Locale}
+ * in order to wrap the value in an XML element as specified by ISO 19115-3 standard.
+ * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3.
  *
  * <p>This adapter formats the locale like below:</p>
  *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -40,7 +40,7 @@ import org.apache.sis.util.Debug;
 final class LocalisedCharacterString {
     /**
      * A prefix to concatenate with the {@linkplain Locale#getISO3Language() language code}.
-     * This is a hack for a common pattern found in the way locales are specified in ISO 19139 files.
+     * This is a hack for a common pattern found in the way locales are specified in ISO 19139:2007 files.
      * See <a href="https://issues.apache.org/jira/browse/SIS-137">SIS-137</a> for more information.
      */
     private static final String PREFIX = "#locale-";

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -32,9 +32,9 @@ import org.apache.sis.util.ArraysExt;
 
 
 /**
- * JAXB wrapper for ISO-19139 {@code <PT_FreeText>} element mapped to {@link InternationalString}.
- * It will be used in order to marshal and unmarshal international strings localized in several
- * language, using the {@link DefaultInternationalString} implementation class. Example:
+ * JAXB wrapper for ISO 19115-3 {@code <PT_FreeText>} element mapped to {@link InternationalString}.
+ * It will be used in order to marshal and unmarshal international strings localized in several language,
+ * using the {@link DefaultInternationalString} implementation class. Example:
  *
  * {@preformat xml
  *   <gmd:title xsi:type="gmd:PT_FreeText_PropertyType">

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -24,8 +24,8 @@ import org.apache.sis.xml.Namespaces;
 
 /**
  * A set of strings localized in different languages. This adapter represents the
- * {@code <gmd:textGroup>} element defined for embedded translations in ISO-19139
- * standard. See {@link PT_FreeText} class javadoc for an example.
+ * {@code <gmd:textGroup>} element defined in ISO 19139:2007.
+ * See {@link PT_FreeText} class javadoc for an example.
  *
  * <p>If a localized string has a {@code null} locale, then this string will not be
  * included in this text group because that string should be already included in
@@ -36,8 +36,8 @@ import org.apache.sis.xml.Namespaces;
  * <p>The {@code TextGroup} name suggests that this object can contain many localized strings.
  * However it appears that despite its name, {@code TextGroup} shall always contains exactly 1
  * localized strings and the whole {@code TextGroup} element shall be repeated for each additional
- * languages. SIS uses the ISO 19139 compliant form for marshalling, but accepts both forms during
- * unmarshalling. More specifically, the name suggests that the format should be:</p>
+ * languages. SIS uses the ISO 19139:2007 compliant form for marshalling, but accepts both forms
+ * during unmarshalling. More specifically, the name suggests that the format should be:</p>
  *
  * {@preformat xml
  *   <gco:CharacterString>Apache SIS, projet OpenSource</gco:CharacterString>
@@ -84,7 +84,7 @@ final class TextGroup {
      * JAXB uses this field at marshalling-time in order to wrap {@code N}
      * {@code <LocalisedCharacterString>} elements inside a single {@code <textGroup>} element.
      *
-     * <p>In ISO 19139 compliant documents, the length of this array shall be exactly 1,
+     * <p>In ISO 19139:2007 compliant documents, the length of this array shall be exactly 1,
      * as in the second example of class javadoc. However SIS allows arbitrary length
      * (as in the first example of class javadoc) for compatibility and convenience reasons.</p>
      */
@@ -99,9 +99,9 @@ final class TextGroup {
 
     /**
      * Constructs a {@linkplain TextGroup text group} for a single locale. This constructor
-     * puts exactly one string in the {@code TextGroup}, as required by ISO 19139. However
-     * it would be possible to declare an other constructor allowing the more compact form
-     * (the smaller ) if there is a need for that in the future.
+     * puts exactly one string in the {@code TextGroup}, as required by ISO 19139:2007.
+     * However it would be possible to declare an other constructor allowing the more compact form
+     * (the smaller) if there is a need for that in the future.
      *
      * @param  locale  the string language.
      * @param  text    the string.

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -27,7 +27,7 @@ import org.apache.sis.util.Classes;
 /**
  * JAXB adapter for {@link VerticalCRS}, in order to integrate the value in an element
  * complying with OGC/ISO standard. Note that the CRS is formatted using the GML schema,
- * not the ISO 19139 one.
+ * not the ISO 19139:2007 one.
  *
  * <p>This wrapper does not declare directly the XML element, because doing so would require
  * the implementation classes in the {@code sis-referencing} module. Instead, this wrapper

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -30,7 +30,7 @@ import org.apache.sis.util.resources.Err
 
 /**
  * JAXB adapter for {@link TemporalPrimitive}, in order to integrate the value in an element complying
- * with OGC/ISO standard. Note that the CRS is formatted using the GML schema, not the ISO 19139 one.
+ * with OGC/ISO standard. Note that the CRS is formatted using the GML schema, not the ISO 19139:2007 one.
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -37,7 +37,7 @@ import static java.util.Collections.sing
  */
 enum FilterVersion {
     /**
-     * Metadata using the legacy ISO 19139 schema (replaced by ISO 19115-3).
+     * Metadata using the legacy ISO 19139:2007 schema (replaced by ISO 19115-3).
      */
     ISO19139(new String[] {
             Namespaces.CAT,

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamResolver.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamResolver.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamResolver.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamResolver.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -38,7 +38,7 @@ import org.apache.sis.internal.util.Coll
 /**
  * A {@code StreamReader} which uses a more complex algorithm backed by a dictionary for identifying the XML namespaces
  * expected by JAXB implementation. This is used when a single namespace in a legacy schema has been splitted into many
- * namespaces in a newer schema. This happen for example in the upgrade from ISO 19139 to ISO 19115-3. In such cases,
+ * namespaces in a newer schema. This happen for example in the upgrade from ISO 19139:2007 to ISO 19115-3. In such cases,
  * we need to check which attribute is being mapped in order to determine the new namespace.
  *
  * @author  Cullen Rombach (Image Matters)
@@ -161,7 +161,7 @@ final class FilteredStreamResolver exten
 
     /**
      * Elements that need to have their name changed.
-     * For example {@code gmd:URL} needs to be changed to {@code gco:CharacterString} for reading ISO 19139.
+     * For example {@code gmd:URL} needs to be changed to {@code gco:CharacterString} for reading ISO 19139:2007.
      *
      * <ul>
      *   <li>key:   old element name</li>
@@ -236,7 +236,7 @@ final class FilteredStreamResolver exten
      * in the context of the current part of the XML document being read.
      *
      * @param   name       the element or attribute name currently being read.
-     * @param   namespace  the namespace declared in the document being read (e.g. an ISO 19139 namespace).
+     * @param   namespace  the namespace declared in the document being read (e.g. an ISO 19139:2007 namespace).
      * @return  the namespace URI for the element or attribute in the current context (e.g. an ISO 19115-3 namespace).
      */
     private String toImplNamespace(final String name, final String namespace) {

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -27,7 +27,7 @@ import org.opengis.metadata.citation.Cit
  * <a href="http://www.epsg.org">EPSG</a> for Coordinate Reference System objects, or a
  * well-known acronym like ISBN for <cite>International Standard Book Number</cite>.
  *
- * <p>When an identified object is marshalled in a ISO 19139 compliant XML document, some identifiers
+ * <p>When an identified object is marshalled in a ISO 19115-3 compliant XML document, some identifiers
  * are handled in a special way: they appear as {@code gml:id}, {@code gco:uuid} or {@code xlink:href}
  * attributes of the XML element. Those identifiers can be specified using the {@link IdentifierSpace}
  * enum values as below:</p>

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -27,8 +27,8 @@ package org.apache.sis.xml;
  * ({@link NilReason#UNKNOWN UNKNOW}), the information may not exist at all ({@link NilReason#MISSING
  * MISSING}) or can not be divulged ({@link NilReason#WITHHELD WITHHELD}).
  *
- * <p>Nil objects appear most frequently in XML documents since if a mandatory ISO 19115 attribute
- * is absent, then the ISO 19139 standard requires us to said why it is so. The following example
+ * <p>Nil objects appear most frequently in XML documents because if a mandatory ISO 19115-1 attribute
+ * is absent, then the ISO 19115-3 standard requires us to said why it is absent. The following example
  * shows a {@code CI_Citation} fragment with an ordinary {@code CI_Series} element on the left side,
  * and an unknown {@code CI_Series} element on the right side:</p>
  *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -106,7 +106,7 @@ abstract class Pooled {
     private TimeZone timezone;
 
     /**
-     * The base URL of ISO 19139 (or other standards) schemas. It shall be an unmodifiable
+     * The base URL of ISO 19115-3 (or other standards) schemas. It shall be an unmodifiable
      * instance because {@link #getProperty(String)} returns a direct reference to the user.
      * The valid values are documented in the {@link XML#SCHEMAS} property.
      */

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -243,8 +243,8 @@ public class ReferenceResolver {
 
     /**
      * Returns the {@code <gmx:Anchor>} to use for the given text, or {@code null} if none.
-     * Anchors can appear in ISO 19139 documents where we would normally expect a character
-     * sequence. For example:
+     * Anchors can appear in ISO 19115-3 documents where we would normally expect a character sequence.
+     * For example:
      *
      * <table class="sis">
      * <caption>XML representations of string</caption>

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -115,7 +115,7 @@ public class ValueConverter {
     }
 
     /**
-     * Converts the given locale to a language code. For better ISO 19139 compliance, the language code
+     * Converts the given locale to a language code. For better compliance with ISO standards, the language code
      * should be a 3-letters ISO 639-2 code (e.g. {@code "jpn"} for {@linkplain Locale#JAPANESE Japanese}).
      * However those codes may not be available for every locales.
      *
@@ -159,7 +159,7 @@ public class ValueConverter {
     }
 
     /**
-     * Converts the given locale to a country code. For better ISO 19139 compliance, the country code
+     * Converts the given locale to a country code. For better compliance with ISO standards, the country code
      * should be a 2-letters ISO 3166 code (e.g. {@code "JP"} for {@linkplain Locale#JAPAN Japan}).
      *
      * <p>The default implementation returns {@link Locale#getCountry()} if non-empty, or {@code null} otherwise.</p>
@@ -185,7 +185,7 @@ public class ValueConverter {
     /**
      * Converts the given character set to a code.
      *
-     * <p>The default implementation first invokes {@link Charset#name()}. Then if marshalling to ISO 19139:2007,
+     * <p>The default implementation first invokes {@link Charset#name()}. Then if marshalling to legacy ISO 19139:2007,
      * this method converts the <a href="http://www.iana.org/assignments/character-sets">IANA</a> name to a
      * ISO 19115:2003 {@code MD_CharacterSetCode} using the following equivalence table:</p>
      *

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -132,14 +132,14 @@ public final class XML extends Static {
      *
      * <ul>
      *   <li>The value of the {@code codeList} attribute when marshalling subclasses of
-     *       {@link org.opengis.util.CodeList} in ISO 19139 compliant XML document.</li>
+     *       {@link org.opengis.util.CodeList} in ISO 19115-3 compliant XML document.</li>
      *   <li>The value of the {@code uom} attribute when marshalling measures (for example
-     *       {@code <gco:Distance>}) in ISO 19139 compliant XML document.</li>
+     *       {@code <gco:Distance>}) in ISO 19115-3 compliant XML document.</li>
      * </ul>
      *
      * As of SIS 0.3, only one {@code Map} key is recognized: {@code "gmd"}, which stands
-     * for the ISO 19139 schemas. Additional keys, if any, are ignored. Future SIS versions
-     * may recognize more keys.
+     * for the legacy ISO 19139:2007 schemas. Additional keys, if any, are ignored.
+     * Future SIS versions may recognize more keys.
      *
      * <div class="section">Valid values</div>
      * <table class="sis">
@@ -193,7 +193,8 @@ public final class XML extends Static {
      *
      * <div class="section">Supported metadata versions</div>
      * Apache SIS currently supports ISO 19115-3 by default (with the value "2014").
-     * SIS can read and write ISO 19139 if this property is set to "2003".
+     * SIS can write legacy ISO 19139:2007 documents if this property is set to "2003".
+     * Both versions can be read without the need to specify this property.
      *
      * @since 1.0
      */

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -17,8 +17,8 @@
 
 /**
  * Provides methods for marshalling and unmarshalling SIS objects in XML.
- * The XML format is compliant with ISO 19139 specification for metadata, and
- * compliant with GML for referencing objects.
+ * The XML format is compliant with ISO 19115-3 specification for metadata,
+ * and compliant with GML for referencing objects.
  *
  * <p>The main class in this package is {@link org.apache.sis.xml.XML}, which provides
  * property keys that can be used for configuring (un)marshallers and convenience
@@ -42,7 +42,7 @@
  * }
  *
  * <div class="section">Customizing the XML</div>
- * In order to parse and format ISO 19139 compliant documents, SIS needs its own
+ * In order to parse and format ISO 19115-3 compliant documents, SIS needs its own
  * {@link javax.xml.bind.Marshaller} and {@link javax.xml.bind.Unmarshaller} instances
  * (which are actually wrappers around standard instances). Those instances are created
  * and cached by {@link org.apache.sis.xml.MarshallerPool}, which is used internally by

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Mon Jan  1 17:46:50 2018
@@ -115,7 +115,7 @@ public abstract strictfp class Annotatio
     /**
      * If the given GeoAPI type, when marshalled to XML, is wrapped into an other XML element,
      * returns the class of the wrapper for that XML element. Otherwise returns {@code null}.
-     * Such wrappers are unusual in XML (except for lists), but the ISO 19139 standard do that
+     * Such wrappers are unusual in XML (except for lists), but the ISO 19115-3 standard do that
      * systematically for every elements.
      *
      * <p><b>Example:</b> when a {@link org.apache.sis.metadata.iso.citation.DefaultContact}
@@ -194,7 +194,7 @@ public abstract strictfp class Annotatio
     }
 
     /**
-     * Returns the XML type for an element of the given type. For example in ISO 19139,
+     * Returns the XML type for an element of the given type. For example in ISO 19115-3,
      * the XML type of {@code CI_Citation} is {@code CI_Citation_Type}.
      *
      * @param  type  the GeoAPI interface.

Modified: sis/branches/ISO-19115-3/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/pom.xml?rev=1819779&r1=1819778&r2=1819779&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/pom.xml (original)
+++ sis/branches/ISO-19115-3/pom.xml Mon Jan  1 17:46:50 2018
@@ -50,7 +50,7 @@ Apache SIS is a free software, Java lang
  SIS provides data structures for geographic data and associated metadata along with methods
  to manipulate those data structures. The SIS metadata module forms the base of the library
  and enables the creation of metadata objects which comply with the ISO 19115 metadata model
- and which can be read from or written to ISO 19139 compliant XML documents.
+ and which can be read from or written to ISO 19115-3 compliant XML documents.
  The SIS referencing module will enable the construction of geodetic data structures for
  geospatial referencing based on the ISO 19111 model such as axis, projection and coordinate
  reference system definitions, along with the associated operations which enable the mathematical



Mime
View raw message