svn commit: r1824850 - in /sis/branches/ISO-19115-3/core: sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java

[desruisseaux]

Author: desruisseaux
Date: Tue Feb 20 11:09:29 2018
New Revision: 1824850

URL: http://svn.apache.org/viewvc?rev=1824850&view=rev
Log:
Renamed ISO 19139:2007 "gco" prefix as "gcol" with "l" as "legacy".
We don't use "gco1" because new ISO 19115-3:2016 "gco" prefix is associated to 
http://standards.iso.org/iso/19115/-3/gco/1.0

Modified:
    
sis/branches/ISO-19115-3/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
    
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java

Modified: 
sis/branches/ISO-19115-3/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java?rev=1824850&r1=1824849&r2=1824850&view=diff
==============================================================================
--- 
sis/branches/ISO-19115-3/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
 [UTF-8] Tue Feb 20 11:09:29 2018
@@ -406,9 +406,9 @@ public strictfp class MetadataTest exten
          * by the anchor version so we can compare the XML with the 
"Metadata.xml" file content.
          */
         final StringBuffer xml = writer.getBuffer();
-        replace(xml, "<gco1:CharacterString>Common Data Index 
record</gco1:CharacterString>",
+        replace(xml, "<gcol:CharacterString>Common Data Index 
record</gcol:CharacterString>",
                      "<gmx:Anchor xlink:href=\"SDN:L231:3:CDI\">Common Data 
Index record</gmx:Anchor>");
-        replace(xml, "<gco1:CharacterString>EPSG:4326</gco1:CharacterString>",
+        replace(xml, "<gcol:CharacterString>EPSG:4326</gcol:CharacterString>",
                      "<gmx:Anchor 
xlink:href=\"SDN:L101:2:4326\">EPSG:4326</gmx:Anchor>");
         /*
          * The <gmd:EX_TemporalExtent> block can not be marshalled yet, since 
it requires the sis-temporal module.

Modified: 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java?rev=1824850&r1=1824849&r2=1824850&view=diff
==============================================================================
--- 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
 [UTF-8] Tue Feb 20 11:09:29 2018
@@ -566,7 +566,7 @@ public final class Namespaces extends St
         p.put("http://www.opengis.net/citygml/building/1.0";,            
"build");
         p.put("http://www.opengis.net/citygml/cityfurniture/1.0";,   
"furniture");
         p.put("http://www.opengis.net/citygml/transportation/1.0";,         
"tr");
-        p.put("http://www.isotc211.org/2005/gco";,                        
"gco1");
+        p.put("http://www.isotc211.org/2005/gco";,                        
"gcol");   // "l" for "legacy" (prior version 1).
         p.put("http://www.isotc211.org/2005/srv";,                        
"srv1");
         p.put("http://www.purl.org/dc/elements/1.1/";,                     
"dc2");
         p.put("http://www.purl.org/dc/terms/";,                           
"dct2");