This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
from 87f745fce9 Merge branch 'geoapi-4.0' into geoapi-3.1.
add c6490c349b feat(Geometry): GeometryCollection implement Iterator,
enforce not null elements in the collection, check array sizes in
ArrayDataPoints
add 15377fcb44 refactor(Geometry): remove MultiMeshPrimitive, replaced by
GeometryCollection
add b809ba400b Change the webapp module (incubator) to a support module
for other web application.
add 8cd3a85563 feat(Geometry): implement point and linestring transform
operation
add 32b6256863 fix(Geometry): fix rectangle ShapeAdaptor missing crs
add 72dc0cbdae Allow the SIS geometry implementation (incubator) to be
detected.
add 297ea99ae9 Move `org.apache.sis.web` module to endorsed module. This
is (for now) only listeners for clean undeploy of Apache SIS in the context of
web containers.
new cac15f3608 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains a move
of `org.apache.sis.web` in endorsed modules as a fix for
https://issues.apache.org/jira/browse/SIS-640
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:
.../apache/sis/buildtools/gradle/Dependency.java | 2 +-
endorsed/build.gradle.kts | 15 +
.../apache/sis/geometry/wrapper/Geometries.java | 5 -
.../sis/geometry/wrapper/GeometryFactories.java | 32 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 2 +-
.../main/org/apache/sis/setup/GeometryLibrary.java | 78 ++---
.../main/org/apache/sis/setup/package-info.java | 2 +-
.../main/org/apache/sis/system/Shutdown.java | 3 +-
.../main/org/apache/sis/system/SystemListener.java | 2 +-
.../jakarta.servlet.ServletContainerInitializer | 1 +
.../javax.servlet.ServletContainerInitializer | 1 +
.../src/org.apache.sis.web/main/module-info.java | 48 +++
.../apache/sis/web/jakarta}/ServletListener.java | 20 +-
.../org/apache/sis/web/jakarta}/package-info.java | 7 +-
.../apache/sis/web/javaee}/ServletListener.java | 30 +-
.../org/apache/sis/web/javaee}/package-info.java | 7 +-
.../org/apache/sis/web/osgi}/OSGiActivator.java | 2 +-
.../org/apache/sis/web/osgi}/package-info.java | 4 +-
.../src/org.apache.sis.web}/webapp/WEB-INF/web.xml | 0
incubator/build.gradle.kts | 14 -
.../org.apache.sis.geometry/main/module-info.java | 2 +
.../main/org/apache/sis/geometries/Geometries.java | 42 ++-
.../apache/sis/geometries/GeometryCollection.java | 89 +++++-
.../apache/sis/geometries/adapter/JTSAdapter.java | 25 +-
.../sis/geometries/adapter/ShapeAdapter.java | 23 +-
.../internal/shared/ArrayDataPoints.java | 11 +-
.../internal/shared/DefaultGeometryCollection.java | 11 +-
.../shared/GeometryCollectionSpliterator.java | 115 ++++++++
.../apache/sis/geometries/mesh/MeshPrimitive.java | 16 +
.../geometries/mesh/MeshPrimitiveComparator.java | 9 +-
.../sis/geometries/mesh/MeshPrimitiveVisitor.java | 15 +-
.../sis/geometries/mesh/MultiMeshPrimitive.java | 96 ------
.../sis/geometries/operation/ComputeAttribute.java | 30 +-
.../geometries/operation/GeometryProcessor.java | 44 ++-
.../sis/geometries/operation/Intersection.java | 5 +-
.../sis/geometries/operation/ToPrimitive.java | 41 +--
.../apache/sis/geometries/operation/Transform.java | 54 +++-
.../operation/extrude/TerrainExtruder.java | 13 +-
.../main/org/apache/sis/geometries/summary.adoc | 323 ++++++++++++++-------
.../SIS.java => geometry/wrapper/sis/Factory.java} | 10 +-
.../adapter => geometry/wrapper/sis}/Wrapper.java | 7 +-
.../main/org/apache/sis/maths/Vector1D.java | 36 +++
.../main/org/apache/sis/maths/Vector2D.java | 45 +++
.../main/org/apache/sis/maths/Vector3D.java | 54 ++++
.../main/org/apache/sis/maths/Vector4D.java | 63 ++++
.../sis/geometries/GeometryCollectionTest.java | 34 +++
.../sis/geometries/adapter/JTSAdapterTest.java | 68 +++++
.../sis/geometries/adapter/ShapeAdapterTest.java | 32 ++
.../sis/geometries/operation/ToPrimitiveTest.java | 15 +-
.../sis/geometries/operation/TransformTest.java | 56 +++-
.../operation/extrude/TerrainExtruderTest.java | 8 +-
.../sis/geometry/wrapper/sis/FactoryTest.java | 27 +-
.../main/module-info.java | 1 +
.../shared => geometry/wrapper}/s2/Factory.java | 5 +-
.../shared => geometry/wrapper}/s2/S2.java | 2 +-
.../shared => geometry/wrapper}/s2/Wrapper.java | 2 +-
.../sis/referencing/dggs/DiscreteGlobalGrid.java | 2 +-
.../org/apache/sis/referencing/dggs/s2/S2Zone.java | 2 +-
.../storage/dggs/DiscreteGlobalGridGeometry.java | 2 +-
.../storage/dggs/DiscreteGlobalGridSystems.java | 4 +-
.../org/apache/sis/storage/rs/CodedDerivation.java | 2 +-
.../org.apache.sis.webapp/main/module-info.java | 27 --
.../main/org/apache/sis/services/Servlet.java | 26 --
.../main/org/apache/sis/services/package-info.java | 21 --
.../webapp/META-INF/context.xml | 26 --
netbeans-project/ivy.xml | 1 +
67 files changed, 1248 insertions(+), 571 deletions(-)
create mode 100644
endorsed/src/org.apache.sis.web/main/META-INF/services/jakarta.servlet.ServletContainerInitializer
create mode 100644
endorsed/src/org.apache.sis.web/main/META-INF/services/javax.servlet.ServletContainerInitializer
create mode 100644 endorsed/src/org.apache.sis.web/main/module-info.java
copy {incubator/src/org.apache.sis.webapp/main/org/apache/sis/services =>
endorsed/src/org.apache.sis.web/main/org/apache/sis/web/jakarta}/ServletListener.java
(69%)
copy endorsed/src/{org.apache.sis.storage.xml/main/org/apache/sis/storage/gps
=> org.apache.sis.web/main/org/apache/sis/web/jakarta}/package-info.java (81%)
rename {incubator/src/org.apache.sis.webapp/main/org/apache/sis/services =>
endorsed/src/org.apache.sis.web/main/org/apache/sis/web/javaee}/ServletListener.java
(58%)
copy {buildSrc/src/main/java/org/apache/sis/buildtools/doclet =>
endorsed/src/org.apache.sis.web/main/org/apache/sis/web/javaee}/package-info.java
(73%)
rename {incubator/src/org.apache.sis.webapp/main/org/apache/sis/services =>
endorsed/src/org.apache.sis.web/main/org/apache/sis/web/osgi}/OSGiActivator.java
(98%)
copy endorsed/src/{org.apache.sis.storage/main/org/apache/sis/storage/wkt =>
org.apache.sis.web/main/org/apache/sis/web/osgi}/package-info.java (87%)
rename {incubator/src/org.apache.sis.webapp =>
endorsed/src/org.apache.sis.web}/webapp/WEB-INF/web.xml (100%)
create mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/GeometryCollectionSpliterator.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MultiMeshPrimitive.java
rename
incubator/src/org.apache.sis.geometry/main/org/apache/sis/{geometries/adapter/SIS.java
=> geometry/wrapper/sis/Factory.java} (98%)
rename
incubator/src/org.apache.sis.geometry/main/org/apache/sis/{geometries/adapter
=> geometry/wrapper/sis}/Wrapper.java (99%)
create mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/JTSAdapterTest.java
copy
optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
=>
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometry/wrapper/sis/FactoryTest.java
(62%)
rename
incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/{storage/rs/internal/shared
=> geometry/wrapper}/s2/Factory.java (98%)
rename
incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/{storage/rs/internal/shared
=> geometry/wrapper}/s2/S2.java (99%)
rename
incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/{storage/rs/internal/shared
=> geometry/wrapper}/s2/Wrapper.java (97%)
delete mode 100644 incubator/src/org.apache.sis.webapp/main/module-info.java
delete mode 100644
incubator/src/org.apache.sis.webapp/main/org/apache/sis/services/Servlet.java
delete mode 100644
incubator/src/org.apache.sis.webapp/main/org/apache/sis/services/package-info.java
delete mode 100644
incubator/src/org.apache.sis.webapp/webapp/META-INF/context.xml
