You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/07/15 12:51:08 UTC
svn commit: r1610640 - in /sis/branches/JDK7: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/...
Author: desruisseaux
Date: Tue Jul 15 10:51:08 2014
New Revision: 1610640
URL: http://svn.apache.org/r1610640
Log:
Merge from the JDK8 branch.
Added:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
- copied unchanged from r1610639, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java
- copied unchanged from r1610639, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultParameter.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/package-info.java
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1610551-1610639
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -28,13 +28,14 @@ import org.opengis.metadata.distribution
import org.opengis.metadata.identification.AggregateInformation;
import org.opengis.metadata.identification.Identification;
import org.opengis.metadata.identification.DataIdentification;
-import org.opengis.metadata.identification.ServiceIdentification;
import org.opengis.metadata.identification.BrowseGraphic;
import org.opengis.metadata.identification.Keywords;
import org.opengis.metadata.identification.Progress;
import org.opengis.metadata.identification.Usage;
+import org.opengis.metadata.service.ServiceIdentification;
import org.opengis.metadata.maintenance.MaintenanceInformation;
import org.opengis.util.InternationalString;
+import org.apache.sis.metadata.iso.service.DefaultServiceIdentification;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.util.iso.Types;
@@ -46,7 +47,7 @@ import org.apache.sis.util.iso.Types;
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
* @since 0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.5
* @module
*/
@XmlType(name = "AbstractMD_Identification_Type", propOrder = {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -16,10 +16,8 @@
*/
package org.apache.sis.metadata.iso.identification;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import org.opengis.metadata.identification.ServiceIdentification;
-import org.apache.sis.xml.Namespaces;
/**
@@ -30,12 +28,14 @@ import org.apache.sis.xml.Namespaces;
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
* @since 0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.5
* @module
+ *
+ * @deprecated Moved to the {@link org.apache.sis.metadata.iso.service} package.
*/
-@XmlType(name = "MD_ServiceIdentification_Type")
-@XmlRootElement(name = "SV_ServiceIdentification", namespace = Namespaces.SRV) // Prefix is really SV_ according ISO 19115 corrigendum.
-public class DefaultServiceIdentification extends AbstractIdentification implements ServiceIdentification {
+@Deprecated
+@XmlTransient
+public class DefaultServiceIdentification extends org.apache.sis.metadata.iso.service.DefaultServiceIdentification implements ServiceIdentification {
/**
* Serial number for compatibility with different versions.
*/
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -39,8 +39,8 @@ import org.apache.sis.metadata.iso.ISOMe
*/
@XmlType(name = "SV_CoupledResource_Type", propOrder = {
"scopedName",
- "resourceReference",
- "resource",
+ "resourceReferences",
+ "resources",
"operation"
})
@XmlRootElement(name = "SV_CoupledResource")
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -38,7 +38,7 @@ import org.apache.sis.metadata.iso.ISOMe
@XmlType(name = "SV_OperationChainMetadata_Type", propOrder = {
"name",
"description",
- "operation"
+ "operations"
})
@XmlRootElement(name = "SV_OperationChainMetadata")
public class DefaultOperationChainMetadata extends ISOMetadata implements OperationChainMetadata {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -41,12 +41,12 @@ import org.opengis.metadata.service.Para
*/
@XmlType(name = "SV_OperationMetadata_Type", propOrder = {
"operationName",
- "distributedComputingPlatform",
- "description",
- "optionality",
- "repeatibility",
- "optionality",
- "repeatibility"
+ "distributedComputingPlatforms",
+ "operationDescription",
+ "invocationName",
+ "connectPoints",
+ "parameters",
+ "dependsOn"
})
@XmlRootElement(name = "SV_OperationMetadata")
public class DefaultOperationMetadata extends ISOMetadata implements OperationMetadata {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultParameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultParameter.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultParameter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultParameter.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -42,7 +42,7 @@ import org.apache.sis.metadata.iso.ISOMe
"direction",
"description",
"optionality",
- "repeatibility"
+ "repeatability"
})
@XmlRootElement(name = "SV_Parameter")
public class DefaultParameter extends ISOMetadata implements Parameter {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/package-info.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/package-info.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -50,6 +50,22 @@
@XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
})
@XmlAccessorType(XmlAccessType.NONE)
+@XmlJavaTypeAdapters({
+ @XmlJavaTypeAdapter(CI_Citation.class),
+ @XmlJavaTypeAdapter(CI_OnlineResource.class),
+ @XmlJavaTypeAdapter(MD_DataIdentification.class),
+ @XmlJavaTypeAdapter(MD_StandardOrderProcess.class),
+ @XmlJavaTypeAdapter(SV_CoupledResource.class),
+ @XmlJavaTypeAdapter(SV_CouplingType.class),
+ @XmlJavaTypeAdapter(SV_OperationMetadata.class),
+ @XmlJavaTypeAdapter(SV_OperationChainMetadata.class),
+ @XmlJavaTypeAdapter(SV_Parameter.class),
+
+ // Java types, primitive types and basic OGC types handling
+ @XmlJavaTypeAdapter(InternationalStringAdapter.class),
+ @XmlJavaTypeAdapter(GO_GenericName.class),
+ @XmlJavaTypeAdapter(GO_Boolean.class), @XmlJavaTypeAdapter(type=boolean.class, value=GO_Boolean.class)
+})
package org.apache.sis.metadata.iso.service;
import javax.xml.bind.annotation.XmlNs;
@@ -57,4 +73,9 @@ import javax.xml.bind.annotation.XmlNsFo
import javax.xml.bind.annotation.XmlSchema;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
+import org.apache.sis.internal.jaxb.gco.*;
+import org.apache.sis.internal.jaxb.code.*;
+import org.apache.sis.internal.jaxb.metadata.*;
Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1610640&r1=1610639&r2=1610640&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Tue Jul 15 10:51:08 2014
@@ -191,7 +191,7 @@ public final strictfp class AllMetadataT
org.opengis.metadata.service.OperationChainMetadata.class,
org.opengis.metadata.service.OperationMetadata.class,
org.opengis.metadata.service.Parameter.class,
-// org.opengis.metadata.service.ServiceIdentification.class,
+ org.opengis.metadata.service.ServiceIdentification.class,
org.opengis.metadata.spatial.CellGeometry.class,
org.opengis.metadata.spatial.Dimension.class,
org.opengis.metadata.spatial.DimensionNameType.class,
@@ -233,9 +233,6 @@ public final strictfp class AllMetadataT
assertEquals(Specification.ISO_19115, specification);
return Namespaces.SRV;
}
- if (impl == org.apache.sis.metadata.iso.identification.DefaultServiceIdentification.class) {
- return Namespaces.SRV;
- }
return super.getExpectedNamespace(impl, specification);
}