You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2021/09/29 15:11:33 UTC
[sis] branch master updated (0bc0b39 -> 3c3b5c9)
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 0bc0b39 Merge branch 'geoapi-3.1'
add c0c2b4f Clarification about the changes allowed on feature types.
add d23de41 Remove references to Java Native Interfaces (JNI) that do not apply anymore after removal of "sis-gdal" module.
add e1bf431 Skip a test if the EPSG geodetic dataset is not present.
add 5a19844 Move into a new class (`OptionalInstallations`) part of the `ResourceDownloader` code asking if user agrees with EPSG terms of use. The intend is to allow to reuse this code in JavaFX application in addition of console application.
add 1e93fa3 Add the possibility to download automatically EPSG data if user agrees with EPSG terms of use.
add c18ff54 Update the EPSG data URL to the next version to be published.
add 199a9f4 Merge branch 'geoapi-4.0' into geoapi-3.1
new 3c3b5c9 Merge branch 'geoapi-3.1'
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:
application/sis-console/pom.xml | 10 +-
.../sis-console/src/main/artifact/lib/README | 5 -
.../src/main/artifact/lib/darwin/content.txt | 2 -
.../src/main/artifact/lib/linux/content.txt | 2 -
.../src/main/artifact/lib/windows/content.txt | 2 -
.../apache/sis/console/ResourcesDownloader.java | 234 ++++---------------
application/sis-javafx/doc/readme.txt | 6 +-
application/sis-javafx/pom.xml | 12 +-
application/sis-javafx/src/main/artifact/bin/sisfx | 2 +-
.../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +-
.../main/java/org/apache/sis/gui/DataViewer.java | 17 ++
.../apache/sis/internal/gui/BackgroundThreads.java | 26 +++
.../sis/internal/gui/OptionalDataDownloader.java | 84 +++++++
.../org/apache/sis/internal/gui/Resources.java | 21 ++
.../apache/sis/internal/gui/Resources.properties | 4 +
.../sis/internal/gui/Resources_fr.properties | 4 +
.../org.apache.sis.setup.InstallationResources | 2 +-
.../sis/referencing/EPSGFactoryFallback.java | 2 +-
.../sis/referencing/factory/sql/EPSGInstaller.java | 2 +-
.../factory/sql/InstallationScriptProvider.java | 2 +-
.../test/integration/CoordinateOperationTest.java | 3 +
.../org/apache/sis/internal/system}/Fallback.java | 4 +-
.../apache/sis/setup/InstallationResources.java | 3 +-
.../apache/sis/setup/OptionalInstallations.java | 253 +++++++++++----------
ide-project/NetBeans/build.xml | 7 +
.../sis/internal/sql/feature/SchemaModifier.java | 5 +-
26 files changed, 369 insertions(+), 347 deletions(-)
delete mode 100644 application/sis-console/src/main/artifact/lib/darwin/content.txt
delete mode 100644 application/sis-console/src/main/artifact/lib/linux/content.txt
delete mode 100644 application/sis-console/src/main/artifact/lib/windows/content.txt
create mode 100644 application/sis-javafx/src/main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java
copy application/{sis-console => sis-javafx}/src/main/resources/META-INF/services/org.apache.sis.setup.InstallationResources (75%)
rename core/{sis-referencing/src/main/java/org/apache/sis/internal/referencing => sis-utility/src/main/java/org/apache/sis/internal/system}/Fallback.java (96%)
copy application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java => core/sis-utility/src/main/java/org/apache/sis/setup/OptionalInstallations.java (53%)
[sis] 01/01: Merge branch 'geoapi-3.1'
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3c3b5c9ea376956d64264a1795a47baadd4a998c
Merge: 0bc0b39 199a9f4
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 29 17:09:11 2021 +0200
Merge branch 'geoapi-3.1'
application/sis-console/pom.xml | 10 +-
.../sis-console/src/main/artifact/lib/README | 5 -
.../src/main/artifact/lib/darwin/content.txt | 2 -
.../src/main/artifact/lib/linux/content.txt | 2 -
.../src/main/artifact/lib/windows/content.txt | 2 -
.../apache/sis/console/ResourcesDownloader.java | 234 ++++---------------
application/sis-javafx/doc/readme.txt | 6 +-
application/sis-javafx/pom.xml | 12 +-
application/sis-javafx/src/main/artifact/bin/sisfx | 2 +-
.../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +-
.../main/java/org/apache/sis/gui/DataViewer.java | 17 ++
.../apache/sis/internal/gui/BackgroundThreads.java | 26 +++
.../sis/internal/gui/OptionalDataDownloader.java | 84 +++++++
.../org/apache/sis/internal/gui/Resources.java | 21 ++
.../apache/sis/internal/gui/Resources.properties | 4 +
.../sis/internal/gui/Resources_fr.properties | 4 +
.../org.apache.sis.setup.InstallationResources | 3 +
.../sis/referencing/EPSGFactoryFallback.java | 2 +-
.../sis/referencing/factory/sql/EPSGInstaller.java | 2 +-
.../factory/sql/InstallationScriptProvider.java | 2 +-
.../test/integration/CoordinateOperationTest.java | 3 +
.../org/apache/sis/internal/system}/Fallback.java | 4 +-
.../apache/sis/setup/InstallationResources.java | 3 +-
.../apache/sis/setup/OptionalInstallations.java | 253 +++++++++++----------
ide-project/NetBeans/build.xml | 7 +
.../sis/internal/sql/feature/SchemaModifier.java | 5 +-
26 files changed, 371 insertions(+), 346 deletions(-)