sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1625180 - in /sis/branches/JDK6: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/conte...
Date Mon, 15 Sep 2014 22:57:06 GMT
Author: desruisseaux
Date: Mon Sep 15 22:57:05 2014
New Revision: 1625180

URL: http://svn.apache.org/r1625180
Log:
Merge from the JDK7 branch.

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

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK8:r1625167-1625174
  Merged /sis/branches/JDK7:r1625168-1625178

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
[UTF-8] Mon Sep 15 22:57:05 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;
 

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
[UTF-8] Mon Sep 15 22:57:05 2014
@@ -16,30 +16,118 @@
  */
 package org.apache.sis.metadata.iso.identification;
 
-import javax.xml.bind.annotation.XmlTransient;
+import java.util.Collection;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+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.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;
 
 
 /**
  * Identification of capabilities which a service provider makes available to a service user
  * through a set of interfaces that define a behaviour.
  *
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ *   <li>Instances of this class are not synchronized for multi-threading.
+ *       Synchronization, if needed, is caller's responsibility.</li>
+ *   <li>Serialized objects of this class are not guaranteed to be compatible with
future Apache SIS releases.
+ *       Serialization support is appropriate for short term storage or RMI between applications
running the
+ *       same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML}
instead.</li>
+ * </ul>
+ *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
- * @since   0.3 (derived from geotk-2.1)
+ * @author  Rémi Maréchal (Geomatys)
+ * @since   0.5
  * @version 0.5
  * @module
- *
- * @deprecated Moved to the {@link org.apache.sis.metadata.iso.service} package.
  */
