From 8b16d7b24a805d80fee1e20ea58c9c310f037650 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Tue, 1 May 2018 20:19:20 +0200
Subject: [PATCH] Changing path for url cache

---
 archiva-modules/archiva-base/archiva-converter/pom.xml | 10 ++++++++++
 .../src/main/resources/META-INF/spring-context.xml     |  2 +-
 .../src/test/resources/spring-context.xml              |  2 +-
 .../archiva-base/archiva-repository-scanner/pom.xml    | 10 ++++++++++
 .../archiva-scheduler-repository/pom.xml               |  1 +
 .../src/main/webapp/WEB-INF/applicationContext.xml     |  2 +-
 archiva-modules/plugins/problem-reports/pom.xml        | 10 ++++++++++
 7 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 98a7abe04..91d1cc6ee 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -138,6 +138,16 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <basedir>${basedir}</basedir>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
index 7ed448f65..676edf7e9 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
@@ -39,7 +39,7 @@
         destroy-method="dispose">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="true"/>
-    <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+    <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
     <property name="maxElementsInMemory" value="1000"/>
     <property name="memoryEvictionPolicy" value="LRU"/>
     <property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
index 65599f758..e8781bc86 100755
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
@@ -71,7 +71,7 @@
         destroy-method="dispose">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
-    <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+    <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
     <property name="maxElementsInMemory" value="1000"/>
     <property name="memoryEvictionPolicy" value="LRU"/>
     <property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 8bb08b9f7..7b76e7b74 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -88,6 +88,16 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <basedir>${basedir}</basedir>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index bd4e3c15a..1b72a32d9 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -171,6 +171,7 @@
           <configuration>
             <systemPropertyVariables>
               <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
+              <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             </systemPropertyVariables>
           </configuration>
         </plugin>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 0197c32d0..8fe71455f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -147,7 +147,7 @@
         destroy-method="dispose">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="true"/>
-    <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+    <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
     <property name="maxElementsInMemory" value="1000"/>
     <property name="memoryEvictionPolicy" value="LRU"/>
     <property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index d08bccb6b..3ffb4b39e 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -123,6 +123,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <basedir>${basedir}</basedir>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
-- 
2.39.5