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 265b2c2c0165db9b72031f6ec586962bc818c5a1 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Aug 22 11:01:23 2023 +0200 Rename the `org.apache.sis.internal.jaxb.referencing` package. --- .../main/org/apache/sis/internal/jaxb/Context.java | 2 +- .../main/org/apache/sis/metadata/iso/citation/Citations.java | 2 +- .../services/org.apache.sis.internal.jaxb.AdapterReplacement | 2 +- endorsed/src/org.apache.sis.referencing/main/module-info.java | 4 ++-- .../main/org/apache/sis/parameter/AbstractParameterDescriptor.java | 2 +- .../main/org/apache/sis/parameter/DefaultParameterDescriptor.java | 2 +- .../org/apache/sis/parameter/DefaultParameterDescriptorGroup.java | 2 +- .../main/org/apache/sis/parameter/DefaultParameterValueGroup.java | 2 +- .../main/org/apache/sis/parameter/package-info.java | 2 +- .../main/org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java | 6 +++--- .../main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/SC_GeographicCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/package-info.java | 2 +- .../main/org/apache/sis/referencing/cs/package-info.java | 2 +- .../main/org/apache/sis/referencing/datum/DefaultEllipsoid.java | 2 +- .../main/org/apache/sis/referencing/datum/package-info.java | 2 +- .../apache/sis/referencing/operation/AbstractSingleOperation.java | 4 ++-- .../apache/sis/referencing/operation/DefaultOperationMethod.java | 4 ++-- .../main/org/apache/sis/referencing/operation/package-info.java | 2 +- .../main/org/apache/sis/referencing/package-info.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CC_Conversion.java | 2 +- .../jaxb => xml/bind}/referencing/CC_CoordinateOperation.java | 2 +- .../jaxb => xml/bind}/referencing/CC_GeneralOperationParameter.java | 2 +- .../jaxb => xml/bind}/referencing/CC_GeneralParameterValue.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CC_OperationMethod.java | 2 +- .../jaxb => xml/bind}/referencing/CC_OperationParameter.java | 2 +- .../jaxb => xml/bind}/referencing/CC_OperationParameterGroup.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CD_Ellipsoid.java | 2 +- .../jaxb => xml/bind}/referencing/CD_EngineeringDatum.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CD_GeodeticDatum.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CD_ImageDatum.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CD_ParametricDatum.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CD_PixelInCell.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CD_PrimeMeridian.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CD_TemporalDatum.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CD_VerticalDatum.java | 2 +- .../jaxb => xml/bind}/referencing/CD_VerticalDatumType.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_AffineCS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_AxisDirection.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_CartesianCS.java | 2 +- .../jaxb => xml/bind}/referencing/CS_CoordinateSystem.java | 2 +- .../jaxb => xml/bind}/referencing/CS_CoordinateSystemAxis.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_CylindricalCS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_EllipsoidalCS.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_LinearCS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_ParametricCS.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_PolarCS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_RangeMeaning.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_SphericalCS.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_TimeCS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/CS_UserDefinedCS.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/CS_VerticalCS.java | 2 +- .../apache/sis/{internal/jaxb => xml/bind}/referencing/Code.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/RS_Identifier.java | 2 +- .../apache/sis/{internal/jaxb => xml/bind}/referencing/SC_CRS.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/SC_DerivedCRSType.java | 2 +- .../{internal/jaxb => xml/bind}/referencing/SC_GeographicCRS.txt | 0 .../sis/{internal/jaxb => xml/bind}/referencing/SC_SingleCRS.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/SC_VerticalCRS.java | 2 +- .../jaxb => xml/bind}/referencing/SecondDefiningParameter.java | 2 +- .../sis/{internal/jaxb => xml/bind}/referencing/package-info.java | 2 +- .../org/apache/sis/referencing/AbstractIdentifiedObjectTest.java | 4 ++-- .../test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java | 2 +- .../sis/referencing/operation/SingleOperationMarshallingTest.java | 2 +- .../bind}/referencing/CC_GeneralOperationParameterTest.java | 2 +- .../bind}/referencing/CC_OperationParameterGroupTest.java | 4 ++-- .../sis/{internal/jaxb => xml/bind}/referencing/CodeTest.java | 2 +- .../jaxb => xml/bind}/referencing/SecondDefiningParameterTest.java | 2 +- 71 files changed, 77 insertions(+), 77 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/internal/jaxb/Context.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/internal/jaxb/Context.java index 17ce6488c0..7f56adcba7 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/internal/jaxb/Context.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/internal/jaxb/Context.java @@ -473,7 +473,7 @@ public final class Context extends MarshalContext { * <p>For performance reasons, this {@code wrapper} information is not provided by default. * To get this information, the {@code PropertyType} implementation needs to define the * {@code beforeUnmarshal(…)} method. For an implementation example, see - * {@link org.apache.sis.internal.jaxb.referencing.CC_OperationParameter}.</p> + * {@link org.apache.sis.xml.bind.referencing.CC_OperationParameter}.</p> * * @param context the current context, or {@code null} if none. * @param wrapper the {@code <gml:*PropertyType>} which is wrapping the {@code <gml:*Type>} object to (un)marshal, diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java index 5d5226c247..27fb9a1aa4 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java @@ -128,7 +128,7 @@ public final class Citations extends Static { * } * * @see #fromName(String) - * @see org.apache.sis.internal.jaxb.referencing.Code#getIdentifier() + * @see org.apache.sis.xml.bind.referencing.Code#getIdentifier() * @see <a href="http://issues.apache.org/jira/browse/SIS-200">SIS-200</a> */ static final CitationConstant IOGP = new CitationConstant(Constants.IOGP); diff --git a/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement b/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement index 9482d00f1e..b3dc67928d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement +++ b/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement @@ -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.jaxb.referencing.SC_VerticalCRS +org.apache.sis.xml.bind.referencing.SC_VerticalCRS diff --git a/endorsed/src/org.apache.sis.referencing/main/module-info.java b/endorsed/src/org.apache.sis.referencing/main/module-info.java index 949a541635..25e314be4e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/module-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/module-info.java @@ -148,7 +148,7 @@ module org.apache.sis.referencing { with org.apache.sis.internal.referencing.ReferencingTypes; provides org.apache.sis.internal.jaxb.AdapterReplacement - with org.apache.sis.internal.jaxb.referencing.SC_VerticalCRS; + with org.apache.sis.xml.bind.referencing.SC_VerticalCRS; provides org.apache.sis.internal.metadata.ReferencingServices with org.apache.sis.internal.referencing.ServicesForMetadata; @@ -197,7 +197,7 @@ module org.apache.sis.referencing { org.apache.sis.storage.earthobservation, org.apache.sis.profile.japan; - exports org.apache.sis.internal.jaxb.referencing to + exports org.apache.sis.xml.bind.referencing to org.glassfish.jaxb.runtime, // For access to beforeUnmarshal(…). org.glassfish.jaxb.core, // For access to various classes. jakarta.xml.bind; // Seems ignored. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java index 36b7eb184c..2b0cacd65d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java @@ -34,7 +34,7 @@ import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Debug; import static org.apache.sis.util.Utilities.deepEquals; -import static org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE; +import static org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java index 2a11e99fe0..59edfe300c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java @@ -38,7 +38,7 @@ import org.apache.sis.internal.util.CollectionsExt; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.internal.jaxb.gco.PropertyType; import org.apache.sis.internal.jaxb.metadata.replace.QualityParameter; -import org.apache.sis.internal.jaxb.referencing.CC_OperationParameter; +import org.apache.sis.xml.bind.referencing.CC_OperationParameter; import org.apache.sis.referencing.IdentifiedObjects; import static org.apache.sis.util.ArgumentChecks.ensureNonNull; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java index 3c9d952218..4ab713c85a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java @@ -30,7 +30,7 @@ import org.opengis.parameter.ParameterDescriptorGroup; import org.opengis.parameter.GeneralParameterDescriptor; import org.opengis.parameter.ParameterNotFoundException; import org.opengis.parameter.InvalidParameterNameException; -import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroup; +import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroup; import org.apache.sis.internal.metadata.ImplementationHelper; import org.apache.sis.internal.referencing.Resources; import org.apache.sis.referencing.IdentifiedObjects; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java index fa56727b9c..471b855ede 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java @@ -585,7 +585,7 @@ scan: for (final GeneralParameterValue param : actual.values()) { * implementation, because the property type is an array (it would not work with a list). * * <p><b>Maintenance note:</b> the {@code "setValues"} method name is also hard-coded in - * {@link org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameter} for logging purpose.</p> + * {@link org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter} for logging purpose.</p> */ private void setValues(final GeneralParameterValue[] parameters) { ParameterValueList addTo = values; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/package-info.java index 2390ffd38c..f3525ce43e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/package-info.java @@ -108,5 +108,5 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -import org.apache.sis.internal.jaxb.referencing.*; +import org.apache.sis.xml.bind.referencing.*; import org.apache.sis.xml.Namespaces; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java index fcbc086b55..346e2b2d43 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java @@ -44,7 +44,7 @@ import org.opengis.referencing.AuthorityFactory; import org.opengis.referencing.IdentifiedObject; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.internal.jaxb.UseLegacyMetadata; -import org.apache.sis.internal.jaxb.referencing.Code; +import org.apache.sis.xml.bind.referencing.Code; import org.apache.sis.internal.util.Strings; import org.apache.sis.internal.util.UnmodifiableArrayList; import org.apache.sis.internal.metadata.NameToIdentifier; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index 025438fa99..7c3db0ea31 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java @@ -35,7 +35,7 @@ import org.opengis.referencing.operation.MathTransformFactory; import org.opengis.geometry.MismatchedDimensionException; import org.apache.sis.referencing.GeodeticException; import org.apache.sis.referencing.operation.DefaultConversion; -import org.apache.sis.internal.jaxb.referencing.CC_Conversion; +import org.apache.sis.xml.bind.referencing.CC_Conversion; import org.apache.sis.internal.referencing.ReferencingFactoryContainer; import org.apache.sis.internal.metadata.ImplementationHelper; import org.apache.sis.internal.metadata.Identifiers; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java index c941cd280f..e793d77e56 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java @@ -46,7 +46,7 @@ import org.apache.sis.internal.referencing.Resources; import org.apache.sis.internal.referencing.WKTUtilities; import org.apache.sis.internal.referencing.ReferencingUtilities; import org.apache.sis.internal.util.UnmodifiableArrayList; -import org.apache.sis.internal.jaxb.referencing.SC_CRS; +import org.apache.sis.xml.bind.referencing.SC_CRS; import org.apache.sis.util.collection.CheckedContainer; import org.apache.sis.util.collection.Containers; import org.apache.sis.util.resources.Errors; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java index 5f80df6601..b6b1f9a4a0 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java @@ -47,9 +47,9 @@ import org.apache.sis.referencing.AbstractIdentifiedObject; import org.apache.sis.referencing.operation.DefaultConversion; import org.apache.sis.referencing.cs.AxesConvention; import org.apache.sis.referencing.cs.CoordinateSystems; -import org.apache.sis.internal.jaxb.referencing.SC_SingleCRS; -import org.apache.sis.internal.jaxb.referencing.SC_DerivedCRSType; -import org.apache.sis.internal.jaxb.referencing.CS_CoordinateSystem; +import org.apache.sis.xml.bind.referencing.SC_SingleCRS; +import org.apache.sis.xml.bind.referencing.SC_DerivedCRSType; +import org.apache.sis.xml.bind.referencing.CS_CoordinateSystem; import org.apache.sis.internal.referencing.ReferencingUtilities; import org.apache.sis.internal.referencing.WKTUtilities; import org.apache.sis.internal.referencing.WKTKeywords; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java index f253683669..5abf89ac9c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java @@ -28,7 +28,7 @@ import org.apache.sis.referencing.cs.*; import org.apache.sis.referencing.AbstractReferenceSystem; import org.apache.sis.internal.metadata.ImplementationHelper; import org.apache.sis.internal.referencing.WKTKeywords; -import org.apache.sis.internal.jaxb.referencing.CS_CoordinateSystem; +import org.apache.sis.xml.bind.referencing.CS_CoordinateSystem; import org.apache.sis.io.wkt.Formatter; import static org.apache.sis.util.ArgumentChecks.ensureNonNull; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SC_GeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SC_GeographicCRS.java index 93e5669387..3fbe9b3f65 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SC_GeographicCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SC_GeographicCRS.java @@ -25,7 +25,7 @@ import org.apache.sis.internal.jaxb.gco.PropertyType; * JAXB adapter for {@link GeographicCRS}, in order to integrate the value in an element * complying with OGC/ISO standard. * - * <p><b>Note:</b> JAXB adapters are usually declared in the {@link org.apache.sis.internal.jaxb.referencing} + * <p><b>Note:</b> JAXB adapters are usually declared in the {@link org.apache.sis.xml.bind.referencing} * package, but this one is an exception because it needs access to package-privated {@link DefaultGeodeticCRS} * class.</p> * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java index 1e377c4acb..e615de52ac 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java @@ -129,4 +129,4 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.gco.*; -import org.apache.sis.internal.jaxb.referencing.*; +import org.apache.sis.xml.bind.referencing.*; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/package-info.java index 0cd368fb9e..3e34c995f4 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/package-info.java @@ -60,4 +60,4 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.gco.UnitAdapter; -import org.apache.sis.internal.jaxb.referencing.*; +import org.apache.sis.xml.bind.referencing.*; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java index 0dd12c0cd5..f0b836bdff 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java @@ -32,7 +32,7 @@ import org.opengis.referencing.datum.Ellipsoid; import org.apache.sis.internal.util.Numerics; import org.apache.sis.internal.util.DoubleDouble; import org.apache.sis.internal.jaxb.gml.Measure; -import org.apache.sis.internal.jaxb.referencing.SecondDefiningParameter; +import org.apache.sis.xml.bind.referencing.SecondDefiningParameter; import org.apache.sis.internal.metadata.ImplementationHelper; import org.apache.sis.internal.referencing.Formulas; import org.apache.sis.internal.referencing.WKTKeywords; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java index edb200fe66..201fedcee0 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java @@ -89,4 +89,4 @@ import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.jaxb.gco.*; import org.apache.sis.internal.jaxb.gml.DateAdapter; import org.apache.sis.internal.jaxb.metadata.*; -import org.apache.sis.internal.jaxb.referencing.*; +import org.apache.sis.xml.bind.referencing.*; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java index 6b6b7407a5..b0256ed1e8 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java @@ -40,8 +40,8 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.parameter.Parameters; import org.apache.sis.parameter.Parameterized; import org.apache.sis.parameter.DefaultParameterValueGroup; -import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroup; -import org.apache.sis.internal.jaxb.referencing.CC_OperationMethod; +import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroup; +import org.apache.sis.xml.bind.referencing.CC_OperationMethod; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.internal.referencing.CoordinateOperations; import org.apache.sis.internal.referencing.ReferencingUtilities; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java index 289145a7de..72aa612b8a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java @@ -47,7 +47,7 @@ import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.SimpleInternationalString; import org.apache.sis.internal.referencing.WKTKeywords; import org.apache.sis.internal.jaxb.gco.StringAdapter; -import org.apache.sis.internal.jaxb.referencing.CC_OperationMethod; +import org.apache.sis.xml.bind.referencing.CC_OperationMethod; import org.apache.sis.internal.referencing.NilReferencingObject; import org.apache.sis.internal.metadata.Identifiers; import org.apache.sis.internal.metadata.ImplementationHelper; @@ -719,7 +719,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * predefined methods, or by unmarshalling the enclosing {@link AbstractSingleOperation}.</p> * * <p><b>Maintenance note:</b> the {@code "setDescriptors"} method name is also hard-coded in - * {@link org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameter} for logging purpose.</p> + * {@link org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter} for logging purpose.</p> * * @see AbstractSingleOperation#setParameters */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/package-info.java index 08bbd351c9..114209f4ab 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/package-info.java @@ -123,7 +123,7 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.gco.*; -import org.apache.sis.internal.jaxb.referencing.*; +import org.apache.sis.xml.bind.referencing.*; import org.apache.sis.internal.jaxb.metadata.EX_Extent; import org.apache.sis.internal.jaxb.metadata.CI_Citation; import org.apache.sis.internal.jaxb.metadata.DQ_PositionalAccuracy; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java index b5403ea423..062ec3dc1f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java @@ -125,4 +125,4 @@ import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.jaxb.gco.*; import org.apache.sis.internal.jaxb.metadata.*; -import org.apache.sis.internal.jaxb.referencing.RS_Identifier; +import org.apache.sis.xml.bind.referencing.RS_Identifier; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_Conversion.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_Conversion.java index 18ae16cbdf..5e1630382d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_Conversion.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.crs.SingleCRS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_CoordinateOperation.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_CoordinateOperation.java index baff59da5f..049a979c52 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_CoordinateOperation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.referencing.operation.CoordinateOperation; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java index 7fb961ab56..f35546efa7 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.List; import java.util.Map; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralParameterValue.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralParameterValue.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralParameterValue.java index 93083a76a6..51e2af8a2b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_GeneralParameterValue.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralParameterValue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElements; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationMethod.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationMethod.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationMethod.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationMethod.java index 7e1c2d810f..db1b125262 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationMethod.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationMethod.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.Map; import java.util.Collection; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameter.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameter.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameter.java index 62752d18d9..db36e30960 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameter.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.annotation.XmlElement; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroup.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroup.java index c2fcf71ee6..e311f1ff50 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.Map; import java.util.List; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_Ellipsoid.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_Ellipsoid.java index 138a043249..9f86c4e321 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_Ellipsoid.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.Ellipsoid; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_EngineeringDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_EngineeringDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_EngineeringDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_EngineeringDatum.java index 3ebb201fa3..d0116f2e86 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_EngineeringDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_EngineeringDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.EngineeringDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_GeodeticDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_GeodeticDatum.java index 00f3269317..b6ada15fdd 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_GeodeticDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.GeodeticDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java index f1b8f2abde..0633b0f3a6 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.ImageDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ParametricDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ParametricDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ParametricDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ParametricDatum.java index 36a5cc731f..d75b169e2f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_ParametricDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ParametricDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.ParametricDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PixelInCell.java similarity index 96% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PixelInCell.java index dc623d449e..d03eb6835b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PixelInCell.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import org.opengis.referencing.datum.PixelInCell; import org.apache.sis.internal.jaxb.gml.CodeListAdapter; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PrimeMeridian.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PrimeMeridian.java index 24e42a39ef..08cdf874b1 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_PrimeMeridian.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.PrimeMeridian; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_TemporalDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_TemporalDatum.java index cdfe1b36b3..576aeafcaf 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_TemporalDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.TemporalDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatum.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatum.java index 4039a2cb9b..3cd6b8dbd6 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.datum.VerticalDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatumType.java similarity index 96% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatumType.java index 8cc031e535..48fc3aef98 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_VerticalDatumType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import org.opengis.referencing.datum.VerticalDatumType; import org.apache.sis.internal.jaxb.gml.CodeListAdapter; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AffineCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AffineCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AffineCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AffineCS.java index cbce8f202a..e7303dff25 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AffineCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AffineCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.AffineCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java similarity index 97% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java index c22ce1c8ee..bdc50450b9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import org.opengis.referencing.cs.AxisDirection; import org.apache.sis.internal.jaxb.gml.CodeListAdapter; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CartesianCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CartesianCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CartesianCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CartesianCS.java index f105f0b507..5992aceb63 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CartesianCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CartesianCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.CartesianCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystem.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystem.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystem.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystem.java index df60d35550..9e31dfdf3f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystem.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.referencing.cs.CoordinateSystem; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystemAxis.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystemAxis.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystemAxis.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystemAxis.java index 6b3297e070..11f33cf0d1 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystemAxis.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CoordinateSystemAxis.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.CoordinateSystemAxis; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CylindricalCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CylindricalCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CylindricalCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CylindricalCS.java index 6d1ea82593..b3f56b66d5 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_CylindricalCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_CylindricalCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.CylindricalCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_EllipsoidalCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_EllipsoidalCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_EllipsoidalCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_EllipsoidalCS.java index 771934c9a8..39efdaeb45 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_EllipsoidalCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_EllipsoidalCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.EllipsoidalCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_LinearCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_LinearCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_LinearCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_LinearCS.java index d609c8d964..9e260bfc02 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_LinearCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_LinearCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.LinearCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_ParametricCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_ParametricCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_ParametricCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_ParametricCS.java index a4ca97975d..6d99413852 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_ParametricCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_ParametricCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.ParametricCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_PolarCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_PolarCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_PolarCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_PolarCS.java index 3b2cba94b3..016bfef496 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_PolarCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_PolarCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.PolarCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java similarity index 97% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java index 15402761ff..7ce17d6c9f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import org.opengis.referencing.cs.RangeMeaning; import org.apache.sis.internal.jaxb.gml.CodeListAdapter; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_SphericalCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_SphericalCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_SphericalCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_SphericalCS.java index 9135198327..e718424c04 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_SphericalCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_SphericalCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.SphericalCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_TimeCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_TimeCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_TimeCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_TimeCS.java index a43be20e28..9390556e0d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_TimeCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_TimeCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.TimeCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_UserDefinedCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_UserDefinedCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java index 26c794be5a..b1834ac15b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_UserDefinedCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.UserDefinedCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_VerticalCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_VerticalCS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_VerticalCS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_VerticalCS.java index 0114e050ab..faa3764b92 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/CS_VerticalCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_VerticalCS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.referencing.cs.VerticalCS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/Code.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/Code.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java index 91abda948c..30f2746f95 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/Code.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlValue; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/RS_Identifier.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/RS_Identifier.java index 1ddcc6e6d0..70cc144506 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/RS_Identifier.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.opengis.metadata.Identifier; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_CRS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_CRS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_CRS.java index 0312f66bdf..8a8004a24b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_CRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_CRS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.referencing.crs.SingleCRS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_DerivedCRSType.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_DerivedCRSType.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_DerivedCRSType.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_DerivedCRSType.java index 75edb35b59..f5cde89e2e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_DerivedCRSType.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_DerivedCRSType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlValue; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_GeographicCRS.txt b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_GeographicCRS.txt similarity index 100% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_GeographicCRS.txt rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_GeographicCRS.txt diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_SingleCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_SingleCRS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_SingleCRS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_SingleCRS.java index c4eef882d5..0c791699fb 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_SingleCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_SingleCRS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.referencing.crs.SingleCRS; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_VerticalCRS.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_VerticalCRS.java index b9c4432a46..18b9712305 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SC_VerticalCRS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SecondDefiningParameter.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SecondDefiningParameter.java index 5b4bdf734b..e4bde1b01c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/SecondDefiningParameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/package-info.java similarity index 97% rename from endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/package-info.java rename to endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/package-info.java index cd834f50c2..c34a835c9b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/internal/jaxb/referencing/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/package-info.java @@ -35,7 +35,7 @@ @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI) }) @XmlAccessorType(XmlAccessType.NONE) -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import org.apache.sis.xml.Namespaces; import jakarta.xml.bind.annotation.XmlNs; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java index a45b4810e5..3bec1a2543 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java @@ -24,7 +24,7 @@ import java.util.Locale; import org.opengis.test.Validators; import org.opengis.metadata.Identifier; import org.apache.sis.referencing.datum.AbstractDatum; -import org.apache.sis.internal.jaxb.referencing.Code; +import org.apache.sis.xml.bind.referencing.Code; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.test.DependsOnMethod; import org.apache.sis.test.DependsOn; @@ -46,7 +46,7 @@ import static org.apache.sis.metadata.iso.citation.Citations.EPSG; */ @DependsOn({ IdentifiedObjectsTest.class, NamedIdentifierTest.class, - org.apache.sis.internal.jaxb.referencing.CodeTest.class + org.apache.sis.xml.bind.referencing.CodeTest.class }) public final class AbstractIdentifiedObjectTest extends TestCase { /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java index a6ce85179b..017291a312 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java @@ -37,7 +37,7 @@ import static org.apache.sis.referencing.Assertions.assertWktEquals; */ @DependsOn({ org.apache.sis.internal.referencing.FormulasTest.class, - org.apache.sis.internal.jaxb.referencing.SecondDefiningParameterTest.class + org.apache.sis.xml.bind.referencing.SecondDefiningParameterTest.class }) public final class DefaultEllipsoidTest extends TestCase { /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java index 16e47c45db..db8514c2b6 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java @@ -36,7 +36,7 @@ import org.opengis.test.Validators; import org.apache.sis.measure.Units; import org.apache.sis.parameter.ParameterBuilder; import org.apache.sis.referencing.operation.provider.Mercator1SP; -import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroupTest; +import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroupTest; import org.apache.sis.referencing.operation.transform.LinearTransform; import org.apache.sis.referencing.operation.matrix.Matrix3; import org.apache.sis.xml.Namespaces; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java rename to endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java index 57d635b085..912a614260 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.Map; import java.util.HashMap; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java rename to endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java index 24a92842a2..5b8d7c4e23 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.List; import java.util.Map; @@ -37,7 +37,7 @@ import org.apache.sis.xml.Namespaces; import org.junit.Test; import static org.apache.sis.metadata.iso.citation.Citations.EPSG; -import static org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE; +import static org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE; import static org.junit.Assert.*; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CodeTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CodeTest.java rename to endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java index d81b3b7e68..e365496d96 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/CodeTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.Set; import org.opengis.referencing.crs.GeographicCRS; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java similarity index 98% rename from endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java rename to endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java index 52ed9d6f5c..ec3192e52d 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.referencing; +package org.apache.sis.xml.bind.referencing; import java.util.Map; import jakarta.xml.bind.JAXBException;