sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1829670 [2/4] - in /sis/trunk: ./ application/sis-console/ application/sis-console/src/test/java/org/apache/sis/console/ application/sis-openoffice/ core/sis-build-helper/ core/sis-feature/ core/sis-feature/src/main/java/org/apache/sis/int...
Date Fri, 20 Apr 2018 16:18:09 GMT
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.metadata.iso.extent;
 
-import java.net.URL;
 import java.util.Arrays;
 import javax.xml.bind.JAXBException;
 import org.opengis.metadata.extent.Extent;
@@ -25,7 +24,7 @@ import org.apache.sis.util.iso.SimpleInt
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.xml.NilObject;
-import org.apache.sis.test.XMLTestCase;
+import org.apache.sis.metadata.xml.TestUsingFile;
 import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
@@ -44,20 +43,11 @@ import static org.apache.sis.test.TestUt
  * @module
  */
 @DependsOn(DefaultGeographicBoundingBoxTest.class)
-public final strictfp class DefaultExtentTest extends XMLTestCase {
+public final strictfp class DefaultExtentTest extends TestUsingFile {
     /**
-     * Returns the URL to a test file in XML.
-     * This is used for test methods outside this {@code DefaultExtentTest} file.
-     *
-     * @param  legacy  {@code true} for legacy ISO 19139:2007 format, or {@code false} for ISO 19115-3 format.
-     * @return URL to a test file in XML.
+     * An XML file containing extent information.
      */
-    public static URL getTestFile(final boolean legacy) {
-        final String filename = legacy ? "Extent (legacy).xml" : "Extent.xml";
-        final URL resource = DefaultExtentTest.class.getResource(filename);
-        assertNotNull(filename, resource);
-        return resource;
-    }
+    public static final String FILENAME = "Extent.xml";
 
     /**
      * Tests {@link DefaultExtent#intersect(Extent)}.
@@ -97,14 +87,11 @@ public final strictfp class DefaultExten
      * Tests the (un)marshalling of a {@code <gmd:EX_Extent>} object.
      * This test opportunistically tests setting {@code "gml:id"} value.
      *
-     * <p><b>XML test file:</b>
-     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent/Extent.xml"}</p>
-     *
      * @throws JAXBException if an error occurred during the during marshalling / unmarshalling processes.
      */
     @Test
     public void testXML() throws JAXBException {
-        roundtrip("Extent.xml", VERSION_2014);
+        roundtrip(XML2016+FILENAME, VERSION_2014);
     }
 
     /**
@@ -114,7 +101,7 @@ public final strictfp class DefaultExten
      */
     @Test
     public void testLegacyXML() throws JAXBException {
-        roundtrip("Extent (legacy).xml", VERSION_2007);
+        roundtrip(XML2007+FILENAME, VERSION_2007);
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -23,9 +23,9 @@ import org.opengis.metadata.citation.Cit
 import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.metadata.xml.TestUsingFile;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.XMLTestCase;
 import org.junit.Test;
 
 import static java.util.Collections.singleton;
@@ -46,16 +46,11 @@ import static org.apache.sis.test.TestUt
     DefaultCoupledResourceTest.class,
     org.apache.sis.metadata.iso.identification.DefaultDataIdentificationTest.class
 })
-public final strictfp class DefaultServiceIdentificationTest extends XMLTestCase {
+public final strictfp class DefaultServiceIdentificationTest extends TestUsingFile {
     /**
-     * An XML file in this package containing a service identification.
+     * An XML file containing a service identification.
      */
-    private static final String XML_FILE = "ServiceIdentification.xml";
-
-    /**
-     * Same as {@link #XML_FILE} but using legacy ISO 19139:2007 schema.
-     */
-    private static final String XML_FILE_LEGACY = "ServiceIdentification (legacy).xml";
+    private static final String FILENAME = "ServiceIdentification.xml";
 
     /**
      * Creates the service identification to use for testing purpose.
@@ -106,14 +101,11 @@ public final strictfp class DefaultServi
     /**
      * Tests the unmarshalling of a service metadata.
      *
-     * <p><b>XML test file:</b>
-     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/service/ServiceIdentification.xml"}</p>
-     *
      * @throws JAXBException if an error occurred during the during unmarshalling process.
      */
     @Test
     public void testUnmarshal() throws JAXBException {
-        final DefaultServiceIdentification id = unmarshalFile(DefaultServiceIdentification.class, XML_FILE);
+        final DefaultServiceIdentification id = unmarshalFile(DefaultServiceIdentification.class, XML2016+FILENAME);
         verify(id);
         final DefaultCoupledResource resource = getSingleton(id.getCoupledResources());
         assertTitleEquals("resourceReference", "WMS specification", getSingleton(resource.getResourceReferences()));
@@ -126,7 +118,7 @@ public final strictfp class DefaultServi
      */
     @Test
     public void testUnmarshalLegacy() throws JAXBException {
-        final DefaultServiceIdentification id = unmarshalFile(DefaultServiceIdentification.class, XML_FILE_LEGACY);
+        final DefaultServiceIdentification id = unmarshalFile(DefaultServiceIdentification.class, XML2007+FILENAME);
         verify(id);
         final DefaultCoupledResource resource = getSingleton(id.getCoupledResources());
         assertEquals("scopedName", "mySpace:ABC-123", String.valueOf(resource.getScopedName()));
@@ -139,7 +131,7 @@ public final strictfp class DefaultServi
      */
     @Test
     public void testMarshal() throws JAXBException {
-        assertMarshalEqualsFile(XML_FILE, create(), "xmlns:*", "xsi:schemaLocation");
+        assertMarshalEqualsFile(XML2016+FILENAME, create(), "xmlns:*", "xsi:schemaLocation");
     }
 
     /**
@@ -149,6 +141,6 @@ public final strictfp class DefaultServi
      */
     @Test
     public void testMarshalLegacy() throws JAXBException {
-        assertMarshalEqualsFile(XML_FILE_LEGACY, create(), VERSION_2007, "xmlns:*", "xsi:schemaLocation");
+        assertMarshalEqualsFile(XML2007+FILENAME, create(), VERSION_2007, "xmlns:*", "xsi:schemaLocation");
     }
 }

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -20,7 +20,7 @@ import javax.xml.bind.JAXBException;
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.internal.jaxb.gmi.LE_ProcessStep;
 import org.apache.sis.metadata.iso.DefaultIdentifier;
-import org.apache.sis.test.XMLTestCase;
+import org.apache.sis.metadata.xml.TestUsingFile;
 import org.apache.sis.util.Version;
 import org.junit.Test;
 
@@ -36,18 +36,20 @@ import static org.opengis.test.Assert.*;
  * @since   0.3
  * @module
  */
-public final strictfp class DefaultProcessStepTest extends XMLTestCase {
+public final strictfp class DefaultProcessStepTest extends TestUsingFile {
+    /**
+     * An XML file containing process step information.
+     */
+    private static final String FILENAME = "ProcessStep.xml";
+
     /**
      * Tests the (un)marshalling of a metadata mixing elements from ISO 19115 and ISO 19115-2 standards.
      *
-     * <p><b>XML test file:</b>
-     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep.xml"}</p>
-     *
      * @throws JAXBException if an error occurred during the during marshalling / unmarshalling processes.
      */
     @Test
     public void testXML() throws JAXBException {
-        roundtrip("ProcessStep.xml", VERSION_2014);
+        roundtrip(XML2016+FILENAME, VERSION_2014);
     }
 
     /**
@@ -58,7 +60,7 @@ public final strictfp class DefaultProce
      */
     @Test
     public void testLegacyXML() throws JAXBException {
-        roundtrip("ProcessStep (legacy).xml", VERSION_2007);
+        roundtrip(XML2007+FILENAME, VERSION_2007);
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -22,7 +22,7 @@ import org.opengis.metadata.quality.Resu
 import org.opengis.util.InternationalString;
 import org.apache.sis.internal.jaxb.lan.FreeTextMarshallingTest;
 import org.apache.sis.util.Version;
-import org.apache.sis.test.XMLTestCase;
+import org.apache.sis.metadata.xml.TestUsingFile;
 import org.apache.sis.test.DependsOn;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -42,15 +42,17 @@ import static org.apache.sis.test.TestUt
  * @module
  */
 @DependsOn(FreeTextMarshallingTest.class)
-public final strictfp class AbstractPositionalAccuracyTest extends XMLTestCase {
+public final strictfp class AbstractPositionalAccuracyTest extends TestUsingFile {
+    /**
+     * An XML file containing quality information.
+     */
+    private static final String FILENAME = "PositionalAccuracy.xml";
+
     /**
      * Tests the (un)marshalling of a text group with a default {@code <gco:CharacterString>} element.
      * This test is somewhat a duplicate of {@link FreeTextMarshallingTest}, but the context is more
      * elaborated.
      *
-     * <p><b>XML test file:</b>
-     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/quality/PositionalAccuracy.xml"}</p>
-     *
      * @throws JAXBException if an error occurred during the during marshalling / unmarshalling processes.
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-394">Issue SIS-394</a>
@@ -59,7 +61,7 @@ public final strictfp class AbstractPosi
     @Test
     @Ignore("Depends on SIS-394")
     public void testXML() throws JAXBException {
-        roundtrip("PositionalAccuracy.xml", VERSION_2014);
+        roundtrip(XML2016+FILENAME, VERSION_2014);
     }
 
     /**
@@ -72,7 +74,7 @@ public final strictfp class AbstractPosi
      */
     @Test
     public void testLegacyXML() throws JAXBException {
-        roundtrip("PositionalAccuracy (legacy).xml", VERSION_2007);
+        roundtrip(XML2007+FILENAME, VERSION_2007);
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml?rev=1829670&r1=1829667&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml (original)
+++ sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml Fri Apr 20 16:18:08 2018
@@ -76,9 +76,6 @@
               </gco:TypeName>
             </gco:attributeType>
           </srv:name>
-          <srv:direction>
-            <srv:SV_ParameterDirection>in</srv:SV_ParameterDirection>
-          </srv:direction>
           <srv:optionality>
             <gco:CharacterString>Optional</gco:CharacterString>
           </srv:optionality>

Modified: sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml?rev=1829670&r1=1829667&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml (original)
+++ sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml Fri Apr 20 16:18:08 2018
@@ -41,7 +41,7 @@
   </srv:serviceTypeVersion>
 
   <srv:couplingType>
-    <srv:SV_CouplingType codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#SV_CouplingType" codeListValue="loose" codeSpace="eng">Loose</srv:SV_CouplingType>
+    <srv:SV_CouplingType codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#SV_CouplingType" codeListValue="loose">Loose</srv:SV_CouplingType>
   </srv:couplingType>
 
   <srv:coupledResource>
@@ -62,7 +62,7 @@
             <gco:CharacterString>Get Map</gco:CharacterString>
           </srv:operationName>
           <srv:distributedComputingPlatform>
-            <srv:DCPList codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#DCPList" codeListValue="WebServices" codeSpace="eng">Web services</srv:DCPList>
+            <srv:DCPList codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#DCPList" codeListValue="WebServices">Web services</srv:DCPList>
           </srv:distributedComputingPlatform>
           <srv:connectPoint gco:nilReason="missing"/>
           <srv:parameter>
@@ -81,9 +81,6 @@
                   </gco:attributeType>
                 </gco:MemberName>
               </srv:name>
-              <srv:direction>
-                <srv:SV_ParameterDirection>in</srv:SV_ParameterDirection>
-              </srv:direction>
               <srv:optionality>
                 <gco:Boolean>true</gco:Boolean>
               </srv:optionality>
@@ -103,7 +100,7 @@
         <gco:CharacterString>Get Map</gco:CharacterString>
       </srv:operationName>
       <srv:distributedComputingPlatform>
-        <srv:DCPList codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#DCPList" codeListValue="WebServices" codeSpace="eng">Web services</srv:DCPList>
+        <srv:DCPList codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#DCPList" codeListValue="WebServices">Web services</srv:DCPList>
       </srv:distributedComputingPlatform>
       <srv:connectPoint gco:nilReason="missing"/>
       <srv:parameter>
@@ -122,9 +119,6 @@
               </gco:attributeType>
             </gco:MemberName>
           </srv:name>
-          <srv:direction>
-            <srv:SV_ParameterDirection>in</srv:SV_ParameterDirection>
-          </srv:direction>
           <srv:optionality>
             <gco:Boolean>true</gco:Boolean>
           </srv:optionality>

Modified: sis/trunk/core/sis-portrayal/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-portrayal/pom.xml?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-portrayal/pom.xml (original)
+++ sis/trunk/core/sis-portrayal/pom.xml Fri Apr 20 16:18:08 2018
@@ -37,12 +37,9 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-portrayal</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache SIS portrayal</name>
   <description>
-  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
-       The leading space after the first line is necessary for proper formatting. -->
-Symbology and map representations, together with a rendering engine for display.
+    Symbology and map representations, together with a rendering engine for display.
   </description>
 
 
@@ -79,15 +76,18 @@ Symbology and map representations, toget
        =========================================================== -->
   <build>
     <plugins>
-
-      <!-- Package as OSGi bundle -->
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.portrayal</Bundle-SymbolicName>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.portrayal
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

Modified: sis/trunk/core/sis-raster/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/pom.xml?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-raster/pom.xml (original)
+++ sis/trunk/core/sis-raster/pom.xml Fri Apr 20 16:18:08 2018
@@ -37,12 +37,9 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-raster</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache SIS rasters</name>
   <description>
-  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
-       The leading space after the first line is necessary for proper formatting. -->
-Access to raster data.
+    Access to raster data.
   </description>
 
 
@@ -80,15 +77,18 @@ Access to raster data.
        =========================================================== -->
   <build>
     <plugins>
-
-      <!-- Package as OSGi bundle -->
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.raster</Bundle-SymbolicName>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.raster
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

Modified: sis/trunk/core/sis-referencing-by-identifiers/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/pom.xml?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/pom.xml (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/pom.xml Fri Apr 20 16:18:08 2018
@@ -33,13 +33,10 @@
 
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-referencing-by-identifiers</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache SIS referencing by geographic identifiers</name>
   <description>
-  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
-       The leading space after the first line is necessary for proper formatting. -->
-Implementations of Spatial Reference Systems using Geographic Identifiers
- gazetteer services derived from ISO 19112.
+    Implementations of Spatial Reference Systems using Geographic Identifiers
+    gazetteer services derived from ISO 19112.
   </description>
 
 
@@ -78,15 +75,18 @@ Implementations of Spatial Reference Sys
        =========================================================== -->
   <build>
     <plugins>
-
-      <!-- Package as OSGi bundle -->
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.referencing.gazetteer</Bundle-SymbolicName>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.referencing.gazetteer
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

Modified: sis/trunk/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/pom.xml?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/pom.xml (original)
+++ sis/trunk/core/sis-referencing/pom.xml Fri Apr 20 16:18:08 2018
@@ -33,13 +33,10 @@
 
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-referencing</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache SIS referencing</name>
   <description>
-  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
-       The leading space after the first line is necessary for proper formatting. -->
-Implementations of Coordinate Reference Systems (CRS),
- conversion and transformation services derived from ISO 19111.
+    Implementations of Coordinate Reference Systems (CRS),
+    conversion and transformation services derived from ISO 19111.
   </description>
 
 
@@ -89,20 +86,18 @@ Implementations of Coordinate Reference
        =========================================================== -->
   <build>
     <plugins>
-
-      <!-- Package as OSGi bundle -->
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.referencing</Bundle-SymbolicName>
-            <Export-Package>org.apache.sis.internal.referencing, *</Export-Package>
-            <Require-Capability>osgi.extender;
-            filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
-            <Provide-Capability>osgi.serviceloader;
-            osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration; osgi.serviceloader=org.apache.sis.internal.jaxb.AdapterReplacement,org.opengis.referencing.operation.MathTransformFactory,org.opengis.referencing.operation.OperationMethod,org.opengis.temporal.TemporalFactory</Provide-Capability>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.referencing
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -171,8 +171,8 @@ public final class Resources extends Ind
         public static final short EllipsoidalHeightNotAllowed_1 = 77;
 
         /**
-         * There is no factory for version {1} of “{0}” authority. Fallback on default version for
-         * objects creation.
+         * There is no local registry for version {1} of “{0}” authority. Fallback on default version
+         * for objects creation.
          */
         public static final short FallbackDefaultFactoryVersion_2 = 17;
 

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] Fri Apr 20 16:18:08 2018
@@ -25,7 +25,7 @@ AmbiguousEllipsoid_1              = Ambi
 ConformanceMeansDatumShift        = This result indicates if a datum shift method has been applied.
 ConstantProjParameterValue_1      = This parameter is shown for completeness, but should never have a value different than {0} for this projection.
 DeprecatedCode_3                  = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
-FallbackDefaultFactoryVersion_2   = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
+FallbackDefaultFactoryVersion_2   = There is no local registry for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
 GeodeticDataBase_4                = {0} geodetic dataset version {1} on \u201c{2}\u201d version {3}.
 IgnoredServiceProvider_3          = More than one service provider of type \u2018{0}\u2019 are declared for \u201c{1}\u201d. Only the first provider (an instance of \u2018{2}\u2019) will be used.
 InverseOperationUsesSameSign      = Inverse operation uses the same parameter value.

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] Fri Apr 20 16:18:08 2018
@@ -30,7 +30,7 @@ AmbiguousEllipsoid_1              = Ambi
 ConformanceMeansDatumShift        = Ce r\u00e9sultat indique si un changement de r\u00e9f\u00e9rentiel a \u00e9t\u00e9 appliqu\u00e9.
 ConstantProjParameterValue_1      = Ce param\u00e8tre est montr\u00e9 pour \u00eatre plus complet, mais sa valeur ne devrait jamais \u00eatre diff\u00e9rente de {0} pour cette projection.
 DeprecatedCode_3                  = Le code \u00ab\u202f{0}\u202f\u00bb est d\u00e9pr\u00e9ci\u00e9 et remplac\u00e9 par le code {1}. La raison est\u00a0: {2}
-FallbackDefaultFactoryVersion_2   = Il n\u2019y a pas de fabrique pour la version {1} de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
+FallbackDefaultFactoryVersion_2   = Il n\u2019y a pas de registre local pour la version {1} de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
 GeodeticDataBase_4                = Base de donn\u00e9es g\u00e9od\u00e9sique {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
 IgnoredServiceProvider_3          = Plusieurs fournisseurs de service de type \u2018{0}\u2019 sont d\u00e9clar\u00e9s pour \u00ab\u202f{1}\u202f\u00bb. Seul le premier fournisseur (une instance de \u2018{2}\u2019) sera utilis\u00e9.
 InverseOperationUsesSameSign      = L\u2019op\u00e9ration inverse utilise la m\u00eame valeur pour ce param\u00e8tre.

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -28,7 +28,7 @@ import org.apache.sis.metadata.iso.citat
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
- * @version 0.6
+ * @version 1.0
  *
  * @see <a href="http://geotiff.maptools.org/proj_list/lambert_conic_conformal_1sp.html">GeoTIFF parameters for Lambert Conic Conformal 1SP</a>
  *
@@ -68,7 +68,7 @@ public final class LambertConformal1SP e
     /**
      * The group of all parameters expected by this coordinate operation.
      */
-    private static final ParameterDescriptorGroup PARAMETERS;
+    static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
 
@@ -80,6 +80,7 @@ public final class LambertConformal1SP e
                 .addName(                    "Lambert Conic Conformal (1SP)")
                 .addName(Citations.OGC,      "Lambert_Conformal_Conic_1SP")
                 .addName(Citations.GEOTIFF,  "CT_LambertConfConic_1SP")
+                .addName(Citations.PROJ4,    "lcc")
                 .addIdentifier(Citations.GEOTIFF, "9")
                 .createGroupForMapProjection(
                         LATITUDE_OF_ORIGIN,

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -164,7 +164,7 @@ public final class LambertConformal2SP e
                 .addName(Citations.NETCDF,   "LambertConformal")
                 .addName(Citations.GEOTIFF,  "CT_LambertConfConic_2SP")
                 .addName(Citations.GEOTIFF,  "CT_LambertConfConic")
-                .addName(Citations.PROJ4,    "lcc")
+                .addName(sameNameAs(Citations.PROJ4, LambertConformal1SP.PARAMETERS))
                 .addIdentifier(Citations.GEOTIFF,  "8")
                 .addIdentifier(Citations.MAP_INFO, "3")
                 .addIdentifier(Citations.S57,      "6")

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -19,6 +19,7 @@ package org.apache.sis.internal.referenc
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
+import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 
 
@@ -29,7 +30,7 @@ import org.apache.sis.parameter.Paramete
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
- * @version 0.6
+ * @version 1.0
  * @since   0.6
  * @module
  */
@@ -66,6 +67,7 @@ public final class MercatorSpherical ext
 
         PARAMETERS = addNameAndLegacy(addIdentifierAndLegacy(builder, IDENTIFIER, "9841"),
                 "Mercator (Spherical)", "Mercator (1SP) (Spherical)")   // "Mercator (Spherical)" starting from EPSG version 7.6
+                .addName(sameNameAs(Citations.PROJ4, Mercator1SP.PARAMETERS))
                 .createGroupForMapProjection(
                         Mercator1SP.LATITUDE_OF_ORIGIN,
                         Mercator1SP.LONGITUDE_OF_ORIGIN,

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -97,9 +97,10 @@ public class ObliqueMercator extends Abs
                 .rename    (Citations.NETCDF), false);                  // Remove the netCDF name.
 
         LONGITUDE_OF_CENTRE = createLongitude(builder.addNamesAndIdentifiers(AlbersEqualArea.LONGITUDE_OF_FALSE_ORIGIN)
-                .reidentify(Citations.EPSG, "8812")
-                .rename    (Citations.EPSG, "Longitude of projection centre")
-                .addName   (Citations.ESRI, "Longitude_Of_Center")
+                .reidentify(Citations.EPSG,  "8812")
+                .rename    (Citations.EPSG,  "Longitude of projection centre")
+                .addName   (Citations.ESRI,  "Longitude_Of_Center")
+                .rename    (Citations.PROJ4, "lonc")
                 .rename    (Citations.NETCDF));                         // Remove the netCDF name.
 
         AZIMUTH = builder
@@ -119,6 +120,7 @@ public class ObliqueMercator extends Abs
                 .addName(Citations.OGC,     "rectified_grid_angle")
                 .addName(Citations.ESRI,    "XY_Plane_Rotation")
                 .addName(Citations.GEOTIFF, "RectifiedGridAngle")
+                .addName(Citations.PROJ4,   "gamma")
                 .createBounded(-360, 360, Double.NaN, Units.DEGREE);
 
         SCALE_FACTOR = createScale(builder

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -35,7 +35,7 @@ import org.apache.sis.measure.Units;
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  *
  * @see <a href="http://geotiff.maptools.org/proj_list/polar_stereographic.html">GeoTIFF parameters for Polar Stereographic</a>
  *
@@ -80,7 +80,7 @@ public final class PolarStereographicA e
     /**
      * The group of all parameters expected by this coordinate operation.
      */
-    private static final ParameterDescriptorGroup PARAMETERS;
+    static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
         LONGITUDE_OF_ORIGIN = createLongitude(builder

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -30,7 +30,7 @@ import org.apache.sis.parameter.Paramete
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.6
  * @module
  */
@@ -80,10 +80,9 @@ public final class PolarStereographicB e
                 .rename(Citations.EPSG, "Longitude of origin")
                 .reidentify(Citations.EPSG, "8833"));
 
-        STANDARD_PARALLEL = createMandatoryLatitude(builder
-                .addIdentifier("8832").addName("Latitude of standard parallel")
-                .addName(sameNameAs(Citations.OGC,  Mercator2SP.STANDARD_PARALLEL))
-                .addName(sameNameAs(Citations.ESRI, Mercator2SP.STANDARD_PARALLEL)));
+        STANDARD_PARALLEL = createMandatoryLatitude(builder.addNamesAndIdentifiers(Mercator2SP.STANDARD_PARALLEL)
+                .rename(Citations.EPSG, "Latitude of standard parallel")
+                .reidentify(Citations.EPSG, "8832"));
 
         SCALE_FACTOR = createScale(builder
                 .addNamesAndIdentifiers(Mercator2SP.SCALE_FACTOR)
@@ -95,6 +94,7 @@ public final class PolarStereographicB e
                 .addName(Citations.S57,  "Polar stereographic")
                 .addName(Citations.S57,  "PST")
                 .addIdentifier(Citations.S57, "11")
+                .addName(sameNameAs(Citations.PROJ4, PolarStereographicA.PARAMETERS))
                 .createGroupForMapProjection(
                         STANDARD_PARALLEL,
                         LONGITUDE_OF_ORIGIN,

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.operation.projection;
 
 import java.util.EnumMap;
-import java.awt.geom.AffineTransform;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.InvalidParameterValueException;
 import org.opengis.referencing.operation.OperationMethod;
@@ -25,8 +24,8 @@ import org.opengis.referencing.operation
 import org.apache.sis.measure.Angle;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
+import org.apache.sis.referencing.operation.matrix.Matrix3;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
-import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
 import org.apache.sis.referencing.operation.transform.ContextualParameters.MatrixRole;
 import org.apache.sis.internal.referencing.provider.ObliqueMercatorTwoPoints;
 import org.apache.sis.internal.referencing.Resources;
@@ -244,18 +243,10 @@ public class ObliqueMercator extends Con
          */
         getContextualParameters().getMatrix(MatrixRole.NORMALIZATION).convertAfter(0, null, -λ0);
         final MatrixSIS denormalize = getContextualParameters().getMatrix(MatrixRole.DENORMALIZATION);
-        if (γc != 0) {
-            // TODO: This complicated code is only a workaround for the absence of "rotate" method in MatrixSIS.
-            // We should provide a "rotate" method in a future SIS version instead.
-            final AffineTransform tmp = AffineTransforms2D.castOrCopy(denormalize);
-            tmp.rotate(-γc);
-            final Matrix m = AffineTransforms2D.toMatrix(tmp);
-            for (int i=0; i<3; i++) {
-                for (int j=0; j<3; j++) {
-                    denormalize.setElement(j, i, m.getElement(j, i));
-                }
-            }
-        }
+        final Matrix3 rotation = new Matrix3();
+        rotation.m00 =   rotation.m11 = cos(γc);
+        rotation.m10 = -(rotation.m01 = sin(γc));
+        denormalize.setMatrix(denormalize.multiply(rotation));
         /*
          * For variant B only, an additional (uc, vc) translation is applied here.
          * Note that the general form of uc works even in  αc = 90°  special case,

Modified: sis/trunk/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/pom.xml?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/pom.xml (original)
+++ sis/trunk/core/sis-utility/pom.xml Fri Apr 20 16:18:08 2018
@@ -37,12 +37,9 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-utility</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache SIS utilities</name>
   <description>
-  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
-       The leading space after the first line is necessary for proper formatting. -->
-Miscellaneous utilities.
+    Miscellaneous utilities.
   </description>
 
 
@@ -122,25 +119,18 @@ Miscellaneous utilities.
        =========================================================== -->
   <build>
     <plugins>
-
-      <!-- Package as OSGi bundle -->
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.util</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.sis.internal.system.OSGiActivator</Bundle-Activator>
-            <Export-Package>*</Export-Package>
-            <Require-Capability>
-              osgi.extender;
-              filter:="(osgi.extender=osgi.serviceloader.registrar)",
-              osgi.serviceloader;
-              ;cardinality:=multiple,osgi.extender;
-              filter:="(osgi.extender=osgi.serviceloader.processor)"
-            </Require-Capability>
-            <SPI-Producer>*</SPI-Producer>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.util
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -22,8 +22,8 @@ package org.apache.sis.internal.system;
  * The constants in this class are used for two purposes:
  *
  * <ul>
- *   <li>OSGi module symbolic names, as declared in the {@code Bundle-SymbolicName} entry of the
- *       {@code META-INF/MANIFEST.MF} file in each JAR files.</li>
+ *   <li>Module symbolic names, as declared in {@code module-info.java} files. In an OSGi context, this would be
+ *       the {@code Bundle-SymbolicName} entry of the {@code META-INF/MANIFEST.MF} file in each JAR files.</li>
  *
  *   <li>Logger names for "module-wide" messages, or when the message to log does not fit in a more
  *       accurate category. Note that other logger names are listed in the {@link Loggers} class.</li>
@@ -32,7 +32,7 @@ package org.apache.sis.internal.system;
  * Each constant should be the name of the main package of its corresponding module.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -83,6 +83,11 @@ public final class Modules {
     public static final String GDAL = "org.apache.sis.storage.gdal";
 
     /**
+     * The {@value} module name.
+     */
+    public static final String SQL = "org.apache.sis.sql";
+
+    /**
      * The major version number of all Apache SIS modules.
      *
      * @see org.apache.sis.util.Version

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/package-info.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/package-info.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -24,7 +24,7 @@
  * may change in incompatible ways in any future version without notice.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 1.0
  * @since   0.3
  * @module
  */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/GeometryLibrary.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/GeometryLibrary.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/GeometryLibrary.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/GeometryLibrary.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -28,7 +28,7 @@ import org.opengis.metadata.acquisition.
  * All those libraries are optional.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  *
  * @see OptionKey#GEOMETRY_LIBRARY
  * @see org.apache.sis.feature.builder.FeatureTypeBuilder#addAttribute(GeometryType)
@@ -38,22 +38,24 @@ import org.opengis.metadata.acquisition.
  */
 public enum GeometryLibrary {
     /**
-     * The Java Topology Suite (JTS) library. This open source library provides an object model
-     * for Euclidean planar geometry together with a set of fundamental geometric functions.
-     * The library is licensed under Eclipse Distribution License.
+     * The Java 2D Graphics and Imaging library. This library does not provide as many topological operations
+     * than other libraries, but is available on most standard Java environments and constitute a reliable
+     * fallback when no other library is available.
      *
      * <table class="sis">
      *   <caption>Implementation classes</caption>
      *   <tr><th>Geometry type</th>               <th>Class name</th></tr>
-     *   <tr><td>Root geometry class</td>         <td>{@code org.locationtech.jts.geom.Geometry}</td></tr>
-     *   <tr><td>{@link GeometryType#POINT}</td>  <td>{@code org.locationtech.jts.geom.Point}</td></tr>
-     *   <tr><td>{@link GeometryType#LINEAR}</td> <td>{@code org.locationtech.jts.geom.LineString}</td></tr>
-     *   <tr><td>{@link GeometryType#AREAL}</td>  <td>{@code org.locationtech.jts.geom.Polygon}</td></tr>
+     *   <tr><td>{@link GeometryType#POINT}</td>  <td>{@code java.awt.geom.Point2D}</td></tr>
+     *   <tr><td>{@link GeometryType#LINEAR}</td> <td>{@code java.awt.Shape}</td></tr>
+     *   <tr><td>{@link GeometryType#AREAL}</td>  <td>{@code java.awt.Shape}</td></tr>
      * </table>
      *
-     * @see <a href="http://locationtech.github.io/jts/">JTS home page</a>
+     * Note that contrarily to JTS and ESRI libraries,
+     * a point does not extend any root geometry class in Java2D.
+     *
+     * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/2d/index.html">Java2D home page</a>
      */
-//  JTS,
+    JAVA2D,
 
     /**
      * The ESRI geometry API library. This library can be used for spatial vector data processing.
@@ -74,22 +76,22 @@ public enum GeometryLibrary {
     ESRI,
 
     /**
-     * The Java 2D Graphics and Imaging library. This library does not provide as many topological operations
-     * than other libraries, but is available on most standard Java environments and constitute a reliable
-     * fallback when no other library is available.
+     * The Java Topology Suite (JTS) library. This open source library provides an object model
+     * for Euclidean planar geometry together with a set of fundamental geometric functions.
+     * The library is licensed under Eclipse Distribution License.
      *
      * <table class="sis">
      *   <caption>Implementation classes</caption>
      *   <tr><th>Geometry type</th>               <th>Class name</th></tr>
-     *   <tr><td>{@link GeometryType#POINT}</td>  <td>{@code java.awt.geom.Point2D}</td></tr>
-     *   <tr><td>{@link GeometryType#LINEAR}</td> <td>{@code java.awt.Shape}</td></tr>
-     *   <tr><td>{@link GeometryType#AREAL}</td>  <td>{@code java.awt.Shape}</td></tr>
+     *   <tr><td>Root geometry class</td>         <td>{@code org.locationtech.jts.geom.Geometry}</td></tr>
+     *   <tr><td>{@link GeometryType#POINT}</td>  <td>{@code org.locationtech.jts.geom.Point}</td></tr>
+     *   <tr><td>{@link GeometryType#LINEAR}</td> <td>{@code org.locationtech.jts.geom.LineString}</td></tr>
+     *   <tr><td>{@link GeometryType#AREAL}</td>  <td>{@code org.locationtech.jts.geom.Polygon}</td></tr>
      * </table>
      *
-     * Note that contrarily to JTS and ESRI libraries,
-     * a point does not extend any root geometry class in Java2D.
+     * @see <a href="http://locationtech.github.io/jts/">JTS home page</a>
      *
-     * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/2d/index.html">Java2D home page</a>
+     * @since 1.0
      */
-    JAVA2D
+    JTS
 }

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java?rev=1829670&r1=1829669&r2=1829670&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java [UTF-8] Fri Apr 20 16:18:08 2018
@@ -23,7 +23,7 @@
  * is created.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */



Mime
View raw message