sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1625174 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/ sis-metad...
Date Mon, 15 Sep 2014 22:43:59 GMT
Author: desruisseaux
Date: Mon Sep 15 22:43:58 2014
New Revision: 1625174

URL: http://svn.apache.org/r1625174
Log:
Moved the service interfaces in the org.opengis.metadata.identification package.
This avoid the ServiceIdentification dilemna (should it be in service or identification package?),
reduce the amount of deprecated interfaces by 1 (we no longer need to deprecate the ISO 19115:2003
class), and avoid the addition of one more package with only 4 classes.

Added:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/OperationName.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultCoupledResourceTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
      - copied, changed from r1625166, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentificationTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/identification/
      - copied from r1625166, sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/service/
Removed:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/
    sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/service/
Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -17,7 +17,7 @@
 package org.apache.sis.internal.jaxb.code;
 
 import javax.xml.bind.annotation.XmlElement;
-import org.opengis.metadata.service.DistributedComputingPlatform;
+import org.opengis.metadata.identification.DistributedComputingPlatform;
 import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
 import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -17,7 +17,7 @@
 package org.apache.sis.internal.jaxb.code;
 
 import javax.xml.bind.annotation.XmlElement;
-import org.opengis.metadata.service.CouplingType;
+import org.opengis.metadata.identification.CouplingType;
 import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
 import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -17,8 +17,8 @@
 package org.apache.sis.internal.jaxb.metadata;
 
 import javax.xml.bind.annotation.XmlElementRef;
-import org.opengis.metadata.service.CoupledResource;
-import org.apache.sis.metadata.iso.service.DefaultCoupledResource;
+import org.opengis.metadata.identification.CoupledResource;
+import org.apache.sis.metadata.iso.identification.DefaultCoupledResource;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
 
 

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -17,8 +17,8 @@
 package org.apache.sis.internal.jaxb.metadata;
 
 import javax.xml.bind.annotation.XmlElementRef;
-import org.opengis.metadata.service.OperationChainMetadata;
-import org.apache.sis.metadata.iso.service.DefaultOperationChainMetadata;
+import org.opengis.metadata.identification.OperationChainMetadata;
+import org.apache.sis.metadata.iso.identification.DefaultOperationChainMetadata;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
 
 

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -17,8 +17,8 @@
 package org.apache.sis.internal.jaxb.metadata;
 
 import javax.xml.bind.annotation.XmlElementRef;
-import org.opengis.metadata.service.OperationMetadata;
-import org.apache.sis.metadata.iso.service.DefaultOperationMetadata;
+import org.opengis.metadata.identification.OperationMetadata;
+import org.apache.sis.metadata.iso.identification.DefaultOperationMetadata;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
 
 

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -83,7 +83,7 @@ public class DefaultBand extends Default
     /**
      * Units in which sensor wavelengths are expressed.
      */
-    private Unit<Length> boundUnit;
+    private Unit<Length> boundUnits;
 
     /**
      * Wavelength at which the response is the highest.
@@ -141,7 +141,7 @@ public class DefaultBand extends Default
         if (object != null) {
             boundMin                 = object.getBoundMin();
             boundMax                 = object.getBoundMax();
-            boundUnit                = object.getBoundUnit();
+            boundUnits               = object.getBoundUnits();
             peakResponse             = object.getPeakResponse();
             toneGradation            = object.getToneGradation();
             bandBoundaryDefinition   = object.getBandBoundaryDefinition();
@@ -241,9 +241,9 @@ public class DefaultBand extends Default
      * @since 0.5
      */
     @Override
