sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1821376 - in /sis/branches/ISO-19115-3/core/sis-utility/src: main/resources/org/apache/sis/xml/NamespaceContent.txt test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
Date Wed, 17 Jan 2018 15:01:16 GMT
Author: desruisseaux
Date: Wed Jan 17 15:01:16 2018
New Revision: 1821376

URL: http://svn.apache.org/viewvc?rev=1821376&view=rev
Log:
Adaptation of commit 4617aca4d15875f7403c4677c132d3cbc3eac29b from Image Matter
(Update a few test classes in sis-utility).

Modified:
    sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
    sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt?rev=1821376&r1=1821375&r2=1821376&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
[UTF-8] Wed Jan 17 15:01:16 2018
@@ -428,8 +428,6 @@ http://standards.iso.org/iso/19115/-3/md
     hierarchyLevel
     hierarchyLevelName
     identificationInfo
-    language
-    locale
     metadataConstraints
     metadataExtensionInfo
     metadataIdentifier

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java?rev=1821376&r1=1821375&r2=1821376&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
[UTF-8] Wed Jan 17 15:01:16 2018
@@ -22,6 +22,7 @@ import java.util.Collections;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.sis.internal.jaxb.LegacyNamespaces;
 import org.apache.sis.internal.simple.SimpleMetadata;
 import org.apache.sis.xml.Namespaces;
 
@@ -41,7 +42,7 @@ final strictfp class MetadataMock extend
      * The language used for documenting metadata. The namespace should be {@code "gmd"},
      * but we use the newer namespace because of the way {@code FilteredStreamResolver} work.
      */
-    @XmlElement(namespace = Namespaces.MDB)
+    @XmlElement(namespace = LegacyNamespaces.GMD)
     @XmlJavaTypeAdapter(LocaleAdapter.class)
     private Locale language;
 



Mime
View raw message