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 4112c33010c8064114957c2be14197f0e65c1bca
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Aug 20 15:12:07 2023 +0200
Rename the internal packages of the `org.apache.sis.storage.xml` module.
Since they are not exported, the `internal` name convention is not needed
anymore.
---
.../main/org/apache/sis/console/FormattedOutputCommand.java | 2 +-
.../main/org/apache/sis/console/OutputFormat.java | 2 +-
.../test/org/apache/sis/console/MimeTypeCommandTest.java | 2 +-
.../main/META-INF/services/org.apache.sis.storage.DataStoreProvider | 2 +-
endorsed/src/org.apache.sis.storage.xml/main/module-info.java | 6 +++---
.../main/org/apache/sis/{internal => }/storage/gpx/Attributes.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Bounds.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Copyright.java | 2 +-
.../apache/sis/{internal => }/storage/gpx/Definitions.properties | 0
.../apache/sis/{internal => }/storage/gpx/Definitions_fr.properties | 0
.../main/org/apache/sis/{internal => }/storage/gpx/Description.java | 2 +-
.../apache/sis/{internal => }/storage/gpx/Designations.properties | 0
.../sis/{internal => }/storage/gpx/Designations_fr.properties | 0
.../main/org/apache/sis/{internal => }/storage/gpx/Email.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Link.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Metadata.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Person.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Reader.java | 4 ++--
.../main/org/apache/sis/{internal => }/storage/gpx/Store.java | 6 +++---
.../org/apache/sis/{internal => }/storage/gpx/StoreProvider.java | 4 ++--
.../main/org/apache/sis/{internal => }/storage/gpx/Tags.java | 2 +-
.../main/org/apache/sis/{internal => }/storage/gpx/Types.java | 6 +++---
.../main/org/apache/sis/{internal => }/storage/gpx/Updater.java | 6 +++---
.../org/apache/sis/{internal => }/storage/gpx/WritableStore.java | 4 ++--
.../main/org/apache/sis/{internal => }/storage/gpx/Writer.java | 4 ++--
.../org/apache/sis/{internal => }/storage/gpx/package-info.java | 2 +-
.../sis/{internal => }/storage/xml/stream/FormattedWriter.java | 2 +-
.../org/apache/sis/{internal => }/storage/xml/stream/InputType.java | 2 +-
.../sis/{internal => }/storage/xml/stream/NamespaceEraser.java | 2 +-
.../apache/sis/{internal => }/storage/xml/stream/OutputType.java | 2 +-
.../sis/{internal => }/storage/xml/stream/RewriteOnUpdate.java | 2 +-
.../apache/sis/{internal => }/storage/xml/stream/StaxDataStore.java | 2 +-
.../{internal => }/storage/xml/stream/StaxDataStoreProvider.java | 2 +-
.../apache/sis/{internal => }/storage/xml/stream/StaxStreamIO.java | 2 +-
.../sis/{internal => }/storage/xml/stream/StaxStreamReader.java | 2 +-
.../sis/{internal => }/storage/xml/stream/StaxStreamWriter.java | 2 +-
.../apache/sis/{internal => }/storage/xml/stream/package-info.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/1.0/metadata.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.0/route.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.0/track.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.0/waypoint.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.1/metadata.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.1/route.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.1/track.xml | 0
.../test/org/apache/sis/{internal => }/storage/gpx/1.1/waypoint.xml | 0
.../org/apache/sis/{internal => }/storage/gpx/MetadataTest.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/ReaderTest.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/TestData.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/TypesTest.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/UpdaterTest.java | 2 +-
.../test/org/apache/sis/{internal => }/storage/gpx/WriterTest.java | 2 +-
.../main/org/apache/sis/internal/storage/xml/package-info.java | 4 ++--
.../src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java | 2 +-
53 files changed, 54 insertions(+), 54 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
index 17527daa4f..3b80a74dd2 100644
---
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
+++
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
@@ -268,7 +268,7 @@ abstract class FormattedOutputCommand extends CommandRunner
{
* Note: after such generalization is done, revert the
xml-store dependency
* scope in pom.xml from "compile" to "runtime".
*/
- final org.apache.sis.internal.storage.gpx.WritableStore fs
= (org.apache.sis.internal.storage.gpx.WritableStore) store;
+ final org.apache.sis.storage.gpx.WritableStore fs =
(org.apache.sis.storage.gpx.WritableStore) store;
if (version != null) {
fs.setVersion(version);
}
diff --git
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OutputFormat.java
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OutputFormat.java
index 533889da0d..5148e87f73 100644
---
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OutputFormat.java
+++
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OutputFormat.java
@@ -49,7 +49,7 @@ enum OutputFormat {
/**
* XML format used for GPS data exchange.
*/
- GPX(org.apache.sis.internal.storage.gpx.StoreProvider.class);
+ GPX(org.apache.sis.storage.gpx.StoreProvider.class);
/**
* The provider class for this format.
diff --git
a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MimeTypeCommandTest.java
b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MimeTypeCommandTest.java
index ed325f5ebb..bee4e9d58c 100644
---
a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MimeTypeCommandTest.java
+++
b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MimeTypeCommandTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.console;
import java.net.URL;
-import org.apache.sis.internal.storage.gpx.TestData;
+import org.apache.sis.storage.gpx.TestData;
import org.apache.sis.metadata.iso.extent.DefaultExtentTest;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
b/endorsed/src/org.apache.sis.storage.xml/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
index a3d4974589..90299bd752 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
+++
b/endorsed/src/org.apache.sis.storage.xml/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
@@ -1,4 +1,4 @@
# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
# The content of this file is automatically derived from module-info.class
file.
# Should be used only if the JAR file was on class-path rather than
module-path.
-org.apache.sis.internal.storage.gpx.StoreProvider
+org.apache.sis.storage.gpx.StoreProvider
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/module-info.java
b/endorsed/src/org.apache.sis.storage.xml/main/module-info.java
index 056894e1d9..2156790929 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/module-info.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/module-info.java
@@ -28,11 +28,11 @@ module org.apache.sis.storage.xml {
requires transitive org.apache.sis.storage;
provides org.apache.sis.storage.DataStoreProvider
- with org.apache.sis.internal.storage.gpx.StoreProvider;
+ with org.apache.sis.storage.gpx.StoreProvider;
exports org.apache.sis.storage.gps;
- exports org.apache.sis.internal.storage.gpx to
+ exports org.apache.sis.storage.gpx to
org.apache.sis.console,
org.apache.sis.gui; // In the "optional"
sub-project.
@@ -40,5 +40,5 @@ module org.apache.sis.storage.xml {
* Allow JAXB to use reflection for marshalling and
* unmarshalling Apache SIS objects in XML documents.
*/
- opens org.apache.sis.internal.storage.gpx to jakarta.xml.bind;
+ opens org.apache.sis.storage.gpx to jakarta.xml.bind;
}
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Attributes.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Attributes.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java
index 6c1cb44968..a02319e1d4 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Attributes.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import org.apache.sis.util.Static;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Bounds.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Bounds.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
index 1835d10576..49b8b90889 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Bounds.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import jakarta.xml.bind.annotation.XmlAttribute;
import org.opengis.metadata.extent.GeographicBoundingBox;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Copyright.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Copyright.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
index 1d6ee86bdd..da402f53ea 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Copyright.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.net.URI;
import java.util.List;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Definitions.properties
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Definitions.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Definitions.properties
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Definitions.properties
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Definitions_fr.properties
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Definitions_fr.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Definitions_fr.properties
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Definitions_fr.properties
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Description.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Description.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Description.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Description.java
index 7f0440c352..35c60416cc 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Description.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Description.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Locale;
import java.util.ResourceBundle;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Designations.properties
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Designations.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Designations.properties
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Designations.properties
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Designations_fr.properties
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Designations_fr.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Designations_fr.properties
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Designations_fr.properties
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Email.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Email.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Email.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Email.java
index 7f7a14c68a..ade345cd3a 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Email.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Email.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Link.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Link.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Link.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Link.java
index aafdda9150..3f1f502f47 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Link.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Link.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.net.URI;
import java.net.URISyntaxException;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Metadata.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Metadata.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
index bb9a265720..6d3a51eefc 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Metadata.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Person.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Person.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Person.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Person.java
index de483bfbf7..595fb98bfc 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Person.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Person.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Collection;
import java.util.Collections;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Reader.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Reader.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Reader.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Reader.java
index 7f34a90c59..370478d84b 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Reader.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Reader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.List;
import java.util.ArrayList;
@@ -31,7 +31,7 @@ import org.apache.sis.storage.gps.Fix;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.internal.feature.AttributeConvention;
-import org.apache.sis.internal.storage.xml.stream.StaxStreamReader;
+import org.apache.sis.storage.xml.stream.StaxStreamReader;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.Version;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Store.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Store.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Store.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Store.java
index b883af5ed1..821a55b5c0 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Store.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Store.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Optional;
import java.util.stream.Stream;
@@ -30,7 +30,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.internal.storage.StoreUtilities;
-import org.apache.sis.internal.storage.xml.stream.StaxDataStore;
+import org.apache.sis.storage.xml.stream.StaxDataStore;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Version;
import org.apache.sis.setup.OptionKey;
@@ -107,7 +107,7 @@ public class Store extends StaxDataStore implements
FeatureSet {
* The format will be part of the metadata returned by {@link
#getMetadata()}.
*
* @see StoreProvider#getFormat()
- * @see org.apache.sis.internal.storage.gpx.Metadata#getResourceFormats()
+ * @see org.apache.sis.storage.gpx.Metadata#getResourceFormats()
*/
final Format getFormat() {
assert Thread.holdsLock(this);
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/StoreProvider.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/StoreProvider.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/StoreProvider.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/StoreProvider.java
index 1fa3ba3225..6cdfa584d8 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/StoreProvider.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/StoreProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Map;
import java.util.logging.Logger;
@@ -26,7 +26,7 @@ import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.internal.storage.Capability;
import org.apache.sis.internal.storage.StoreMetadata;
-import org.apache.sis.internal.storage.xml.stream.StaxDataStoreProvider;
+import org.apache.sis.storage.xml.stream.StaxDataStoreProvider;
import org.apache.sis.measure.Range;
import org.apache.sis.util.Version;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Tags.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Tags.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java
index becf5121d1..3bcd5b5958 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Tags.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import org.apache.sis.util.Static;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Types.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Types.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java
index eddfca7f5f..395d8c9aea 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Types.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Collection;
import java.util.Locale;
@@ -305,8 +305,8 @@ final class Types {
final GenericName name = p.getName();
if (!AttributeConvention.contains(name)) {
final InternationalString[] resources =
previous.computeIfAbsent(name.toString(), (key) -> new InternationalString[] {
- new
Description("org.apache.sis.internal.storage.gpx.Designations", key),
- new
Description("org.apache.sis.internal.storage.gpx.Definitions", key)
+ new Description("org.apache.sis.storage.gpx.Designations",
key),
+ new Description("org.apache.sis.storage.gpx.Definitions",
key)
});
p.setDefinition (resources[1]);
p.setDesignation(resources[0]);
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Updater.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Updater.java
similarity index 94%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Updater.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Updater.java
index ef210b205f..48c31ba1e9 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Updater.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Updater.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.stream.Stream;
-import org.apache.sis.internal.storage.xml.stream.RewriteOnUpdate;
-import org.apache.sis.internal.storage.xml.stream.StaxStreamWriter;
+import org.apache.sis.storage.xml.stream.RewriteOnUpdate;
+import org.apache.sis.storage.xml.stream.StaxStreamWriter;
import org.apache.sis.storage.DataStoreException;
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/WritableStore.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/WritableStore.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
index ab9b9103bb..1554874e4d 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/WritableStore.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Iterator;
import java.util.function.Predicate;
@@ -158,7 +158,7 @@ public final class WritableStore extends Store implements
WritableFeatureSet {
/*
* Get the writer if no read or other write operation is in
progress, then write the data.
*/
- try (Writer writer = new Writer(this,
org.apache.sis.internal.storage.gpx.Metadata.castOrCopy(metadata, locale),
null)) {
+ try (Writer writer = new Writer(this,
org.apache.sis.storage.gpx.Metadata.castOrCopy(metadata, locale), null)) {
writer.writeStartDocument();
if (features != null) {
features.forEachOrdered(writer);
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Writer.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Writer.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Writer.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Writer.java
index 15af84aeba..bf91e1f526 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/Writer.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Writer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.io.IOException;
import java.io.OutputStream;
@@ -24,7 +24,7 @@ import jakarta.xml.bind.JAXBException;
import org.apache.sis.storage.gps.Fix;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.IllegalFeatureTypeException;
-import org.apache.sis.internal.storage.xml.stream.StaxStreamWriter;
+import org.apache.sis.storage.xml.stream.StaxStreamWriter;
import org.apache.sis.internal.feature.AttributeConvention;
import org.apache.sis.internal.feature.GeometryWrapper;
import org.apache.sis.internal.feature.Geometries;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/package-info.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/package-info.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/package-info.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/package-info.java
index 7bcef0fab7..74c9beaf7b 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/gpx/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/package-info.java
@@ -68,7 +68,7 @@
})
@XmlAccessorType(XmlAccessType.NONE)
@XmlJavaTypeAdapter(UniversalTimeAdapter.class)
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlNsForm;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/FormattedWriter.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/FormattedWriter.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/FormattedWriter.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/FormattedWriter.java
index 35585bd14e..37c02ba4f4 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/FormattedWriter.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/FormattedWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Arrays;
import javax.xml.stream.XMLStreamWriter;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/InputType.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/InputType.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/InputType.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/InputType.java
index 309e14f942..acfd39b127 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/InputType.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/InputType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.io.Reader;
import java.io.InputStream;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/NamespaceEraser.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/NamespaceEraser.java
index bd56e81b5b..d21d57d590 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/NamespaceEraser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import javax.xml.XMLConstants;
import javax.xml.stream.XMLStreamWriter;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/OutputType.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/OutputType.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/OutputType.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/OutputType.java
index ae74ca88dd..677c969d12 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/OutputType.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/OutputType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.io.Writer;
import java.io.StringReader;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/RewriteOnUpdate.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/RewriteOnUpdate.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
index 5c5b65dee8..bd27210442 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/RewriteOnUpdate.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Locale;
import java.util.Iterator;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
index 40f230b839..42dd997880 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Locale;
import java.util.TimeZone;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStoreProvider.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStoreProvider.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
index 70a0d2aa02..4a06a2a358 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxDataStoreProvider.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Map;
import jakarta.xml.bind.JAXBContext;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamIO.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamIO.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamIO.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamIO.java
index 179eb619c7..8412e375b8 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamIO.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamIO.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.io.Closeable;
import java.io.IOException;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
index bf5e11bc5d..ae13411bf4 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Date;
import java.util.Map;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamWriter.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamWriter.java
index 41973e4f64..d2e812478b 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
import java.util.Map;
import java.util.Date;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/package-info.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/package-info.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/package-info.java
rename to
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/package-info.java
index 6b2260d287..d1f7a697ff 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/internal/storage/xml/stream/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/package-info.java
@@ -27,4 +27,4 @@
* @version 1.4
* @since 0.8
*/
-package org.apache.sis.internal.storage.xml.stream;
+package org.apache.sis.storage.xml.stream;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/metadata.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/metadata.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/metadata.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/metadata.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/route.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/route.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/route.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/route.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/track.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/track.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/track.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/track.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/waypoint.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/waypoint.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.0/waypoint.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.0/waypoint.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/metadata.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/metadata.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/metadata.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/metadata.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/route.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/route.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/route.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/route.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/track.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/track.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/track.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/track.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/waypoint.xml
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/waypoint.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/1.1/waypoint.xml
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/1.1/waypoint.xml
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/MetadataTest.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/MetadataTest.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
index f5042c1e3c..45119ace74 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/MetadataTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.List;
import java.net.URI;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/ReaderTest.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/ReaderTest.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
index 55e4ab1b39..3d2bd90f90 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/ReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.Collection;
import java.util.Iterator;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TestData.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TestData.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TestData.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TestData.java
index e6e50e1ce1..260c4d5221 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TestData.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TestData.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.net.URL;
import java.io.InputStream;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TypesTest.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TypesTest.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
index 2814257cb6..4c8582225b 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/TypesTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import org.opengis.util.GenericName;
import org.opengis.util.FactoryException;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/UpdaterTest.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/UpdaterTest.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
index 330aee153e..a997fba841 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/UpdaterTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.List;
import java.io.IOException;
diff --git
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/WriterTest.java
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/WriterTest.java
rename to
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
index 5feaf68df5..a22cdd150d 100644
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/internal/storage/gpx/WriterTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.gpx;
+package org.apache.sis.storage.gpx;
import java.util.List;
import java.time.Instant;
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
index b01a677d4f..e51734cf99 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
@@ -22,8 +22,8 @@
*
* <p>This base package is designed for use with JAXB, which allows this
package to be very small since most of the
* XML (un)marshalling rules are specified in external classes designed for
use with JAXB. However, some classes can
- * also be used in other contexts. In particular, the {@code
org.apache.sis.internal.storage.xml.stream} package in
- * the {@code org.apache.sis.storage.xml} module extends this package with
classes designed for use with StAX cursor API.</p>
+ * also be used in other contexts. In particular, the {@code
org.apache.sis.storage.xml.stream} package in the
+ * {@code org.apache.sis.storage.xml} module extends this package with classes
designed for use with StAX cursor API.</p>
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.4
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
index 2c040b574f..697cc905cd 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
@@ -240,7 +240,7 @@ public class DataViewer extends Application {
*/
case
org.apache.sis.internal.storage.wkt.StoreProvider.NAME: continue;
case
org.apache.sis.internal.storage.xml.StoreProvider.NAME: write = false; break;
- case
org.apache.sis.internal.storage.gpx.StoreProvider.NAME: read = false; break;
+ case org.apache.sis.storage.gpx.StoreProvider.NAME: read
= false; break;
}
String label = null;
for (final String suffix : md.fileSuffixes()) {
