You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/06/21 15:49:01 UTC
[sis] branch master updated (5ed134f -> a977d2a)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git.
from 5ed134f Merge branch 'geoapi-3.1'
add 450ad14 Avoid the use of ImmutableIdentifier in anticipation for its migration to sis-referencing module.
add 2f7d100 Initial move of WKT parser/formatter from sis-metadata module to sis-referencing. https://issues.apache.org/jira/browse/SIS-463
add 2058ee3 Merge branch 'geoapi-4.0' into geoapi-3.1: move of WKT support from sis-metadata to sis-referencing module. This merge contains only the moving part, with the minimal amount of changes needed for compiling and passing tests. Cleanup will be part of a separated merge.
new a977d2a Merge branch 'geoapi-3.1': move of WKT support from sis-metadata to sis-referencing module. This merge contains only the moving part, with the minimal amount of changes needed for compiling and passing tests. Cleanup will be part of a separated merge.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jaxb/metadata/replace/RS_Identifier.java | 22 ++++++
.../sis/internal/metadata/ReferencingServices.java | 32 ---------
.../java/org/apache/sis/io/wkt/WKTFormatTest.txt | 4 --
.../java/org/apache/sis/test/MetadataAssert.java | 79 ---------------------
.../apache/sis/test/suite/MetadataTestSuite.java | 8 ---
.../internal/referencing/ServicesForMetadata.java | 6 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 0
.../main/java/org/apache/sis/io/wkt/Colors.java | 0
.../java/org/apache/sis/io/wkt/Convention.java | 0
.../main/java/org/apache/sis/io/wkt/Element.java | 0
.../java/org/apache/sis/io/wkt/ElementKind.java | 0
.../org/apache/sis/io/wkt/FormattableObject.java | 0
.../main/java/org/apache/sis/io/wkt/Formatter.java | 6 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 0
.../java/org/apache/sis/io/wkt/KeywordCase.java | 0
.../java/org/apache/sis/io/wkt/KeywordStyle.java | 0
.../org/apache/sis/io/wkt/MathTransformParser.java | 0
.../main/java/org/apache/sis/io/wkt/Parser.java | 0
.../main/java/org/apache/sis/io/wkt/Symbols.java | 0
.../java/org/apache/sis/io/wkt/Transliterator.java | 0
.../sis/io/wkt/UnformattableObjectException.java | 0
.../sis/io/wkt/UnparsableObjectException.java | 0
.../java/org/apache/sis/io/wkt/VerticalInfo.java | 0
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 0
.../main/java/org/apache/sis/io/wkt/Warnings.java | 0
.../java/org/apache/sis/io/wkt/package-info.java | 0
.../sis/metadata/iso/ImmutableIdentifier.java | 0
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../provider/LongitudeRotationTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ColorsTest.java | 0
.../java/org/apache/sis/io/wkt/ConventionTest.java | 0
.../java/org/apache/sis/io/wkt/ElementTest.java | 0
.../java/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../java/org/apache/sis/io/wkt/SymbolsTest.java | 0
.../org/apache/sis/io/wkt/TransliteratorTest.java | 0
.../sis/metadata/iso/ImmutableIdentifierTest.java | 4 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../org/apache/sis/parameter/TensorValuesTest.java | 2 +-
.../referencing/AbstractReferenceSystemTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultTransformationTest.java | 2 +-
.../org/apache/sis/test/ReferencingAssert.java | 80 +++++++++++++++++++++-
.../sis/test/suite/ReferencingTestSuite.java | 9 +++
.../profile/fra/DirectReferenceSystemTest.java | 4 +-
.../sis/profile/france/FrenchProfileTest.java | 4 +-
61 files changed, 144 insertions(+), 162 deletions(-)
delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.txt
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/AbstractParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Colors.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Convention.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Element.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/ElementKind.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/FormattableObject.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Formatter.java (99%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/KeywordCase.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Parser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Symbols.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Transliterator.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/WKTFormat.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Warnings.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/package-info.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ColorsTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ConventionTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ElementTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/FormatterTest.java (98%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java (98%)
[sis] 01/01: Merge branch 'geoapi-3.1': move of WKT support from
sis-metadata to sis-referencing module. This merge contains only the moving
part,
with the minimal amount of changes needed for compiling and passing tests.
Cleanup will be part of a separated merge.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit a977d2ac8063768ea4ab562a365bfca98c902c4d
Merge: 5ed134f 2058ee3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Jun 21 11:10:51 2019 +0200
Merge branch 'geoapi-3.1': move of WKT support from sis-metadata to sis-referencing module.
This merge contains only the moving part, with the minimal amount of changes needed for compiling and passing tests.
Cleanup will be part of a separated merge.
.../jaxb/metadata/replace/RS_Identifier.java | 22 ++++++
.../sis/internal/metadata/ReferencingServices.java | 32 ---------
.../java/org/apache/sis/io/wkt/WKTFormatTest.txt | 4 --
.../java/org/apache/sis/test/MetadataAssert.java | 79 ---------------------
.../apache/sis/test/suite/MetadataTestSuite.java | 8 ---
.../internal/referencing/ServicesForMetadata.java | 6 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 0
.../main/java/org/apache/sis/io/wkt/Colors.java | 0
.../java/org/apache/sis/io/wkt/Convention.java | 0
.../main/java/org/apache/sis/io/wkt/Element.java | 0
.../java/org/apache/sis/io/wkt/ElementKind.java | 0
.../org/apache/sis/io/wkt/FormattableObject.java | 0
.../main/java/org/apache/sis/io/wkt/Formatter.java | 6 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 0
.../java/org/apache/sis/io/wkt/KeywordCase.java | 0
.../java/org/apache/sis/io/wkt/KeywordStyle.java | 0
.../org/apache/sis/io/wkt/MathTransformParser.java | 0
.../main/java/org/apache/sis/io/wkt/Parser.java | 0
.../main/java/org/apache/sis/io/wkt/Symbols.java | 0
.../java/org/apache/sis/io/wkt/Transliterator.java | 0
.../sis/io/wkt/UnformattableObjectException.java | 0
.../sis/io/wkt/UnparsableObjectException.java | 0
.../java/org/apache/sis/io/wkt/VerticalInfo.java | 0
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 0
.../main/java/org/apache/sis/io/wkt/Warnings.java | 0
.../java/org/apache/sis/io/wkt/package-info.java | 0
.../sis/metadata/iso/ImmutableIdentifier.java | 0
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../provider/LongitudeRotationTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ColorsTest.java | 0
.../java/org/apache/sis/io/wkt/ConventionTest.java | 0
.../java/org/apache/sis/io/wkt/ElementTest.java | 0
.../java/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../java/org/apache/sis/io/wkt/SymbolsTest.java | 0
.../org/apache/sis/io/wkt/TransliteratorTest.java | 0
.../sis/metadata/iso/ImmutableIdentifierTest.java | 4 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../org/apache/sis/parameter/TensorValuesTest.java | 2 +-
.../referencing/AbstractReferenceSystemTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultTransformationTest.java | 2 +-
.../org/apache/sis/test/ReferencingAssert.java | 80 +++++++++++++++++++++-
.../sis/test/suite/ReferencingTestSuite.java | 9 +++
.../profile/fra/DirectReferenceSystemTest.java | 4 +-
.../sis/profile/france/FrenchProfileTest.java | 4 +-
61 files changed, 144 insertions(+), 162 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
index 38cf03b,2653d77..9516472
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
@@@ -53,14 -54,8 +53,13 @@@ import org.apache.sis.metadata.iso.exte
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.system.OptionalDependency;
import org.apache.sis.internal.system.Modules;
- import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.util.Deprecable;
+// Branch-specific imports
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.datum.DatumFactory;
+import org.opengis.util.NoSuchIdentifierException;
+
/**
* Provides access to services defined in the {@code "sis-referencing"} module.
diff --cc core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
index c9a9f70,56a76c7..44871a3
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
@@@ -23,12 -23,10 +23,8 @@@ import javax.xml.parsers.ParserConfigur
import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.lineage.Source;
-import org.opengis.metadata.maintenance.Scope;
import org.opengis.metadata.maintenance.ScopeCode;
-import org.opengis.metadata.content.FeatureTypeInfo;
import org.opengis.metadata.content.FeatureCatalogueDescription;
- import org.opengis.referencing.IdentifiedObject;
- import org.apache.sis.io.wkt.Symbols;
- import org.apache.sis.io.wkt.WKTFormat;
- import org.apache.sis.io.wkt.Convention;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.DocumentComparator;
import org.apache.sis.internal.xml.LegacyNamespaces;
diff --cc core/sis-referencing/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
index 6730c85,6ec6251..d754681
--- a/core/sis-referencing/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
@@@ -30,11 -30,10 +30,10 @@@ import org.apache.sis.io.wkt.Convention
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.opengis.test.Validators;
- import org.apache.sis.test.DependsOn;
import org.junit.Test;
- import static org.apache.sis.test.MetadataAssert.*;
+ import static org.apache.sis.test.ReferencingAssert.*;
-import static org.opengis.metadata.Identifier.*;
+import static org.opengis.referencing.ReferenceIdentifier.*;
/**