You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/04 17:59:21 UTC
svn commit: r1197665 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/
archiva-modules/archiva-base/archiva-indexer/
archiva-modules/archiva-base/archiva-proxy/
archiva-modules/archiva-base/archiva-repositor...
Author: olamy
Date: Fri Nov 4 16:59:20 2011
New Revision: 1197665
URL: http://svn.apache.org/viewvc?rev=1197665&view=rev
Log:
use derby only in memory for testing
Modified:
archiva/trunk/.gitignore
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
Modified: archiva/trunk/.gitignore
URL: http://svn.apache.org/viewvc/archiva/trunk/.gitignore?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/.gitignore (original)
+++ archiva/trunk/.gitignore Fri Nov 4 16:59:20 2011
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=1197665&r1=1197664&r2=1197665&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml Fri Nov 4 16:59:20 2011
@@ -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>