This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit df002cfc99c212def62c33ee2aac1680d23d6b5c Merge: 45c820c45f cac15f3608 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Nov 4 15:43:04 2026 +0100 Merge branch 'geoapi-3.1' .../apache/sis/buildtools/gradle/Dependency.java | 2 +- endorsed/build.gradle.kts | 15 ++++++ .../apache/sis/geometry/wrapper/Geometries.java | 5 -- .../sis/geometry/wrapper/GeometryFactories.java | 30 ++++-------- .../referencing/factory/sql/EPSGFactoryTest.java | 2 +- .../src/org.apache.sis.util/main/module-info.java | 2 +- .../main/org/apache/sis/setup/GeometryLibrary.java | 57 ++++++++++------------ .../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 | 14 +++--- .../apache/sis/web/javaee}/ServletListener.java | 30 +++++++----- .../org/apache/sis/web/javaee/package-info.java | 12 ++--- .../org/apache/sis/web/osgi}/OSGiActivator.java | 2 +- .../org/apache/sis/web/osgi}/package-info.java | 6 ++- .../src/org.apache.sis.web}/webapp/WEB-INF/web.xml | 0 incubator/build.gradle.kts | 14 ------ .../webapp/META-INF/context.xml | 26 ---------- netbeans-project/ivy.xml | 1 + 23 files changed, 155 insertions(+), 140 deletions(-) diff --cc buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java index eef951d21f,a599698fdc..74db208d9b --- a/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java +++ b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java @@@ -77,7 -79,8 +77,7 @@@ public final class Dependency Map.entry("storage.gdal", "storage:sis-gdal"), Map.entry("storage.geopackage", "storage:sis-geopackage"), Map.entry("storage.json", "storage:sis-json"), - Map.entry("webapp", "application:sis-webapp") - Map.entry("portrayal.map", "core:sis-portrayal-map"), + Map.entry("web", "application:sis-web") ); /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java index 13a01772c2,1be7e0138e..071f66ca37 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java @@@ -37,11 -36,16 +36,16 @@@ import org.apache.sis.feature.internal. public final class GeometryFactories { /** * The default geometry implementation to use. The default implementation - * is JTS if present, or otherwise ESRI if present, or otherwise Java2D. + * is <abbr>JTS</abbr> if present, or otherwise <abbr>ESRI</abbr> if present. + * Java2D is used as the last fallback. The order may change in future version. */ - static final Geometries<?> DEFAULT = link(link(link(link(link(null, "j2d"), "s2"), "sis"), "esri"), "jts"); + static final Geometries<?> DEFAULT = link(link(link(null, "j2d"), "esri"), "jts"); static { - setStandard(new StandardGeometries<>(DEFAULT)); + Geometries<?> factory = DEFAULT; // Should never be null because at least "j2d" should be present. + while (factory.fallback != null) { + factory = factory.fallback; + } + factory.fallback = new StandardGeometries<>(DEFAULT); } /** diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java index 54e04e5358,36d9e01db7..bdb0449e41 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java @@@ -91,8 -93,43 +93,8 @@@ public enum GeometryLibrary * * @since 1.0 */ - JTS("JTS"), + JTS, - /** - * The Google S2 library. - * This library is designed to work with shapes drawn on a sphere rather than on a plane. - * The library is licensed under the Apache License. - * - * <table class="sis"> - * <caption>Implementation classes</caption> - * <tr><th>Geometry type</th> <th>Class name</th></tr> - * <tr><td>Root geometry class</td> <td>{@code com.google.common.geometry.S2Region}</td></tr> - * </table> - * - * @see <a href="https://github.com/google/s2-geometry-library-java";><abbr>S2</abbr> repository</a> - * - * @since 2.0 (temporary version number until the code in incubator is released) - */ - S2, - - /** - * The SIS library. This open source library provides an object model - * for a large set of geometry types but has limited geometric functions. - * The library is available under Apache 2 license. - * - * <table class="sis"> - * <caption>Implementation classes</caption> - * <tr><th>Geometry type</th> <th>Class name</th></tr> - * <tr><td>Root geometry class</td> <td>{@code org.apache.sis.geometries.Geometry}</td></tr> - * <tr><td>{@link GeometryType#POINT}</td> <td>{@code org.apache.sis.geometries.Point}</td></tr> - * <tr><td>{@link GeometryType#LINEAR}</td> <td>{@code org.apache.sis.geometries.LineString}</td></tr> - * <tr><td>{@link GeometryType#AREAL}</td> <td>{@code org.apache.sis.geometries.Polygon}</td></tr> - * </table> - * - * @since 2.0 (temporary version number until the code in incubator is released) - */ - SIS, - /** * The GeoAPI geometry interfaces. * Since GeoAPI interfaces are implementation neutral, the actual implementation is currently unspecified diff --cc incubator/build.gradle.kts index 69615268d5,6efc2ed003..8db6cf810f --- a/incubator/build.gradle.kts +++ b/incubator/build.gradle.kts @@@ -199,18 -246,18 +197,6 @@@ publishing description = "Read and write files in the JSON Coverage format." } } - create<MavenPublication>("webapp") { - var module = "org.apache.sis.webapp" - groupId = "org.apache.sis.application" - artifactId = "sis-webapp" - create<MavenPublication>("portrayal.map") { - var module = "org.apache.sis.portrayal.map" - groupId = "org.apache.sis.core" - artifactId = "sis-portrayal-map" -- artifact(layout.buildDirectory.file("libs/${module}.jar")) -- artifact(layout.buildDirectory.file("docs/${module}-sources.jar")) {classifier = "sources"} -- artifact(layout.buildDirectory.file("docs/${module}-javadoc.jar")) {classifier = "javadoc"} -- pom { - name = "Apache SIS web services layer" - description = "Placeholder for future developments." - name = "Apache SIS portrayal" - description = "Symbology and map representations, together with a rendering engine for display." -- } -- } } /* Following block is currently repeated in all sub-projects. */ repositories {
