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:11 UTC
[sis] 04/23: Rename the internal packages of the `org.apache.sis.storage.shapefile` 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 f045dd494d3f264008b6fd42fe69048784d742e3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Aug 20 13:40:25 2023 +0200
Rename the internal packages of the `org.apache.sis.storage.shapefile` module.
Since they are not exported, the `internal` name convention is not needed anymore.
---
.../sis/storage/shapefile/InputFeatureStream.java | 22 +++++++++++++---------
.../apache/sis/storage/shapefile/ShapeFile.java | 4 ++--
.../shapefile/internal}/AutoChecker.java | 2 +-
...nvalidRecordNumberForDirectAccessException.java | 2 +-
.../SQLNoDirectAccessAvailableException.java | 2 +-
.../internal}/SQLShapefileNotFoundException.java | 2 +-
.../shapefile/internal}/ShapefileByteReader.java | 4 ++--
.../internal}/ShapefileByteReader.properties | 0
.../internal}/ShapefileByteReader_fr.properties | 0
.../shapefile/internal}/ShapefileDescriptor.java | 2 +-
.../shapefile/internal}/package-info.java | 2 +-
.../shapefile/jdbc/AbstractDbase3ByteReader.java | 2 +-
.../jdbc/AbstractDbase3ByteReader.properties | 0
.../jdbc/AbstractDbase3ByteReader_fr.properties | 0
.../shapefile/jdbc/AbstractJDBC.java | 4 ++--
.../shapefile/jdbc/AbstractJDBC.properties | 0
.../shapefile/jdbc/AbstractJDBC_fr.properties | 0
.../shapefile/jdbc/CommonByteReader.java | 4 ++--
.../shapefile/jdbc/CommonByteReader.properties | 0
.../shapefile/jdbc/DBFDriver.java | 6 +++---
.../shapefile/jdbc/DBase3FieldDescriptor.java | 4 ++--
.../jdbc/DBase3FieldDescriptor.properties | 0
.../jdbc/DBase3FieldDescriptor_fr.properties | 0
.../shapefile/jdbc/DBaseDataType.java | 2 +-
.../shapefile/jdbc/Dbase3ByteReader.java | 6 +++---
.../shapefile/jdbc/MappedByteReader.java | 8 ++++----
.../shapefile/jdbc/MappedByteReader.properties | 0
.../shapefile/jdbc/MappedByteReader_fr.properties | 0
.../jdbc/SQLConnectionClosedException.java | 2 +-
.../jdbc/SQLDbaseFileNotFoundException.java | 2 +-
.../jdbc/SQLInvalidDbaseFileFormatException.java | 2 +-
.../jdbc/connection/AbstractConnection.java | 4 ++--
.../jdbc/connection/AbstractConnection.properties | 0
.../connection/AbstractConnection_fr.properties | 0
.../shapefile/jdbc/connection/DBFConnection.java | 10 +++++-----
.../jdbc/connection/DBFConnection.properties | 0
.../jdbc/connection/DBFConnection_fr.properties | 0
.../connection/SQLClosingIOFailureException.java | 2 +-
.../shapefile/jdbc/connection/package-info.java | 2 +-
.../jdbc/metadata/AbstractDatabaseMetaData.java | 6 +++---
.../jdbc/metadata/DBFDatabaseMetaData.java | 14 +++++++-------
.../jdbc/metadata/DBFResultSetMataData.java | 16 ++++++++--------
.../jdbc/metadata/DBFResultSetMataData.properties | 0
.../metadata/DBFResultSetMataData_fr.properties | 0
.../shapefile/jdbc/metadata/package-info.java | 2 +-
.../shapefile/jdbc/package-info.java | 2 +-
.../jdbc/resultset/AbstractResultSet.java | 4 ++--
.../jdbc/resultset/AbstractResultSet.properties | 0
.../jdbc/resultset/AbstractResultSet_fr.properties | 0
.../jdbc/resultset/BuiltInMemoryResultSet.java | 4 ++--
...iltInMemoryResultSetForCatalogNamesListing.java | 4 ++--
...DBFBuiltInMemoryResultSetForColumnsListing.java | 6 +++---
...ltInMemoryResultSetForColumnsListing.properties | 0
...nMemoryResultSetForColumnsListing_fr.properties | 0
.../DBFBuiltInMemoryResultSetForSchemaListing.java | 4 ++--
.../DBFBuiltInMemoryResultSetForTablesListing.java | 4 ++--
...iltInMemoryResultSetForTablesListing.properties | 0
...uiltInMemoryResultSetForTablesTypesListing.java | 4 ++--
...MemoryResultSetForTablesTypesListing.properties | 0
.../jdbc/resultset/DBFRecordBasedResultSet.java | 20 ++++++++++----------
.../resultset/DBFRecordBasedResultSet.properties | 0
.../DBFRecordBasedResultSet_fr.properties | 0
.../shapefile/jdbc/resultset/DBFResultSet.java | 8 ++++----
.../jdbc/resultset/DBFResultSet.properties | 0
.../jdbc/resultset/DBFResultSet_fr.properties | 0
.../resultset/SQLIllegalColumnIndexException.java | 2 +-
.../jdbc/resultset/SQLNoResultException.java | 2 +-
.../jdbc/resultset/SQLNoSuchFieldException.java | 2 +-
.../jdbc/resultset/SQLNotDateException.java | 2 +-
.../jdbc/resultset/SQLNotNumericException.java | 2 +-
.../shapefile/jdbc/resultset/package-info.java | 2 +-
.../shapefile/jdbc/sql/ClauseResolver.java | 8 ++++----
.../shapefile/jdbc/sql/ClauseResolver.properties | 0
.../jdbc/sql/ClauseResolver_fr.properties | 0
.../jdbc/sql/ConditionalClauseResolver.java | 2 +-
.../shapefile/jdbc/sql/CrudeSQLParser.java | 10 +++++-----
.../shapefile/jdbc/sql/CrudeSQLParser.properties | 0
.../jdbc/sql/SQLIllegalParameterException.java | 2 +-
.../jdbc/sql/SQLInvalidStatementException.java | 2 +-
.../sql/SQLUnsupportedParsingFeatureException.java | 2 +-
.../shapefile/jdbc/sql/package-info.java | 2 +-
.../jdbc/statement/AbstractStatement.java | 4 ++--
.../shapefile/jdbc/statement/DBFStatement.java | 12 ++++++------
.../jdbc/statement/DBFStatement.properties | 0
.../jdbc/statement/DBFStatement_fr.properties | 0
.../shapefile/jdbc/statement/package-info.java | 2 +-
.../jdbc/AbstractTestBaseForInternalJDBC.java | 4 ++--
.../shapefile/jdbc/DBFConnectionTest.java | 4 ++--
.../shapefile/jdbc/DBFResultSetTest.java | 4 ++--
.../shapefile/jdbc/DBFStatementTest.java | 4 ++--
.../shapefile/jdbc/readme.txt | 0
.../shapefile/jdbc/sql/WhereClauseTest.java | 6 +++---
92 files changed, 142 insertions(+), 138 deletions(-)
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/InputFeatureStream.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/InputFeatureStream.java
index fef7fdaf05..726e7c50a7 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/InputFeatureStream.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/InputFeatureStream.java
@@ -16,6 +16,11 @@
*/
package org.apache.sis.storage.shapefile;
+import org.apache.sis.storage.shapefile.internal.ShapefileDescriptor;
+import org.apache.sis.storage.shapefile.internal.SQLShapefileNotFoundException;
+import org.apache.sis.storage.shapefile.internal.SQLInvalidRecordNumberForDirectAccessException;
+import org.apache.sis.storage.shapefile.internal.ShapefileByteReader;
+import org.apache.sis.storage.shapefile.internal.SQLNoDirectAccessAvailableException;
import java.io.File;
import java.io.InputStream;
import java.sql.SQLFeatureNotSupportedException;
@@ -27,15 +32,14 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.sis.feature.DefaultFeatureType;
-import org.apache.sis.internal.shapefile.*;
-import org.apache.sis.internal.shapefile.jdbc.*;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.metadata.DBFDatabaseMetaData;
-import org.apache.sis.internal.shapefile.jdbc.resultset.*;
-import org.apache.sis.internal.shapefile.jdbc.sql.SQLIllegalParameterException;
-import org.apache.sis.internal.shapefile.jdbc.sql.SQLInvalidStatementException;
-import org.apache.sis.internal.shapefile.jdbc.sql.SQLUnsupportedParsingFeatureException;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.*;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.metadata.DBFDatabaseMetaData;
+import org.apache.sis.storage.shapefile.jdbc.resultset.*;
+import org.apache.sis.storage.shapefile.jdbc.sql.SQLIllegalParameterException;
+import org.apache.sis.storage.shapefile.jdbc.sql.SQLInvalidStatementException;
+import org.apache.sis.storage.shapefile.jdbc.sql.SQLUnsupportedParsingFeatureException;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.storage.DataStoreClosedException;
import org.opengis.feature.Feature;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapeFile.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapeFile.java
index f84df242c7..89b46c7d11 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapeFile.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapeFile.java
@@ -21,8 +21,8 @@ import java.util.List;
import java.util.Objects;
import org.apache.sis.feature.DefaultFeatureType;
-import org.apache.sis.internal.shapefile.ShapefileDescriptor;
-import org.apache.sis.internal.shapefile.jdbc.DBase3FieldDescriptor;
+import org.apache.sis.storage.shapefile.internal.ShapefileDescriptor;
+import org.apache.sis.storage.shapefile.jdbc.DBase3FieldDescriptor;
/**
* Provides a ShapeFile Reader.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/AutoChecker.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/AutoChecker.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/AutoChecker.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/AutoChecker.java
index 86eda9c2ba..e3f8e1eb4d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/AutoChecker.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/AutoChecker.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.lang.reflect.Constructor;
import java.text.MessageFormat;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLInvalidRecordNumberForDirectAccessException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLInvalidRecordNumberForDirectAccessException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLInvalidRecordNumberForDirectAccessException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLInvalidRecordNumberForDirectAccessException.java
index 5b76da6078..0ac1ca325d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLInvalidRecordNumberForDirectAccessException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLInvalidRecordNumberForDirectAccessException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.sql.SQLNonTransientException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLNoDirectAccessAvailableException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLNoDirectAccessAvailableException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLNoDirectAccessAvailableException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLNoDirectAccessAvailableException.java
index 7b663bb57d..623ee74a36 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLNoDirectAccessAvailableException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLNoDirectAccessAvailableException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.sql.SQLNonTransientException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLShapefileNotFoundException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLShapefileNotFoundException.java
similarity index 96%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLShapefileNotFoundException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLShapefileNotFoundException.java
index 25c5c31a4a..82d0e1fbd1 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/SQLShapefileNotFoundException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/SQLShapefileNotFoundException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.sql.SQLNonTransientException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
index e988a439d0..3c015aa0e9 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.io.*;
import java.nio.ByteOrder;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.feature.DefaultFeatureType;
-import org.apache.sis.internal.shapefile.jdbc.*;
+import org.apache.sis.storage.shapefile.jdbc.*;
import org.apache.sis.storage.shapefile.InvalidShapefileFormatException;
import org.apache.sis.storage.shapefile.ShapeTypeEnum;
import org.opengis.feature.Feature;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileByteReader_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileDescriptor.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileDescriptor.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileDescriptor.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileDescriptor.java
index 0e6e23429c..a2d49277a4 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/ShapefileDescriptor.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileDescriptor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
import java.nio.ByteOrder;
import java.nio.MappedByteBuffer;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/package-info.java
similarity index 94%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/package-info.java
index 90b5246d28..d65e603736 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/package-info.java
@@ -21,4 +21,4 @@
* @version 0.5
* @since 0.5
*/
-package org.apache.sis.internal.shapefile;
+package org.apache.sis.storage.shapefile.internal;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader.java
index 724ef03362..46883ff6cd 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.File;
import java.nio.charset.Charset;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractDbase3ByteReader_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC.java
index f820eab73f..8ee8d4dffa 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.File;
import java.sql.*;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.AutoChecker;
+import org.apache.sis.storage.shapefile.internal.AutoChecker;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/AbstractJDBC_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/CommonByteReader.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/CommonByteReader.java
index f3593da76e..30b2864c68 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/CommonByteReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.*;
import java.nio.MappedByteBuffer;
@@ -22,7 +22,7 @@ import java.nio.channels.FileChannel;
import java.util.Objects;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.AutoChecker;
+import org.apache.sis.storage.shapefile.internal.AutoChecker;
/**
* Common byte reader.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/CommonByteReader.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/CommonByteReader.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBFDriver.java
similarity index 95%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBFDriver.java
index 4337677058..0c32c455b9 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBFDriver.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.File;
import java.sql.Connection;
@@ -24,7 +24,7 @@ import java.util.Objects;
import java.util.Properties;
import java.util.logging.Logger;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
import org.apache.sis.internal.system.Modules;
@@ -91,7 +91,7 @@ public class DBFDriver extends AbstractJDBC implements Driver {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getFile()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getFile()
*/
@Override protected File getFile() {
return null;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor.java
index 3563b90912..e2a56ea092 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.nio.MappedByteBuffer;
-import org.apache.sis.internal.shapefile.AutoChecker;
+import org.apache.sis.storage.shapefile.internal.AutoChecker;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBase3FieldDescriptor_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBaseDataType.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBaseDataType.java
index 14b63bff36..b57fd9b523 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/DBaseDataType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/Dbase3ByteReader.java
similarity index 94%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/Dbase3ByteReader.java
index 1374c85271..b39ae1fb6d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/Dbase3ByteReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -22,8 +22,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.sis.internal.shapefile.jdbc.resultset.SQLIllegalColumnIndexException;
-import org.apache.sis.internal.shapefile.jdbc.resultset.SQLNoSuchFieldException;
+import org.apache.sis.storage.shapefile.jdbc.resultset.SQLIllegalColumnIndexException;
+import org.apache.sis.storage.shapefile.jdbc.resultset.SQLNoSuchFieldException;
import org.opengis.feature.Feature;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader.java
index 0151005168..219410b9ac 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.File;
import java.nio.BufferUnderflowException;
@@ -24,8 +24,8 @@ import java.nio.charset.UnsupportedCharsetException;
import java.util.*;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.resultset.SQLIllegalColumnIndexException;
-import org.apache.sis.internal.shapefile.jdbc.resultset.SQLNoSuchFieldException;
+import org.apache.sis.storage.shapefile.jdbc.resultset.SQLIllegalColumnIndexException;
+import org.apache.sis.storage.shapefile.jdbc.resultset.SQLNoSuchFieldException;
import org.opengis.feature.Feature;
@@ -255,7 +255,7 @@ public class MappedByteReader extends AbstractDbase3ByteReader implements AutoCl
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.Dbase3ByteReader#getColumnCount()
+ * @see org.apache.sis.storage.shapefile.jdbc.Dbase3ByteReader#getColumnCount()
*/
@Override
public int getColumnCount() {
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/MappedByteReader_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/MappedByteReader_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLConnectionClosedException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLConnectionClosedException.java
index 118f6d9a6d..a1cc02be6a 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLConnectionClosedException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLDbaseFileNotFoundException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLDbaseFileNotFoundException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLDbaseFileNotFoundException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLDbaseFileNotFoundException.java
index a76f50e3b5..dbd716ca7a 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLDbaseFileNotFoundException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLDbaseFileNotFoundException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.sql.SQLNonTransientException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java
index 14220fc6a7..e430b1b060 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.sql.SQLNonTransientException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection.java
index 4f1d44068e..340c387023 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.connection;
+package org.apache.sis.storage.shapefile.jdbc.connection;
import java.sql.*;
import java.util.Collections;
@@ -23,7 +23,7 @@ import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/AbstractConnection_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection.java
index 3319ce68a9..60a070cd79 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.connection;
+package org.apache.sis.storage.shapefile.jdbc.connection;
import java.io.File;
import java.io.IOException;
@@ -24,10 +24,10 @@ import java.util.*;
import java.util.logging.Level;
import java.util.stream.Collectors;
-import org.apache.sis.internal.shapefile.jdbc.*;
-import org.apache.sis.internal.shapefile.jdbc.metadata.DBFDatabaseMetaData;
-import org.apache.sis.internal.shapefile.jdbc.resultset.*;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.*;
+import org.apache.sis.storage.shapefile.jdbc.metadata.DBFDatabaseMetaData;
+import org.apache.sis.storage.shapefile.jdbc.resultset.*;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/DBFConnection_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/SQLClosingIOFailureException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/SQLClosingIOFailureException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/SQLClosingIOFailureException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/SQLClosingIOFailureException.java
index e20e58c967..6cc2a5cc1f 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/SQLClosingIOFailureException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/SQLClosingIOFailureException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.connection;
+package org.apache.sis.storage.shapefile.jdbc.connection;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/package-info.java
similarity index 93%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/package-info.java
index e10322c3ca..92eb2cbd92 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/connection/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/connection/package-info.java
@@ -16,4 +16,4 @@
*/
/** Connections */
-package org.apache.sis.internal.shapefile.jdbc.connection;
+package org.apache.sis.storage.shapefile.jdbc.connection;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
index 91d0f0dec7..3f0d41c760 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.metadata;
+package org.apache.sis.storage.shapefile.jdbc.metadata;
import java.sql.*;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
/**
* Unimplemented methods of DatabaseMetaData.
@@ -194,7 +194,7 @@ public abstract class AbstractDatabaseMetaData extends AbstractJDBC implements D
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#unwrap(java.lang.Class)
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#unwrap(java.lang.Class)
*/
@Override public <T> T unwrap(Class<T> iface) throws SQLFeatureNotSupportedException {
throw unsupportedOperation("unwrap", iface);
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
index 931ed87e35..7ca83a6eec 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.metadata;
+package org.apache.sis.storage.shapefile.jdbc.metadata;
import java.io.File;
import java.sql.*;
import java.util.Arrays;
import java.util.Objects;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.resultset.*;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.resultset.*;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* Database Metadata.
@@ -44,7 +44,7 @@ public class DBFDatabaseMetaData extends AbstractDatabaseMetaData {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#isWrapperFor(java.lang.Class)
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#isWrapperFor(java.lang.Class)
*/
@Override public boolean isWrapperFor(Class<?> iface) {
logStep("isWrapperFor", iface);
@@ -1292,7 +1292,7 @@ public class DBFDatabaseMetaData extends AbstractDatabaseMetaData {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getInterface()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getInterface()
*/
@Override protected Class<?> getInterface() {
return DatabaseMetaData.class;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData.java
index f3ae694fba..88d9ff7b6c 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.metadata;
+package org.apache.sis.storage.shapefile.jdbc.metadata;
import java.io.File;
import java.sql.ResultSetMetaData;
@@ -23,11 +23,11 @@ import java.sql.SQLFeatureNotSupportedException;
import java.util.Objects;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
-import org.apache.sis.internal.shapefile.jdbc.resultset.*;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.resultset.*;
/**
* ResultSet Metadata.
@@ -425,14 +425,14 @@ public class DBFResultSetMataData extends AbstractJDBC implements ResultSetMetaD
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getInterface()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getInterface()
*/
@Override protected Class<?> getInterface() {
return ResultSetMetaData.class;
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getFile()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getFile()
*/
@Override
protected File getFile() {
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/DBFResultSetMataData_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/package-info.java
similarity index 93%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/package-info.java
index 68e310daee..2e960b3b25 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/metadata/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/metadata/package-info.java
@@ -18,4 +18,4 @@
/**
* Metadata classes and dedicated forged ResultSets for JDBC DBase 3 driver.
*/
-package org.apache.sis.internal.shapefile.jdbc.metadata;
+package org.apache.sis.storage.shapefile.jdbc.metadata;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/package-info.java
similarity index 95%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/package-info.java
index 607f33586d..be3ed6724d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/package-info.java
@@ -22,4 +22,4 @@
* @version 0.5
* @since 0.5
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet.java
index d775f2b898..a604bf3b13 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.InputStream;
import java.io.Reader;
@@ -24,7 +24,7 @@ import java.sql.*;
import java.util.Calendar;
import java.util.Map;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
index 1e2496aec1..7166e9752e 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.math.BigDecimal;
import java.sql.Date;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
similarity index 92%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
index 9e211db7ff..4bfdb2ef45 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
index de9a111ede..353dcd275f 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.sql.DatabaseMetaData;
import java.sql.Types;
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.DBase3FieldDescriptor;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.DBase3FieldDescriptor;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* Special ResultSet listing columns contained in this DBase 3.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
similarity index 92%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
index 69301e2f2e..b3b580ab34 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
similarity index 96%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
index 6b0cb607de..b35749c7c1 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* Special ResultSet listing tables contained in this DBase 3 (a single table).
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
similarity index 95%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
index 60676c9ef5..1987f1ddf8 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* Special ResultSet listing tables types contained in this DBase 3 (only tables).
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
index 86d799b205..fae9958e9d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -29,11 +29,11 @@ import java.util.Map;
import java.util.function.Function;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.metadata.DBFResultSetMataData;
-import org.apache.sis.internal.shapefile.jdbc.sql.*;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.metadata.DBFResultSetMataData;
+import org.apache.sis.storage.shapefile.jdbc.sql.*;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* A ResultSet based on a record.
@@ -64,7 +64,7 @@ public class DBFRecordBasedResultSet extends DBFResultSet {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet#getBigDecimal(java.lang.String)
+ * @see org.apache.sis.storage.shapefile.jdbc.resultset.AbstractResultSet#getBigDecimal(java.lang.String)
* @throws SQLConnectionClosedException if the connection is closed.
* @throws SQLNoSuchFieldException if the field looked for doesn't exist.
* @throws SQLNotNumericException if the field value is not numeric.
@@ -249,7 +249,7 @@ public class DBFRecordBasedResultSet extends DBFResultSet {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet#getInt(java.lang.String)
+ * @see org.apache.sis.storage.shapefile.jdbc.resultset.AbstractResultSet#getInt(java.lang.String)
* @throws SQLConnectionClosedException if the connection is closed.
* @throws SQLNoSuchFieldException if the field looked for doesn't exist.
* @throws SQLNotNumericException if the field value is not numeric.
@@ -315,7 +315,7 @@ public class DBFRecordBasedResultSet extends DBFResultSet {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet#getObject(int)
+ * @see org.apache.sis.storage.shapefile.jdbc.resultset.AbstractResultSet#getObject(int)
*/
@Override
public Object getObject(int column) throws SQLConnectionClosedException, SQLIllegalColumnIndexException, SQLFeatureNotSupportedException, SQLNoSuchFieldException, SQLNotNumericException, SQLNotDateException {
@@ -391,7 +391,7 @@ public class DBFRecordBasedResultSet extends DBFResultSet {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.resultset.DBFResultSet#getObject(java.lang.String)
+ * @see org.apache.sis.storage.shapefile.jdbc.resultset.DBFResultSet#getObject(java.lang.String)
*/
@Override
public Object getObject(String columnLabel) throws SQLConnectionClosedException, SQLFeatureNotSupportedException, SQLNoSuchFieldException, SQLNotNumericException, SQLNotDateException {
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet.java
index 1e664a55ba..08ccbe38fb 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.io.InputStream;
@@ -27,9 +27,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
/**
* Common implemented features of all ResultSets : those based on a record, but also those returning results forged in memory.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/DBFResultSet_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
index b8efa6b790..2bd51d26f0 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLIllegalColumnIndexException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoResultException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoResultException.java
index 4756da3b3d..1c1ad1bd65 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoResultException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
index 337a8bbcd4..dc14f7aae2 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotDateException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotDateException.java
index 3baeefa228..a0ed4d3cf0 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotDateException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotNumericException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotNumericException.java
index 82afb4e3e3..8e41c48fa6 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/SQLNotNumericException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/package-info.java
similarity index 93%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/package-info.java
index af21cf71e5..a429a9bdf1 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/resultset/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/resultset/package-info.java
@@ -18,4 +18,4 @@
/**
* Result sets for SQL statements and DB Metadata querying.
*/
-package org.apache.sis.internal.shapefile.jdbc.resultset;
+package org.apache.sis.storage.shapefile.jdbc.resultset;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver.java
index f978ff3c36..e600f5cd2b 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import java.util.Objects;
import java.util.function.Function;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.AutoChecker;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.resultset.*;
+import org.apache.sis.storage.shapefile.internal.AutoChecker;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.resultset.*;
/**
* Base class for clause resolver.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ClauseResolver_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ConditionalClauseResolver.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ConditionalClauseResolver.java
index 526a805ca0..5f3c577634 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/ConditionalClauseResolver.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
/**
* Conditional Clause resolver : resolves a single part of an expression :
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/CrudeSQLParser.java
similarity index 93%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/CrudeSQLParser.java
index 6e9785e056..c466311ae5 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/CrudeSQLParser.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import java.io.File;
import java.util.Objects;
import java.util.logging.Level;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
/**
* Simple and temporary SQL parser.
@@ -121,14 +121,14 @@ public class CrudeSQLParser extends AbstractJDBC {
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getFile()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getFile()
*/
@Override protected File getFile() {
return this.rs.getFile();
}
/**
- * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getInterface()
+ * @see org.apache.sis.storage.shapefile.jdbc.AbstractJDBC#getInterface()
*/
@Override protected Class<?> getInterface() {
logStep("getInterface");
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/CrudeSQLParser.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/CrudeSQLParser.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLIllegalParameterException.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLIllegalParameterException.java
index 14e6dc6df3..ff2d9eb836 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLIllegalParameterException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLInvalidStatementException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLInvalidStatementException.java
index 8ec7679b8e..86bd557c8a 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLInvalidStatementException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
similarity index 97%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
index 19dc898630..f5ab5ae0a0 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import java.io.File;
import java.sql.SQLException;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/package-info.java
similarity index 94%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/package-info.java
index 45c3f80617..f238ac80b2 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/sql/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/sql/package-info.java
@@ -17,4 +17,4 @@
/**
* SQL Parser.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/AbstractStatement.java
similarity index 98%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/AbstractStatement.java
index ce757e6c5f..59af5fd859 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/AbstractStatement.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.statement;
+package org.apache.sis.storage.shapefile.jdbc.statement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
+import org.apache.sis.storage.shapefile.jdbc.AbstractJDBC;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement.java
similarity index 94%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement.java
index a7d408ea07..7ac11683aa 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.statement;
+package org.apache.sis.storage.shapefile.jdbc.statement;
import java.io.File;
import java.sql.*;
@@ -24,11 +24,11 @@ import java.util.Objects;
import java.util.logging.Level;
import java.util.stream.Collectors;
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFResultSet;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
-import org.apache.sis.internal.shapefile.jdbc.sql.SQLInvalidStatementException;
+import org.apache.sis.storage.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.resultset.DBFResultSet;
+import org.apache.sis.storage.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.apache.sis.storage.shapefile.jdbc.sql.SQLInvalidStatementException;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement_fr.properties
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/DBFStatement_fr.properties
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/package-info.java
similarity index 93%
rename from incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java
rename to incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/package-info.java
index e9c9245515..099dbed76d 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/jdbc/statement/package-info.java
@@ -16,4 +16,4 @@
*/
/** Statements */
-package org.apache.sis.internal.shapefile.jdbc.statement;
+package org.apache.sis.storage.shapefile.jdbc.statement;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
similarity index 94%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
index ee942eddab..2b428fe78b 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -37,7 +37,7 @@ import org.junit.Before;
*/
public abstract class AbstractTestBaseForInternalJDBC {
/** Logger. */
- protected Logger log = Logger.getLogger("org.apache.sis.internal.shapefile.jdbc");
+ protected Logger log = Logger.getLogger("org.apache.sis.storage.shapefile.jdbc");
/** The database file to use for testing purpose. */
protected File dbfFile;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFConnectionTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFConnectionTest.java
index 042761c8ca..19d0f50f76 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFConnectionTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.sql.*;
import java.util.Properties;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.storage.shapefile.jdbc.connection.DBFConnection;
import org.junit.*;
import static org.junit.Assert.*;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFResultSetTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFResultSetTest.java
index 90cb667c62..076753b8ea 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFResultSetTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -24,7 +24,7 @@ import java.sql.*;
import java.text.MessageFormat;
import java.util.ArrayList;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.apache.sis.storage.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
import org.junit.Test;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFStatementTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFStatementTest.java
index d1adbfebda..4b3cf8a1d7 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/DBFStatementTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc;
+package org.apache.sis.storage.shapefile.jdbc;
import java.sql.*;
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.storage.shapefile.jdbc.statement.DBFStatement;
import org.junit.*;
import static org.junit.Assert.*;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/readme.txt b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/readme.txt
similarity index 100%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/readme.txt
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/readme.txt
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/sql/WhereClauseTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
rename to incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/sql/WhereClauseTest.java
index 42ccbe999a..255b121a44 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/jdbc/sql/WhereClauseTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.shapefile.jdbc.sql;
+package org.apache.sis.storage.shapefile.jdbc.sql;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
import java.sql.*;
-import org.apache.sis.internal.shapefile.jdbc.AbstractTestBaseForInternalJDBC;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.apache.sis.storage.shapefile.jdbc.AbstractTestBaseForInternalJDBC;
+import org.apache.sis.storage.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
import org.junit.Test;
/**