Introduce a factory bean to use execution resources

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / core / execution / FileExecutionResources.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
index e6530832ad7638ea7d41babadfe64363df49a4b9..a023fc7f579ba99d30f96a37150752425dc4c443 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
@@ -14,12 +14,20 @@ public class FileExecutionResources implements ExecutionResources {
        private final static Log log = LogFactory
                        .getLog(FileExecutionResources.class);
        protected final static String DEFAULT_EXECUTION_RESOURCES_DIRNAME = "executionResources";
+       public final static String DEFAULT_EXECUTION_RESOURCES_TMP_PATH = System
+                       .getProperty("java.io.tmpdir")
+                       + File.separator
+                       + "slc"
+                       + File.separator
+                       + DEFAULT_EXECUTION_RESOURCES_DIRNAME;
 
        private File baseDir;
        private ExecutionContext executionContext;
        private String prefixDatePattern = "yyyyMMdd_HHmmss_";
        private SimpleDateFormat sdf = null;
 
+       private Boolean withExecutionSubdirectory = true;
+
        public FileExecutionResources() {
                // Default base directory
                String osgiInstanceArea = System.getProperty("osgi.instance.area");
@@ -38,8 +46,7 @@ public class FileExecutionResources implements ExecutionResources {
                        baseDir = new File(osgiInstanceAreaDefault + File.separator
                                        + DEFAULT_EXECUTION_RESOURCES_DIRNAME);
                } else {// outside OSGi
-                       baseDir = new File(tempDir + File.separator + "slc"
-                                       + File.separator + DEFAULT_EXECUTION_RESOURCES_DIRNAME);
+                       baseDir = new File(DEFAULT_EXECUTION_RESOURCES_TMP_PATH);
                }
        }
 
@@ -61,6 +68,7 @@ public class FileExecutionResources implements ExecutionResources {
                        parentDir.mkdirs();
                }
                Resource resource = new FileSystemResource(file);
+
                if (log.isTraceEnabled())
                        log.trace("Returns writable resource " + resource);
                return resource;
@@ -69,13 +77,18 @@ public class FileExecutionResources implements ExecutionResources {
        public File getFile(String relativePath) {
                Assert.notNull(executionContext, "execution context is null");
 
-               String path = baseDir.getPath() + File.separator
-                               + sdf().format(executionContext.getCreationDate())
-                               + executionContext.getUuid();
-               File executionDir = new File(path);
-
-               return new File(executionDir.getPath() + File.separator
-                               + relativePath.replace('/', File.separatorChar));
+               if (withExecutionSubdirectory) {
+                       String path = baseDir.getPath() + File.separator
+                                       + sdf().format(executionContext.getCreationDate())
+                                       + executionContext.getUuid();
+                       File executionDir = new File(path);
+
+                       return new File(executionDir.getPath() + File.separator
+                                       + relativePath.replace('/', File.separatorChar));
+               } else {
+                       return new File(baseDir.getPath() + File.separator
+                                       + relativePath.replace('/', File.separatorChar));
+               }
        }
 
        protected String removeFilePrefix(String url) {
@@ -110,4 +123,9 @@ public class FileExecutionResources implements ExecutionResources {
        public String getPrefixDatePattern() {
                return prefixDatePattern;
        }
+
+       public void setWithExecutionSubdirectory(Boolean withExecutionSubdirectory) {
+               this.withExecutionSubdirectory = withExecutionSubdirectory;
+       }
+
 }