From: Brett Porter <brett@apache.org>
Date: Sat, 1 Oct 2011 05:14:38 +0000 (+0000)
Subject: fix properties to avoid putting test data in WAR and remove derby.log from root
X-Git-Tag: archiva-1.4-M1~133
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=052750b17ad57d4ba8074490c2f62fdd87a32333;p=archiva.git

fix properties to avoid putting test data in WAR and remove derby.log from root

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index b95df32eb..342fba193 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -538,8 +538,9 @@
         <configuration>
           <runOrder>alphabetical</runOrder>
           <systemPropertyVariables>
-            <plexus.home>${project.build.outputDirectory}</plexus.home>
-            <appserver.base>${project.build.outputDirectory}</appserver.base>
+            <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>
             <archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
             <rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
             <archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName>