use derby only in memory for testing

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

diff --git a/.gitignore b/.gitignore
index 11beaceaa587d2f9d8f9286f6e45cb8562c2fde6..c3383de5f8de4433c2d204c13c11e1d43ffe073e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 target
 build
 *.iml
-derby.log
 archiva-modules/archiva-web/archiva-webapp/appserver-base/
 archiva-modules/archiva-web/archiva-webapp/overlays/
 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 3ce4029505baa4486dda32f7ddc3f6c529d99488..4222dfc0d68d5d1aa18a469a0b44794afadfa58c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -119,6 +119,8 @@
               <appserver.base>${project.build.directory}/appserver-base</appserver.base>
               <plexus.home>${project.build.directory}/appserver-base</plexus.home>
               <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+              <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+              <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
               <archiva.user.configFileName>${project.build.directory}/archiva.xml</archiva.user.configFileName>
             </systemPropertyVariables>
           </configuration>

diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 2c1d6c1d2b9be54cbcd8a321644b40adafe26b43..ec70560dc75df5d394d047fc96bf0e8273eb8178 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -170,6 +170,8 @@
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <plexus.home>${project.build.directory}/appserver-base</plexus.home>
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 25c9d5fabf1288b12bb05e32dae20d76c4a0cf85..3cf6f60bde868286612c6dde104f27a7af1c22fa 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -159,6 +159,8 @@
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <plexus.home>${project.build.directory}/appserver-base</plexus.home>
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 6af38b62657e1ab90b5b17ad4dfa1f2b715101b1..b01764f236b9505c3b7d0d22cd59f64dca181815 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -213,6 +213,8 @@
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <plexus.home>${project.build.directory}/appserver-base</plexus.home>
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 959af941c8c8ce3182dd7c986741f8600d559c58..50375e7ab1fbade9ea7fbaa8deca9f3ce769b09d 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -27,10 +27,6 @@
   <artifactId>archiva-scheduler-indexing</artifactId>
   <name>Archiva Scheduler :: Indexing</name>
 
-  <properties>
-    <jettyVersion>7.4.5.v20110725</jettyVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.archiva</groupId>
@@ -151,6 +147,8 @@
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <plexus.home>${project.build.directory}/appserver-base</plexus.home>
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
             <basedir>${basedir}</basedir>
           </systemPropertyVariables>
         </configuration>

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 36809fa37b777f2d1176f40d1e0088fb2e910cd8..06a428e707248f1c9b300ad89bb254eb93bee2cf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -311,6 +311,8 @@
             <archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
             <rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
             <test.useTomcat>${test.useTomcat}</test.useTomcat>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 86f2fe1d7434f07636cb559f383f174e0de764a1..cb9709f3e778ed0a664c5607741c444d31258787 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -161,6 +161,8 @@
         <configuration>
           <systemPropertyVariables>
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+            <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
index 322d8e91bf78ccbb57d9fd3cafb6de7e57f86723..901eb48c817139566e96ef35cd9dffaef766e8c3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
@@ -168,6 +168,9 @@
               <appserver.base>${project.build.directory}/appserver-base</appserver.base>
               <plexus.home>${project.build.directory}/appserver-base</plexus.home>
               <java.io.tmpdir>${project.build.testOutputDirectory}</java.io.tmpdir>
+              <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+              <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+              <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
             </systemPropertyVariables>
           </configuration>
         </plugin>