Last configuration and documentation fixes ported from Apache SIS 1.0-RC1.
diff --git a/application/sis-console/src/main/artifact/README b/application/sis-console/src/main/artifact/README
index ce5f727..d7f1562 100644
--- a/application/sis-console/src/main/artifact/README
+++ b/application/sis-console/src/main/artifact/README
@@ -13,7 +13,9 @@
Installation
============
-SIS is based on Java 8 and provided as a unique standalone JAR file.
+SIS requires Java 8 or later. If running on Java 9 or later,
+then the Derby JAR file should be added in the bin/ directory.
+See http://sis.apache.org/epsg.html#command-line
Unix
----
diff --git a/application/sis-console/src/main/artifact/lib/README b/application/sis-console/src/main/artifact/lib/README
index ab4d188..aeb28ea 100644
--- a/application/sis-console/src/main/artifact/lib/README
+++ b/application/sis-console/src/main/artifact/lib/README
@@ -2,6 +2,7 @@
Recognized optional dependencies are:
- Derby database
+ - JAXB implementation
- UCAR netCDF library
- ESRI Geometry API
- Java Topology Suite
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
index c5770cd..fc656b7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
@@ -1049,7 +1049,7 @@
case IGNORE_METADATA: return equals(m1, m2, 0, false);
case DEBUG: // Fall through
case ALLOW_VARIANT: // Fall through
- case APPROXIMATE: return equals(m1, m2, Numerics.COMPARISON_THRESHOLD, true);
+ case APPROXIMATE: return equals(m1, m2, Numerics.COMPARISON_THRESHOLD, true);
default: throw new IllegalArgumentException(Errors.format(
Errors.Keys.UnknownEnumValue_2, ComparisonMode.class, mode));
}
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 73e9dcb..cf5a089 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
@@ -145,20 +145,24 @@
<pre>mvn install -Dorg.apache.sis.test.extensive=true</pre></li>
- <li><p>Upgrade the <code>FACTORY.VERSION</code> value defined in the
- <code>org.apache.sis.referencing.report.CoordinateReferenceSystems</code> class, then execute that class.
- It can be executed from the IDE since the <code>main</code> method takes no argument.
- This class will write a <code>CoordinateReferenceSystems.html</code> file in current directory
- (the full path will be printed in the standard output).
- That file should be moved to the <code>site/content/tables/</code> directory,
- where <code>site</code> is the directory containing a local checkout of
- <a href="http://svn.apache.org/repos/asf/sis/site/trunk">http://svn.apache.org/repos/asf/sis/site/trunk</a>.</p></li>
+ <li><p>Regenerate the HTML pages listing available CRS and coordinate operation methods.
+ Those pages will be copied into the
+ <code><a href="http://svn.apache.org/repos/asf/sis/site/trunk/content/tables/">site/content/tables/</a></code>
+ directory during the <a href="http://sis.apache.org/release-management.html#update-crs-list">release process</a>,
+ but for now the purpose is only to check if there is errors:</p>
+ <ul>
+ <li><p>Upgrade the <code>FACTORY.VERSION</code> value defined in the
+ <code>org.apache.sis.referencing.report.CoordinateReferenceSystems</code> class, then execute that class.
+ It can be executed from the IDE since the <code>main</code> method takes no argument.
+ This class will write a <code>CoordinateReferenceSystems.html</code> file in current directory
+ (the full path will be printed in the standard output).</p></li>
- <li><p>Execute the <code>org.apache.sis.referencing.report.CoordinateOperationMethods</code> class.
- It can be executed from the IDE since the <code>main</code> method takes no argument.
- This class will write a <code>CoordinateOperationMethods.html</code> file in current directory.
- That file should be moved to the <code>site/content/tables/</code> directory,
- where <code>site</code> is the directory than above.</p></li>
+ <li><p>Execute the <code>org.apache.sis.referencing.report.CoordinateOperationMethods</code> class.
+ It can be executed from the IDE since the <code>main</code> method takes no argument.
+ This class will write a <code>CoordinateOperationMethods.html</code> file in current directory.</p></li>
+ </ul>
+ <p>Open those generated HTML files in a web browser and verify the result.</p>
+ </li>
</ol>
</body>
</html>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java b/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
index a27973d..964de1d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
@@ -86,14 +86,32 @@
/**
* Specifies the data source to use if no {@code "jdbc/SpatialMetadata"} source is binded to a JNDI environment.
* Data source specified by JNDI has precedence over data source specified by this method in order to let users
- * control their data source.
+ * control their data source. The following example shows how to setup a connection to a PostgreSQL database:
*
- * <p>This method can be invoked only before the first attempt to {@linkplain #getDatabase() get the database}.
- * If the {@link DataSource} has already be obtained, then this method throws {@link IllegalStateException}.</p>
+ * {@preformat java
+ * import org.postgresql.ds.PGSimpleDataSource;
+ *
+ * // Class and method declarations omitted for brevity.
+ * PGSimpleDataSource ds = new PGSimpleDataSource();
+ * ds.setServerName("localhost");
+ * ds.setDatabaseName("SpatialMetadata");
+ *
+ * // Registration assuming that a JNDI implementation is available
+ * Context env = (Context) InitialContext.doLookup("java:comp/env");
+ * env.bind("jdbc/SpatialMetadata", ds);
+ *
+ * // Registration without JNDI.
+ * Configuration.current().setDatabase(() -> ds);
+ * }
+ *
+ * This method can be invoked only before the first attempt to {@linkplain #getDatabase() get the database}.
+ * If the {@link DataSource} has already be obtained, then this method throws {@link IllegalStateException}.
*
* @param source supplier of data source to set.
* The supplier may return {@code null}, in which case it will be ignored.
* @throws IllegalStateException if {@link DataSource} has already be obtained before this method call.
+ *
+ * @see <a href="http://sis.apache.org/epsg.html#jndi">How to use EPSG geodetic dataset</a>
*/
public void setDatabase(final Supplier<DataSource> source) {
ArgumentChecks.ensureNonNull("source", source);
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index bf11345..2430fb3 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -116,7 +116,7 @@
rome.version = 0.9
jdom1.version = 1.0
jdom2.version = 2.0.4
-jee.version = 8.0
+jee.version = 8.0.1
osgi.version = 6.0.0
netcdf.version = 4.6.14
joda-time.version = 2.8.1
diff --git a/pom.xml b/pom.xml
index 18b9d27..caa3947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -873,6 +873,7 @@
<additionalOptions>
<additionalOption>--add-stylesheet "${maven.multiModuleProjectDirectory}/src/main/javadoc/sis.css"</additionalOption>
+ <additionalOption>--no-module-directories</additionalOption> <!-- https://bugs.openjdk.java.net/browse/JDK-8215291 -->
</additionalOptions>
<!-- Separates packages on the overview page into the groups specified. -->
