sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553963 - in /sis/branches/JDK6: ./ application/sis-webapp/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-build-helper/src/main/javadoc/ core/sis-build-helper/src/site/ core/sis-metadata/src/main/java/org/apa...
Date Sat, 28 Dec 2013 23:09:43 GMT
Author: desruisseaux
Date: Sat Dec 28 23:09:42 2013
New Revision: 1553963

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

Added:
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
      - copied unchanged from r1553960, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
    sis/branches/JDK6/core/sis-metadata/src/main/javadoc/overview.html
      - copied unchanged from r1553960, sis/branches/JDK7/core/sis-metadata/src/main/javadoc/overview.html
    sis/branches/JDK6/core/sis-referencing/src/main/javadoc/overview.html
      - copied unchanged from r1553960, sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
      - copied unchanged from r1553960, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/WGS 84.xml
      - copied unchanged from r1553960, sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/WGS 84.xml
Removed:
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/DateAsLongAdapter.java
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/application/sis-webapp/pom.xml
    sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
    sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
    sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/overview.html
    sis/branches/JDK6/core/sis-build-helper/src/site/site.xml
    sis/branches/JDK6/core/sis-metadata/src/site/site.xml
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke 1880.xml   (contents, props changed)
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Greenwich.xml
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
    sis/branches/JDK6/core/sis-utility/src/main/javadoc/overview.html
    sis/branches/JDK6/core/sis-utility/src/site/site.xml
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/branches/JDK6/core/src/site/site.xml
    sis/branches/JDK6/pom.xml
    sis/branches/JDK6/src/site/site.xml
    sis/branches/JDK6/storage/sis-netcdf/src/site/site.xml
    sis/branches/JDK6/storage/sis-storage/src/site/site.xml
    sis/branches/JDK6/storage/src/site/site.xml

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1553456-1553960

Modified: sis/branches/JDK6/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-webapp/pom.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK6/application/sis-webapp/pom.xml Sat Dec 28 23:09:42 2013
@@ -70,6 +70,7 @@
             <configuration>
               <portNames>
                 <portName>jettyPort</portName>
+                <portName>stopPort</portName>
               </portNames>
             </configuration>
           </execution>
@@ -79,7 +80,8 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <configuration>
-          <webApp>${basedir}/target/sis-webapp-${project.version}.war</webApp>
+          <stopKey>stopJetty</stopKey>
+          <stopPort>${stopPort}</stopPort>
         </configuration>
         <executions>
           <execution>
@@ -108,6 +110,13 @@
               </systemProperties>
             </configuration>
           </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -165,12 +165,10 @@ public final class Module implements Tag
         }
         final StringBuilder buffer = new StringBuilder(128);
         buffer.append("\n<p><font size=\"-1\">");
