configure to use appserver.base sys props only in ${project.build.directory}/appserve...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1231931 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 92fddf67d6f94fff9be43d775aaa5239bae0704b..d4e368c139e09c3bd1c0c12da70664beb9bf3de5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -875,7 +875,7 @@
             </goals>
             <configuration>
               <tasks>
-                <copy todir="${basedir}/appserver-base">
+                <copy todir="${project.build.directory}/appserver-base">
                   <fileset dir="src/appserver-base"/>
                 </copy>
               </tasks>
@@ -1039,10 +1039,10 @@
           <path>/archiva</path>
           <contextFile>${tomcatContextXml}</contextFile>
           <systemProperties>
-            <plexus.home>${basedir}/appserver-base</plexus.home>
-            <appserver.base>${basedir}/appserver-base</appserver.base>
+            <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>${basedir}/appserver-base/logs</derby.system.home>
+            <derby.system.home>${project.build.directory}/appserver-base/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>
           </systemProperties>
@@ -1090,11 +1090,11 @@
           <systemProperties>
             <systemProperty>
               <name>plexus.home</name>
-              <value>${basedir}/appserver-base</value>
+              <value>${project.build.directory}/appserver-base</value>
             </systemProperty>
             <systemProperty>
               <name>appserver.base</name>
-              <value>${basedir}/appserver-base</value>
+              <value>${project.build.directory}/appserver-base</value>
             </systemProperty>
             <systemProperty>
               <name>appserver.home</name>
@@ -1102,7 +1102,7 @@
             </systemProperty>
             <systemProperty>
               <name>derby.system.home</name>
-              <value>${basedir}/appserver-base/logs</value>
+              <value>${project.build.directory}/appserver-base/logs</value>
             </systemProperty>
           </systemProperties>
         </configuration>
@@ -1229,36 +1229,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>cleanJetty</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-clean-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>cleanJetty</id>
-                <phase>clean</phase>
-                <configuration>
-                  <filesets>
-                    <fileset>
-                      <directory>${basedir}/appserver-base</directory>
-                      <includes>
-                        <include>**/**</include>
-                      </includes>
-                    </fileset>
-                  </filesets>
-                </configuration>
-                <goals>
-                  <goal>clean</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <!-- profile for tomcat plugin dev an log output in the console -->
       <id>dev</id>
@@ -1419,10 +1389,10 @@
               <path>/archiva</path>
               <contextFile>${tomcatContextXml}</contextFile>
               <systemProperties>
-                <plexus.home>${basedir}/appserver-base</plexus.home>
-                <appserver.base>${basedir}/appserver-base</appserver.base>
+                <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>${basedir}/appserver-base/logs</derby.system.home>
+                <derby.system.home>${project.build.directory}/appserver-base/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>
@@ -1449,10 +1419,10 @@
               <path>/archiva</path>
               <contextFile>${tomcatContextXml}</contextFile>
               <systemProperties>
-                <plexus.home>${basedir}/appserver-base</plexus.home>
-                <appserver.base>${basedir}/appserver-base</appserver.base>
+                <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>${basedir}/appserver-base/logs</derby.system.home>
+                <derby.system.home>${project.build.directory}/appserver-base/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>