Author: olamy
Date: Tue May 29 10:04:32 2012
New Revision: 1343640
URL: http://svn.apache.org/viewvc?rev=1343640&view=rev
Log:
use only derby in memory for 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
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1343640&r1=1343639&r2=1343640&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Tue May 29 10:04:32 2012
@@ -574,7 +574,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>2.2.8</version>
</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=1343640&r1=1343639&r2=1343640&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 10:04:32 2012
@@ -27,7 +27,7 @@ application.timestamp=EEE d MMM yyyy HH:
jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
#jdbc.url=jdbc:hsqldb:mem:redback-users-tests
#jdbc.url=jdbc:derby:memory:users-test;create=true
-jdbc.url=jdbc:derby:users-test;create=true
+jdbc.url=jdbc:derby:memory:users-test;create=true
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=1343640&r1=1343639&r2=1343640&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 10:04:32 2012
@@ -24,7 +24,7 @@ application.timestamp=EEE d MMM yyyy HH:
# JDBC Setup
jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:${plexus.home}/database;create=true
+jdbc.url=jdbc:derby:memory:users-tests;create=true
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=1343640&r1=1343639&r2=1343640&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 10:04:32 2012
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-jdbc.url=jdbc:derby:target/database;create=true
+
# --------------------------------------------------------------------
@@ -25,8 +25,9 @@ application.timestamp=EEE d MMM yyyy HH:
# --------------------------------------------------------------------
# JDBC Setup
-
+jdbc.url=jdbc:derby:memory:users-tests;create=true
jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+
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=1343640&r1=1343639&r2=1343640&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 10:04:32 2012
@@ -31,7 +31,7 @@
<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:${basedir}/target" />
+ <property name="url" value="jdbc:derby:memory:users-test" />
<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=1343640&r1=1343639&r2=1343640&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 10:04:32 2012
@@ -16,9 +16,6 @@
# under the License.
-jdbc.url=jdbc:derby:target/database;create=true
-
-
# --------------------------------------------------------------------
# Application Configuration
@@ -26,7 +23,7 @@ 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.username=sa
jdbc.password=
