Remove temp files that leak into container directory - again

Resolves: https://www.pivotaltracker.com/story/show/62031750
fcrepo · Dec 6, 2013 · 0f3c594 · 0f3c594
1 parent 125e2b8
commit 0f3c594
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/spring/DefaultPropertiesLoader.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/spring/DefaultPropertiesLoader.java
@@ -100,7 +100,7 @@ public void loadSystemProperties() {
 
         for (final PROPERTIES prop : PROPERTIES.values()) {
             final String val = prop.getValue();
-            LOGGER.trace("{} = {}", val, getProperty(val));
+            LOGGER.info("{} = {}", val, getProperty(val));
         }
     }
 

diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -227,27 +227,6 @@
             <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>
@@ -282,6 +261,23 @@
                   <name>integration-test</name>
                   <value>true</value>
                 </systemProperty>
+
+                <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>