-@Deprecated
-@XmlTransient
-public class DefaultServiceIdentification extends org.apache.sis.metadata.iso.service.DefaultServiceIdentification
implements ServiceIdentification {
+@XmlType(name = "MD_ServiceIdentification_Type", propOrder = { // ISO 19139 still use the
old prefix.
+    "serviceType",
+    "serviceTypeVersions",
+/// "accessProperties",
+    "coupledResources",
+    "couplingType",
+/// "operatedDatasets",
+/// "profiles",
+/// "serviceStandards",
+    "containsOperations",
+    "operatesOn",
+/// "containsChain"
+})
+@XmlRootElement(name = "SV_ServiceIdentification", namespace = Namespaces.SRV)
+public class DefaultServiceIdentification extends AbstractIdentification implements ServiceIdentification
{
     /**
      * Serial number for compatibility with different versions.
      */
-    private static final long serialVersionUID = 4988429302218128178L;
+    private static final long serialVersionUID = 7700836694236616300L;
+
+    /**
+     * A service type name.
+     */
+    private GenericName serviceType;
+
+    /**
+     * The version of the service, supports searching based on the version of serviceType.
+     */
+    private Collection<String> serviceTypeVersions;
+
+    /**
+     * Information about the availability of the service.
+     */
+    private StandardOrderProcess accessProperties;
+
+    /**
+     * Type of coupling between service and associated data (if exist).
+     */
+    private CouplingType couplingType;
+
+    /**
+     * Further description of the data coupling in the case of tightly coupled services.
+     */
+    private Collection<CoupledResource> coupledResources;
+
+    /**
+     * References to the resource on which the service operates.
+     */
+    private Collection<Citation> operatedDatasets;
+
+    /**
+     * Profiles to which the service adheres.
+     */
+    private Collection<Citation> profiles;
+
+    /**
+     * Standards to which the service adheres.
+     */
+    private Collection<Citation> serviceStandards;
+
+    /**
+     * Information about the operations that comprise the service.
+     */
+    private Collection<OperationMetadata> containsOperations;
+
+    /**
+     * Information on the resources that the service operates on.
+     */
+    private Collection<DataIdentification> operatesOn;
+
+    /**
+     * Information about the chain applied by the service.
+     */
+    private Collection<OperationChainMetadata> containsChain;
 
     /**
      * Constructs an initially empty service identification.
@@ -48,6 +136,21 @@ public class DefaultServiceIdentificatio
     }
 
     /**
+     * Constructs a service identification initialized to the specified values.
+     *
+     * @param serviceType Service type name.
+     * @param citation    Citation data for the resource(s).
+     * @param abstracts   Brief narrative summary of the content of the resource(s).
+     */
+    public DefaultServiceIdentification(final GenericName  serviceType,
+                                        final Citation     citation,
+                                        final CharSequence abstracts)
+    {
+        super(citation, abstracts);
+        this.serviceType = serviceType;
+    }
+
+    /**
      * Constructs a new instance initialized with the values from the specified metadata
object.
      * This is a <cite>shallow</cite> copy constructor, since the other metadata
contained in the
      * given object are not recursively copied.
@@ -58,6 +161,19 @@ public class DefaultServiceIdentificatio
      */
     public DefaultServiceIdentification(final ServiceIdentification object) {
         super(object);
+        if (object != null) {
+            serviceType         = object.getServiceType();
+            serviceTypeVersions = copyCollection(object.getServiceTypeVersions(), String.class);
+            accessProperties    = object.getAccessProperties();
+            couplingType        = object.getCouplingType();
+            coupledResources    = copyCollection(object.getCoupledResources(), CoupledResource.class);
+            operatedDatasets    = copyCollection(object.getOperatedDatasets(), Citation.class);
+            profiles            = copyCollection(object.getProfiles(), Citation.class);
+            serviceStandards    = copyCollection(object.getServiceStandards(), Citation.class);
+            containsOperations  = copyCollection(object.getContainsOperations(), OperationMetadata.class);
+            operatesOn          = copyCollection(object.getOperatesOn(), DataIdentification.class);
+            containsChain       = copyCollection(object.getContainsChain(), OperationChainMetadata.class);
+        }
     }
 
     /**
@@ -84,4 +200,239 @@ public class DefaultServiceIdentificatio
         }
         return new DefaultServiceIdentification(object);
     }
+
+    /**
+     * Returns a service type name.
+     *
+     * <div class="note"><b>Examples:</b> "discovery", "view", "download",
"transformation", or "invoke"</div>
+     *
+     * @return A service type name.
+     */
+    @Override
+    @XmlElement(name = "serviceType", namespace = Namespaces.SRV, required = true)
+    public GenericName getServiceType() {
+        return serviceType;
+    }
+
+    /**
+     * Sets the service type name.
+     *
+     * @param newValue The new service type name.
+     */
+    public void setServiceType(final GenericName newValue) {
+        checkWritePermission();
+        serviceType = newValue;
+    }
+
+    /**
+     * Returns the versions of the service.
+     *
+     * @return The versions of the service.
+     */
+    @Override
+    @XmlElement(name = "serviceTypeVersion", namespace = Namespaces.SRV)
+    public Collection<String> getServiceTypeVersions() {
+        return serviceTypeVersions = nonNullCollection(serviceTypeVersions, String.class);
+    }
+
+    /**
+     * Sets the versions of the service.
+     *
+     * @param newValues The new versions of the service.
+     */
+    public void setServiceTypeVersions(final Collection<? extends String> newValues)
{
+        serviceTypeVersions = writeCollection(newValues, serviceTypeVersions, String.class);
+    }
+
+    /**
+     * Returns information about the availability of the service.
+     *
+     * @return Information about the availability of the service, or {@code null} if none.
+     */
+    @Override
+/// @XmlElement(name = "accessProperties", namespace = Namespaces.SRV)
+    public StandardOrderProcess getAccessProperties() {
+        return accessProperties;
+
+    }
+
+    /**
+     * Sets information about the availability of the service.
+     *
+     * @param newValue The new information about the availability of the service.
+     */
+    public void setAccessProperties(final StandardOrderProcess newValue) {
+        checkWritePermission();
+        accessProperties = newValue;
+    }
+
+    /**
+     * Returns type of coupling between service and associated data (if exist).
+     *
+     * @return Type of coupling between service and associated data, or {@code null} if none.
+     */
+    @Override
+    @XmlElement(name = "couplingType", namespace = Namespaces.SRV)
+    public CouplingType getCouplingType() {
+        return couplingType;
+    }
+
+    /**
+     * Sets the type of coupling between service and associated data.
+     *
+     * @param newValue The new type of coupling between service and associated data.
+     */
+    public void setCouplingType(final CouplingType newValue) {
+        checkWritePermission();
+        couplingType = newValue;
+    }
+
+    /**
+     * Returns further description(s) of the data coupling in the case of tightly coupled
services.
+     *
+     * @return Further description(s) of the data coupling in the case of tightly coupled
services.
+     */
+    @Override
+    @XmlElement(name = "coupledResource", namespace = Namespaces.SRV)
+    public Collection<CoupledResource> getCoupledResources() {
+        return coupledResources = nonNullCollection(coupledResources, CoupledResource.class);
+    }
+
+    /**
+     * Sets further description(s) of the data coupling in the case of tightly coupled services.
+     *
+     * @param newValues The new further description(s) of the data coupling.
+     */
+    public void setCoupledResources(final Collection<? extends CoupledResource> newValues)
{
+        coupledResources = writeCollection(newValues, coupledResources, CoupledResource.class);
+    }
+
+    /**
+     * Returns the reference(s) to the resource on which the service operates.
+     *
+     * @return Reference(s) to the resource on which the service operates.
+     */
+    @Override
+/// @XmlElement(name = "operatedDataset", namespace = Namespaces.SRV)
+    public Collection<Citation> getOperatedDatasets() {
+        return operatedDatasets = nonNullCollection(operatedDatasets, Citation.class);
+    }
+
+    /**
+     * Sets the reference(s) to the resource on which the service operates.
+     *
+     * @param newValues The new reference(s) to the resource on which the service operates.
+     */
+    public void setOperatedDatasets(final Collection<? extends Citation> newValues)
{
+        operatedDatasets = writeCollection(newValues, operatedDatasets, Citation.class);
+    }
+
+    /**
+     * Returns the profile(s) to which the service adheres.
+     *
+     * @return Profile(s) to which the service adheres.
+     */
+    @Override
+/// @XmlElement(name = "profile", namespace = Namespaces.SRV)
+    public Collection<Citation> getProfiles() {
+        return profiles = nonNullCollection(profiles, Citation.class);
+    }
+
+    /**
+     * Sets the profile(s) to which the service adheres.
+     *
+     * @param newValues The new profile(s) to which the service adheres.
+     */
+    public void setProfiles(final Collection<? extends Citation> newValues) {
+        profiles = writeCollection(newValues, profiles, Citation.class);
+    }
+
+    /**
+     * Returns the standard(s) to which the service adheres.
+     *
+     * @return Standard(s) to which the service adheres.
+     */
+    @Override
+/// @XmlElement(name = "serviceStandard", namespace = Namespaces.SRV)
+    public Collection<Citation> getServiceStandards() {
+        return serviceStandards = nonNullCollection(serviceStandards, Citation.class);
+    }
+
+    /**
+     * Sets the standard(s) to which the service adheres.
+     *
+     * @param newValues The new standard(s) to which the service adheres.
+     */
+    public void setServiceStandards(final Collection<? extends Citation> newValues)
{
+        serviceStandards = writeCollection(newValues, serviceStandards, Citation.class);
+    }
+
+    /**
+     * Provides information about the operations that comprise the service.
+     *
+     * @return Information about the operations that comprise the service.
+     */
+    @Override
+    @XmlElement(name = "containsOperations", namespace = Namespaces.SRV)
+    public Collection<OperationMetadata> getContainsOperations() {
+        return containsOperations = nonNullCollection(containsOperations, OperationMetadata.class);
+    }
+
+    /**
+     * Sets information(s) about the operations that comprise the service.
+     *
+     * @param newValues The new information(s) about the operations that comprise the service.
+     */
+    public void setContainsOperations(final Collection<? extends OperationMetadata>
newValues) {
+        containsOperations = writeCollection(newValues, containsOperations, OperationMetadata.class);
+    }
+
+    /**
+     * Provides information on the resources that the service operates on.
+     *
+     * @return Information on the resources that the service operates on.
+     */
+    @Override
+    @XmlElement(name = "operatesOn", namespace = Namespaces.SRV)
+    public Collection<DataIdentification> getOperatesOn() {
+        return operatesOn = nonNullCollection(operatesOn, DataIdentification.class);
+    }
+
+    /**
+     * Sets the information on the resources that the service operates on.
+     *
+     * @param newValues The new information on the resources that the service operates on.
+     */
+    public void setOperatesOn(final Collection<? extends DataIdentification> newValues)
{
+        operatesOn = writeCollection(newValues, operatesOn, DataIdentification.class);
+    }
+
+    /**
+     * Provides information about the chain applied by the service.
+     *
+     * @return Information about the chain applied by the service.
+     */
+    @Override
+/// @XmlElement(name = "containsChain", namespace = Namespaces.SRV)
+    public Collection<OperationChainMetadata> getContainsChain() {
+        return containsChain = nonNullCollection(containsChain, OperationChainMetadata.class);
+    }
+
+    /**
+     * Sets the information about the chain applied by the service.
+     *
+     * @param newValues The new information about the chain applied by the service.
+     */
+    public void setContainsChain(final Collection<? extends OperationChainMetadata>
 newValues) {
+        containsChain = writeCollection(newValues, containsChain, OperationChainMetadata.class);
+    }
+
+    /**
+     * Invoked after JAXB has unmarshalled this object.
+     */
+    private void afterUnmarshal(final Unmarshaller u, final Object parent) {
+        if (containsOperations != null && coupledResources != null) {
+            OperationName.resolve(containsOperations, coupledResources);
+        }
+    }
 }

Copied: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
(from r1625178, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java?p2=sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java&p1=sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java&r1=1625178&r2=1625180&rev=1625180&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
[UTF-8] Mon Sep 15 22:57:05 2014
@@ -87,7 +87,7 @@ final class OperationName implements Ope
      * were identified only by a name in a {@code <srv:operationName>} element.</p>
      */
     static void resolve(final Collection<OperationMetadata> containsOperations, final
Collection<CoupledResource> coupledResources) {
-        final Map<String,OperationMetadata> byName = new HashMap<>();
+        final Map<String,OperationMetadata> byName = new HashMap<String,OperationMetadata>();
         for (final OperationMetadata operation : containsOperations) {
             add(byName, operation.getOperationName(), operation);
         }

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] Mon Sep 15 22:57:05 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;
         }

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] Mon Sep 15 22:57:05 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/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java?rev=1625180&r1=1625179&r2=1625180&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
[UTF-8] Mon Sep 15 22:57:05 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