archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r723581 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp: ./ pom.xml src/appserver-base/conf/archiva.xml
Date Fri, 05 Dec 2008 04:25:21 GMT
Author: brett
Date: Thu Dec  4 20:25:20 2008
New Revision: 723581

URL: http://svn.apache.org/viewvc?rev=723581&view=rev
Log:
run Jetty from outside the target so that you have to use -PcleanJetty to clean up, generally
persisting the server and configuration that you used
merged from: r721951, 721953

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml
      - copied unchanged from r721953, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/   (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec  4 20:25:20 2008
@@ -1,3 +1,4 @@
+appserver-base
 target
 .deployment
 *~

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=723581&r1=723580&r2=723581&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Dec  4 20:25:20 2008
@@ -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>



Mime
View raw message