summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2011-10-01 05:14:38 +0000
committerBrett Porter <brett@apache.org>2011-10-01 05:14:38 +0000
commit052750b17ad57d4ba8074490c2f62fdd87a32333 (patch)
tree68311ce1668be849be4c6a4127225242dd95c2b9
parent38638641f06665cbbd091bab8bfa7a111f08e4e7 (diff)
downloadarchiva-052750b17ad57d4ba8074490c2f62fdd87a32333.tar.gz
archiva-052750b17ad57d4ba8074490c2f62fdd87a32333.zip
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
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml5
1 files changed, 3 insertions, 2 deletions
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>