-        for (int i=0; i<tags.length; i++) {
-            final Tag tag = tags[i];
+        for (final Tag tag : tags) {
             File file = tag.position().file();
             module = file.getName();
-            while (file != null) {
-                file = file.getParentFile();
+            while ((file = file.getParentFile()) != null) {
                 if (file.getName().equals("src")) {
                     file = file.getParentFile();
                     if (file != null) {

Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -22,7 +22,8 @@ import com.sun.tools.doclets.Taglet;
 
 
 /**
- * The <code>@website</code> tag for inserting a URL to the web site.
+ * The <code>@website</code> tag for inserting a URL to the web site for Maven reports.
+ * The main interest of this taglet is to adapt the URL to the SIS branch.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/overview.html?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/overview.html Sat Dec 28 23:09:42 2013
@@ -26,7 +26,7 @@
   </head>
   <body>
     Overview of Apache <a href="{@website}/sis-build-helper">sis-build-helper</a> module.
-    This Javadoc is only about one specific module. For the full Apache SIS project, see
-    the <a href="{@website}/apidocs/overview-summary.html">aggregated Javadoc</a>.
+    This module is for internal use by Apache SIS only and may change in incompatible way
+    in any SIS version.
   </body>
 </html>

Modified: sis/branches/JDK6/core/sis-build-helper/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/site/site.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -29,10 +29,11 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK6/core/sis-metadata/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/site/site.xml (original)
+++ sis/branches/JDK6/core/sis-metadata/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -29,11 +29,12 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/metadata/iso/package-summary.html"/>
       <item name="FAQ"             href="http://sis.apache.org/faq.html#metadata"/>
-      <item name="Apache SIS home" href="../index.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -77,7 +77,7 @@ public final class CD_PrimeMeridian exte
      *
      * @return The element to be marshalled.
      */
-    @XmlElement(name = "Ellipsoid")
+    @XmlElement(name = "PrimeMeridian")
     public DefaultPrimeMeridian getElement() {
         return DefaultPrimeMeridian.castOrCopy(metadata);
     }

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -21,7 +21,6 @@ import java.util.Map;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.extent.Extent;
@@ -34,7 +33,6 @@ import org.apache.sis.util.iso.Types;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.internal.metadata.MetadataUtilities;
-import org.apache.sis.internal.jaxb.gco.DateAsLongAdapter;
 
 import static org.apache.sis.util.Utilities.deepEquals;
 import static org.apache.sis.util.collection.Containers.property;
@@ -87,22 +85,22 @@ public class AbstractDatum extends Abstr
      * Description, possibly including coordinates, of the point or points used to anchor the datum
      * to the Earth. Also known as the "origin", especially for Engineering and Image Datums.
      */
-    @XmlElement
+    @XmlElement(name = "anchorDefinition")
     private final InternationalString anchorPoint;
 
     /**
      * The time after which this datum definition is valid. This time may be precise
      * (e.g. 1997 for IRTF97) or merely a year (e.g. 1983 for NAD83). If the time is
      * not defined, then the value is {@link Long#MIN_VALUE}.
+     *
+     * <p>Consider this field as final. It is non-final only for the need of XML unmarshalling.</p>
      */
-    @XmlElement
-    @XmlJavaTypeAdapter(value=DateAsLongAdapter.class, type=long.class)
-    private final long realizationEpoch;
+    private long realizationEpoch;
 
     /**
      * Area or region in which this datum object is valid.
      */
-    @XmlElement(name = "validArea")
+    @XmlElement
     private final Extent domainOfValidity;
 
     /**
@@ -275,11 +273,19 @@ public class AbstractDatum extends Abstr
      * @return The time after which this datum definition is valid, or {@code null} if none.
      */
     @Override
+    @XmlElement(name = "realizationEpoch")
     public Date getRealizationEpoch() {
         return MetadataUtilities.toDate(realizationEpoch);
     }
 
     /**
+     * Invoked by JAXB only at unmarshalling time.
+     */
+    private void setRealizationEpoch(final Date value) {
+        realizationEpoch = MetadataUtilities.toMilliseconds(value);
+    }
+
+    /**
      * Returns the region or timeframe in which this datum is valid, or {@code null} if unspecified.
      *
      * @return Area or region or timeframe in which this datum is valid, or {@code null}.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -53,7 +53,8 @@
     @XmlJavaTypeAdapter(CD_PrimeMeridian.class),
     @XmlJavaTypeAdapter(CD_VerticalDatumType.class),
     @XmlJavaTypeAdapter(StringAdapter.class),
-    @XmlJavaTypeAdapter(InternationalStringConverter.class)
+    @XmlJavaTypeAdapter(InternationalStringConverter.class),
+    @XmlJavaTypeAdapter(DateAdapter.class),
 })
 package org.apache.sis.referencing.datum;
 
@@ -66,5 +67,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.gco.*;
+import org.apache.sis.internal.jaxb.gml.DateAdapter;
 import org.apache.sis.internal.jaxb.metadata.*;
 import org.apache.sis.internal.jaxb.referencing.*;

Modified: sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -19,8 +19,6 @@ package org.apache.sis.referencing.datum
 import java.net.URL;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.JAXBException;
-import javax.measure.unit.NonSI;
-import org.opengis.referencing.datum.PrimeMeridian;
 import org.apache.sis.xml.MarshallerPool;
 import org.apache.sis.test.XMLTestCase;
 
@@ -43,24 +41,6 @@ abstract strictfp class DatumTestCase ex
     }
 
     /**
-     * Asserts the the given prime meridian is the Greenwich one.
-     */
-    static void assertIsGreenwichMeridian(final PrimeMeridian meridian) {
-        assertEquals("name", "Greenwich", meridian.getName().getCode());
-        assertEquals("greenwichLongitude", 0, meridian.getGreenwichLongitude(), 0);
-        assertEquals("angularUnit", NonSI.DEGREE_ANGLE, meridian.getAngularUnit());
-    }
-
-    /**
-     * Asserts the the given prime meridian is the Paris one.
-     */
-    static void assertIsParisMeridian(final PrimeMeridian meridian) {
-        assertEquals("name", "Paris", meridian.getName().getCode());
-        assertEquals("greenwichLongitude", 2.5969213, meridian.getGreenwichLongitude(), 0);
-        assertEquals("angularUnit", NonSI.GRADE, meridian.getAngularUnit());
-    }
-
-    /**
      * Marshals the given object and ensure that the result is equals to the content of the given file,
      * ignoring namespace declarations.
      *

Modified: sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -21,10 +21,13 @@ import java.util.HashMap;
 import java.util.Locale;
 import javax.measure.unit.SI;
 import javax.measure.unit.NonSI;
+import javax.xml.bind.JAXBException;
 import org.opengis.metadata.extent.Extent;
+import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.test.Validators;
+import org.apache.sis.xml.Namespaces;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.test.DependsOnMethod;
@@ -32,7 +35,9 @@ import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
 import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.TestUtilities.getSingleton;
 import static org.apache.sis.test.mock.GeodeticDatumMock.*;
+import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
 
 
 /**
@@ -176,4 +181,61 @@ public final strictfp class DefaultGeode
                 "DATUM[“WGS84”,\n" +
                 "  SPHEROID[“WGS84”, 6378137.0, 298.257223563]]");
     }
+
+    /**
+     * Tests marshalling.
+     *
+     * @throws JAXBException If an error occurred during marshalling.
+     */
+    @Test
+    public void testMarshalling() throws JAXBException {
+        assertXmlEquals(
+                "<gml:GeodeticDatum xmlns:gml=\"" + Namespaces.GML + "\">\n" +
+                "  <gml:name codeSpace=\"test\">WGS84</gml:name>\n" +
+                "  <gml:primeMeridian>\n" +
+                "    <gml:PrimeMeridian>\n" +
+                "      <gml:name codeSpace=\"test\">Greenwich</gml:name>\n" +
+                "      <gml:greenwichLongitude uom=\"urn:ogc:def:uom:EPSG::9102\">0.0</gml:greenwichLongitude>\n" +
+                "    </gml:PrimeMeridian>\n" +
+                "  </gml:primeMeridian>\n" +
+                "  <gml:ellipsoid>\n" +
+                "    <gml:Ellipsoid>\n" +
+                "      <gml:name codeSpace=\"test\">WGS84</gml:name>\n" +
+                "      <gml:semiMajorAxis uom=\"urn:ogc:def:uom:EPSG::9001\">6378137.0</gml:semiMajorAxis>\n" +
+                "      <gml:secondDefiningParameter>\n" +
+                "        <gml:SecondDefiningParameter>\n" +
+                "          <gml:inverseFlattening uom=\"urn:ogc:def:uom:EPSG::9201\">298.257223563</gml:inverseFlattening>\n" +
+                "        </gml:SecondDefiningParameter>\n" +
+                "      </gml:secondDefiningParameter>\n" +
+                "    </gml:Ellipsoid>\n" +
+                "  </gml:ellipsoid>\n" +
+                "</gml:GeodeticDatum>",
+                marshal(new DefaultGeodeticDatum(WGS84)), "xmlns:*");
+    }
+
+    /**
+     * Tests unmarshalling.
+     *
+     * @throws JAXBException If an error occurred during unmarshalling.
+     */
+    @Test
+    public void testUnmarshalling() throws JAXBException {
+        final DefaultGeodeticDatum datum = unmarshall(DefaultGeodeticDatum.class, "WGS 84.xml");
+        assertIsWGS84(datum);
+        assertIsWorld((GeographicBoundingBox) getSingleton(datum.getDomainOfValidity().getGeographicElements()));
+        /*
+         * Values in the following tests are specific to our XML file.
+         * The actual texts in the EPSG database are more descriptive.
+         */
+        assertEquals("remarks", "No distinction between the original and subsequent WGS 84 frames.",
+                datum.getRemarks().toString());
+        assertEquals("scope", "Satellite navigation.",
+                datum.getScope().toString());
+        assertEquals("anchorDefinition", "Station coordinates changed by a few centimetres in 1994, 1997, 2002 and 2012.",
+                datum.getAnchorPoint().toString());
+        assertEquals("realizationEpoch", xmlDate("1984-01-01 00:00:00"),
+                datum.getRealizationEpoch());
+        assertEquals("remarks", "Defining parameters cited in EPSG database.",
+                datum.getEllipsoid().getRemarks().toString());
+    }
 }

Modified: sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -30,6 +30,7 @@ import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
 import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
 import static org.apache.sis.test.mock.PrimeMeridianMock.GREENWICH;
 
 
@@ -49,7 +50,7 @@ public final strictfp class DefaultPrime
     @Test
     public void testToWKT() {
         final DefaultPrimeMeridian pm = new DefaultPrimeMeridian(GREENWICH);
-        assertIsGreenwichMeridian(pm);
+        assertIsGreenwich(pm);
         assertWktEquals(pm, "PRIMEM[“Greenwich”, 0.0]");
     }
 
@@ -106,7 +107,7 @@ public final strictfp class DefaultPrime
     @Test
     public void testUnmarshall() throws JAXBException {
         final DefaultPrimeMeridian pm = unmarshall(DefaultPrimeMeridian.class, "Greenwich.xml");
-        assertIsGreenwichMeridian(pm);
+        assertIsGreenwich(pm);
     }
 
     /**
@@ -123,7 +124,7 @@ public final strictfp class DefaultPrime
         final DefaultPrimeMeridian pm = (DefaultPrimeMeridian)
                 unmarshal(unmarshaller, getGreenwichXml(LegacyNamespaces.GML));
         pool.recycle(unmarshaller);
-        assertIsGreenwichMeridian(pm);
+        assertIsGreenwich(pm);
     }
 
     /**
@@ -135,7 +136,7 @@ public final strictfp class DefaultPrime
     @DependsOnMethod({"testUnmarshall", "testMarshall"})
     public void testParisMeridian() throws JAXBException {
         final DefaultPrimeMeridian pm = unmarshall(DefaultPrimeMeridian.class, "Paris.xml");
-        assertIsParisMeridian(pm);
+        assertIsParis(pm);
         assertEquals("greenwichLongitude", 2.33722917, pm.getGreenwichLongitude(NonSI.DEGREE_ANGLE), 1E-12);
         assertEquals("Equivalent to 2°20′14.025″.", pm.getRemarks().toString());
         assertNull("name.codeSpace", pm.getName().getCodeSpace());

Modified: sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke 1880.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke%201880.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke 1880.xml [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke 1880.xml [iso-8859-1] Sat Dec 28 23:09:42 2013
@@ -18,11 +18,10 @@
   under the License.
 -->
 
-<gml:Ellipsoid
-    xmlns:gml = "http://www.opengis.net/gml/3.2"
-    xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/datums.xsd"
-    gml:id = "epsg-ellipsoid-7055">
+<gml:Ellipsoid 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             = "epsg-ellipsoid-7055">
 
   <gml:identifier codeSpace="OGP">urn:ogc:def:ellipsoid:EPSG::7055</gml:identifier>
   <gml:name>Clarke 1880 (international foot)</gml:name>

Propchange: sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke 1880.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat Dec 28 23:09:42 2013
@@ -1 +1 @@
-text/plain;charset=UTF-8
+text/xml

Modified: sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Greenwich.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Greenwich.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Greenwich.xml (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Greenwich.xml Sat Dec 28 23:09:42 2013
@@ -18,11 +18,10 @@
   under the License.
 -->
 
-<gml:PrimeMeridian
-    xmlns:gml = "http://www.opengis.net/gml/3.2"
-    xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/datums.xsd"
-    gml:id = "epsg-meridian-8901">
+<gml:PrimeMeridian 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             = "epsg-meridian-8901">
 
   <gml:identifier codeSpace="OGP">urn:ogc:def:meridian:EPSG::8901</gml:identifier>
   <gml:name>Greenwich</gml:name>

Modified: sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml (original)
+++ sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml Sat Dec 28 23:09:42 2013
@@ -18,11 +18,10 @@
   under the License.
 -->
 
-<gml:PrimeMeridian
-    xmlns:gml = "http://www.opengis.net/gml/3.2"
-    xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/datums.xsd"
-    gml:id = "epsg-meridian-8903">
+<gml:PrimeMeridian 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             = "epsg-meridian-8903">
 
   <gml:identifier codeSpace="OGP">urn:ogc:def:meridian:EPSG::8903</gml:identifier>
   <gml:name>Paris</gml:name>

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -34,7 +34,7 @@ import org.apache.sis.internal.jaxb.XmlU
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-2.5)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final class GO_DateTime extends XmlAdapter<GO_DateTime, Date> {
@@ -53,7 +53,7 @@ public final class GO_DateTime extends X
     private XMLGregorianCalendar date;
 
     /**
-     * Empty constructor for JAXB, and also for empty wrapper for formating only an empty element.
+     * Empty constructor for JAXB.
      */
     public GO_DateTime() {
     }
@@ -62,14 +62,12 @@ public final class GO_DateTime extends X
      * Builds a wrapper for the given {@link Date}.
      *
      * @param date The date to marshal. Can not be {@code null}.
-     * @param allowTime {@code true} for allowing the usage of {@code "DateTime"} field if
-     *        applicable, or {@code false} for using the {@code "Date"} field in every cases.
      */
-    GO_DateTime(final Date date, final boolean allowTime) {
+    private GO_DateTime(final Date date) {
         final Context context = Context.current();
         try {
             final XMLGregorianCalendar gc = XmlUtilities.toXML(context, date);
-            if (XmlUtilities.trimTime(gc, !allowTime)) {
+            if (XmlUtilities.trimTime(gc, false)) {
                 this.date = gc;
             } else {
                 dateTime = gc;
@@ -109,6 +107,6 @@ public final class GO_DateTime extends X
      */
     @Override
     public GO_DateTime marshal(final Date value) {
-        return (value != null) ? new GO_DateTime(value, true) : null;
+        return (value != null) ? new GO_DateTime(value) : null;
     }
 }

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -125,18 +125,18 @@ public final class Measure {
     @XmlAttribute(required = true)
     public String getUOM() {
         final Unit<?> unit = this.unit;
-        if (unit == null || unit.equals(Unit.ONE)) {
-            return "";
-        }
-        if (unit.equals(NonSI.PIXEL)) {
-            return "pixel"; // TODO: maybe not the most appropriate unit.
-        }
         if (!asXPointer) {
             final Integer code = Units.getEpsgCode(unit);
             if (code != null) {
                 return "urn:ogc:def:uom:EPSG::" + code;
             }
         }
+        if (unit == null || unit.equals(Unit.ONE)) {
+            return "";
+        }
+        if (unit.equals(NonSI.PIXEL)) {
+            return "pixel"; // TODO: maybe not the most appropriate unit.
+        }
         return Context.schema(Context.current(), "gmd", Schemas.METADATA_ROOT).append(Schemas.UOM_PATH)
                 .append("#xpointer(//*[@gml:id='").append(unit).append("'])").toString();
     }

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -227,11 +227,7 @@ public class CodeListSet<E extends CodeL
                  */
                 return false;
             }
-            if (element == null) {
-                throw new NullArgumentException(message);
-            } else {
-                throw new IllegalArgumentException(message);
-            }
+            throw new NullArgumentException(message);
         }
         int ordinal = element.ordinal();
         if (ordinal < Long.SIZE) {

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -113,9 +113,8 @@ public class ReferenceResolver {
      *
      * @param  <T>     The compile-time type of the {@code type} argument.
      * @param  context Context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
-     * @param  type    The type of object to be unmarshalled as an <strong>interface</strong>.
-     *                 This is usually a <a href="http://www.geoapi.org">GeoAPI</a> interface.
-     * @param  link The {@code xlink} attributes.
+     * @param  type    The type of object to be unmarshalled, often as an interface.
+     * @param  link    The {@code xlink} attributes.
      * @return An object of the given type for the given {@code xlink} attribute, or {@code null} if none.
      */
     public <T> T resolve(final MarshalContext context, final Class<T> type, final XLink link) {
@@ -141,8 +140,7 @@ public class ReferenceResolver {
      *
      * @param  <T>     The compile-time type of the {@code type} argument.
      * @param  context Context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
-     * @param  type    The type of object to be marshalled as an <strong>interface</strong>.
-     *                 This is usually a <a href="http://www.geoapi.org">GeoAPI</a> interface.
+     * @param  type    The type of object to be unmarshalled, often as an interface.
      * @param  object  The object to be marshalled.
      * @param  uuid    The unique identifier of the object to be marshalled.
      * @return {@code true} if the marshaller can use the {@code uuidref} attribute

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -69,7 +69,8 @@ public final class XML extends Static {
     /**
      * Specifies the locale to use for marshalling
      * {@link org.opengis.util.InternationalString} and {@link org.opengis.util.CodeList}
-     * instances. The value for this property shall be an instance of {@link Locale}.
+     * instances. The value for this property shall be an instance of {@link Locale} or a
+     * {@link CharSequence} recognized by {@link org.apache.sis.util.Locales#parse(String)}.
      *
      * <p>This property is mostly for marshallers. However this property can also be used at
      * unmarshalling time, for example if a {@code <gmd:PT_FreeText>} element containing
@@ -98,6 +99,8 @@ public final class XML extends Static {
 
     /**
      * Specifies the timezone to use for marshalling dates and times.
+     * The value for this property shall be an instance of {@link TimeZone}
+     * or a {@link CharSequence} recognized by {@link TimeZone#getTimeZone(String)}.
      *
      * {@section Default behavior}
      * If this property is never set, then (un)marshalling will use the

Modified: sis/branches/JDK6/core/sis-utility/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/javadoc/overview.html?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/javadoc/overview.html Sat Dec 28 23:09:42 2013
@@ -27,6 +27,6 @@
   <body>
     Overview of Apache <a href="{@website}/sis-utility">sis-utility</a> module.
     This Javadoc is only about one specific module. For the full Apache SIS project,
-    see the <a href="{@website}/apidocs/overview-summary.html">aggregated Javadoc</a>.
+    see the <a href="http://sis.apache.org/apidocs/overview-summary.html">aggregated Javadoc</a>.
   </body>
 </html>

Modified: sis/branches/JDK6/core/sis-utility/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/site/site.xml (original)
+++ sis/branches/JDK6/core/sis-utility/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -29,10 +29,11 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/util/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -17,9 +17,11 @@
 package org.apache.sis.internal.jaxb.gco;
 
 import java.net.URISyntaxException;
+import javax.measure.unit.Unit;
 import javax.measure.unit.SI;
 import javax.measure.unit.NonSI;
 import org.apache.sis.internal.jaxb.Schemas;
+import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
@@ -31,16 +33,30 @@ import static org.junit.Assert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-3.10)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final strictfp class MeasureTest extends TestCase {
     /**
+     * Tests the {@link Measure#getUOM()}.
+     */
+    @Test
+    public void testGetUOM() {
+        final Measure measure = new Measure(10, SI.METRE);
+        assertEquals("urn:ogc:def:uom:EPSG::9001", measure.getUOM());
+        measure.unit = NonSI.DEGREE_ANGLE;
+        assertEquals("urn:ogc:def:uom:EPSG::9102", measure.getUOM());
+        measure.unit = Unit.ONE;
+        assertEquals("urn:ogc:def:uom:EPSG::9201", measure.getUOM());
+    }
+
+    /**
      * Tests the {@link Measure#setUOM(String)}.
      *
      * @throws URISyntaxException Should not happen.
      */
     @Test
+    @DependsOnMethod("testGetUOM")
     public void testSetUOM() throws URISyntaxException {
         final Measure measure = new Measure();
         measure.setUOM("http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#m");

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java [UTF-8] Sat Dec 28 23:09:42 2013
@@ -20,6 +20,10 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import javax.xml.bind.Marshaller;
@@ -52,6 +56,23 @@ import static org.opengis.test.Assert.*;
  */
 public abstract strictfp class XMLTestCase extends TestCase {
     /**
+     * The timezone used for the tests. We intentionally use a timezone different than UTC in order
+     * to have an error of one or two hours if a code fails to take timezone offset in account.
+     */
+    private static final String TIMEZONE = "CET";
+
+    /**
+     * Date parser and formatter using the {@code "yyyy-MM-dd HH:mm:ss"} pattern
+     * and the time zone of the XML (un)marshallers used for the tests.
+     */
+    private static final DateFormat dateFormat;
+    static {
+        dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.UK);
+        dateFormat.setTimeZone(TimeZone.getTimeZone(TIMEZONE));
+        dateFormat.setLenient(false);
+    };
+
+    /**
      * A poll of configured {@link Marshaller} and {@link Unmarshaller} binded to the default set of classes.
      * The locale is set to {@link Locale#UK} (the language of ISO standards) and the timezone is arbitrarily
      * set to CET (Central European Time). We intentionally use a timezone different than UTC in order to have
@@ -99,7 +120,7 @@ public abstract strictfp class XMLTestCa
         if (defaultPool == null) {
             final Map<String,Object> properties = new HashMap<String,Object>(4);
             assertNull(properties.put(XML.LOCALE, Locale.UK));
-            assertNull(properties.put(XML.TIMEZONE, "CET"));
+            assertNull(properties.put(XML.TIMEZONE, TIMEZONE));
             defaultPool = new MarshallerPool(properties);
         }
         return defaultPool;
@@ -198,4 +219,22 @@ public abstract strictfp class XMLTestCa
         ArgumentChecks.ensureNonNull("xml", xml);
         return unmarshaller.unmarshal(new StringReader(xml));
     }
+
+    /**
+     * Parses the date for the given string using the {@code "yyyy-MM-dd HH:mm:ss"} pattern
+     * and the time zone of the XML (un)marshallers used for the tests.
+     *
+     * @param  date The date as a {@link String}.
+     * @return The date as a {@link Date}.
+     */
+    protected static Date xmlDate(final String date) {
+        ArgumentChecks.ensureNonNull("date", date);
+        try {
+            synchronized (dateFormat) {
+                return dateFormat.parse(date);
+            }
+        } catch (ParseException e) {
+            throw new AssertionError(e);
+        }
+    }
 }

Modified: sis/branches/JDK6/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/core/src/site/site.xml (original)
+++ sis/branches/JDK6/core/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -33,6 +33,7 @@
         Those menus are NOT inherited - all modules must defines their own.
     -->
     <menu name="Quick links" inherit="none">
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>

Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Sat Dec 28 23:09:42 2013
@@ -398,7 +398,7 @@ Apache SIS is a free software, Java lang
   <properties>
     <geoapi.version>3.1-M04</geoapi.version>
     <netcdf.version>4.3.18</netcdf.version>
-    <findbugs.version>2.5.2</findbugs.version>
+    <findbugs.version>2.5.3</findbugs.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>
@@ -550,13 +550,16 @@ Apache SIS is a free software, Java lang
         </executions>
       </plugin>
 
-      <!-- Create web site -->
+      <!-- Create web site. The Maven generated site is not deployed at the URL
+           declared in this pom.xml (namely http://sis.apache.org). Consequently,
+           we disable links relativization for avoiding confusing behavior. -->
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <locales>${website.locale}</locales>
           <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
           <outputEncoding>${website.encoding}</outputEncoding>
+          <relativizeDecorationLinks>false</relativizeDecorationLinks>
         </configuration>
       </plugin>
 
@@ -590,7 +593,7 @@ Apache SIS is a free software, Java lang
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>8.0.1.v20110908</version>
+          <version>8.1.14.v20131031</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -606,6 +609,23 @@ Apache SIS is a free software, Java lang
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>2.7</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>summary</report>
+              <report>license</report>
+              <report>dependency-info</report>
+              <report>dependencies</report>
+              <report>dependency-convergence</report>
+              <report>issue-tracking</report>
+              <report>mailing-list</report>
+              <report>project-team</report>
+              <report>scm</report>
+              <report>cim</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
 
       <!-- Produce JavaDoc -->
@@ -669,7 +689,7 @@ Apache SIS is a free software, Java lang
           </groups>
 
           <!-- Internal packages to hide from javadoc. -->
-          <excludePackageNames>org.apache.sis.internal:com</excludePackageNames>
+          <excludePackageNames>org.apache.sis.internal:org.apache.sis.util.resources:com</excludePackageNames>
 
           <!-- Custom taglets, some of them implemented in Java. -->
           <tags>
@@ -693,25 +713,48 @@ Apache SIS is a free software, Java lang
             <version>${sis.plugin.version}</version>
           </tagletArtifact>
         </configuration>
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
 
       <!-- Produce Source cross references -->
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
 
       <!-- Unit tests report -->
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.15</version>
+        <version>2.16</version>
       </plugin>
 
       <!-- "Release Audit" report (checks license headers etc.) -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.10</version>
+        <configuration>
+          <excludes>
+            <exclude>ide-project/**</exclude>
+          </excludes>
+        </configuration>
       </plugin>
 
       <!-- FindBugs Report. Checkstyle configuration instructions apply also to FindBugs:

Modified: sis/branches/JDK6/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/src/site/site.xml (original)
+++ sis/branches/JDK6/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -41,6 +41,7 @@
     -->
     <links>
       <item name="Apache" href="http://www.apache.org"/>
+      <item name="SIS home" href="http://sis.apache.org"/>
       <item name="Open Geospatial Consortium (OGC)" href="http://www.opengeospatial.org"/>
       <item name="GeoAPI" href="http://www.geoapi.org"/>
       <item name="Javadoc" href="http://builds.apache.org/job/sis-trunk/site/apidocs/index.html"/>
@@ -60,7 +61,26 @@
       <item name="License"            href="license.html"/>
     </menu>
 
-    <menu ref="modules"/> <!-- Replaced by menu for submodules. -->
+    <!--
+        List the modules ourselves instead of relying on <menu ref="modules"/> because we
+        want to list directly the modules producing the JAR files (we omit the sub-groups
+        like "core" and "application"), we do not want to list all modules  (e.g. we omit
+        sis-build-helper), and the links generated by maven-site-plugin do not match the
+        directory layout created by Jenkins (http://issues.apache.org/jira/browse/SIS-112).
+    -->
+    <menu name="Modules" inherit="none">
+      <item name="Utilities"      href="sis-utility/index.html"/>
+      <item name="Metadata"       href="sis-metadata/index.html"/>
+      <item name="Referencing"    href="sis-referencing/index.html"/>
+      <item name="Features"       href="sis-features/index.html"/>
+      <item name="Storage"        href="sis-storage/index.html"/>
+      <item name="Shapefile"      href="sis-shapefile/index.html"/>
+      <item name="NetCDF"         href="sis-netcdf/index.html"/>
+      <item name="Web services"   href="sis-webapp/index.html"/>
+      <item name="Command line"   href="sis-console/index.html"/>
+      <item name="French profile" href="sis-french-profile/index.html"/>
+    </menu>
+
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
 
   </body>

Modified: sis/branches/JDK6/storage/sis-netcdf/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/site/site.xml (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -29,10 +29,11 @@
        ============================================================ -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/storage/netcdf/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK6/storage/sis-storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/site/site.xml (original)
+++ sis/branches/JDK6/storage/sis-storage/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -29,10 +29,11 @@
        ========================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/storage/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK6/storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/src/site/site.xml?rev=1553963&r1=1553962&r2=1553963&view=diff
==============================================================================
--- sis/branches/JDK6/storage/src/site/site.xml (original)
+++ sis/branches/JDK6/storage/src/site/site.xml Sat Dec 28 23:09:42 2013
@@ -33,6 +33,7 @@
         Those menus are NOT inherited - all modules must defines their own.
     -->
     <menu name="Quick links" inherit="none">
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>



Mime
View raw message