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 b95df32eb51f312cfd31a958f5c5690669dc0138..342fba1931c6fd1d1bcf6fc2fc8830d6f8a223ff 100644 (file)
--- 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>