Author: desruisseaux
Date: Fri Sep 20 09:51:52 2019
New Revision: 1867210
URL: http://svn.apache.org/viewvc?rev=1867210&view=rev
Log:
Update version numbers.
Modified:
sis/site/trunk/content/command-line.mdtext
sis/site/trunk/content/downloads.mdtext
sis/site/trunk/content/epsg.mdtext
sis/site/trunk/content/index.mdtext
Modified: sis/site/trunk/content/command-line.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/command-line.mdtext?rev=1867210&r1=1867209&r2=1867210&view=diff
==============================================================================
--- sis/site/trunk/content/command-line.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/command-line.mdtext [UTF-8] Fri Sep 20 09:51:52 2019
@@ -31,11 +31,11 @@ in their own application.
Installation {#install}
==========================
-Select "Apache SIS 0.8 binary" from the [downloads page](downloads.html) an
unzip in any directory.
+Select "Apache SIS 1.0 binary" from the [downloads page](downloads.html) an
unzip in any directory.
The directory structure will be as below:
:::text
- apache-sis-0.8
+ apache-sis-1.0
├─ bin
├─ conf
├─ data
@@ -47,10 +47,10 @@ The `bin` sub-directory can be added to
Example:
:::bash
- export PATH=$PWD/apache-sis-0.8/bin:$PATH
+ export PATH=$PWD/apache-sis-1.0/bin:$PATH
The remaining of this page assumes that the `bin` directory is on the search
path.
-If not, the same examples can still be executed by replacing the `sis` command
by `./apache-sis-0.8/bin/sis`.
+If not, the same examples can still be executed by replacing the `sis` command
by `./apache-sis-1.0/bin/sis`.
Optional dependencies {#dependencies}
@@ -375,7 +375,7 @@ By default, the metadata are shown in a
But the metadata can optionally be exported as an ISO 19139 compliant XML
document.
<blockquote><b>Note:</b>
-As of SIS 0.8, only ISO 19139 XML documents, CF-compliant netCDF files,
GeoTIFF files, GPX files
+As of SIS 1.0, only ISO 19139 XML documents, CF-compliant netCDF files,
GeoTIFF files, GPX files
or Moving Features CSV files can be given in argument to this command.
</blockquote>
Modified: sis/site/trunk/content/downloads.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/downloads.mdtext?rev=1867210&r1=1867209&r2=1867210&view=diff
==============================================================================
--- sis/site/trunk/content/downloads.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/downloads.mdtext [UTF-8] Fri Sep 20 09:51:52 2019
@@ -18,8 +18,8 @@ Notice: Licensed to the Apache Software
-Apache SIS 0.8 is now available.
-See the [release notes](release-notes/0.8.html) for a list of changes since
the previous version.
+Apache SIS 1.0 is now available.
+See the [release notes](release-notes/1.0.html) for a list of changes since
the previous version.
Apache SIS releases are available under the [Apache License, Version
2.0][license].
See the `NOTICE` file contained in each release artifact for applicable
copyright attribution notices.
@@ -36,9 +36,9 @@ For convenience, an aggregated Javadoc a
The precompiled JAR file contains most modules and dependencies in a single
archive for easier inclusion
in a classpath.
- * [Apache SIS 0.8 sources][src] [[PGP][src-PGP]]
- * [Apache SIS 0.8 javadoc][doc] [[PGP][doc-PGP]]
- * [Apache SIS 0.8 binary][bin] [[PGP][bin-PGP]]
+ * [Apache SIS 1.0 sources][src] [[PGP][src-PGP]]
+ * [Apache SIS 1.0 javadoc][doc] [[PGP][doc-PGP]]
+ * [Apache SIS 1.0 binary][bin] [[PGP][bin-PGP]]
@@ -81,7 +81,7 @@ If running on Java 11 or higher, at leas
:::xml
<properties>
- <sis.version>0.8</sis.version>
+ <sis.version>1.0</sis.version>
</properties>
<dependencies>
@@ -143,11 +143,11 @@ See [How to use EPSG geodetic dataset](e
[maven]: http://maven.apache.org/
[keys]: http://www.apache.org/dist/sis/KEYS
[license]: http://www.apache.org/licenses/LICENSE-2.0
-[src]: http://www.apache.org/dyn/closer.cgi/sis/0.8/apache-sis-0.8-src.zip
-[doc]: http://www.apache.org/dyn/closer.cgi/sis/0.8/apache-sis-0.8-doc.zip
-[bin]: http://www.apache.org/dyn/closer.cgi/sis/0.8/apache-sis-0.8-bin.zip
-[src-PGP]: http://www.apache.org/dist/sis/0.8/apache-sis-0.8-src.zip.asc
-[doc-PGP]: http://www.apache.org/dist/sis/0.8/apache-sis-0.8-doc.zip.asc
-[bin-PGP]: http://www.apache.org/dist/sis/0.8/apache-sis-0.8-bin.zip.asc
+[src]: http://www.apache.org/dyn/closer.cgi/sis/1.0/apache-sis-1.0-src.zip
+[doc]: http://www.apache.org/dyn/closer.cgi/sis/1.0/apache-sis-1.0-doc.zip
+[bin]: http://www.apache.org/dyn/closer.cgi/sis/1.0/apache-sis-1.0-bin.zip
+[src-PGP]: http://www.apache.org/dist/sis/1.0/apache-sis-1.0-src.zip.asc
+[doc-PGP]: http://www.apache.org/dist/sis/1.0/apache-sis-1.0-doc.zip.asc
+[bin-PGP]: http://www.apache.org/dist/sis/1.0/apache-sis-1.0-bin.zip.asc
[EPSG]: http://www.epsg.org/
[EPSG-ToU]: http://www.epsg.org/TermsOfUse.aspx
Modified: sis/site/trunk/content/epsg.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/epsg.mdtext?rev=1867210&r1=1867209&r2=1867210&view=diff
==============================================================================
--- sis/site/trunk/content/epsg.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/epsg.mdtext [UTF-8] Fri Sep 20 09:51:52 2019
@@ -58,12 +58,17 @@ For example:
The first time that the command-line tool needs to query EPSG, it will prompt
the user for authorization
to download EPSG geodetic dataset from Maven Central. If the user accepts EPSG
terms of use, then a local
-copy of the EPSG geodetic dataset will be created and stored in the
`apache-sis-0.8/data` sub-directory.
+copy of the EPSG geodetic dataset will be created and stored in the
`apache-sis-1.0/data` sub-directory.
If the command-line tool does not offer to download the EPSG geodetic dataset,
-try adding a `derby-<version>.jar` file (download lib-distribution from [Derby
project][Derby]) in the `apache-sis-0.8/lib` sub-directory.
-This is normally not needed with Oracle JDK6, JDK7 or JDK8 because Apache SIS
tries to use the JavaDB embedded
-in those distributions, but may be necessary with other distributions or in
security-constrained environments.
+try adding a `derby-<version>.jar` file (download lib-distribution from [Derby
project][Derby]) in the `apache-sis-1.0/lib` sub-directory.
+This is normally not needed with Oracle JDK8 because Apache SIS tries to use
the JavaDB embedded
+in those distributions, but may be necessary with other distributions or in
security-constrained environments:
+
+ :::bash
+ cd apache-sis-1.0/lib
+ wget
http://repo1.maven.org/maven2/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
+
Use the local copy in other applications {#use-local}
@@ -71,20 +76,20 @@ Use the local copy in other applications
For using the installed EPSG geodetic dataset in your own application, apply
*one* of the following choices:
- * Set the `SIS_DATA` environment variable to the path of
`apache-sis-0.8/data` directory _(preferred choice)_.
- * Set the `derby.system.home` Java property to the path of
`apache-sis-0.8/data/Databases` directory.
+ * Set the `SIS_DATA` environment variable to the path of
`apache-sis-1.0/data` directory _(preferred choice)_.
+ * Set the `derby.system.home` Java property to the path of
`apache-sis-1.0/data/Databases` directory.
Alternatively `SIS_DATA` or `derby.system.home` can be set to the path of any
other directory which contain the same files.
-Examples are shown below for Unix systems, assuming that the current directory
is the directory where `apache-sis-0.8-bin.zip`
+Examples are shown below for Unix systems, assuming that the current directory
is the directory where `apache-sis-1.0-bin.zip`
has been unzipped:
:::bash
- export SIS_DATA=apache-sis-0.8/data
- java -classpath apache-sis-0.8/lib/sis.jar:myApp.jar myMainClass
+ export SIS_DATA=apache-sis-1.0/data
+ java -classpath apache-sis-1.0/lib/sis.jar:myApp.jar myMainClass
If the `SIS_DATA` environment variable can not be set, Java property can be
used as a fallback:
- java -Dderby.system.home=apache-sis-0.8/data/Databases -classpath
apache-sis-0.8/lib/sis.jar:myApp.jar myMainClass
+ java -Dderby.system.home=apache-sis-1.0/data/Databases -classpath
apache-sis-1.0/lib/sis.jar:myApp.jar myMainClass
@@ -111,6 +116,7 @@ The target database must be specified by
or a directory that contain other Derby databases. The specified directory
must exist.
* Register a `DataSource` under the `java:comp/env/jdbc/SpatialMetadata`
name in a JNDI directory
(see [next section](#jndi)). The database must exist but can be initially
empty.
+ * Set a `DataSource` [from Java
code](./apidocs/org/apache/sis/setup/Configuration.html).
The Maven dependency is as below (the Derby dependency can be replaced by
another database driver
if that database is specified by JNDI):
@@ -120,12 +126,12 @@ if that database is specified by JNDI):
<dependency>
<groupId>org.apache.sis.non-free</groupId>
<artifactId>sis-epsg</artifactId>
- <version>0.8</version>
+ <version>1.0</version>
<scope>runtime</scope>
</dependency>
- <!-- Following dependency can be omitted on Oracle JDK6, JDK7 or JDK8
- since those Java distributions contain Derby (a.k.a JavaDB). -->
+ <!-- Following dependency can be omitted on Oracle JDK8
+ since that Java distributions contain Derby (a.k.a JavaDB). -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -159,7 +165,7 @@ Note that `sis-epsg` and `sis-embedded-d
<dependency>
<groupId>org.apache.sis.non-free</groupId>
<artifactId>sis-embedded-data</artifactId>
- <version>0.8</version>
+ <version>1.0</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -181,7 +187,7 @@ While Apache SIS uses Apache Derby by de
For using an arbitrary database, register a `javax.sql.DataSource` instance
through the Java Naming and Directory Interface (JNDI).
That registration can be done programmatically (by Java code) or by
configuring XML files in some environments.
The database must exist but can be empty, in which case it will be populated
with an EPSG schema when first needed
-if the <code
style="white-space:normal">org.apache.sis.non-free:sis-epsg:0.8</code>
dependency is on the classpath
+if the <code
style="white-space:normal">org.apache.sis.non-free:sis-epsg:1.0</code>
dependency is on the classpath
(see [above section](#maven-epsg)).
@@ -201,6 +207,12 @@ Registration can be done by the followin
Context env = (Context) InitialContext.doLookup("java:comp/env");
env.bind("jdbc/SpatialMetadata", ds);
+If there is no JNDI environment, the `org.apache.sis.setup.Configuration`
class can be used as a fallback:
+
+ :::java
+ // Fallback if no JNDI environment is available.
+ Configuration.current().setDatabase(() -> ds);
+
Registration in web application containers {#jndi-webapp}
Modified: sis/site/trunk/content/index.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/index.mdtext?rev=1867210&r1=1867209&r2=1867210&view=diff
==============================================================================
--- sis/site/trunk/content/index.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/index.mdtext [UTF-8] Fri Sep 20 09:51:52 2019
@@ -50,7 +50,7 @@ Some Apache SIS features are:
Using Apache SIS {#user}
---------------------------
-The latest SIS release is 0.8, released November 2017.
+The latest SIS release is 1.0, released September 2019.
Apache SIS requires Java 10 or higher for building, but can be executed on
Java 8 or higher.
If using Java 8 Runtime Environment, nothing else is needed since Java 8
includes JAXB.
If using Java 9 or higher, one of the following configurations is needed
