Author: desruisseaux
Date: Thu Oct 5 23:59:42 2023
New Revision: 1912761
URL: http://svn.apache.org/viewvc?rev=1912761&view=rev
Log:
Add `module-info.java` files.
Added:
sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak
sis/data/non-free/sis-epsg/src/main/java/module-info.java
Modified:
sis/data/non-free/sis-embedded-data/pom.xml
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java
sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
sis/data/non-free/sis-epsg/pom.xml
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java
Modified: sis/data/non-free/sis-embedded-data/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
--- sis/data/non-free/sis-embedded-data/pom.xml (original)
+++ sis/data/non-free/sis-embedded-data/pom.xml Thu Oct 5 23:59:42 2023
@@ -136,7 +136,7 @@ Provides non-free data, including the EP
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <include>**/Generator*</include>
+ <exclude>**/Generator*</exclude>
</excludes>
<!-- Anticipation for Java 9 -->
<archive>
Added: sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak?rev=1912761&view=auto
==============================================================================
--- sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak (added)
+++ sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak Thu Oct
5 23:59:42 2023
@@ -0,0 +1,29 @@
+TODO: Not yet working, as Derby seems to not find the database anymore.
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module org.apache.sis.referencing.database {
+ requires transitive org.opengis.geoapi;
+ requires transitive org.apache.sis.referencing;
+ requires org.apache.derby.tools;
+
+ exports org.apache.sis.resources.embedded;
+
+ uses org.apache.sis.setup.InstallationResources;
+ provides org.apache.sis.setup.InstallationResources
+ with org.apache.sis.resources.embedded.EmbeddedResources;
+}
Modified:
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java
[UTF-8] (original)
+++
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -36,7 +36,7 @@ import org.apache.sis.util.resources.Err
* which should be accepted by users before the EPSG dataset can be installed.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.4
* @since 0.8
*
* @see <a href="https://www.epsg.org/";>https://www.epsg.org/</a>
Modified:
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
[UTF-8] (original)
+++
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -59,8 +59,6 @@ import org.apache.sis.referencing.factor
* Instead we write the files right in their final destination, {@code
target/classes}.</div>
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since 0.8
*/
final class Generator {
/**
Modified:
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java
[UTF-8] (original)
+++
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -35,7 +35,7 @@
* {@code org.apache.sis:non-free} Maven group.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.4
* @since 0.8
*/
package org.apache.sis.resources.embedded;
Modified:
sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
[UTF-8] (original)
+++
sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -38,8 +38,6 @@ import static org.junit.Assert.*;
* Tests {@link EmbeddedResources}.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.8
*/
public final strictfp class EmbeddedResourcesTest {
/**
Modified: sis/data/non-free/sis-epsg/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Thu Oct 5 23:59:42 2023
@@ -89,15 +89,6 @@ The EPSG geodetic dataset provides defin
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>
- org.apache.sis.referencing.epsg
- </Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
</plugins>
</build>
Added: sis/data/non-free/sis-epsg/src/main/java/module-info.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/java/module-info.java?rev=1912761&view=auto
==============================================================================
--- sis/data/non-free/sis-epsg/src/main/java/module-info.java (added)
+++ sis/data/non-free/sis-epsg/src/main/java/module-info.java Thu Oct 5
23:59:42 2023
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SQL scripts for EPSG geodetic data set installation.
+ *
+ * <p><b>Licensing</b></p>
+ * EPSG is maintained by the <a href="http://www.iogp.org/";>International
Association of Oil and Gas Producers</a>
+ * (IOGP) Surveying & Positioning Committee and is reproduced in this
module with identical content, but in a
+ * more compact format. All SQL scripts in this module are subject to <a
href="https://epsg.org/terms-of-use.html";>EPSG
+ * terms of use</a>. The remaining (Java code, configuration files) are under
Apache 2 license.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.4
+ * @since 0.7
+ */
+module org.apache.sis.referencing.epsg {
+ requires transitive org.opengis.geoapi;
+ requires transitive org.apache.sis.referencing;
+
+ exports org.apache.sis.referencing.factory.sql.epsg;
+
+ uses org.apache.sis.setup.InstallationResources;
+ provides org.apache.sis.setup.InstallationResources
+ with org.apache.sis.referencing.factory.sql.epsg.ScriptProvider;
+}
Modified:
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -30,7 +30,7 @@
* terms of use</a>. The remaining (Java code, configuration files) are under
Apache 2 license.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 1.4
* @since 0.7
*/
package org.apache.sis.referencing.factory.sql.epsg;
Modified:
sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java?rev=1912761&r1=1912760&r2=1912761&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java
[UTF-8] Thu Oct 5 23:59:42 2023
@@ -30,8 +30,6 @@ import static org.junit.Assert.*;
* Test {@link ScriptProvider}.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.7
- * @since 0.7
*/
public final strictfp class ScriptProviderTest {
/**
