From: Olivier Lamy <olamy@apache.org>
Date: Thu, 1 Mar 2012 13:24:28 +0000 (+0000)
Subject: use same hack with appserver-base as a property in the classic webapp
X-Git-Tag: archiva-1.4-M3~1155
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=485675de1ef7db0947952add1479d1f446f2923f;p=archiva.git

use same hack with appserver-base as a property in the classic webapp

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295555 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 e2b891e01..d35415525 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -34,6 +34,7 @@
     <archiva.baseRestUrl/>
     <rest.admin.pwd/>
     <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
+    <archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
   </properties>
 
   <dependencies>
@@ -1388,10 +1389,10 @@
               <path>/archiva</path>
               <contextFile>${tomcatContextXml}</contextFile>
               <systemProperties>
-                <plexus.home>${project.build.directory}/appserver-base</plexus.home>
-                <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-                <appserver.home>${project.build.directory}/appserver-home</appserver.home>
-                <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
+                <plexus.home>${archivaAppServerBase}</plexus.home>
+                <appserver.base>${archivaAppServerBase}</appserver.base>
+                <appserver.home>${archivaAppServerBase}</appserver.home>
+                <derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
                 <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
                 </redback.admin.creation.file>
                 <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
@@ -1418,10 +1419,10 @@
               <path>/archiva</path>
               <contextFile>${tomcatContextXml}</contextFile>
               <systemProperties>
-                <plexus.home>${project.build.directory}/appserver-base</plexus.home>
-                <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-                <appserver.home>${project.build.directory}/appserver-home</appserver.home>
-                <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
+                <plexus.home>${archivaAppServerBase}</plexus.home>
+                <appserver.base>${archivaAppServerBase}</appserver.base>
+                <appserver.home>${archivaAppServerBase}</appserver.home>
+                <derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
                 <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
                 </redback.admin.creation.file>
                 <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>