sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1554696 - in /sis/branches/JDK7/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/ sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/ sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/ sis...
Date Wed, 01 Jan 2014 23:11:06 GMT
Author: desruisseaux
Date: Wed Jan  1 23:11:06 2014
New Revision: 1554696

URL: http://svn.apache.org/r1554696
Log:
Completed the JAXB annotations for datum.

Added:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
      - copied, changed from r1554591, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
  (with props)
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
  (with props)
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml   (with props)
Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -44,6 +44,8 @@ import org.apache.sis.internal.jaxb.XmlU
  * @since   0.4
  * @version 0.4
  * @module
+ *
+ * @see UniversalTimeAdapter
  */
 public final class DateAdapter extends XmlAdapter<XMLGregorianCalendar, Date> {
     /**

Copied: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
(from r1554591, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java?p2=sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java&p1=sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java&r1=1554591&r2=1554696&rev=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -17,39 +17,41 @@
 package org.apache.sis.internal.jaxb.gml;
 
 import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.GregorianCalendar;
+import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.XmlUtilities;
 
+import static org.apache.sis.internal.jaxb.XmlUtilities.getDatatypeFactory;
+
 
 /**
  * JAXB adapter wrapping the date value (as milliseconds elapsed since January 1st, 1970)
in a
- * {@link XMLGregorianCalendar} for the {@code xsd:date} type. Hours, minutes and seconds
are
- * discarded.
- *
- * <p>Using this adapter is equivalent to apply the following annotation on a {@code
Date} field:</p>
- *
- * {@preformat java
- *     &#64;XmlElement
- *     &#64;XmlSchemaType(name="date")
- *     private Date realizationEpoch;
- * }
- *
- * The main difference is that this adapter will take in account the timezone declared using
the
- * {@link org.apache.sis.xml.XML#TIMEZONE} property.
+ * {@link XMLGregorianCalendar} for the {@code xsd:dateTime} type with the timezone forced
to UTC.
+ * The milliseconds are omitted if not different than zero.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
  * @version 0.4
  * @module
+ *
+ * @see DateAdapter
  */
-public final class DateAdapter extends XmlAdapter<XMLGregorianCalendar, Date> {
+public final class UniversalTimeAdapter extends XmlAdapter<XMLGregorianCalendar, Date>
{
+    /**
+     * The timezone of the date to marshal with this adapter.
+     */
+    private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
+
     /**
      * Empty constructor for JAXB only.
      */
-    public DateAdapter() {
+    public UniversalTimeAdapter() {
     }
 
     /**
@@ -74,13 +76,16 @@ public final class DateAdapter extends X
     @Override
     public XMLGregorianCalendar marshal(final Date value) {
         if (value != null) {
-            final Context context = Context.current();
+            final GregorianCalendar calendar = new GregorianCalendar(UTC, Locale.ROOT);
+            calendar.setTime(value);
             try {
-                final XMLGregorianCalendar gc = XmlUtilities.toXML(context, value);
-                XmlUtilities.trimTime(gc, true); // Type is xsd:date without time.
+                final XMLGregorianCalendar gc = getDatatypeFactory().newXMLGregorianCalendar(calendar);
+                if (gc.getMillisecond() == 0) {
+                    gc.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+                }
                 return gc;
             } catch (DatatypeConfigurationException e) {
-                Context.warningOccured(context, XmlAdapter.class, "marshal", e, true);
+                Context.warningOccured(Context.current(), XmlAdapter.class, "marshal", e,
true);
             }
         }
         return null;

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -138,6 +138,16 @@ public final strictfp class HardCodedCit
     }
 
     /**
+     * The <a href="http://sis.apache.org">Apache SIS</a> project.
+     */
+    public static final DefaultCitation SIS;
+    static {
+        final DefaultCitation c = new DefaultCitation("SIS");
+        c.freeze();
+        SIS = c;
+    }
+
+    /**
      * Do not allow instantiation of this class.
      */
     private HardCodedCitations() {

Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java?rev=1554696&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.jaxb.referencing;
+
+import org.opengis.referencing.datum.PixelInCell;
+import org.apache.sis.internal.jaxb.gml.CodeListAdapter;
+
+
+/**
+ * JAXB adapter for (un)marshalling of GeoAPI code list.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.4
+ * @version 0.4
+ * @module
+ */
+public final class CD_PixelInCell extends CodeListAdapter<PixelInCell> {
+    /**
+     * Empty constructor for JAXB only.
+     */
+    public CD_PixelInCell() {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return {@code PixelInCell.class}
+     */
+    @Override
+    protected Class<PixelInCell> getCodeListClass() {
+        return PixelInCell.class;
+    }
+}

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -21,8 +21,7 @@ import org.apache.sis.internal.jaxb.gml.
 
 
 /**
- * JAXB adapter mapping implementing class to the GeoAPI interface. See
- * package documentation for more information about JAXB and interface.
+ * JAXB adapter for (un)marshalling of GeoAPI code list.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4 (derived from geotk-3.20)

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -69,7 +69,10 @@ import java.util.Objects;
 @XmlType(name = "AbstractDatumType")
 @XmlSeeAlso({
     DefaultGeodeticDatum.class,
-    DefaultVerticalDatum.class
+    DefaultVerticalDatum.class,
+    DefaultTemporalDatum.class,
+    DefaultEngineeringDatum.class,
+    DefaultImageDatum.class
 })
 public class AbstractDatum extends AbstractIdentifiedObject implements Datum {
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.datum
 
 import java.util.Map;
 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.util.InternationalString;
@@ -59,6 +60,7 @@ public class DefaultImageDatum extends A
     /**
      * Specification of the way the image grid is associated with the image data attributes.
      */
+    @XmlElement(required = true)
     private final PixelInCell pixelInCell;
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Wed Jan  1 23:11:06 2014
@@ -19,11 +19,14 @@ package org.apache.sis.referencing.datum
 import java.util.Date;
 import java.util.Map;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.referencing.ReferenceIdentifier;
 import org.opengis.referencing.datum.TemporalDatum;
+import org.apache.sis.internal.jaxb.gml.UniversalTimeAdapter;
 import org.apache.sis.internal.metadata.MetadataUtilities;
 import org.apache.sis.util.ComparisonMode;
 
@@ -83,8 +86,10 @@ public class DefaultTemporalDatum extend
      * The date and time origin of this temporal datum, or {@link Long#MIN_VALUE} if none.
      * This information is mandatory, but SIS is tolerant to missing value is case a XML
      * fragment was incomplete.
+     *
+     * <p>Consider this field as final. It is non-final only for the need of XML unmarshalling.</p>
      */
-    private final long origin;
+    private long origin;
 
     /**
      * Constructs a new datum in which every attributes are set to a null value.
@@ -194,11 +199,20 @@ public class DefaultTemporalDatum extend
      * @return The date and time origin of this temporal datum.
      */
     @Override
+    @XmlElement(name = "origin")
+    @XmlJavaTypeAdapter(UniversalTimeAdapter.class)
     public Date getOrigin() {
         return MetadataUtilities.toDate(origin);
     }
 
     /**
+     * Invoked by JAXB only at unmarshalling time.
+     */
+    private void setOrigin(final Date value) {
+        origin = MetadataUtilities.toMilliseconds(value);
+    }
+
+    /**
      * Compares this temporal datum with the specified object for equality.
      *
      * @param  object The object to compare to {@code this}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -56,6 +56,7 @@
     @XmlJavaTypeAdapter(CD_Ellipsoid.class),
     @XmlJavaTypeAdapter(CD_PrimeMeridian.class),
     @XmlJavaTypeAdapter(CD_VerticalDatumType.class),
+    @XmlJavaTypeAdapter(CD_PixelInCell.class),
     @XmlJavaTypeAdapter(StringAdapter.class),
     @XmlJavaTypeAdapter(InternationalStringConverter.class),
     @XmlJavaTypeAdapter(DateAdapter.class),

Added: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1554696&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.datum;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+import javax.xml.bind.JAXBException;
+import org.apache.sis.metadata.iso.ImmutableIdentifier;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+import org.apache.sis.test.XMLTestCase;
+import org.junit.Test;
+
+import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.TestUtilities.getSingleton;
+
+
+/**
+ * Tests the {@link DefaultTemporalDatum} class.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.4
+ * @version 0.4
+ * @module
+ */
+public final strictfp class DefaultTemporalDatumTest extends XMLTestCase {
+    /**
+     * An XML file in this package containing a vertical datum definition.
+     */
+    private static final String XML_FILE = "Modified Julian.xml";
+
+    /**
+     * November 17, 1858 at 00:00 UTC as a Java timestamp.
+     */
+    private static final long ORIGIN = -40587 * (24*60*60*1000L);
+
+    /**
+     * Tests XML marshalling.
+     *
+     * @throws JAXBException If an error occurred during marshalling.
+     */
+    @Test
+    public void testMarshalling() throws JAXBException {
+        final Map<String,Object> properties = new HashMap<>(4);
+        assertNull(properties.put(DefaultTemporalDatum.IDENTIFIERS_KEY,
+                new ImmutableIdentifier(HardCodedCitations.SIS, "SIS", "MJ")));
+        assertNull(properties.put(DefaultTemporalDatum.NAME_KEY, "Modified Julian"));
+        assertNull(properties.put(DefaultTemporalDatum.SCOPE_KEY, "History."));
+        assertNull(properties.put(DefaultTemporalDatum.REMARKS_KEY,
+                "Time measured as days since November 17, 1858 at 00:00 UTC."));
+
+        final DefaultTemporalDatum datum = new DefaultTemporalDatum(properties, new Date(ORIGIN));
+        assertMarshalEqualsFile(XML_FILE, datum, "xlmns:*", "xsi:schemaLocation");
+    }
+
+    /**
+     * Tests XML unmarshalling.
+     *
+     * @throws JAXBException If an error occurred during unmarshalling.
+     */
+    @Test
+    public void testUnmarshalling() throws JAXBException {
+        final DefaultTemporalDatum datum = unmarshalFile(DefaultTemporalDatum.class, XML_FILE);
+        assertIdentifierEquals("identifier", "SIS", "SIS", null, "MJ",
+                getSingleton(datum.getIdentifiers()));
+        assertEquals("name", "Modified Julian",
+                datum.getName().getCode());
+        assertEquals("remarks", "Time measured as days since November 17, 1858 at 00:00 UTC.",
+                datum.getRemarks().toString());
+        assertEquals("scope", "History.",
+                datum.getScope().toString());
+        assertEquals("origin", new Date(ORIGIN), datum.getOrigin());
+    }
+}

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1554696&r1=1554695&r2=1554696&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Wed Jan  1 23:11:06 2014
@@ -58,6 +58,7 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.datum.DefaultEllipsoidTest.class,
     org.apache.sis.referencing.datum.DefaultPrimeMeridianTest.class,
     org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class,
+    org.apache.sis.referencing.datum.DefaultTemporalDatumTest.class,
     org.apache.sis.referencing.datum.DefaultGeodeticDatumTest.class,
     org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class,
     org.apache.sis.referencing.cs.DefaultCoordinateSystemAxisTest.class,

Added: sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified%20Julian.xml?rev=1554696&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml (added)
+++ sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml Wed Jan  1 23:11:06 2014
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<gml:TemporalDatum xsi:schemaLocation = "http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/datums.xsd"
+                   xmlns:gml          = "http://www.opengis.net/gml/3.2"
+                   xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
+                   gml:id             = "sis-datum-mj">
+
+  <gml:identifier codeSpace="SIS">urn:ogc:def:datum:SIS::MJ</gml:identifier>
+  <gml:name>Modified Julian</gml:name>
+  <gml:remarks>Time measured as days since November 17, 1858 at 00:00 UTC.</gml:remarks>
+  <gml:scope>History.</gml:scope>
+  <gml:origin>1858-11-17T00:00:00Z</gml:origin>
+</gml:TemporalDatum>

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message