sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1820034 - in /sis/branches/ISO-19115-3/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/ sis-utility/src/main/resources/org/apache/sis/xml/
Date Thu, 04 Jan 2018 05:42:29 GMT
Author: desruisseaux
Date: Thu Jan  4 05:42:29 2018
New Revision: 1820034

URL: http://svn.apache.org/viewvc?rev=1820034&view=rev
Log:
Adaptation of commit 97b73cd1d048120ed11b22cda824fbf01cbd4608 from Image Matter
(fix some minor bugs, add documentation to root folder)

The project at this revision can be built but is known to have test failures.
Tests will pass only after we completed the port of all ISO 19115-3 work.

Modified:
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
    sis/branches/ISO-19115-3/core/sis-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/metadata/iso/lineage/DefaultProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1820034&r1=1820033&r2=1820034&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
[UTF-8] Thu Jan  4 05:42:29 2018
@@ -78,9 +78,9 @@ import static org.apache.sis.internal.me
     "reference",                // New in ISO 19115:2014
     "scope",                    // New in ISO 19115:2014
     "sources",
-    "outputs",
-    "processingInformation",
-    "reports"
+    "outputs",                  // ISO 19115-2 extension
+    "processingInformation",    // Ibid.
+    "reports"                   // Ibid.
 })
 @XmlRootElement(name = "LI_ProcessStep")
 @XmlSeeAlso(org.apache.sis.internal.jaxb.gmi.LE_ProcessStep.class)

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java?rev=1820034&r1=1820033&r2=1820034&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
[UTF-8] Thu Jan  4 05:42:29 2018
@@ -51,7 +51,7 @@ import org.apache.sis.xml.Namespaces;
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
 @TitleProperty(name = "name")
-@XmlType(name = "LE_ProcessStepReport_Type", propOrder = {
+@XmlType(name = "LE_ProcessStepReport_Type", namespace = Namespaces.GMI, propOrder = {
     "name",
     "description",
     "fileType"
@@ -133,7 +133,7 @@ public class DefaultProcessStepReport ex
      * @return name of the processing report, or {@code null}.
      */
     @Override
-    @XmlElement(name = "name", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "name", required = true)
     public InternationalString getName() {
         return name;
     }
@@ -154,7 +154,7 @@ public class DefaultProcessStepReport ex
      * @return what occurred during the process step, or {@code null}.
      */
     @Override
-    @XmlElement(name = "description", namespace = Namespaces.GMI)
+    @XmlElement(name = "description")
     public InternationalString getDescription() {
         return description;
     }
@@ -175,7 +175,7 @@ public class DefaultProcessStepReport ex
      * @return type of file that contains the processing report, or {@code null}.
      */
     @Override
-    @XmlElement(name = "fileType", namespace = Namespaces.GMI)
+    @XmlElement(name = "fileType")
     public InternationalString getFileType() {
         return fileType;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1820034&r1=1820033&r2=1820034&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
[UTF-8] Thu Jan  4 05:42:29 2018
@@ -97,8 +97,8 @@ import org.apache.sis.xml.Namespaces;
     "sourceExtents",                // Legacy ISO 19115:2003
     "scope",                        // New in ISO 19115:2014
     "sourceSteps",
-    "processedLevel",
-    "resolution"
+    "processedLevel",               // ISO 19115-2 extension
+    "resolution"                    // ISO 19115-2 extension
 })
 @XmlRootElement(name = "LI_Source")
 @XmlSeeAlso(org.apache.sis.internal.jaxb.gmi.LE_Source.class)

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1820034&r1=1820033&r2=1820034&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
[UTF-8] Thu Jan  4 05:42:29 2018
@@ -63,7 +63,8 @@ import static org.apache.sis.util.collec
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
- * @version 0.5
+ * @author  Cullen Rombach (Image Matters)
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -318,6 +319,7 @@ public class DefaultScopeDescription ext
      * @return feature types to which the information applies.
      */
     @Override
+    @XmlElement(name = "features")
     public Set<CharSequence> getFeatures() {
         return getProperty(FEATURES);
     }
@@ -351,6 +353,7 @@ public class DefaultScopeDescription ext
      * @return attribute types to which the information applies.
      */
     @Override
+    @XmlElement(name = "attributes")
     public Set<CharSequence> getAttributes() {
         return getProperty(ATTRIBUTES);
     }
@@ -384,6 +387,7 @@ public class DefaultScopeDescription ext
      * @return feature instances to which the information applies.
      */
     @Override
+    @XmlElement(name = "featureInstances")
     public Set<CharSequence> getFeatureInstances() {
         return getProperty(FEATURE_INSTANCES);
     }
@@ -417,6 +421,7 @@ public class DefaultScopeDescription ext
      * @return attribute instances to which the information applies.
      */
     @Override
+    @XmlElement(name = "attributeInstances")
     public Set<CharSequence> getAttributeInstances() {
         return getProperty(ATTRIBUTE_INSTANCES);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1820034&r1=1820033&r2=1820034&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
[UTF-8] Thu Jan  4 05:42:29 2018
@@ -89,6 +89,7 @@
     // Java types, primitive types and basic OGC types handling
     @XmlJavaTypeAdapter(GO_DateTime.class),
     @XmlJavaTypeAdapter(StringAdapter.class),
+    @XmlJavaTypeAdapter(CharSequenceAdapter.class),
     @XmlJavaTypeAdapter(InternationalStringAdapter.class)
 })
 package org.apache.sis.metadata.iso.maintenance;

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=1820034&r1=1820033&r2=1820034&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] Thu Jan  4 05:42:29 2018
@@ -364,6 +364,7 @@ http://standards.iso.org/iso/19115/-3/md
     <type>
   MD_Metadata
     <type>
+    alternativeMetadataReference
     applicationSchemaInfo
     characterSet
     contact
@@ -383,7 +384,9 @@ http://standards.iso.org/iso/19115/-3/md
     metadataConstraints
     metadataExtensionInfo
     metadataIdentifier
+    metadataLinkage
     metadataMaintenance
+    metadataProfile
     metadataScope
     metadataStandard
     metadataStandardName
@@ -393,6 +396,7 @@ http://standards.iso.org/iso/19115/-3/md
     parentMetadata
     portrayalCatalogueInfo
     referenceSystemInfo
+    resourceLineage
     spatialRepresentationInfo
   MD_MetadataScope
     <type>
@@ -414,6 +418,7 @@ http://standards.iso.org/iso/19115/-3/md
   MD_TopologyLevelCode
     <type>
   MI_Metadata
+    alternativeMetadataReference
     acquisitionInformation
     applicationSchemaInfo
     characterSet
@@ -434,7 +439,9 @@ http://standards.iso.org/iso/19115/-3/md
     metadataConstraints
     metadataExtensionInfo
     metadataIdentifier
+    metadataLinkage
     metadataMaintenance
+    metadataProfile
     metadataScope
     metadataStandard
     metadataStandardName
@@ -444,6 +451,7 @@ http://standards.iso.org/iso/19115/-3/md
     parentMetadata
     portrayalCatalogueInfo
     referenceSystemInfo
+    resourceLineage
     spatialRepresentationInfo
   RS_Identifier
     <type>



Mime
View raw message