sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/04: Update links to EPSG terms of use.
Date Thu, 02 Jul 2020 16:52:22 GMT
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 3de9eb32baf66a02fe39acc1b23136546f250d1a
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Jul 2 10:03:59 2020 +0200

    Update links to EPSG terms of use.
---
 NOTICE                                                                | 2 +-
 application/sis-openoffice/src/main/unopkg/license.txt                | 2 +-
 .../apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java  | 2 +-
 .../java/org/apache/sis/referencing/factory/sql/epsg/package.html     | 2 +-
 .../src/main/java/org/apache/sis/setup/InstallationResources.java     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NOTICE b/NOTICE
index b6d81b3..3281099 100644
--- a/NOTICE
+++ b/NOTICE
@@ -39,7 +39,7 @@ http://junit.org/junit4/
 -------------------------------------------------------------
 The optional `non-free` group of modules contain geodetic data
 collected by the International Association of Oil and Gas Producers.
-http://www.epsg.org/TermsOfUse.aspx
+https://epsg.org/terms-of-use.html
 
 The optional `sis-javafx` module depends on JavaFX
 published under GPL 2 with classpath exception.
diff --git a/application/sis-openoffice/src/main/unopkg/license.txt b/application/sis-openoffice/src/main/unopkg/license.txt
index d53a686..43547b5 100644
--- a/application/sis-openoffice/src/main/unopkg/license.txt
+++ b/application/sis-openoffice/src/main/unopkg/license.txt
@@ -8,6 +8,6 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 This software may contain geodetic dataset distributed under EPSG terms of use. You may not
use the EPSG Facilities or any of them in whole or in part unless you agree to these Terms
of Use. You may obtain a copy of EPSG terms of use at
 
-    http://www.epsg.org/TermsOfUse.aspx
+    https://epsg.org/terms-of-use.html
 
 Data and information provided in the EPSG facilities are provided "as is" without warranty
of any kind, either expressed or implied, including but not limited to the implied warranties
of merchantability and/or fitness for a particular purpose.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
index f3ba867..d2e3870 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
@@ -186,7 +186,7 @@ public final class DataScriptFormatter extends ScriptRunner {
         try (LineNumberReader in = new LineNumberReader(new InputStreamReader(Files.newInputStream(inputFile),
StandardCharsets.UTF_8))) {
             out.write("---\n" +
                       "---    Copyright International Association of Oil and Gas Producers
(IOGP)\n" +
-                      "---    See  http://www.epsg.org/TermsOfUse.aspx  (a copy is in ./LICENSE.txt).\n"
+
+                      "---    See  https://epsg.org/terms-of-use.html  (a copy is in ./LICENSE.txt).\n"
+
                       "---\n" +
                       "---    This file has been reformatted (without any change in the data)
for the needs of Apache SIS project.\n" +
                       "---    See org.apache.sis.referencing.factory.sql.epsg.DataScriptFormatter.\n"
+
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
index cf5a089..356c93c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
@@ -32,7 +32,7 @@
       This dataset provides definitions for thousands of Coordinate Reference Systems (CRS),
       together with parameter values for thousands of Coordinate Operations between various
pairs of CRS.
       EPSG is maintained by the <a href="http://www.iogp.org/">International Association
of Oil and Gas Producers</a> (IOGP)
-      Surveying &amp; Positioning Committee and is subject to <a href="http://www.epsg.org/TermsOfUse.aspx">EPSG
terms of use</a>.
+      Surveying &amp; Positioning Committee and is subject to <a href="https://epsg.org/terms-of-use.html">EPSG
terms of use</a>.
       Because of incompatibilities between EPSG terms of use and Apache 2 license, the EPSG
geodetic dataset is not distributed
       by default with Apache SIS. A copy of the dataset is provided in a separated module
in a separated source code repository.
       The Maven identifier of that module is <code>org.apache.sis.non-free:sis-epsg</code>
and the source repository is located at
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
b/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
index d9a37ef..fdf1ed6 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
@@ -33,7 +33,7 @@ import java.io.BufferedReader;
  *     But the weight of those files (about 2.4 Mb) is unnecessary for users who do not live
in North America.</li>
  * <li>On the other hand, the <a href="http://www.epsg.org/">EPSG geodetic dataset</a>
is important for most users.
  *     Codes like {@code "EPSG:4326"} became a <i>de-facto</i> standard in various
places like <cite>Web Map Services</cite>,
- *     images encoded in GeoTIFF format, <i>etc</i>. But the <a href="http://www.epsg.org/TermsOfUse.aspx">EPSG
terms of use</a>
+ *     images encoded in GeoTIFF format, <i>etc</i>. But the <a href="https://epsg.org/terms-of-use.html">EPSG
terms of use</a>
  *     are more restrictive than the Apache license and require that we inform the users
about those conditions.</li>
  * </ul></div>
  *
@@ -111,7 +111,7 @@ public abstract class InstallationResources {
      *     <th>License</th>
      *   </tr><tr>
      *     <td>{@code "EPSG"}</td>
-     *     <td>A copy of the <a href="http://www.epsg.org/TermsOfUse.aspx">http://www.epsg.org/TermsOfUse.aspx</a>
page.</td>
+     *     <td>A copy of the <a href="https://epsg.org/terms-of-use.html">https://epsg.org/terms-of-use.html</a>
page.</td>
      *   </tr><tr>
      *     <td>{@code "Embedded"}</td>
      *     <td>Above EPSG license.</td>


Mime
View raw message