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 dffc143 Merge bug fixes from branch 'geoapi-3.1'.
add 16b8ea2 Move netCDF extensions GCOM_C and GCOM_W into a new "sis-japan-profile"
module. https://lists.apache.org/thread.html/95edcfee0b4029b7ceb37f587c9c03f37d9dda4594639bd7abe3d21a@%3Cdev.sis.apache.org%3E
add e8b267b Add sis-japan-profiles to the list of JAR files to include in the distribution,
because it provides support for worldwide data.
add f79abf8 Replace hard-coded string value by the constant provided by UCAR library.
add 3a7c924 Change the scope of UCAR dependency from "provided" to "compile" in the
sis-japan-profile module since SIS can not read GCOM data without the help of UCAR library
currently.
add 5fc63a3 Add a test for the Japan profile module. This is mostly as a matter of principle,
for avoiding issues with build tools expecting tests to exist in all modules.
add 0b696ef Merge the sis-raster module into sis-feature. https://lists.apache.org/thread.html/8c80d54004dcb2cacb9e1f3a4581fe0055f6910042a6ef2499a02cbd@%3Cdev.sis.apache.org%3E
add 25759fe Merge ex sis-raster resources into sis-feature resources, in order to have
a single resource file per module.
add 3a998cb Move org.apache.sis.internal.raster package to org.apache.sis.internal.coverage.
add c74628e Merge branch 'geoapi-4.0' into geoapi-3.1. Contains merge and split of modules
(no code changes other than those modules refactoring).
new 7e0dc41 Merge branch 'geoapi-3.1'. Contains merge and split of modules (no code
changes other than those modules refactoring).
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:
core/pom.xml | 1 -
core/sis-feature/pom.xml | 35 ++-
.../java/org/apache/sis/coverage/Category.java | 2 +-
.../java/org/apache/sis/coverage/CategoryList.java | 2 +-
.../org/apache/sis/coverage/ConvertedCategory.java | 0
.../org/apache/sis/coverage/ConvertedRange.java | 0
.../coverage/MismatchedCoverageRangeException.java | 0
.../org/apache/sis/coverage/SampleDimension.java | 2 +-
.../org/apache/sis/coverage/SampleRangeFormat.java | 0
.../coverage/SubspaceNotSpecifiedException.java | 0
.../main/java/org/apache/sis/coverage/ToNaN.java | 2 +-
.../sis/coverage/grid/DisjointExtentException.java | 2 +-
.../sis/coverage/grid/GridCoordinatesView.java | 0
.../org/apache/sis/coverage/grid/GridCoverage.java | 0
.../apache/sis/coverage/grid/GridDerivation.java | 2 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../apache/sis/coverage/grid/GridRoundingMode.java | 0
.../grid/IllegalGridGeometryException.java | 2 +-
.../apache/sis/coverage/grid/ImageRenderer.java | 6 +-
.../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 | 2 +-
.../java/org/apache/sis/image/LinearIterator.java | 2 +-
.../java/org/apache/sis/image/PixelIterator.java | 0
.../java/org/apache/sis/image/SequenceType.java | 0
.../java/org/apache/sis/image/TransferType.java | 0
.../apache/sis/image/WritablePixelIterator.java | 2 +-
.../java/org/apache/sis/image/package-info.java | 0
.../internal/coverage/BufferedGridCoverage.java | 0
.../sis/internal/coverage}/ColorModelFactory.java | 2 +-
.../sis/internal/coverage}/ColorModelPatch.java | 2 +-
.../internal/coverage/ConvertedGridCoverage.java | 2 +-
.../coverage}/MultiBandsIndexColorModel.java | 2 +-
.../sis/internal/coverage}/RasterFactory.java | 3 +-
.../sis/internal/coverage}/ScaledColorSpace.java | 2 +-
.../apache/sis/internal/coverage/package-info.java | 0
.../org/apache/sis/internal/feature/Resources.java | 165 ++++++++++
.../sis/internal/feature/Resources.properties | 32 ++
.../sis/internal/feature/Resources_fr.properties | 35 ++-
.../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
.../internal/coverage}/ScaledColorSpaceTest.java | 2 +-
.../apache/sis/test/suite/FeatureTestSuite.java | 15 +-
core/sis-raster/pom.xml | 144 ---------
.../org/apache/sis/internal/raster/Resources.java | 340 ---------------------
.../sis/internal/raster/Resources.properties | 53 ----
.../sis/internal/raster/Resources_fr.properties | 59 ----
.../org/apache/sis/test/suite/RasterTestSuite.java | 55 ----
.../transform/SpecializableTransform1D.txt | 2 +-
ide-project/NetBeans/build.xml | 3 -
ide-project/NetBeans/nbproject/build-impl.xml | 66 ++--
.../nbproject/{build-impl.xml => build-impl.xml~} | 66 ++--
ide-project/NetBeans/nbproject/genfiles.properties | 6 +-
ide-project/NetBeans/nbproject/project.properties | 4 +-
ide-project/NetBeans/nbproject/project.xml | 4 +-
pom.xml | 2 +-
profiles/pom.xml | 8 +
.../apache/sis/profile/france/package-info.java | 2 +-
.../sis-japan-profile}/pom.xml | 55 ++--
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 3 +-
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 0
.../sis/internal/earth/netcdf/package-info.java | 0
.../apache/sis/profile/japan}/package-info.java | 13 +-
.../org.apache.sis.internal.netcdf.Convention | 0
.../apache/sis/profile/japan/JapanProfileTest.java | 26 +-
.../sis/test/suite/JapanProfileTestSuite.java} | 10 +-
.../org/apache/sis/test/suite/package-info.txt | 0
storage/sis-earth-observation/pom.xml | 6 -
.../apache/sis/internal/netcdf/RasterResource.java | 2 +-
storage/sis-storage/pom.xml | 5 -
84 files changed, 444 insertions(+), 818 deletions(-)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/Category.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/CategoryList.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/ConvertedRange.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/SampleDimension.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/ToNaN.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
(98%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
(98%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/grid/package-info.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/coverage/package-info.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/DefaultIterator.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/LinearIterator.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/PixelIterator.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/SequenceType.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/TransferType.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/WritablePixelIterator.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/image/package-info.java
(100%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
(100%)
rename core/{sis-raster/src/main/java/org/apache/sis/internal/raster => sis-feature/src/main/java/org/apache/sis/internal/coverage}/ColorModelFactory.java
(99%)
rename core/{sis-raster/src/main/java/org/apache/sis/internal/raster => sis-feature/src/main/java/org/apache/sis/internal/coverage}/ColorModelPatch.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
(99%)
rename core/{sis-raster/src/main/java/org/apache/sis/internal/raster => sis-feature/src/main/java/org/apache/sis/internal/coverage}/MultiBandsIndexColorModel.java
(99%)
rename core/{sis-raster/src/main/java/org/apache/sis/internal/raster => sis-feature/src/main/java/org/apache/sis/internal/coverage}/RasterFactory.java
(99%)
rename core/{sis-raster/src/main/java/org/apache/sis/internal/raster => sis-feature/src/main/java/org/apache/sis/internal/coverage}/ScaledColorSpace.java
(99%)
rename core/{sis-raster => sis-feature}/src/main/java/org/apache/sis/internal/coverage/package-info.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/CategoryListTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/CategoryTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/image/ImageTestCase.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/image/LinearIteratorTest.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/image/TestViewer.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/image/TiledImageMock.java
(100%)
rename core/{sis-raster => sis-feature}/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
(100%)
rename core/{sis-raster/src/test/java/org/apache/sis/internal/raster => sis-feature/src/test/java/org/apache/sis/internal/coverage}/ScaledColorSpaceTest.java
(98%)
delete mode 100644 core/sis-raster/pom.xml
delete mode 100644 core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.java
delete mode 100644 core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources.properties
delete mode 100644 core/sis-raster/src/main/java/org/apache/sis/internal/raster/Resources_fr.properties
delete mode 100644 core/sis-raster/src/test/java/org/apache/sis/test/suite/RasterTestSuite.java
copy ide-project/NetBeans/nbproject/{build-impl.xml => build-impl.xml~} (96%)
copy {storage/sis-gdal => profiles/sis-japan-profile}/pom.xml (73%)
rename {storage/sis-earth-observation => profiles/sis-japan-profile}/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
(99%)
rename {storage/sis-earth-observation => profiles/sis-japan-profile}/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
(100%)
rename {storage/sis-earth-observation => profiles/sis-japan-profile}/src/main/java/org/apache/sis/internal/earth/netcdf/package-info.java
(100%)
rename {core/sis-raster/src/main/java/org/apache/sis/internal/raster => profiles/sis-japan-profile/src/main/java/org/apache/sis/profile/japan}/package-info.java
(74%)
rename {storage/sis-earth-observation => profiles/sis-japan-profile}/src/main/resources/META-INF/services/org.apache.sis.internal.netcdf.Convention
(100%)
copy core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
=> profiles/sis-japan-profile/src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java
(55%)
copy profiles/{sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
=> sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java}
(77%)
rename {core/sis-raster => profiles/sis-japan-profile}/src/test/java/org/apache/sis/test/suite/package-info.txt
(100%)
|