Author: buildbot
Date: Thu May 19 19:52:55 2016
New Revision: 988655
Log:
Staging update by buildbot for sis
Modified:
websites/staging/sis/trunk/content/ (props changed)
websites/staging/sis/trunk/content/command-line.html
websites/staging/sis/trunk/content/epsg.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 19 19:52:55 2016
@@ -1 +1 @@
-1744628
+1744631
Modified: websites/staging/sis/trunk/content/command-line.html
==============================================================================
--- websites/staging/sis/trunk/content/command-line.html (original)
+++ websites/staging/sis/trunk/content/command-line.html Thu May 19 19:52:55
2016
@@ -134,11 +134,12 @@ If not, the same examples can still be e
<h2 id="dependencies">Optional dependencies<a class="headerlink"
href="#dependencies" title="Permanent link">¶</a></h2>
<p>Every JAR files present in the <code>lib</code> sub-directory will be
included on the classpath during <code>sis</code> command execution.
By default, the <code>lib</code> directory contains only the
<code>sis.jar</code> file.
- However users can add other JAR files in that directory for the following
optional dependencies:</p>
+However users can add other JAR files in that directory for the following
optional dependencies:</p>
<ul>
<li>
<p><strong>Derby driver â</strong>
- needed only if Apache SIS can not locate a JavaDB driver in the JDK
installation directory.</p>
+ needed only if Apache SIS can not locate a JavaDB driver in the JDK
installation directory.
+ This is normally not needed on Oracle JDK6, JDK7 or JDK8 distribution.</p>
</li>
<li>
<p><strong>UCAR NetCDF library â</strong>
@@ -200,7 +201,8 @@ For example the following command prints
<p>The first time that a command requires the EPSG dataset, Apache SIS will
propose to download and install a local copy.
This automatic download happen only when using the command-line tools
described in this page.
-Developers who wish to use the EPSG dataset in their applications can use the
Maven artifact documented in (TODO).</p>
+Developers who wish to use the EPSG dataset in their applications can use the
Maven artifact
+documented in <a href="downloads.html#epsg">download</a> page.</p>
<p><details>
<summary>The above command should produce the following output (click to
expand):</summary>
<pre>ProjectedCRS["JGD2011 / Japan Plane Rectangular CS VIII",
Modified: websites/staging/sis/trunk/content/epsg.html
==============================================================================
--- websites/staging/sis/trunk/content/epsg.html (original)
+++ websites/staging/sis/trunk/content/epsg.html Thu May 19 19:52:55 2016
@@ -116,6 +116,12 @@ are incompatible with Apache license. Th
<li>No data that has been modified other than as permitted in these Terms of
Use shall be attributed to the EPSG Dataset.</li>
</ul>
<p>In order to use the EPSG geodetic dataset with Apache SIS, there is two
possibilities:</p>
+<div class="toc">
+<ul>
+<li><a href="#command-line">Install a local copy with command-line
tool</a></li>
+<li><a href="#maven">Add a Maven dependency</a></li>
+</ul>
+</div>
<h1 id="command-line">Install a local copy with command-line tool<a
class="headerlink" href="#command-line" title="Permanent link">¶</a></h1>
<p>If the <a href="command-line.html">command-line tool</a> has been
downloaded and installed, just query any CRS.
For example:</p>
@@ -127,7 +133,7 @@ For example:</p>
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
<code>apache-sis-0.7/data</code> sub-directory.</p>
<p>If the command-line tool does not offer to download the EPSG geodetic
dataset,
-try adding a <code>derby-<version>.jar</code> file (<a
href="http://db.apache.org/derby/derby_downloads.html";>download
lib-distribution</a>) in the <code>apache-sis-0.7/lib</code> sub-directory.
+try adding a <code>derby-<version>.jar</code> file (download
lib-distribution from <a
href="http://db.apache.org/derby/derby_downloads.html";>Derby project</a>) in
the <code>apache-sis-0.7/lib</code> 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.</p>
<p>For using the installed EPSG geodetic dataset in your own application,
apply <em>one</em> of the following choices:</p>
@@ -138,16 +144,16 @@ in those distributions, but may be neces
<p>Alternatively <code>SIS_DATA</code> or <code>derby.system.home</code> can
be set to the path of any other directory which contain the same files.</p>
<h1 id="maven">Add a Maven dependency<a class="headerlink" href="#maven"
title="Permanent link">¶</a></h1>
<p>Maven projects can get the EPSG geodetic dataset automatically, <em>without
any prompt for terms of use agreement</em>,
-if they add a dependency to the
<code>org.apache.sis.non-free:sis-epsg:0.7</code> artifact in their project.
-We assume that developers who add this dependency explicitely in their
projects agree with the terms of use.
-The <code><dependency></code> fragment to use in the
<code>pom.xml</code> file is given in the <a
href="download.html#epsg">download</a> page.</p>
+if they add a dependency to the
<code>org.apache.sis.non-free:âsis-epsg:â0.7</code> artifact in their
project.
+We assume that developers who add this dependency explicitely in their project
agree with EPSG terms of use.
+The <code><dependency></code> fragment to use in <code>pom.xml</code>
files is given in the <a href="downloads.html#epsg">download</a> page.</p>
<p>In addition, users need to apply <em>one</em> of the following choices:</p>
<ul>
<li>Set the <code>SIS_DATA</code> environment variable to the path of an
initially empty directory <em>(preferred choice)</em>.</li>
<li>Set the <code>derby.system.home</code> Java property to the path of an
initially empty directory,
or a directory that contain other Derby databases.</li>
</ul>
-<p>The directory references by <code>SIS_DATA</code> or
<code>derby.system.home</code> must exist.
+<p>The directory referenced by <code>SIS_DATA</code> or
<code>derby.system.home</code> must exist.
Sub-directories in that directory will be created as needed.</p>
</article>
</section>
