You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/08/22 16:29:13 UTC
[sis] 06/23: Rename the internal packages of the `org.apache.sis.profile.japan` module. Since they are not exported, the `internal` name convention is not needed anymore.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit fb10d1ec0d4b6b94f67b06dbf132acf178cf3872
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Aug 20 13:53:20 2023 +0200
Rename the internal packages of the `org.apache.sis.profile.japan` module.
Since they are not exported, the `internal` name convention is not needed anymore.
---
.../META-INF/services/org.apache.sis.internal.netcdf.Convention | 4 ++--
.../services/ucar.nc2.dataset.spi.CoordSystemBuilderFactory | 2 +-
endorsed/src/org.apache.sis.profile.japan/main/module-info.java | 6 +++---
.../{internal/earth => profile/japan}/netcdf/FactoryForUCAR.java | 2 +-
.../apache/sis/{internal/earth => profile/japan}/netcdf/GCOM_C.java | 2 +-
.../apache/sis/{internal/earth => profile/japan}/netcdf/GCOM_W.java | 2 +-
.../sis/{internal/earth => profile/japan}/netcdf/package-info.java | 2 +-
.../test/org/apache/sis/profile/japan/JapanProfileTest.java | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/org.apache.sis.internal.netcdf.Convention b/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/org.apache.sis.internal.netcdf.Convention
index 427b2d392c..52d6148e59 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/org.apache.sis.internal.netcdf.Convention
+++ b/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/org.apache.sis.internal.netcdf.Convention
@@ -1,5 +1,5 @@
# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
# The content of this file is automatically derived from module-info.class file.
# Should be used only if the JAR file was on class-path rather than module-path.
-org.apache.sis.internal.earth.netcdf.GCOM_C
-org.apache.sis.internal.earth.netcdf.GCOM_W
+org.apache.sis.profile.japan.netcdf.GCOM_C
+org.apache.sis.profile.japan.netcdf.GCOM_W
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/ucar.nc2.dataset.spi.CoordSystemBuilderFactory b/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/ucar.nc2.dataset.spi.CoordSystemBuilderFactory
index da66943f71..e463bb92ba 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/ucar.nc2.dataset.spi.CoordSystemBuilderFactory
+++ b/endorsed/src/org.apache.sis.profile.japan/main/META-INF/services/ucar.nc2.dataset.spi.CoordSystemBuilderFactory
@@ -1,4 +1,4 @@
# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
# The content of this file is automatically derived from module-info.class file.
# Should be used only if the JAR file was on class-path rather than module-path.
-org.apache.sis.internal.earth.netcdf.FactoryForUCAR
+org.apache.sis.profile.japan.netcdf.FactoryForUCAR
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/module-info.java b/endorsed/src/org.apache.sis.profile.japan/main/module-info.java
index bd5df892fe..1af0d5c2c4 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/module-info.java
+++ b/endorsed/src/org.apache.sis.profile.japan/main/module-info.java
@@ -27,11 +27,11 @@ module org.apache.sis.profile.japan {
requires cdm.core;
provides org.apache.sis.internal.netcdf.Convention
- with org.apache.sis.internal.earth.netcdf.GCOM_C,
- org.apache.sis.internal.earth.netcdf.GCOM_W;
+ with org.apache.sis.profile.japan.netcdf.GCOM_C,
+ org.apache.sis.profile.japan.netcdf.GCOM_W;
provides ucar.nc2.dataset.spi.CoordSystemBuilderFactory
- with org.apache.sis.internal.earth.netcdf.FactoryForUCAR;
+ with org.apache.sis.profile.japan.netcdf.FactoryForUCAR;
exports org.apache.sis.profile.japan;
}
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/FactoryForUCAR.java b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/FactoryForUCAR.java
similarity index 98%
rename from endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/FactoryForUCAR.java
rename to endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/FactoryForUCAR.java
index e8ead1bf48..f34ca4455c 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/FactoryForUCAR.java
+++ b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/FactoryForUCAR.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.earth.netcdf;
+package org.apache.sis.profile.japan.netcdf;
import ucar.nc2.Attribute;
import ucar.nc2.NetcdfFile;
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_C.java b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_C.java
similarity index 99%
rename from endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_C.java
rename to endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_C.java
index f171960e5f..c59d16b132 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_C.java
+++ b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_C.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.earth.netcdf;
+package org.apache.sis.profile.japan.netcdf;
import java.util.Objects;
import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_W.java b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_W.java
similarity index 99%
rename from endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_W.java
rename to endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_W.java
index 03a0195097..c04c1e21d4 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/GCOM_W.java
+++ b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/GCOM_W.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.earth.netcdf;
+package org.apache.sis.profile.japan.netcdf;
import java.util.Set;
import java.util.Map;
diff --git a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/package-info.java b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/package-info.java
rename to endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/package-info.java
index e1a85b08ff..0200ba9b01 100644
--- a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/internal/earth/netcdf/package-info.java
+++ b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/netcdf/package-info.java
@@ -24,4 +24,4 @@
* @version 1.3
* @since 1.0
*/
-package org.apache.sis.internal.earth.netcdf;
+package org.apache.sis.profile.japan.netcdf;
diff --git a/endorsed/src/org.apache.sis.profile.japan/test/org/apache/sis/profile/japan/JapanProfileTest.java b/endorsed/src/org.apache.sis.profile.japan/test/org/apache/sis/profile/japan/JapanProfileTest.java
index 03beb8e815..311d35a2c1 100644
--- a/endorsed/src/org.apache.sis.profile.japan/test/org/apache/sis/profile/japan/JapanProfileTest.java
+++ b/endorsed/src/org.apache.sis.profile.japan/test/org/apache/sis/profile/japan/JapanProfileTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.profile.japan;
-import org.apache.sis.internal.earth.netcdf.GCOM_C;
+import org.apache.sis.profile.japan.netcdf.GCOM_C;
import org.apache.sis.internal.netcdf.Convention;
import org.apache.sis.test.TestCase;
import org.junit.Test;