Author: olamy
Date: Tue May 29 11:23:42 2012
New Revision: 1343669
URL: http://svn.apache.org/viewvc?rev=1343669&view=rev
Log:
use hsql for unit test
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Tue May 29 11:23:42 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
Tue May 29 11:23:42 2012
@@ -23,11 +23,10 @@ application.timestamp=EEE d MMM yyyy HH:
# --------------------------------------------------------------------
# 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=
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
Tue May 29 11:23:42 2012
@@ -23,8 +23,12 @@ application.timestamp=EEE d MMM yyyy HH:
# --------------------------------------------------------------------
# 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=
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
Tue May 29 11:23:42 2012
@@ -25,8 +25,11 @@ application.timestamp=EEE d MMM yyyy HH:
# --------------------------------------------------------------------
# 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=
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
Tue May 29 11:23:42 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
Tue May 29 11:23:42 2012
@@ -23,8 +23,12 @@ application.timestamp=EEE d MMM yyyy HH:
# --------------------------------------------------------------------
# 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=
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml?rev=1343669&r1=1343668&r2=1343669&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
Tue May 29 11:23:42 2012
@@ -173,12 +173,6 @@
</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>
