svn commit: r1822427 - in /sis/branches/ISO-19115-3/core/sis-metadata/src: main/java/org/apache/sis/internal/jaxb/code/ test/java/org/apache/sis/metadata/iso/

2018-01-27 Thread desruisseaux 
Author: desruisseaux
Date: Sat Jan 27 16:37:06 2018
New Revision: 1822427

URL: http://svn.apache.org/viewvc?rev=1822427=rev
Log:
Apply namespace fixes to code lists.

Modified:

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java

sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/SchemaVerifier.java

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1822427=1822426=1822427=diff
==
--- 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] Sat Jan 27 16:37:06 2018
@@ -16,10 +16,12 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.quality.EvaluationMethodType;
 import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
 import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -28,10 +30,11 @@ import org.apache.sis.internal.jaxb.gmd.
  * See package documentation for more information about the handling of {@code 
CodeList} in ISO 19115-3.
  *
  * @author  Cédric Briançon (Geomatys)
- * @version 0.3
+ * @version 1.0
  * @since   0.3
  * @module
  */
+@XmlType(namespace = Namespaces.MDQ)
 public final class DQ_EvaluationMethodTypeCode
 extends CodeListAdapter
 {

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
URL:

[jira] [Created] (SIS-389) DefaultMedium.name property should be a Citation

2018-01-27 Thread Martin Desruisseaux (JIRA) 
Martin Desruisseaux created SIS-389:
---

 Summary: DefaultMedium.name property should be a Citation
 Key: SIS-389
 URL: https://issues.apache.org/jira/browse/SIS-389
 Project: Spatial Information Systems
  Issue Type: Task
  Components: Metadata
Affects Versions: 0.8, 0.7, 0.6, 0.5
Reporter: Martin Desruisseaux
 Fix For: 2.0


{{MD_Medium.name}} was a {{MD_MediumNameCode}} code list in ISO 19115:2003 but 
became a {{CI_Citation}} in ISO 19115:2014. This change has not yet been 
propagated in GeoAPI 3.0.1 or in Apache SIS, because it would be an 
incompatible change. We may consider applying this change in GeoAPI 4.0 or 
Apache SIS 2.0. This change implies:

* In {{DefaultMedium}}, change the return and parameter type of {{getName()}} 
and {{setName(…)}}.
* Deprecated or remove {{MD_MediumNameCode}} adapter.




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (SIS-389) DefaultMedium.name property should be a Citation

2018-01-27 Thread Martin Desruisseaux (JIRA) 

 [ 
https://issues.apache.org/jira/browse/SIS-389?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Martin Desruisseaux updated SIS-389:

Description: 
{{MD_Medium.name}} was a {{MD_MediumNameCode}} code list in ISO 19115:2003 but 
became a {{CI_Citation}} in ISO 19115:2014. This change has not yet been 
propagated in GeoAPI 3.0.1 or in Apache SIS, because it would be an 
incompatible change. We may consider applying this change in GeoAPI 4.0 or 
Apache SIS 2.0. This change implies:

* In {{DefaultMedium}}, change the return and parameter type of {{getName()}} 
and {{setName(…)}}.
* Deprecated or remove {{MD_MediumNameCode}} adapter.

See https://github.com/opengeospatial/geoapi/issues/14


  was:
{{MD_Medium.name}} was a {{MD_MediumNameCode}} code list in ISO 19115:2003 but 
became a {{CI_Citation}} in ISO 19115:2014. This change has not yet been 
propagated in GeoAPI 3.0.1 or in Apache SIS, because it would be an 
incompatible change. We may consider applying this change in GeoAPI 4.0 or 
Apache SIS 2.0. This change implies:

* In {{DefaultMedium}}, change the return and parameter type of {{getName()}} 
and {{setName(…)}}.
* Deprecated or remove {{MD_MediumNameCode}} adapter.



> DefaultMedium.name property should be a Citation
> 
>
> Key: SIS-389
> URL: https://issues.apache.org/jira/browse/SIS-389
> Project: Spatial Information Systems
>  Issue Type: Task
>  Components: Metadata
>Affects Versions: 0.5, 0.6, 0.7, 0.8
>Reporter: Martin Desruisseaux
>Priority: Major
> Fix For: 2.0
>
>
> {{MD_Medium.name}} was a {{MD_MediumNameCode}} code list in ISO 19115:2003 
> but became a {{CI_Citation}} in ISO 19115:2014. This change has not yet been 
> propagated in GeoAPI 3.0.1 or in Apache SIS, because it would be an 
> incompatible change. We may consider applying this change in GeoAPI 4.0 or 
> Apache SIS 2.0. This change implies:
> * In {{DefaultMedium}}, change the return and parameter type of {{getName()}} 
> and {{setName(…)}}.
> * Deprecated or remove {{MD_MediumNameCode}} adapter.
> See https://github.com/opengeospatial/geoapi/issues/14



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

svn commit: r1822418 - in /sis/branches/ISO-19115-3/core/sis-metadata/src: main/java/org/apache/sis/metadata/iso/content/ main/java/org/apache/sis/metadata/iso/lineage/ main/java/org/apache/sis/metada

2018-01-27 Thread desruisseaux 
Author: desruisseaux
Date: Sat Jan 27 15:29:32 2018
New Revision: 1822418

URL: http://svn.apache.org/viewvc?rev=1822418=rev
Log:
Fix more namespace URLs with SchemaVerifier help.

Modified:

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.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/DefaultProcessing.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.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/quality/DefaultCoverageResult.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java

sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/SchemaVerifier.java

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java?rev=1822418=1822417=1822418=diff
==
--- 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
 [UTF-8] Sat Jan 27 15:29:32 2018
@@ -25,7 +25,6 @@ import org.opengis.util.InternationalStr
 import org.opengis.metadata.content.RangeElementDescription;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.metadata.TitleProperty;
-import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -54,12 +53,12 @@ import org.apache.sis.xml.Namespaces;
  */
 @SuppressWarnings("CloneableClassWithoutClone") // 
ModifiableMetadata needs shallow clones.
 @TitleProperty(name = "name")
-@XmlType(name = "MI_RangeElementDescription_Type", namespace = Namespaces.GMI, 
propOrder = {
+@XmlType(name = "MI_RangeElementDescription_Type", propOrder = {
 "name",
 "definition",
 "rangeElements"
 })
-@XmlRootElement(name = "MI_RangeElementDescription", namespace = 
Namespaces.GMI)
+@XmlRootElement(name = "MI_RangeElementDescription")
 public class DefaultRangeElementDescription extends ISOMetadata implements 
RangeElementDescription {
 /**
  * Serial number for inter-operability with different versions.

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java?rev=1822418=1822417=1822418=diff
==
--- 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
 [UTF-8] Sat Jan 27 15:29:32 2018
@@ -23,7 +23,6 @@ import org.opengis.metadata.citation.Cit
 import org.opengis.metadata.lineage.Algorithm;
 import org.opengis.util.InternationalString;
 import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -53,11 +52,11 @@ import org.apache.sis.xml.Namespaces;
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone") // 
ModifiableMetadata needs shallow clones.
-@XmlType(name = "LE_Algorithm_Type", namespace = Namespaces.GMI, propOrder = {
+@XmlType(name = "LE_Algorithm_Type", propOrder = {
 "citation",
 "description"
 })
-@XmlRootElement(name = "LE_Algorithm", namespace = Namespaces.GMI)
+@XmlRootElement(name = "LE_Algorithm")
 public class DefaultAlgorithm extends ISOMetadata implements Algorithm {
 /**
  * Serial number for inter-operability with different versions.

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
URL:

svn commit: r1822408 - in /sis/branches/ISO-19115-3/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/ sis-metadata/src/

2018-01-27 Thread desruisseaux 
Author: desruisseaux
Date: Sat Jan 27 14:07:17 2018
New Revision: 1822408

URL: http://svn.apache.org/viewvc?rev=1822408=rev
Log:
Fix a few namespaces with the help of SchemaVerifier.

Modified:

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java

sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java

sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/SchemaVerifier.java

sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep.xml

sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java

sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.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/DefaultApplicationSchemaInformation.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1822408=1822407=1822408=diff
==
--- 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
 [UTF-8] Sat Jan 27 14:07:17 2018
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.adapter
 import org.opengis.metadata.ApplicationSchemaInformation;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.citation.OnlineResource;
+import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
 import org.apache.sis.internal.jaxb.metadata.CI_OnlineResource;
 
@@ -56,7 +57,7 @@ import org.apache.sis.internal.jaxb.meta
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone") // 
ModifiableMetadata needs shallow clones.
-@XmlType(name = "MD_ApplicationSchemaInformation_Type", propOrder = {
+@XmlType(name = "MD_ApplicationSchemaInformation_Type", namespace = 
Namespaces.MAS, propOrder = {
 "name",
 "schemaLanguage",
 "constraintLanguage",
@@ -65,7 +66,7 @@ import org.apache.sis.internal.jaxb.meta
 "softwareDevelopmentFile",
 "softwareDevelopmentFileFormat"
 })
-@XmlRootElement(name = "MD_ApplicationSchemaInformation")
+@XmlRootElement(name = "MD_ApplicationSchemaInformation", namespace = 
Namespaces.MAS)
 public class DefaultApplicationSchemaInformation extends ISOMetadata 
implements ApplicationSchemaInformation {
 /**
  * Serial number for inter-operability with different versions.

Modified: 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java?rev=1822408=1822407=1822408=diff
==
--- 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
 [UTF-8] Sat Jan 27 14:07:17 2018
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElem
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.PortrayalCatalogueReference;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -50,8 +51,8 @@ import org.opengis.metadata.PortrayalCat
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone") // 
ModifiableMetadata needs shallow clones.
-@XmlType(name =