-/// @XmlElement(name = "boundUnit")
-    public Unit<Length> getBoundUnit() {
-        return boundUnit;
+/// @XmlElement(name = "boundUnits")
+    public Unit<Length> getBoundUnits() {
+        return boundUnits;
     }
 
     /**
@@ -253,9 +253,9 @@ public class DefaultBand extends Default
      *
      * @since 0.5
      */
-    public void setBoundUnit(final Unit<Length> newValue) {
+    public void setBoundUnits(final Unit<Length> newValue) {
         checkWritePermission();
-        boundUnit = newValue;
+        boundUnits = newValue;
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -37,13 +37,12 @@ import org.opengis.metadata.identificati
 import org.opengis.metadata.identification.Resolution;
 import org.opengis.metadata.identification.TopicCategory;
 import org.opengis.metadata.identification.Usage;
-import org.opengis.metadata.service.ServiceIdentification;
+import org.opengis.metadata.identification.ServiceIdentification;
 import org.opengis.metadata.maintenance.MaintenanceInformation;
 import org.opengis.metadata.spatial.SpatialRepresentationType;
 import org.opengis.temporal.Duration;
 import org.opengis.util.InternationalString;
 import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
-import org.apache.sis.metadata.iso.service.DefaultServiceIdentification;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.util.iso.Types;
 

Copied: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultCoupledResource.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import java.util.Collection;
 import javax.xml.bind.annotation.XmlType;
@@ -25,10 +25,11 @@ import javax.xml.bind.annotation.adapter
 import org.opengis.util.ScopedName;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.identification.DataIdentification;
-import org.opengis.metadata.service.CoupledResource;
-import org.opengis.metadata.service.OperationMetadata;
+import org.opengis.metadata.identification.CoupledResource;
+import org.opengis.metadata.identification.OperationMetadata;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.internal.jaxb.metadata.direct.GO_ScopedName;
+import org.apache.sis.xml.Namespaces;
 
 import static org.apache.sis.internal.jaxb.gco.PropertyType.LEGACY_XML;
 
@@ -51,7 +52,7 @@ import static org.apache.sis.internal.ja
  * @since   0.5
  * @module
  */
-@XmlType(name = "SV_CoupledResource_Type", propOrder = {
+@XmlType(name = "SV_CoupledResource_Type", namespace = Namespaces.SRV, propOrder = {
     "operationName",
     "identifier",
     "scopedName" /*,
@@ -59,7 +60,7 @@ import static org.apache.sis.internal.ja
     "resources",
     "operation" */
 })
-@XmlRootElement(name = "SV_CoupledResource")
+@XmlRootElement(name = "SV_CoupledResource", namespace = Namespaces.SRV)
 public class DefaultCoupledResource extends ISOMetadata implements CoupledResource {
     /**
      * Serial number for compatibility with different versions.
@@ -183,7 +184,7 @@ public class DefaultCoupledResource exte
      * @return References to the resource on which the services operates.
      */
     @Override
-/// @XmlElement(name = "resourceReference")
+/// @XmlElement(name = "resourceReference", namespace = Namespaces.SRV)
     public Collection<Citation> getResourceReferences() {
         return resourceReferences = nonNullCollection(resourceReferences, Citation.class);
     }
@@ -203,7 +204,7 @@ public class DefaultCoupledResource exte
      * @return tightly coupled resources.
      */
     @Override
-/// @XmlElement(name = "resource")
+/// @XmlElement(name = "resource", namespace = Namespaces.SRV)
     public Collection<DataIdentification> getResources() {
         return resources = nonNullCollection(resources, DataIdentification.class);
     }
@@ -223,7 +224,7 @@ public class DefaultCoupledResource exte
      * @return The service operation, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "operation")
+/// @XmlElement(name = "operation", namespace = Namespaces.SRV)
     public OperationMetadata getOperation() {
         return operation;
     }
@@ -245,7 +246,7 @@ public class DefaultCoupledResource exte
     /**
      * For JAXB marhalling of ISO 19119 document only.
      */
-    @XmlElement(name = "operationName")
+    @XmlElement(name = "operationName", namespace = Namespaces.SRV)
     final String getOperationName() {
         if (LEGACY_XML) {
             final OperationMetadata operation = getOperation();
@@ -270,7 +271,7 @@ public class DefaultCoupledResource exte
     /**
      * Returns the resource identifier, which is assumed to be the name as a string.
      */
-    @XmlElement(name = "identifier")
+    @XmlElement(name = "identifier", namespace = Namespaces.SRV)
     final String getIdentifier() {
         if (LEGACY_XML) {
             final ScopedName name = getScopedName();

Copied: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationChainMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import java.util.List;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.opengis.metadata.service.OperationChainMetadata;
-import org.opengis.metadata.service.OperationMetadata;
+import org.opengis.metadata.identification.OperationChainMetadata;
+import org.opengis.metadata.identification.OperationMetadata;
 import org.opengis.util.InternationalString;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.util.iso.Types;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -45,12 +46,12 @@ import org.apache.sis.util.iso.Types;
  * @since   0.5
  * @module
  */
-@XmlType(name = "SV_OperationChainMetadata_Type", propOrder = {
+@XmlType(name = "SV_OperationChainMetadata_Type", namespace = Namespaces.SRV, propOrder = {
     "name",
     "description",
     "operations"
 })
-@XmlRootElement(name = "SV_OperationChainMetadata")
+@XmlRootElement(name = "SV_OperationChainMetadata", namespace = Namespaces.SRV)
 public class DefaultOperationChainMetadata extends ISOMetadata implements OperationChainMetadata {
     /**
      * Serial number for compatibility with different versions.
@@ -136,7 +137,7 @@ public class DefaultOperationChainMetada
      * @return Name as used by the service for this chain.
      */
     @Override
-    @XmlElement(name = "name", required = true)
+    @XmlElement(name = "name", namespace = Namespaces.SRV, required = true)
     public InternationalString getName() {
         return name;
     }
@@ -157,7 +158,7 @@ public class DefaultOperationChainMetada
      * @return Narrative explanation of the services in the chain and resulting output, or {@code null} if none.
      */
     @Override
-    @XmlElement(name = "description")
+    @XmlElement(name = "description", namespace = Namespaces.SRV)
     public InternationalString getDescription() {
         return description;
     }
@@ -178,7 +179,7 @@ public class DefaultOperationChainMetada
      * @return Information about the operations applied by the chain.
      */
     @Override
-    @XmlElement(name = "operation", required = true)
+    @XmlElement(name = "operation", namespace = Namespaces.SRV, required = true)
     public List<OperationMetadata> getOperations() {
         return operations = nonNullList(operations, OperationMetadata.class);
     }

Copied: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultOperationMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import java.util.List;
 import java.util.Collection;
@@ -24,9 +24,10 @@ import javax.xml.bind.annotation.XmlRoot
 import org.opengis.util.InternationalString;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.opengis.metadata.citation.OnlineResource;
-import org.opengis.metadata.service.DistributedComputingPlatform;
-import org.opengis.metadata.service.OperationMetadata;
+import org.opengis.metadata.identification.DistributedComputingPlatform;
+import org.opengis.metadata.identification.OperationMetadata;
 import org.opengis.parameter.ParameterDescriptor;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -47,7 +48,7 @@ import org.opengis.parameter.ParameterDe
  * @since   0.5
  * @module
  */
-@XmlType(name = "SV_OperationMetadata_Type", propOrder = {
+@XmlType(name = "SV_OperationMetadata_Type", namespace = Namespaces.SRV, propOrder = {
     "operationName",
     "distributedComputingPlatforms",
     "operationDescription",
@@ -56,7 +57,7 @@ import org.opengis.parameter.ParameterDe
     "connectPoints",
     "dependsOn"
 })
-@XmlRootElement(name = "SV_OperationMetadata")
+@XmlRootElement(name = "SV_OperationMetadata", namespace = Namespaces.SRV)
 public class DefaultOperationMetadata extends ISOMetadata implements OperationMetadata {
     /**
      * Serial number for compatibility with different versions.
@@ -174,7 +175,7 @@ public class DefaultOperationMetadata ex
      * @return An unique identifier for this interface.
      */
     @Override
-    @XmlElement(name = "operationName", required = true)
+    @XmlElement(name = "operationName", namespace = Namespaces.SRV, required = true)
     public String getOperationName() {
         return operationName;
     }
@@ -195,7 +196,7 @@ public class DefaultOperationMetadata ex
      * @return Distributed computing platforms on which the operation has been implemented.
      */
     @Override
-    @XmlElement(name = "DCP", required = true)
+    @XmlElement(name = "DCP", namespace = Namespaces.SRV, required = true)
     public Collection<DistributedComputingPlatform> getDistributedComputingPlatforms() {
         return distributedComputingPlatforms = nonNullCollection(distributedComputingPlatforms, DistributedComputingPlatform.class);
     }
@@ -215,7 +216,7 @@ public class DefaultOperationMetadata ex
      * @return Free text description of the intent of the operation and the results of the operation, or {@code null} if none.
      */
     @Override
-    @XmlElement(name = "operationDescription")
+    @XmlElement(name = "operationDescription", namespace = Namespaces.SRV)
     public InternationalString getOperationDescription() {
         return operationDescription;
     }
@@ -237,7 +238,7 @@ public class DefaultOperationMetadata ex
      *         or {@code null} if none.
      */
     @Override
-    @XmlElement(name = "invocationName")
+    @XmlElement(name = "invocationName", namespace = Namespaces.SRV)
     public InternationalString getInvocationName() {
         return invocationName;
     }
@@ -258,7 +259,7 @@ public class DefaultOperationMetadata ex
      * @return Handle for accessing the service interface.
      */
     @Override
-    @XmlElement(name = "connectPoint", required = true)
+    @XmlElement(name = "connectPoint", namespace = Namespaces.SRV, required = true)
     public Collection<OnlineResource> getConnectPoints() {
         return connectPoints = nonNullCollection(connectPoints, OnlineResource.class);
     }
@@ -279,7 +280,7 @@ public class DefaultOperationMetadata ex
      */
     @Override
     @SuppressWarnings("unchecked")
-    @XmlElement(name = "parameters")
+    @XmlElement(name = "parameters", namespace = Namespaces.SRV)
     public Collection<ParameterDescriptor<?>> getParameters() {
         return parameters = nonNullCollection(parameters, (Class) ParameterDescriptor.class);
     }
@@ -300,7 +301,7 @@ public class DefaultOperationMetadata ex
      * @return List of operation that must be completed immediately, or an empty list if none.
      */
     @Override
-    @XmlElement(name = "dependsOn")
+    @XmlElement(name = "dependsOn", namespace = Namespaces.SRV)
     public List<OperationMetadata> getDependsOn() {
         return dependsOn = nonNullList(dependsOn, OperationMetadata.class);
     }

Copied: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentification.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import java.util.Collection;
 import javax.xml.bind.Unmarshaller;
@@ -25,12 +25,12 @@ import org.opengis.util.GenericName;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.identification.DataIdentification;
 import org.opengis.metadata.distribution.StandardOrderProcess;
-import org.opengis.metadata.service.ServiceIdentification;
-import org.opengis.metadata.service.CoupledResource;
-import org.opengis.metadata.service.CouplingType;
-import org.opengis.metadata.service.OperationChainMetadata;
-import org.opengis.metadata.service.OperationMetadata;
-import org.apache.sis.metadata.iso.identification.AbstractIdentification;
+import org.opengis.metadata.identification.ServiceIdentification;
+import org.opengis.metadata.identification.CoupledResource;
+import org.opengis.metadata.identification.CouplingType;
+import org.opengis.metadata.identification.OperationChainMetadata;
+import org.opengis.metadata.identification.OperationMetadata;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
@@ -67,7 +67,7 @@ import org.apache.sis.metadata.iso.ident
     "operatesOn",
 /// "containsChain"
 })
-@XmlRootElement(name = "SV_ServiceIdentification")
+@XmlRootElement(name = "SV_ServiceIdentification", namespace = Namespaces.SRV)
 public class DefaultServiceIdentification extends AbstractIdentification implements ServiceIdentification {
     /**
      * Serial number for compatibility with different versions.
@@ -209,7 +209,7 @@ public class DefaultServiceIdentificatio
      * @return A service type name.
      */
     @Override
-    @XmlElement(name = "serviceType", required = true)
+    @XmlElement(name = "serviceType", namespace = Namespaces.SRV, required = true)
     public GenericName getServiceType() {
         return serviceType;
     }
@@ -230,7 +230,7 @@ public class DefaultServiceIdentificatio
      * @return The versions of the service.
      */
     @Override
-    @XmlElement(name = "serviceTypeVersion")
+    @XmlElement(name = "serviceTypeVersion", namespace = Namespaces.SRV)
     public Collection<String> getServiceTypeVersions() {
         return serviceTypeVersions = nonNullCollection(serviceTypeVersions, String.class);
     }
@@ -250,7 +250,7 @@ public class DefaultServiceIdentificatio
      * @return Information about the availability of the service, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "accessProperties")
+/// @XmlElement(name = "accessProperties", namespace = Namespaces.SRV)
     public StandardOrderProcess getAccessProperties() {
         return accessProperties;
 
@@ -272,7 +272,7 @@ public class DefaultServiceIdentificatio
      * @return Type of coupling between service and associated data, or {@code null} if none.
      */
     @Override
-    @XmlElement(name = "couplingType")
+    @XmlElement(name = "couplingType", namespace = Namespaces.SRV)
     public CouplingType getCouplingType() {
         return couplingType;
     }
@@ -293,7 +293,7 @@ public class DefaultServiceIdentificatio
      * @return Further description(s) of the data coupling in the case of tightly coupled services.
      */
     @Override
-    @XmlElement(name = "coupledResource")
+    @XmlElement(name = "coupledResource", namespace = Namespaces.SRV)
     public Collection<CoupledResource> getCoupledResources() {
         return coupledResources = nonNullCollection(coupledResources, CoupledResource.class);
     }
@@ -313,7 +313,7 @@ public class DefaultServiceIdentificatio
      * @return Reference(s) to the resource on which the service operates.
      */
     @Override
-/// @XmlElement(name = "operatedDataset")
+/// @XmlElement(name = "operatedDataset", namespace = Namespaces.SRV)
     public Collection<Citation> getOperatedDatasets() {
         return operatedDatasets = nonNullCollection(operatedDatasets, Citation.class);
     }
@@ -333,7 +333,7 @@ public class DefaultServiceIdentificatio
      * @return Profile(s) to which the service adheres.
      */
     @Override
-/// @XmlElement(name = "profile")
+/// @XmlElement(name = "profile", namespace = Namespaces.SRV)
     public Collection<Citation> getProfiles() {
         return profiles = nonNullCollection(profiles, Citation.class);
     }
@@ -353,7 +353,7 @@ public class DefaultServiceIdentificatio
      * @return Standard(s) to which the service adheres.
      */
     @Override
-/// @XmlElement(name = "serviceStandard")
+/// @XmlElement(name = "serviceStandard", namespace = Namespaces.SRV)
     public Collection<Citation> getServiceStandards() {
         return serviceStandards = nonNullCollection(serviceStandards, Citation.class);
     }
@@ -373,7 +373,7 @@ public class DefaultServiceIdentificatio
      * @return Information about the operations that comprise the service.
      */
     @Override
-    @XmlElement(name = "containsOperations")
+    @XmlElement(name = "containsOperations", namespace = Namespaces.SRV)
     public Collection<OperationMetadata> getContainsOperations() {
         return containsOperations = nonNullCollection(containsOperations, OperationMetadata.class);
     }
@@ -393,7 +393,7 @@ public class DefaultServiceIdentificatio
      * @return Information on the resources that the service operates on.
      */
     @Override
-    @XmlElement(name = "operatesOn")
+    @XmlElement(name = "operatesOn", namespace = Namespaces.SRV)
     public Collection<DataIdentification> getOperatesOn() {
         return operatesOn = nonNullCollection(operatesOn, DataIdentification.class);
     }
@@ -413,7 +413,7 @@ public class DefaultServiceIdentificatio
      * @return Information about the chain applied by the service.
      */
     @Override
-/// @XmlElement(name = "containsChain")
+/// @XmlElement(name = "containsChain", namespace = Namespaces.SRV)
     public Collection<OperationChainMetadata> getContainsChain() {
         return containsChain = nonNullCollection(containsChain, OperationChainMetadata.class);
     }

Copied: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/OperationName.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/OperationName.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/service/OperationName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import java.util.List;
 import java.util.Map;
@@ -23,9 +23,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.io.Serializable;
 import org.opengis.metadata.citation.OnlineResource;
-import org.opengis.metadata.service.CoupledResource;
-import org.opengis.metadata.service.DistributedComputingPlatform;
-import org.opengis.metadata.service.OperationMetadata;
+import org.opengis.metadata.identification.CoupledResource;
+import org.opengis.metadata.identification.DistributedComputingPlatform;
+import org.opengis.metadata.identification.OperationMetadata;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.util.InternationalString;
 

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -32,7 +32,7 @@
  * {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
  * {@code  ├─}     {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification       Identification} «abstract»<br>
  * {@code  │   ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification    Data identification}<br>
- * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.service.DefaultServiceIdentification        Service identification}<br>
+ * {@code  │   └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
  * {@code  ├─}     {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution            Resolution}<br>
  * {@code  ├─}     {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic         Browse graphic}<br>
  * {@code  ├─}     {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords              Keywords}<br>
@@ -95,8 +95,10 @@
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
     @XmlJavaTypeAdapter(CI_Citation.class),
+    @XmlJavaTypeAdapter(CI_OnlineResource.class),
     @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
+    @XmlJavaTypeAdapter(DCPList.class),
     @XmlJavaTypeAdapter(DS_AssociationTypeCode.class),
     @XmlJavaTypeAdapter(DS_InitiativeTypeCode.class),
     @XmlJavaTypeAdapter(EX_Extent.class),
@@ -104,6 +106,7 @@
     @XmlJavaTypeAdapter(MD_BrowseGraphic.class),
     @XmlJavaTypeAdapter(MD_CharacterSetCode.class),
     @XmlJavaTypeAdapter(MD_Constraints.class),
+    @XmlJavaTypeAdapter(MD_DataIdentification.class),
     @XmlJavaTypeAdapter(MD_Format.class),
     @XmlJavaTypeAdapter(MD_Identifier.class),
     @XmlJavaTypeAdapter(MD_Keywords.class),
@@ -113,15 +116,24 @@
     @XmlJavaTypeAdapter(MD_RepresentativeFraction.class),
     @XmlJavaTypeAdapter(MD_Resolution.class),
     @XmlJavaTypeAdapter(MD_SpatialRepresentationTypeCode.class),
+    @XmlJavaTypeAdapter(MD_StandardOrderProcess.class),
     @XmlJavaTypeAdapter(MD_TopicCategoryCode.class),
     @XmlJavaTypeAdapter(MD_Usage.class),
+    @XmlJavaTypeAdapter(SV_CoupledResource.class),
+    @XmlJavaTypeAdapter(SV_CouplingType.class),
+    @XmlJavaTypeAdapter(SV_OperationMetadata.class),
+    @XmlJavaTypeAdapter(SV_OperationChainMetadata.class),
+    @XmlJavaTypeAdapter(SV_Parameter.class),
+    @XmlJavaTypeAdapter(SV_ParameterDirection.class),
 
     // Java types, primitive types and basic OGC types handling
     @XmlJavaTypeAdapter(URIAdapter.class),
     @XmlJavaTypeAdapter(LocaleAdapter.class),
     @XmlJavaTypeAdapter(StringAdapter.class),
     @XmlJavaTypeAdapter(InternationalStringAdapter.class),
-    @XmlJavaTypeAdapter(GO_DateTime.class)
+    @XmlJavaTypeAdapter(GO_DateTime.class),
+    @XmlJavaTypeAdapter(GO_GenericName.class),
+    @XmlJavaTypeAdapter(GO_Boolean.class), @XmlJavaTypeAdapter(type=boolean.class, value=GO_Boolean.class)
 })
 package org.apache.sis.metadata.iso.identification;
 

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -22,7 +22,11 @@ import org.opengis.annotation.UML;
 import org.opengis.annotation.Specification;
 import org.apache.sis.metadata.MetadataStandard;
 import org.apache.sis.metadata.MetadataTestCase;
+import org.apache.sis.metadata.iso.identification.DefaultCoupledResource;
+import org.apache.sis.metadata.iso.identification.DefaultOperationChainMetadata;
+import org.apache.sis.metadata.iso.identification.DefaultOperationMetadata;
 import org.apache.sis.metadata.iso.identification.DefaultRepresentativeFraction;
+import org.apache.sis.metadata.iso.identification.DefaultServiceIdentification;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.xml.Namespaces;
 import org.junit.Rule;
@@ -138,14 +142,18 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.identification.AssociationType.class,
             org.opengis.metadata.identification.BrowseGraphic.class,
             org.opengis.metadata.identification.CharacterSet.class,
+            org.opengis.metadata.identification.CoupledResource.class,
             org.opengis.metadata.identification.DataIdentification.class,
             org.opengis.metadata.identification.Identification.class,
             org.opengis.metadata.identification.InitiativeType.class,
             org.opengis.metadata.identification.Keywords.class,
             org.opengis.metadata.identification.KeywordType.class,
             org.opengis.metadata.identification.Progress.class,
+            org.opengis.metadata.identification.OperationChainMetadata.class,
+            org.opengis.metadata.identification.OperationMetadata.class,
             org.opengis.metadata.identification.RepresentativeFraction.class,
             org.opengis.metadata.identification.Resolution.class,
+            org.opengis.metadata.identification.ServiceIdentification.class,
             org.opengis.metadata.identification.TopicCategory.class,
             org.opengis.metadata.identification.Usage.class,
             org.opengis.metadata.lineage.Algorithm.class,
@@ -188,10 +196,6 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.quality.ThematicClassificationCorrectness.class,
             org.opengis.metadata.quality.TopologicalConsistency.class,
             org.opengis.metadata.quality.Usability.class,
-            org.opengis.metadata.service.CoupledResource.class,
-            org.opengis.metadata.service.OperationChainMetadata.class,
-            org.opengis.metadata.service.OperationMetadata.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,
@@ -262,7 +266,11 @@ public final strictfp class AllMetadataT
      */
     @Override
     protected String getExpectedNamespace(final Class<?> impl, final Specification specification) {
-        if (impl.getPackage().getName().equals("org.apache.sis.metadata.iso.service")) {
+        if (impl == DefaultCoupledResource.class ||
+            impl == DefaultOperationChainMetadata.class ||
+            impl == DefaultOperationMetadata.class ||
+            impl == DefaultServiceIdentification.class)
+        {
             assertEquals(Specification.ISO_19115, specification);
             return Namespaces.SRV;
         }

Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultCoupledResourceTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultCoupledResourceTest.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultCoupledResourceTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import org.opengis.util.ScopedName;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.metadata.citation.OnlineResource;
-import org.opengis.metadata.service.OperationMetadata;
-import org.opengis.metadata.service.DistributedComputingPlatform;
+import org.opengis.metadata.identification.OperationMetadata;
+import org.opengis.metadata.identification.DistributedComputingPlatform;
 import org.apache.sis.internal.jaxb.metadata.replace.ServiceParameterTest;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.DependsOn;

Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java (from r1625166, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentificationTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentificationTest.java&r1=1625166&r2=1625174&rev=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/service/DefaultServiceIdentificationTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso.service;
+package org.apache.sis.metadata.iso.identification;
 
 import javax.xml.bind.JAXBException;
 import org.opengis.metadata.citation.Citation;
-import org.opengis.metadata.service.CouplingType;
+import org.opengis.metadata.identification.CouplingType;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.DependsOn;

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -73,8 +73,8 @@ import org.junit.BeforeClass;
     org.apache.sis.metadata.iso.identification.DefaultBrowseGraphicTest.class,
     org.apache.sis.metadata.iso.identification.DefaultDataIdentificationTest.class,
     org.apache.sis.internal.jaxb.metadata.replace.ServiceParameterTest.class,
-    org.apache.sis.metadata.iso.service.DefaultCoupledResourceTest.class,
-    org.apache.sis.metadata.iso.service.DefaultServiceIdentificationTest.class,
+    org.apache.sis.metadata.iso.identification.DefaultCoupledResourceTest.class,
+    org.apache.sis.metadata.iso.identification.DefaultServiceIdentificationTest.class,
     org.apache.sis.metadata.iso.quality.AbstractElementTest.class,
     org.apache.sis.metadata.iso.quality.AbstractPositionalAccuracyTest.class,
     org.apache.sis.metadata.iso.lineage.DefaultLineageTest.class,

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java?rev=1625174&r1=1625173&r2=1625174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] Mon Sep 15 22:43:58 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.util.iso;
 
-
 import java.net.URI;
 import java.util.Date;
 import java.util.Locale;



Mime
View raw message