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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new ab5b693 Rename "sis-sql" module as "sis-sqlstore" for consistency
with "sis-xmlstore" and for avoiding confusion with an other module that may
possibly be added later for putting a SQL front arbitrary DataStore.
ab5b693 is described below
commit ab5b6939a441a71343843a93c0063b18a32257de
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Tue Jul 10 18:35:38 2018 +0200
Rename "sis-sql" module as "sis-sqlstore" for consistency with
"sis-xmlstore" and for avoiding confusion with an other module that may
possibly be added later for putting a SQL front arbitrary DataStore.
---
ide-project/NetBeans/build.xml | 2 +-
ide-project/NetBeans/nbproject/project.properties | 4 ++--
storage/pom.xml | 4 ++--
storage/{sis-sql => sis-sqlstore}/pom.xml | 2 +-
.../src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/Database.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java | 0
.../java/org/apache/sis/internal/sql/feature/QueriedFeatureSet.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/Relation.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/Resources.java | 2 +-
.../java/org/apache/sis/internal/sql/feature/Resources.properties | 2 +-
.../java/org/apache/sis/internal/sql/feature/Resources_fr.properties | 2 +-
.../src/main/java/org/apache/sis/internal/sql/feature/Schema.java | 0
.../java/org/apache/sis/internal/sql/feature/SpatialFunctions.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/Table.java | 0
.../src/main/java/org/apache/sis/internal/sql/feature/TableName.java | 0
.../main/java/org/apache/sis/internal/sql/feature/package-info.java | 0
.../src/main/java/org/apache/sis/storage/sql/SQLQuery.java | 0
.../src/main/java/org/apache/sis/storage/sql/SQLStore.java | 0
.../src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java | 0
.../src/main/java/org/apache/sis/storage/sql/package-info.java | 0
.../src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java | 0
.../src/test/java/org/apache/sis/test/suite/package-info.txt | 0
.../src/test/resources/org/apache/sis/storage/sql/Features.sql | 0
24 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ide-project/NetBeans/build.xml b/ide-project/NetBeans/build.xml
index 64e5de0..e67120b 100644
--- a/ide-project/NetBeans/build.xml
+++ b/ide-project/NetBeans/build.xml
@@ -248,7 +248,7 @@
<include name="**/*.gpx"/>
<include name="**/*.xml"/>
</fileset>
- <fileset dir="${project.root}/storage/sis-sql/src/test/resources">
+ <fileset dir="${project.root}/storage/sis-sqlstore/src/test/resources">
<include name="**/*.sql"/>
</fileset>
<fileset
dir="${project.root}/storage/sis-earth-observation/src/test/resources">
diff --git a/ide-project/NetBeans/nbproject/project.properties
b/ide-project/NetBeans/nbproject/project.properties
index 930d36b..08fae87 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -61,8 +61,8 @@ src.netcdf.dir =
${project.root}/storage/sis-netcdf/src/main/java
test.netcdf.dir = ${project.root}/storage/sis-netcdf/src/test/java
src.shapefile.dir = ${project.root}/storage/sis-shapefile/src/main/java
test.shapefile.dir = ${project.root}/storage/sis-shapefile/src/test/java
-src.sql.dir = ${project.root}/storage/sis-sql/src/main/java
-test.sql.dir = ${project.root}/storage/sis-sql/src/test/java
+src.sql.dir = ${project.root}/storage/sis-sqlstore/src/main/java
+test.sql.dir = ${project.root}/storage/sis-sqlstore/src/test/java
src.xmlstore.dir = ${project.root}/storage/sis-xmlstore/src/main/java
test.xmlstore.dir = ${project.root}/storage/sis-xmlstore/src/test/java
src.gdal.dir = ${project.root}/storage/sis-gdal/src/main/java
diff --git a/storage/pom.xml b/storage/pom.xml
index 885c4e0..6a6d505 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -164,10 +164,10 @@
<modules>
<module>sis-storage</module>
<module>sis-shapefile</module>
- <module>sis-sql</module>
+ <module>sis-xmlstore</module>
+ <module>sis-sqlstore</module>
<module>sis-netcdf</module>
<module>sis-geotiff</module>
- <module>sis-xmlstore</module>
<module>sis-earth-observation</module>
<module>sis-gdal</module>
</modules>
diff --git a/storage/sis-sql/pom.xml b/storage/sis-sqlstore/pom.xml
similarity index 99%
rename from storage/sis-sql/pom.xml
rename to storage/sis-sqlstore/pom.xml
index aba863a..7deabc0 100644
--- a/storage/sis-sql/pom.xml
+++ b/storage/sis-sqlstore/pom.xml
@@ -36,7 +36,7 @@
Module Description
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-sql</artifactId>
+ <artifactId>sis-sqlstore</artifactId>
<name>Apache SIS SQL storage</name>
<description>
Read and write features from SQL databases.
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Database.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Database.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/QueriedFeatureSet.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/QueriedFeatureSet.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/QueriedFeatureSet.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/QueriedFeatureSet.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Relation.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Relation.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Relation.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Relation.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
similarity index 99%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
index cf11959..0785e03 100644
---
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
+++
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.java
@@ -27,7 +27,7 @@ import
org.apache.sis.util.resources.ResourceInternationalString;
/**
- * Warning and error messages that are specific to the {@code sis-sql} module.
+ * Warning and error messages that are specific to the {@code sis-sqlstore}
module.
* Resources in this file should not be used by any other module. For
resources shared by
* all modules in the Apache SIS project, see {@link
org.apache.sis.util.resources} package.
*
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
similarity index 91%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
index db1b778..b694616 100644
---
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
+++
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources.properties
@@ -16,7 +16,7 @@
#
#
-# Resources in this file are for "sis-sql" usage only and should not be used
by any other module.
+# Resources in this file are for "sis-sqlstore" usage only and should not be
used by any other module.
# For resources shared by all modules in the Apache SIS project, see
"org.apache.sis.util.resources" package.
#
DuplicatedEntity_2 = Unexpected duplication of \u201c{0}\u201d
entity named \u201c{1}\u201d.
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
similarity index 92%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
index 7b627c3..274e752 100644
---
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
+++
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Resources_fr.properties
@@ -16,7 +16,7 @@
#
#
-# Resources in this file are for "sis-sql" usage only and should not be used
by any other module.
+# Resources in this file are for "sis-sqlstore" usage only and should not be
used by any other module.
# For resources shared by all modules in the Apache SIS project, see
"org.apache.sis.util.resources" package.
#
# Punctuation rules in French (source:
http://unicode.org/udhr/n/notes_fra.html)
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Schema.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Schema.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Schema.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Schema.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SpatialFunctions.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SpatialFunctions.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SpatialFunctions.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SpatialFunctions.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Table.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Table.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Table.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Table.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/TableName.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/TableName.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/TableName.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/TableName.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
diff --git
a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/package-info.java
similarity index 100%
rename from
storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
rename to
storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/package-info.java
diff --git
a/storage/sis-sql/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
similarity index 100%
rename from
storage/sis-sql/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
rename to
storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
diff --git
a/storage/sis-sql/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
similarity index 100%
rename from
storage/sis-sql/src/test/java/org/apache/sis/test/suite/package-info.txt
rename to
storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
diff --git
a/storage/sis-sql/src/test/resources/org/apache/sis/storage/sql/Features.sql
b/storage/sis-sqlstore/src/test/resources/org/apache/sis/storage/sql/Features.sql
similarity index 100%
rename from
storage/sis-sql/src/test/resources/org/apache/sis/storage/sql/Features.sql
rename to
storage/sis-sqlstore/src/test/resources/org/apache/sis/storage/sql/Features.sql
