sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1821109 - in /sis/branches/ISO-19115-3/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/ sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citatio...
Date Sun, 14 Jan 2018 14:54:55 GMT
Author: desruisseaux
Date: Sun Jan 14 14:54:55 2018
New Revision: 1821109

URL: http://svn.apache.org/viewvc?rev=1821109&view=rev
Log:
Fix wrong namespace for a few code lists.

Modified:
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml
    sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml
    sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1821109&r1=1821108&r2=1821109&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
[UTF-8] Sun Jan 14 14:54:55 2018
@@ -16,9 +16,11 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.TopicCategory;
 import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -29,10 +31,11 @@ import org.apache.sis.internal.jaxb.gmd.
  * @author  Cédric Briançon (Geomatys)
  * @author  Guihem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.5
+ * @version 1.0
  * @since   0.3
  * @module
  */
+@XmlType(namespace = Namespaces.MRI)
 public final class MD_TopicCategoryCode extends EnumAdapter<MD_TopicCategoryCode, TopicCategory>
{
     /**
      * The enumeration value.

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java?rev=1821109&r1=1821108&r2=1821109&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
[UTF-8] Sun Jan 14 14:54:55 2018
@@ -225,6 +225,7 @@ public final strictfp class DefaultCitat
                 new DefaultResponsibility(Role.FUNDER,     null, new DefaultIndividual("Robin
Hood",  null, contact))
         ));
         c.getDates().add(new DefaultCitationDate(TestUtilities.date("2015-10-17 00:00:00"),
DateType.ADOPTED));
+        c.getPresentationForms().add(PresentationForm.PHYSICAL_OBJECT);
         // Check that XML file built by the marshaller is the same as the example file.
         assertMarshalEqualsFile(file, c, version, "xlmns:*", "xsi:schemaLocation");
     }
@@ -269,6 +270,7 @@ public final strictfp class DefaultCitat
         final CitationDate date = getSingleton(c.getDates());
         assertEquals("date", date.getDate(), TestUtilities.date("2015-10-17 00:00:00"));
         assertEquals("dateType", date.getDateType(), DateType.ADOPTED);
+        assertEquals("presentationForm", PresentationForm.PHYSICAL_OBJECT, getSingleton(c.getPresentationForms()));
 
         final Iterator<Responsibility> it = c.getCitedResponsibleParties().iterator();
         final Contact contact = assertResponsibilityEquals(Role.ORIGINATOR, "Maid Marian",
it.next());

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation%20%28legacy%29.xml?rev=1821109&r1=1821108&r2=1821109&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml Sun Jan 14 14:54:55 2018
@@ -72,6 +72,6 @@
   </gmd:citedResponsibleParty>
   <gmd:presentationForm>
     <gmd:CI_PresentationFormCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_PresentationFormCode"
-                                 codeListValue="physicalObject">Physical Object</gmd:CI_PresentationFormCode>
+                                 codeListValue="physicalObject">Physical object</gmd:CI_PresentationFormCode>
   </gmd:presentationForm>
 </gmd:CI_Citation>

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml?rev=1821109&r1=1821108&r2=1821109&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml
(original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml
Sun Jan 14 14:54:55 2018
@@ -81,6 +81,6 @@
   </cit:citedResponsibleParty>
   <cit:presentationForm>
     <cit:CI_PresentationFormCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#CI_PresentationFormCode"
-                                 codeListValue="physicalObject">Physical Object</cit:CI_PresentationFormCode>
+                                 codeListValue="physicalObject">Physical object</cit:CI_PresentationFormCode>
   </cit:presentationForm>
 </cit:CI_Citation>

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=1821109&r1=1821108&r2=1821109&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] Sun Jan 14 14:54:55 2018
@@ -70,6 +70,8 @@ http://standards.iso.org/iso/19115/-3/ci
     <type>
     contactInfo
     name
+  CI_PresentationFormCode
+    <type>
   CI_Responsibility
     <type>
     extent
@@ -334,8 +336,6 @@ http://standards.iso.org/iso/19115/-3/mc
     useLimitation
     userNote
 http://standards.iso.org/iso/19115/-3/mdb/1.0
-  CI_PresentationFormCode
-    <type>
   DQ_EvaluationMethodTypeCode
     <type>
   MD_ApplicationSchemaInformation
@@ -416,8 +416,6 @@ http://standards.iso.org/iso/19115/-3/md
     <type>
   MD_SpatialRepresentationTypeCode
     <type>
-  MD_TopicCategoryCode
-    <type>
   MD_TopologyLevelCode
     <type>
   MI_Metadata
@@ -805,6 +803,8 @@ http://standards.iso.org/iso/19115/-3/mr
     equivalentScale
     levelOfDetail
     vertical
+  MD_TopicCategoryCode
+    <type>
   MD_Usage
     <type>
     additionalDocumentation



Mime
View raw message