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 afab6a5d5ce4d656b837e7e86f46a563dc29ca26
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Aug 20 13:48:38 2023 +0200
Rename the internal packages of the `org.apache.sis.profile.france` module.
Since they are not exported, the `internal` name convention is not needed
anymore.
---
.../META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration | 2 +-
endorsed/src/org.apache.sis.profile.france/main/module-info.java | 4 ++--
.../main/org/apache/sis/profile/france/FrenchProfile.java | 2 +-
.../apache/sis/{internal/profile => xml/bind}/fra/Constraints.java | 2 +-
.../sis/{internal/profile => xml/bind}/fra/DataIdentification.java | 2 +-
.../sis/{internal/profile => xml/bind}/fra/DirectReferenceSystem.java | 2 +-
.../{internal/profile => xml/bind}/fra/IndirectReferenceSystem.java | 2 +-
.../sis/{internal/profile => xml/bind}/fra/LegalConstraints.java | 2 +-
.../apache/sis/{internal/profile => xml/bind}/fra/ProfileTypes.java | 2 +-
.../apache/sis/{internal/profile => xml/bind}/fra/RenameOnImport.lst | 0
.../sis/{internal/profile => xml/bind}/fra/SecurityConstraints.java | 2 +-
.../apache/sis/{internal/profile => xml/bind}/fra/package-info.java | 2 +-
.../test/org/apache/sis/profile/france/FrenchProfileTest.java | 4 ++--
.../{internal/profile => xml/bind}/fra/DataIdentificationTest.java | 2 +-
.../sis/{internal/profile => xml/bind}/fra/DirectReferenceSystem.xml | 0
.../{internal/profile => xml/bind}/fra/DirectReferenceSystemTest.java | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration
b/endorsed/src/org.apache.sis.profile.france/main/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration
index 0e85e85658..d0e71ac244 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration
+++
b/endorsed/src/org.apache.sis.profile.france/main/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration
@@ -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.profile.fra.ProfileTypes
+org.apache.sis.xml.bind.fra.ProfileTypes
diff --git a/endorsed/src/org.apache.sis.profile.france/main/module-info.java
b/endorsed/src/org.apache.sis.profile.france/main/module-info.java
index f1183935f6..2adc190d52 100644
--- a/endorsed/src/org.apache.sis.profile.france/main/module-info.java
+++ b/endorsed/src/org.apache.sis.profile.france/main/module-info.java
@@ -28,9 +28,9 @@ module org.apache.sis.profile.france {
requires transitive org.apache.sis.metadata;
provides org.apache.sis.internal.jaxb.TypeRegistration
- with org.apache.sis.internal.profile.fra.ProfileTypes;
+ with org.apache.sis.xml.bind.fra.ProfileTypes;
exports org.apache.sis.profile.france;
- opens org.apache.sis.internal.profile.fra to jakarta.xml.bind;
+ opens org.apache.sis.xml.bind.fra to jakarta.xml.bind;
}
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java
index 824f22daad..85f49b02bd 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java
@@ -17,7 +17,7 @@
package org.apache.sis.profile.france;
import org.opengis.referencing.ReferenceSystem;
-import org.apache.sis.internal.profile.fra.*;
+import org.apache.sis.xml.bind.fra.*;
import org.apache.sis.util.Static;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/Constraints.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/Constraints.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/Constraints.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/Constraints.java
index ec440c0baa..e0f09abc6c 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/Constraints.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/Constraints.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.util.Collection;
import jakarta.xml.bind.annotation.XmlType;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DataIdentification.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DataIdentification.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DataIdentification.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DataIdentification.java
index e15f5e8684..eea7b5b11b 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DataIdentification.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DataIdentification.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.util.Collection;
import jakarta.xml.bind.annotation.XmlType;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DirectReferenceSystem.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DirectReferenceSystem.java
index a5e14f9096..64bba59072 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/DirectReferenceSystem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/IndirectReferenceSystem.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/IndirectReferenceSystem.java
index c234ece285..841c3ffc21 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/IndirectReferenceSystem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/LegalConstraints.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/LegalConstraints.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/LegalConstraints.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/LegalConstraints.java
index 83c0021a50..1ccc0957e4 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/LegalConstraints.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/LegalConstraints.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.util.Collection;
import jakarta.xml.bind.annotation.XmlType;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/ProfileTypes.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/ProfileTypes.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/ProfileTypes.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/ProfileTypes.java
index 9abe908f16..0761ba0db5 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/ProfileTypes.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/ProfileTypes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.io.InputStream;
import java.util.Collection;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/RenameOnImport.lst
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/RenameOnImport.lst
similarity index 100%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/RenameOnImport.lst
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/RenameOnImport.lst
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/SecurityConstraints.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/SecurityConstraints.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/SecurityConstraints.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/SecurityConstraints.java
index 66ec5a3000..097e89c9e1 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/SecurityConstraints.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/SecurityConstraints.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.util.Collection;
import jakarta.xml.bind.annotation.XmlType;
diff --git
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/package-info.java
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/package-info.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/package-info.java
rename to
endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/package-info.java
index fc2a45a0a9..240804ed13 100644
---
a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/internal/profile/fra/package-info.java
+++
b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/xml/bind/fra/package-info.java
@@ -35,7 +35,7 @@
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(CI_Citation.class)
})
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlNsForm;
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
index 43d09d1958..ce19f9b9b1 100644
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
@@ -24,8 +24,8 @@ import
org.apache.sis.metadata.iso.constraint.DefaultConstraints;
import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import org.apache.sis.metadata.iso.constraint.DefaultSecurityConstraints;
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
-import org.apache.sis.internal.profile.fra.IndirectReferenceSystem;
-import org.apache.sis.internal.profile.fra.DirectReferenceSystem;
+import org.apache.sis.xml.bind.fra.IndirectReferenceSystem;
+import org.apache.sis.xml.bind.fra.DirectReferenceSystem;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.test.TestCase;
import org.junit.Test;
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
rename to
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
index 2ae6d2fc8f..1d24c57e25 100644
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import jakarta.xml.bind.JAXBException;
import org.apache.sis.test.xml.TestCase;
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystem.xml
similarity index 100%
rename from
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
rename to
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystem.xml
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
rename to
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
index 2f4065c3a7..882d6c883b 100644
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.profile.fra;
+package org.apache.sis.xml.bind.fra;
import java.util.Set;
import java.util.Collection;
