PR: MRM-250

- pointed log files into ${appserver.base}
- added jetty:run configuration for ${appserver.base}

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

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 0d00d8da4b289c7032e17aa22d64947acbc3e4e5..71c97541ad857a4b893b2c672915d720d7e80836 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -153,6 +153,22 @@
     </dependency>
   </dependencies>
   <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/META-INF/plexus/application.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>**/*.properties</exclude>
+        </excludes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -286,4 +302,11 @@
       </plugin>
     </plugins>
   </build>
+
+<!--
+  This property is here bec the system properties configuration in jetty plugin doesn't work
+ -->
+  <properties>
+    <appserver.base>${basedir}/target</appserver.base>
+  </properties>
 </project>

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index f9ddb54478c68a2488d9fdcdf6006595acbf6597..140e5a11f775ddd7493fffb8f24a41d0631969b1 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -115,7 +115,7 @@
             <properties>
               <property>
                 <name>file</name>
-                <value>${plexus.home}/logs/archiva.log</value>
+                <value>${appserver.base}/logs/archiva.log</value>
               </property>
               <property>
                 <name>append</name>
@@ -137,7 +137,7 @@
             <properties>
               <property>
                 <name>file</name>
-                <value>${plexus.home}/logs/audit.log</value>
+                <value>${appserver.base}/logs/audit.log</value>
               </property>
               <property>
                 <name>append</name>