sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1830959 - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/ core/...
Date Sat, 05 May 2018 10:07:47 GMT
Author: desruisseaux
Date: Sat May  5 10:07:46 2018
New Revision: 1830959

URL: http://svn.apache.org/viewvc?rev=1830959&view=rev
Log:
Declare explicit dependency to Derby with test scope, and remove reference to JavaDB from
documentation (SIS-383).

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TestDatabase.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
    sis/branches/JDK8/core/sis-referencing/pom.xml
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
    sis/branches/JDK8/ide-project/NetBeans/nbproject/project.properties

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -34,7 +34,7 @@ public final class TypeMapper {
      * but only the ones which are of interest for the Apache SIS metadata implementation.
      * The types will be tested in the order they are declared, so the last declarations
are fallbacks.
      *
-     * <p>The types declared here matches both the JavaDB and PostgreSQL mapping.</p>
+     * <p>The types declared here matches both the Derby and PostgreSQL mapping.</p>
      */
     private static final TypeMapper[] TYPES = {
         new TypeMapper(Boolean.class, Types.BOOLEAN,   "BOOLEAN"),
@@ -44,7 +44,7 @@ public final class TypeMapper {
         new TypeMapper(Long   .class, Types.BIGINT,    "BIGINT"),
         new TypeMapper(Integer.class, Types.INTEGER,   "INTEGER"),
         new TypeMapper(Short  .class, Types.SMALLINT,  "SMALLINT"),
-        new TypeMapper(Byte   .class, Types.TINYINT,   "SMALLINT"),     // JavaDB does not
support TINYINT.
+        new TypeMapper(Byte   .class, Types.TINYINT,   "SMALLINT"),     // Derby does not
support TINYINT.
         new TypeMapper(Number .class, Types.DECIMAL,   "DECIMAL")       // Implemented by
BigDecimal.
     };
 

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TestDatabase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TestDatabase.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TestDatabase.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TestDatabase.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -58,7 +58,7 @@ import static org.junit.Assume.*;
 public final strictfp class TestDatabase {
     /**
      * Data source to an alternative database to use for testing purpose.
-     * If {@code null}, an in-memory Derby or JavaDB database will be used.
+     * If {@code null}, an in-memory Derby database will be used.
      *
      * This field is occasionally set to a non-null value (e.g. a connection to a PostgreSQL
database) only for
      * debugging purpose. In such case, it is developer responsibility to ensure that the
appropriate driver is
@@ -74,7 +74,7 @@ public final strictfp class TestDatabase
     }
 
     /**
-     * Creates a Derby database in memory. If no Derby or JavaDB driver is not found,
+     * Creates a Derby database in memory. If no Derby driver is not found,
      * then the test will be interrupted by an {@code org.junit.Assume} statement.
      *
      * @param  name  the database name (without {@code "memory:"} prefix).
@@ -89,7 +89,7 @@ public final strictfp class TestDatabase
         try {
             ds = Initializer.forJavaDB("memory:" + name);
         } catch (ClassNotFoundException e) {
-            assumeNoException("No Derby or JavaDB driver has been found.", e);
+            assumeNoException("No Derby driver has been found.", e);
             throw e;
         }
         ds.getClass().getMethod("setCreateDatabase", String.class).invoke(ds, "create");

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -62,7 +62,7 @@ public final strictfp class MetadataWrit
     private MetadataWriter source;
 
     /**
-     * Runs all tests on JavaDB in the required order.
+     * Runs all tests on Derby in the required order.
      *
      * @throws Exception if an error occurred while writing or reading the database.
      */

Modified: sis/branches/JDK8/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/pom.xml?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK8/core/sis-referencing/pom.xml Sat May  5 10:07:46 2018
@@ -140,6 +140,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -92,7 +92,7 @@ public abstract class GeodeticAuthorityF
      *   │  └─ Function ……………………………………… Browse
      *   └─ Online resource (2 of 2)
      *      ├─ Linkage ………………………………………… jdbc:derby:/my/path/to/SIS_DATA/Databases/SpatialMetadata
-     *      ├─ Description ……………………………… EPSG dataset version
8.9 on “Apache Derby Embedded JDBC Driver” version 10.12.
+     *      ├─ Description ……………………………… EPSG dataset version
9.1 on “Apache Derby Embedded JDBC Driver” version 10.14.
      *      └─ Function ……………………………………… Connection
      * }
      *

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -411,7 +411,7 @@ public class EPSGDataAccess extends Geod
      *   │  └─ Function ……………………………………… Browse
      *   └─ Online resource (2 of 2)
      *      ├─ Linkage ………………………………………… jdbc:derby:/my/path/to/SIS_DATA/Databases/SpatialMetadata
-     *      ├─ Description ……………………………… EPSG dataset version
8.9 on “Apache Derby Embedded JDBC Driver” version 10.12.
+     *      ├─ Description ……………………………… EPSG dataset version
9.1 on “Apache Derby Embedded JDBC Driver” version 10.14.
      *      └─ Function ……………………………………… Connection
      * }
      */
@@ -450,7 +450,7 @@ public class EPSGDataAccess extends Geod
              *
              *    Linkage:      jdbc:derby:/my/path/to/SIS_DATA/Databases/SpatialMetadata
              *    Function:     Connection
-             *    Description:  EPSG dataset version 8.9 on “Apache Derby Embedded JDBC
Driver” version 10.12.
+             *    Description:  EPSG dataset version 9.1 on “Apache Derby Embedded JDBC
Driver” version 10.14.
              *
              * TODO: A future version should use Citations.EPSG as a template.
              *       See the "EPSG" case in ServiceForUtility.createCitation(String).

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -24,7 +24,7 @@
  *
  *
  * <div class="section">Connection to the database</div>
- * By default Apache SIS uses Apache Derby (a.k.a. JavaDB in Oracle JDK),
+ * By default Apache SIS uses Apache Derby,
  * but the database can also be PostgreSQL or MS-Access.
  * The database connection is obtained by the first of the following data sources which is
found:
  *
@@ -40,8 +40,7 @@
  * </ol>
  *
  * In choice 1, the JDBC driver must be provided by the application container (e.g. Apache
Tomcat).
- * In choice 2 and 3, Apache SIS tries to use the JavaDB driver in the JDK installation directory
- * (included in Oracle's distribution of Java) if no Apache Derby driver is found on the
classpath.
+ * With other choices, an Apache Derby driver should be available on the classpath.
  *
  *
  * <div class="section">The EPSG dataset</div>

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -124,7 +124,7 @@ public final strictfp class EPSGInstalle
 
     /**
      * Tests the creation of an EPSG database on Derby.
-     * This test is skipped if Derby/JavaDB is not found, or if the SQL scripts are not found.
+     * This test is skipped if Derby is not found, or if the SQL scripts are not found.
      *
      * @throws Exception if an error occurred while creating the database.
      */

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
[UTF-8] Sat May  5 10:07:46 2018
@@ -53,7 +53,7 @@ import static org.apache.sis.internal.ut
  * <tr><td><code>00:01</code></td><td style="background:blue"><code>CONFIG</code></td>
  *     <td><code><b>[MyApplication]</b> Read configuration from “my-application/setup.xml”.</code></td></tr>
  * <tr><td><code>00:03</code></td><td style="background:green"><code>INFO</code></td>
- *     <td><code><b>[EPSGFactory]</b> Connected to the EPSG database
version 6.9 on JavaDB 10.8.</code></td></tr>
+ *     <td><code><b>[EPSGFactory]</b> Connected to the EPSG database
version 9.1 on Derby 10.14.</code></td></tr>
  * <tr><td><code>00:12</code></td><td style="background:goldenrod"><code>WARNING</code></td>
  *     <td><code><b>[DefaultTemporalExtent]</b> This operation requires
the “sis-temporal” module.</code></td></tr>
  * </table></blockquote>

Modified: sis/branches/JDK8/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/ide-project/NetBeans/nbproject/project.properties?rev=1830959&r1=1830958&r2=1830959&view=diff
==============================================================================
--- sis/branches/JDK8/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Sat May
 5 10:07:46 2018
@@ -118,6 +118,7 @@ slf4j.version        = 1.7.22
 junit.version        = 4.12
 hamcrest.version     = 1.3
 jaxb-ns-mapper       = 2.2.4
+derby.version        = 10.14.2.0
 hsqldb.version       = 2.4.0
 postgresql.version   = 42.2.2
 icons.version        = 3.0.1
@@ -146,6 +147,7 @@ javac.test.classpath=\
     ${javac.classpath}:\
     ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
     ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
+    ${maven.repository}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar:\
     ${maven.repository}/org/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar:\
     ${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\
     ${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\



Mime
View raw message