run Jetty from outside the target so that you have to use -PcleanJetty to clean up...

merged from: r721951, 721953

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@723581 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 2903636052e80d74c7e9aa416906f431803a5c62..f353e46b0908c11619cd5286f2ca31aa41aeddf4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -353,11 +353,11 @@
           <systemProperties>
             <systemProperty>
               <name>plexus.home</name>
-              <value>${project.build.directory}/appserver-base</value>
+              <value>${basedir}/appserver-base</value>
             </systemProperty>
             <systemProperty>
               <name>appserver.base</name>
-              <value>${project.build.directory}/appserver-base</value>
+              <value>${basedir}/appserver-base</value>
             </systemProperty>
             <systemProperty>
               <name>appserver.home</name>
@@ -365,7 +365,7 @@
             </systemProperty>
             <systemProperty>
               <name>derby.system.home</name>
-              <value>${project.build.directory}/appserver-base/logs</value>
+              <value>${basedir}/appserver-base/logs</value>
             </systemProperty>
           </systemProperties>
         </configuration>
@@ -444,7 +444,7 @@
             </goals>
             <configuration>
               <tasks>
-                <copy todir="${project.build.directory}/appserver-base">
+                <copy todir="${basedir}/appserver-base">
                   <fileset dir="src/appserver-base" />
                 </copy>
               </tasks>
@@ -497,5 +497,35 @@
         </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>
   </profiles>
 </project>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml b/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml
new file mode 100644 (file)
index 0000000..9afb833
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml
@@ -0,0 +1 @@
+<configuration />