Author: gmazza
Date: Wed Jun 26 16:48:08 2013
New Revision: 1497001
URL: http://svn.apache.org/r1497001
Log:
Switched to in-memory Derby database for build JUnit tests; mvn clean install
takes about 25% less time as a result.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/test/resources/roller-custom.properties
roller/trunk/app/src/test/resources/roller-jettyrun.properties
roller/trunk/pom.xml
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StartDerbyTask.java
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StopDerbyTask.java
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jun 26 16:48:08 2013
@@ -764,21 +764,6 @@
<systemProperties>
<systemProperty>
- <name>derby.dir</name>
-
<value>${project.build.directory}/work/derby-system</value>
- </systemProperty>
-
- <systemProperty>
- <name>config.dir</name>
- <value>${basedir}/src/test/resources</value>
- </systemProperty>
-
- <systemProperty>
- <name>derby.port</name>
- <value>3223</value>
- </systemProperty>
-
- <systemProperty>
<name>roller.custom.config</name>
<value>${project.build.directory}/test-classes/roller-jettyrun.properties</value>
</systemProperty>
@@ -968,7 +953,7 @@
</goals>
<configuration>
<tasks>
- <!-- Derby only for unit testing: skip when
maven.text.skip is set -->
+ <!-- Derby only for unit testing and jetty:run
dev testing: skipped when maven.text.skip is set -->
<delete dir="${basedir}/target/derby-system"
verbose="true" failonerror="false" />
<taskdef name="startdb"
classname="org.apache.roller.weblogger.ant.StartDerbyTask"
classpathref="maven.test.classpath"/>
Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Wed Jun 26
16:48:08 2013
@@ -1,7 +1,7 @@
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
-database.jdbc.connectionURL=jdbc:derby://localhost:3223/rollerdb
+database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb
database.jdbc.username=APP
database.jdbc.password=APP
Modified: roller/trunk/app/src/test/resources/roller-jettyrun.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-jettyrun.properties?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/trunk/app/src/test/resources/roller-jettyrun.properties Wed Jun 26
16:48:08 2013
@@ -1,9 +1,12 @@
+# used during mvn jetty:run, not Roller testing (mvn test)
+
installation.type=auto
planet.aggregator.enabled=true
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
-database.jdbc.connectionURL=jdbc:derby://localhost:3223/rollerdb;create=true
+# In-memory Derby database activated via "startdb" execution in app/pom.xml
+database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb;create=true
database.jdbc.username=app
database.jdbc.password=app
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Wed Jun 26 16:48:08 2013
@@ -25,8 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<roller.version>5.1.0-SNAPSHOT</roller.version>
- <!-- avoid CLOB/BLOB error in all later versions of Derby -->
- <derby.version>10.1.3.1</derby.version>
+ <derby.version>10.10.1.1</derby.version>
</properties>
<modules>
Modified:
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StartDerbyTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StartDerbyTask.java?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
---
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StartDerbyTask.java
(original)
+++
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StartDerbyTask.java
Wed Jun 26 16:48:08 2013
@@ -59,7 +59,7 @@ public class StartDerbyTask extends Task
Class.forName("org.apache.derby.jdbc.ClientDriver");
Connection conn = DriverManager.getConnection(
- "jdbc:derby://localhost:" + port +
"/rollerdb;create=true","APP", "APP");
+ "jdbc:derby://localhost:" + port +
"/memory:rollerdb;create=true","APP", "APP");
//Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
//Connection conn = DriverManager.getConnection(
Modified:
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StopDerbyTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StopDerbyTask.java?rev=1497001&r1=1497000&r2=1497001&view=diff
==============================================================================
---
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StopDerbyTask.java
(original)
+++
roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/StopDerbyTask.java
Wed Jun 26 16:48:08 2013
@@ -43,7 +43,7 @@ public class StopDerbyTask extends Task
Class.forName("org.apache.derby.jdbc.ClientDriver");
String driverURL =
- "jdbc:derby://localhost:" + port + "/rollerdb";
+ "jdbc:derby://localhost:" + port + "/memory:rollerdb";
Connection conn =
DriverManager.getConnection(driverURL,"APP", "APP");
