Merge pull request #59 from futures/46142329-tmp-files

[Fixes #46142329] Control the creation of application temp directories.
fcrepo · May 15, 2013 · ec9b374 · ec9b374
2 parents 22b48ab + a454784
commit ec9b374
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/fcrepo-jms/src/main/resources/config/activemq.xml b/fcrepo-jms/src/main/resources/config/activemq.xml
@@ -76,7 +76,7 @@
             http://activemq.apache.org/persistence.html
         -->
         <persistenceAdapter>
-            <kahaDB directory="ActiveMQ/kahadb"/>
+            <kahaDB directory="${fcrepo.activemq.dir:ActiveMQ/kahadb}"/>
         </persistenceAdapter>
 
 

diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -121,6 +121,28 @@
           <webApp>
             <contextPath>${test.context.path}</contextPath>
           </webApp>
+
+          <systemProperties>
+
+            <systemProperty>
+              <name>
+                com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean.default.objectStoreDir
+              </name>
+              <value>${project.build.directory}/object-store-default</value>
+            </systemProperty>
+
+            <systemProperty>
+              <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
+              <value>${project.build.directory}/object-store</value>
+            </systemProperty>
+
+            <systemProperty>
+              <name>fcrepo.activemq.dir</name>
+              <value>${project.build.directory}/active-mq</value>
+            </systemProperty>
+
+          </systemProperties>
+
         </configuration>
         <executions>
           <execution>

diff --git a/fcrepo-webapp/src/main/resources/config/activemq.xml b/fcrepo-webapp/src/main/resources/config/activemq.xml
@@ -76,7 +76,7 @@
             http://activemq.apache.org/persistence.html
         -->
         <persistenceAdapter>
-            <kahaDB directory="ActiveMQ/kahadb"/>
+            <kahaDB directory="${fcrepo.activemq.dir:ActiveMQ/kahadb}"/>
         </persistenceAdapter>
 
 

diff --git a/pom.xml b/pom.xml
@@ -399,6 +399,12 @@
             <systemPropertyVariables>
               <test.port>${test.port}</test.port>
               <test.context.path>${test.context.path}</test.context.path>
+              <com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean.default.objectStoreDir>
+                ${project.build.directory}/object-store-default
+              </com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean.default.objectStoreDir>
+              <com.arjuna.ats.arjuna.objectstore.objectStoreDir>
+                ${project.build.directory}/object-store
+              </com.arjuna.ats.arjuna.objectstore.objectStoreDir>
             </systemPropertyVariables>
           </configuration>
           <executions>