From: Olivier Lamy <olamy@apache.org>
Date: Thu, 1 Mar 2012 12:57:29 +0000 (+0000)
Subject: use a property for appserver base path so as it I can do clean without removing all... 
X-Git-Tag: archiva-1.4-M3~1157
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=630ae74fc19187811c83af060e63af643e3bd7f5;p=archiva.git

use a property for appserver base path so as it I can do clean without removing all datas :-)

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 570121afd..8d0f2ec06 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -37,6 +37,7 @@
     <archiva.devMode>true</archiva.devMode>
     <archiva.javascriptLog>true</archiva.javascriptLog>
     <archiva.logMissingI18n>true</archiva.logMissingI18n>
+    <archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
   </properties>
 
   <dependencies>
@@ -661,14 +662,14 @@
           <path>${tomcatRunPath}</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>
-            <archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
+            <archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
             <archiva.devMode>${archiva.devMode}</archiva.devMode>
             <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
@@ -698,13 +699,13 @@
           <path>${tomcatRunPath}</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>
-            <archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
+            <archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
             <archiva.devMode>${archiva.devMode}</archiva.devMode>
             <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>