use hsql for unit test

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1343669 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/pom.xml b/pom.xml
index 70e302c3b26cbc3fa18210ddd1cc2e2b25c6fc11..990a79c565c4ed1e8fab800bb933adc0a315f23c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -156,9 +156,12 @@
     <gpg.useagent>true</gpg.useagent>
     <cxfVersion>2.6.0</cxfVersion>
     <derbyVersion>10.8.2.2</derbyVersion>
-
+    <!--
     <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
     <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
+     -->
+    <redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
+    <redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
 
   </properties>
 
@@ -575,6 +578,7 @@
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
         <version>2.2.8</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>

diff --git a/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties b/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
index 5621a702c0ce0179b779b5ce029ddd2916567468..2d94a928c325ac1011959c082b0a357b56896ffd 100644 (file)
--- a/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
@@ -23,11 +23,10 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 # --------------------------------------------------------------------
 # JDBC Setup
 
-#jdbc.driver.name=org.hsqldb.jdbcDriver
-jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
-#jdbc.url=jdbc:hsqldb:mem:redback-users-tests
+#jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
 #jdbc.url=jdbc:derby:memory:users-test;create=true
-jdbc.url=jdbc:derby:memory:users-test;create=true
+jdbc.driver.name=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:mem:redback-test
 jdbc.username=sa
 jdbc.password=
 

diff --git a/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
index 22313266464c5946e7aacbbf8e5d378832d42ee8..4db3be2ce64215d29014981c9abf4718d801ac0d 100644 (file)
--- a/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
@@ -23,8 +23,12 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 # --------------------------------------------------------------------
 # JDBC Setup
 
-jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:memory:users-tests;create=true
+#jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+#jdbc.url=jdbc:derby:memory:users-tests;create=true
+
+jdbc.driver.name=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:mem:redback-test
+
 jdbc.username=sa
 jdbc.password=
 

diff --git a/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties b/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
index 63902ad1160c76dfa2febb9b834749bc4a71d07d..9667b877630b4df315d1ddc4aa0c5715a610e62e 100644 (file)
--- a/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
@@ -25,8 +25,11 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 
 # --------------------------------------------------------------------
 # JDBC Setup
+# keys restore need derby
 jdbc.url=jdbc:derby:memory:users-tests;create=true
 jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+#jdbc.driver.name=org.hsqldb.jdbcDriver
+#jdbc.url=jdbc:hsqldb:mem:redback-test
 
 jdbc.username=sa
 jdbc.password=

diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml
index ae1f6f9985acc353aa557e6b6e82c55fc9dbab27..06ea9af36a83416200765a62929fb4470f6f9396 100644 (file)
--- a/redback-data-management/src/test/resources/spring-context.xml
+++ b/redback-data-management/src/test/resources/spring-context.xml
@@ -30,8 +30,14 @@
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
     <property name="config" ref="userConfiguration"/>
+    <!--
     <property name="driverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:memory:users-test" />
+    -->
+    <property name="driverName" value="org.hsqldb.jdbcDriver"/>
+    <property name="url" value="" />
+
+
     <property name="userName" value="sa"/>
     <property name="password" value=""/>
   </bean>

diff --git a/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties b/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
index bbc9c1d2142bc8bdd892a9218fd3df23ec6dc3d7..3ed04e54a89dec3a5146dbaecd050fe1f84fae9e 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
@@ -23,8 +23,12 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 
 # --------------------------------------------------------------------
 # JDBC Setup
-jdbc.url=jdbc:derby:memory:users-test;create=true
-jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+#jdbc.url=jdbc:derby:memory:users-test;create=true
+#jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+
+jdbc.driver.name=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:mem:redback-test
+
 jdbc.username=sa
 jdbc.password=
 

diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 6450005b9d341d3d8e2c1f0ece9008b38e43aaab..9eabc43dcd98b7e5162f4539bcd74942de92e7f8 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -172,12 +172,6 @@
       <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>