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 0b696efa42ca2da670810b7b9507d86803ebe3b1
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jun 4 12:33:02 2019 +0200
Merge the sis-raster module into sis-feature.
https://lists.apache.org/thread.html/8c80d54004dcb2cacb9e1f3a4581fe0055f6910042a6ef2499a02cbd@%3Cdev.sis.apache.org%3E
---
core/pom.xml | 1 -
core/sis-feature/pom.xml | 35 ++++-
.../java/org/apache/sis/coverage/Category.java | 0
.../java/org/apache/sis/coverage/CategoryList.java | 0
.../org/apache/sis/coverage/ConvertedCategory.java | 0
.../org/apache/sis/coverage/ConvertedRange.java | 0
.../coverage/MismatchedCoverageRangeException.java | 0
.../org/apache/sis/coverage/SampleDimension.java | 0
.../org/apache/sis/coverage/SampleRangeFormat.java | 0
.../coverage/SubspaceNotSpecifiedException.java | 0
.../main/java/org/apache/sis/coverage/ToNaN.java | 0
.../sis/coverage/grid/DisjointExtentException.java | 0
.../sis/coverage/grid/GridCoordinatesView.java | 0
.../org/apache/sis/coverage/grid/GridCoverage.java | 0
.../apache/sis/coverage/grid/GridDerivation.java | 0
.../org/apache/sis/coverage/grid/GridExtent.java | 0
.../org/apache/sis/coverage/grid/GridGeometry.java | 0
.../apache/sis/coverage/grid/GridRoundingMode.java | 0
.../grid/IllegalGridGeometryException.java | 0
.../apache/sis/coverage/grid/ImageRenderer.java | 0
.../grid/IncompleteGridGeometryException.java | 0
.../apache/sis/coverage/grid/PixelTranslation.java | 0
.../org/apache/sis/coverage/grid/package-info.java | 0
.../java/org/apache/sis/coverage/package-info.java | 0
.../java/org/apache/sis/image/DefaultIterator.java | 0
.../java/org/apache/sis/image/LinearIterator.java | 0
.../java/org/apache/sis/image/PixelIterator.java | 0
.../java/org/apache/sis/image/TransferType.java | 0
.../apache/sis/image/WritablePixelIterator.java | 0
.../java/org/apache/sis/image/package-info.java | 0
.../internal/coverage/BufferedGridCoverage.java | 0
.../internal/coverage/ConvertedGridCoverage.java | 0
.../apache/sis/internal/coverage/package-info.java | 0
.../sis/internal/raster/ColorModelFactory.java | 0
.../sis/internal/raster/ColorModelPatch.java | 0
.../internal/raster/MultiBandsIndexColorModel.java | 0
.../apache/sis/internal/raster/RasterFactory.java | 0
.../org/apache/sis/internal/raster/Resources.java | 0
.../sis/internal/raster/Resources.properties | 0
.../sis/internal/raster/Resources_fr.properties | 0
.../sis/internal/raster/ScaledColorSpace.java | 0
.../apache/sis/internal/raster/package-info.java | 0
.../org/apache/sis/coverage/CategoryListTest.java | 0
.../java/org/apache/sis/coverage/CategoryTest.java | 0
.../apache/sis/coverage/SampleDimensionTest.java | 0
.../sis/coverage/grid/GridDerivationTest.java | 0
.../apache/sis/coverage/grid/GridExtentTest.java | 0
.../apache/sis/coverage/grid/GridGeometryTest.java | 0
.../sis/coverage/grid/PixelTranslationTest.java | 0
.../org/apache/sis/image/DefaultIteratorTest.java | 0
.../java/org/apache/sis/image/ImageTestCase.java | 0
.../org/apache/sis/image/LinearIteratorTest.java | 0
.../test/java/org/apache/sis/image/TestViewer.java | 0
.../java/org/apache/sis/image/TiledImageMock.java | 0
.../coverage/BufferedGridCoverageTest.java | 0
.../sis/internal/raster/ScaledColorSpaceTest.java | 0
.../apache/sis/test/suite/FeatureTestSuite.java | 15 ++-
core/sis-raster/pom.xml | 144 ---------------------
.../org/apache/sis/test/suite/RasterTestSuite.java | 55 --------
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../transform/SpecializableTransform1D.txt | 2 +-
ide-project/NetBeans/build.xml | 3 -
ide-project/NetBeans/nbproject/build-impl.xml | 47 ++-----
ide-project/NetBeans/nbproject/genfiles.properties | 4 +-
ide-project/NetBeans/nbproject/project.properties | 2 -
ide-project/NetBeans/nbproject/project.xml | 2 -
pom.xml | 2 +-
storage/sis-storage/pom.xml | 5 -
68 files changed, 66 insertions(+), 254 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 68e2aee..183699d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -192,7 +192,6 @@
<module>sis-referencing</module>
<module>sis-referencing-by-identifiers</module>
<module>sis-feature</module>
- <module>sis-raster</module>
<module>sis-portrayal</module>
</modules>
diff --git a/core/sis-feature/pom.xml b/core/sis-feature/pom.xml
index cf328c1..6c48b60 100644
--- a/core/sis-feature/pom.xml
+++ b/core/sis-feature/pom.xml
@@ -40,6 +40,7 @@
<name>Apache SIS features</name>
<description>
Representations of geographic features.
+ Includes access to both vector and raster data.
</description>
@@ -63,7 +64,29 @@
<organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>developer</role>
+ <role>committer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Johann Sorel</name>
+ <id>jsorel</id>
+ <email>johann.sorel@geomatys.com</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rémi Maréchal</name>
+ <id>rmarechal</id>
+ <email>rmarechal@apache.org</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>committer</role>
</roles>
</developer>
</developers>
@@ -74,6 +97,16 @@
<role>developer</role>
</roles>
</contributor>
+ <contributor>
+ <name>Alexis manin</name>
+ <email>alexis.manin@geomatys.com</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
</contributors>
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/Category.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/Category.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/CategoryList.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/CategoryList.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/ConvertedCategory.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/ConvertedRange.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/ConvertedRange.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/SampleDimension.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/SampleDimension.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/ToNaN.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/ToNaN.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/grid/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/coverage/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/DefaultIterator.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/DefaultIterator.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/LinearIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/LinearIterator.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/LinearIterator.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/LinearIterator.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/TransferType.java b/core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/TransferType.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/image/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/image/package-info.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/image/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/package-info.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/coverage/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/coverage/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/RasterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.properties b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources.properties
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.properties
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources.properties
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources_fr.properties b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources_fr.properties
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources_fr.properties
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/Resources_fr.properties
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
diff --git a/core/sis-raster/src/main/java/org/apache/sis/internal/raster/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/package-info.java
similarity index 100%
rename from core/sis-raster/src/main/java/org/apache/sis/internal/raster/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/raster/package-info.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/ImageTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/image/ImageTestCase.java
rename to core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/LinearIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/image/LinearIteratorTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/TestViewer.java b/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/image/TestViewer.java
rename to core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/TiledImageMock.java b/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/image/TiledImageMock.java
rename to core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
diff --git a/core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
similarity index 100%
rename from core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index c54f1c8..d66a76b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -69,7 +69,20 @@ import org.junit.BeforeClass;
org.apache.sis.feature.builder.CharacteristicTypeBuilderTest.class,
org.apache.sis.feature.builder.AttributeTypeBuilderTest.class,
org.apache.sis.feature.builder.AssociationRoleBuilderTest.class,
- org.apache.sis.feature.builder.FeatureTypeBuilderTest.class
+ org.apache.sis.feature.builder.FeatureTypeBuilderTest.class,
+
+ // Rasters
+ org.apache.sis.image.DefaultIteratorTest.class,
+ org.apache.sis.image.LinearIteratorTest.class,
+ org.apache.sis.coverage.grid.PixelTranslationTest.class,
+ org.apache.sis.coverage.grid.GridExtentTest.class,
+ org.apache.sis.coverage.grid.GridGeometryTest.class,
+ org.apache.sis.coverage.grid.GridDerivationTest.class,
+ org.apache.sis.coverage.CategoryTest.class,
+ org.apache.sis.coverage.CategoryListTest.class,
+ org.apache.sis.coverage.SampleDimensionTest.class,
+ org.apache.sis.internal.raster.ScaledColorSpaceTest.class,
+ org.apache.sis.internal.coverage.BufferedGridCoverageTest.class
})
public final strictfp class FeatureTestSuite extends TestSuite {
/**
diff --git a/core/sis-raster/pom.xml b/core/sis-raster/pom.xml
deleted file mode 100644
index e402459..0000000
--- a/core/sis-raster/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sis</groupId>
- <artifactId>core</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
-
-
- <!-- ===========================================================
- Module Description
- =========================================================== -->
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-raster</artifactId>
- <name>Apache SIS rasters</name>
- <description>
- Access to raster data.
- </description>
-
-
- <!-- ===========================================================
- Developers and Contributors
- =========================================================== -->
- <developers>
- <developer>
- <name>Martin Desruisseaux</name>
- <id>desruisseaux</id>
- <email>desruisseaux@apache.org</email>
- <organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com</organizationUrl>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rémi Maréchal</name>
- <id>rmarechal</id>
- <email>rmarechal@apache.org</email>
- <organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com</organizationUrl>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Alexis manin</name>
- <email>alexis.manin@geomatys.com</email>
- <organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com</organizationUrl>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </contributor>
- </contributors>
-
-
- <!-- ===========================================================
- Build configuration
- =========================================================== -->
- <build>
- <plugins>
- <!-- Anticipation for Java 9 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>
- org.apache.sis.raster
- </Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <!-- ===========================================================
- Dependencies
- =========================================================== -->
- <dependencies>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-referencing</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-utility</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-metadata</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-referencing</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/core/sis-raster/src/test/java/org/apache/sis/test/suite/RasterTestSuite.java b/core/sis-raster/src/test/java/org/apache/sis/test/suite/RasterTestSuite.java
deleted file mode 100644
index fedcc58..0000000
--- a/core/sis-raster/src/test/java/org/apache/sis/test/suite/RasterTestSuite.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-raster} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since 1.0
- * @module
- */
-@Suite.SuiteClasses({
- org.apache.sis.image.DefaultIteratorTest.class,
- org.apache.sis.image.LinearIteratorTest.class,
- org.apache.sis.coverage.grid.PixelTranslationTest.class,
- org.apache.sis.coverage.grid.GridExtentTest.class,
- org.apache.sis.coverage.grid.GridGeometryTest.class,
- org.apache.sis.coverage.grid.GridDerivationTest.class,
- org.apache.sis.coverage.CategoryTest.class,
- org.apache.sis.coverage.CategoryListTest.class,
- org.apache.sis.coverage.SampleDimensionTest.class,
- org.apache.sis.internal.raster.ScaledColorSpaceTest.class,
- org.apache.sis.internal.coverage.BufferedGridCoverageTest.class
-})
-public final strictfp class RasterTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(RasterTestSuite.class);
- verifyTestList(RasterTestSuite.class);
- }
-}
diff --git a/core/sis-raster/src/test/java/org/apache/sis/test/suite/package-info.txt b/core/sis-raster/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b5..0000000
--- a/core/sis-raster/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about collisions.
-This package is initially defined by the sis-utility module, which also provides
-the package-info.java file.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
index 34dfd98..4026acc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
@@ -1,3 +1,3 @@
There is no SpecializableTransform1D implementation yet because a
more specific implementation is needed for Grid Coverage anyway.
-See the SampleDimension class in sis-raster module.
+See the SampleDimension class in sis-coverage module.
diff --git a/ide-project/NetBeans/build.xml b/ide-project/NetBeans/build.xml
index ea5a0f7..64a2234 100644
--- a/ide-project/NetBeans/build.xml
+++ b/ide-project/NetBeans/build.xml
@@ -65,9 +65,6 @@
<fileset dir="${project.root}/core/sis-feature/target/generated-resources">
<include name="**/*.utf"/>
</fileset>
- <fileset dir="${project.root}/core/sis-raster/target/generated-resources">
- <include name="**/*.utf"/>
- </fileset>
<!-- Not yet available.
<fileset dir="${project.root}/core/sis-portrayal/target/generated-resources">
<include name="**/*.utf"/>
diff --git a/ide-project/NetBeans/nbproject/build-impl.xml b/ide-project/NetBeans/nbproject/build-impl.xml
index 09fea23..5d6cd1d 100644
--- a/ide-project/NetBeans/nbproject/build-impl.xml
+++ b/ide-project/NetBeans/nbproject/build-impl.xml
@@ -90,7 +90,7 @@ is divided into following sections:
</not>
</condition>
</fail>
- <j2seproject3:modulename property="module.name" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal [...]
+ <j2seproject3:modulename property="module.name" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/>
<condition property="named.module.internal">
<and>
<isset property="module.name"/>
@@ -204,7 +204,6 @@ is divided into following sections:
<available file="${test.xmlstore.dir}"/>
<available file="${test.storage.dir}"/>
<available file="${test.feature.dir}"/>
- <available file="${test.raster.dir}"/>
<available file="${test.referencing.dir}"/>
<available file="${test.ref-by-id.dir}"/>
<available file="${test.metadata.dir}"/>
@@ -229,7 +228,6 @@ is divided into following sections:
<available file="${src.xmlstore.dir}"/>
<available file="${src.storage.dir}"/>
<available file="${src.feature.dir}"/>
- <available file="${src.raster.dir}"/>
<available file="${src.referencing.dir}"/>
<available file="${src.ref-by-id.dir}"/>
<available file="${src.metadata.dir}"/>
@@ -353,7 +351,6 @@ is divided into following sections:
<fail unless="src.xmlstore.dir">Must set src.xmlstore.dir</fail>
<fail unless="src.storage.dir">Must set src.storage.dir</fail>
<fail unless="src.feature.dir">Must set src.feature.dir</fail>
- <fail unless="src.raster.dir">Must set src.raster.dir</fail>
<fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
<fail unless="src.ref-by-id.dir">Must set src.ref-by-id.dir</fail>
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
@@ -374,7 +371,6 @@ is divided into following sections:
<fail unless="test.xmlstore.dir">Must set test.xmlstore.dir</fail>
<fail unless="test.storage.dir">Must set test.storage.dir</fail>
<fail unless="test.feature.dir">Must set test.feature.dir</fail>
- <fail unless="test.raster.dir">Must set test.raster.dir</fail>
<fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
<fail unless="test.ref-by-id.dir">Must set test.ref-by-id.dir</fail>
<fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
@@ -402,7 +398,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -414,7 +410,7 @@ is divided into following sections:
<attribute default="${excludes}" name="excludes"/>
<attribute default="${javac.debug}" name="debug"/>
<attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" if:set="named.module.internal [...]
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" if:set="named.module.internal" name="sourcepath"/>
<attribute default="${empty.dir}" name="gensrcdir"/>
<element name="customize" optional="true"/>
<sequential>
@@ -469,7 +465,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -512,7 +508,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -547,7 +543,7 @@ is divided into following sections:
</target>
<target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -716,9 +712,6 @@ is divided into following sections:
<fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -799,9 +792,6 @@ is divided into following sections:
<fileset dir="${test.feature.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.raster.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1305,7 +1295,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
@@ -1323,7 +1313,6 @@ is divided into following sections:
<fileset dir="${src.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${src.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1352,7 +1341,7 @@ is divided into following sections:
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}: [...]
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile. [...]
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1769,9 +1758,6 @@ is divided into following sections:
<fileset dir="${src.feature.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.raster.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
<fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1843,9 +1829,6 @@ is divided into following sections:
<fileset dir="${src.feature.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.raster.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
<fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1892,14 +1875,14 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
- <j2seproject3:modulename property="test.module.name" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}"/>
- <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}">
+ <j2seproject3:modulename property="test.module.name" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}"/>
+ <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}">
<and>
<isset property="test.module.name"/>
<length length="0" string="${test.module.name}" when="greater"/>
</and>
</condition>
- <condition else="--patch-module ${module.name}=${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir} --add-reads ${module.name} [...]
+ <condition else="--patch-module ${module.name}=${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir} --add-reads ${module.name}=ALL-UNNAMED" prope [...]
<and>
<isset property="test.module.name"/>
<length length="0" string="${test.module.name}" when="greater"/>
@@ -1940,10 +1923,10 @@ is divided into following sections:
</target>
<target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
<target if="do.depend.true" name="-compile-test-depend">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-pr [...]
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.g [...]
</target>
<target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${tes [...]
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${tes [...]
<customize>
<compilerarg line="${javac.test.compilerargs}"/>
</customize>
@@ -1961,7 +1944,6 @@ is divided into following sections:
<fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1983,7 +1965,7 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:$ [...]
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:$ [...]
<customize>
<compilerarg line="${javac.test.compilerargs}"/>
</customize>
@@ -2001,7 +1983,6 @@ is divided into following sections:
<fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
diff --git a/ide-project/NetBeans/nbproject/genfiles.properties b/ide-project/NetBeans/nbproject/genfiles.properties
index 2ef5d3f..1bc6a00 100644
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=a63b4991
-nbproject/build-impl.xml.script.CRC32=28dd6934
+nbproject/build-impl.xml.data.CRC32=30bc0b09
+nbproject/build-impl.xml.script.CRC32=9b707f2e
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.91.1.48
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index c04328c..6a28a41 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -78,8 +78,6 @@ src.storage.dir = ${project.root}/storage/sis-storage/src/main/java
test.storage.dir = ${project.root}/storage/sis-storage/src/test/java
src.feature.dir = ${project.root}/core/sis-feature/src/main/java
test.feature.dir = ${project.root}/core/sis-feature/src/test/java
-src.raster.dir = ${project.root}/core/sis-raster/src/main/java
-test.raster.dir = ${project.root}/core/sis-raster/src/test/java
src.portrayal.dir = ${project.root}/core/sis-portrayal/src/main/java
test.portrayal.dir = ${project.root}/core/sis-portrayal/src/test/java
src.referencing.dir = ${project.root}/core/sis-referencing/src/main/java
diff --git a/ide-project/NetBeans/nbproject/project.xml b/ide-project/NetBeans/nbproject/project.xml
index c5f952c..61072de 100644
--- a/ide-project/NetBeans/nbproject/project.xml
+++ b/ide-project/NetBeans/nbproject/project.xml
@@ -36,7 +36,6 @@
<root id="src.xmlstore.dir" name="XMLStore"/>
<root id="src.storage.dir" name="Storage"/>
<root id="src.feature.dir" name="Feature"/>
- <root id="src.raster.dir" name="Raster"/>
<root id="src.referencing.dir" name="Referencing"/>
<root id="src.ref-by-id.dir" name="Referencing by identifiers"/>
<root id="src.metadata.dir" name="Metadata"/>
@@ -59,7 +58,6 @@
<root id="test.xmlstore.dir" name="Test XMLStore"/>
<root id="test.storage.dir" name="Test Storage"/>
<root id="test.feature.dir" name="Test Feature"/>
- <root id="test.raster.dir" name="Test Raster"/>
<root id="test.referencing.dir" name="Test Referencing"/>
<root id="test.ref-by-id.dir" name="Test Referencing by identifiers"/>
<root id="test.metadata.dir" name="Test Metadata"/>
diff --git a/pom.xml b/pom.xml
index a23b473..3152daf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
<organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>committer</role>
+ <role>PMC member</role>
</roles>
</developer>
<developer>
diff --git a/storage/sis-storage/pom.xml b/storage/sis-storage/pom.xml
index 6cfbf48..9faedbf 100644
--- a/storage/sis-storage/pom.xml
+++ b/storage/sis-storage/pom.xml
@@ -126,11 +126,6 @@
<artifactId>sis-feature</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-raster</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
|