Make default execution ressources temp dir dependent of the JVM OS user, in order...

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
index 0f3a8dc5841051cca98785f68c2967e8280ea66b..37de20ef8d0289c6835b283b3cd256dac6be01a1 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.core.execution;
 
 import java.io.File;
@@ -16,6 +31,7 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
+/** Implements write access to resources based on standard Java {@link File} */
 public class FileExecutionResources implements ExecutionResources {
        private final static Log log = LogFactory
                        .getLog(FileExecutionResources.class);
@@ -23,9 +39,10 @@ public class FileExecutionResources implements ExecutionResources {
        public final static String DEFAULT_EXECUTION_RESOURCES_TMP_PATH = System
                        .getProperty("java.io.tmpdir")
                        + File.separator
-                       + "slc"
+                       + System.getProperty("user.name")
                        + File.separator
-                       + DEFAULT_EXECUTION_RESOURCES_DIRNAME;
+                       + "slc"
+                       + File.separator + DEFAULT_EXECUTION_RESOURCES_DIRNAME;
 
        private File baseDir;
        private ExecutionContext executionContext;
@@ -79,10 +96,25 @@ public class FileExecutionResources implements ExecutionResources {
                return resource;
        }
 
+       public String getWritableOsPath(String relativePath) {
+               try {
+                       return getFile(relativePath).getCanonicalPath();
+               } catch (IOException e) {
+                       throw new SlcException("Cannot find canonical path", e);
+               }
+       }
+
+       public File getWritableOsFile(String relativePath) {
+               return getFile(relativePath);
+       }
+
        public String getAsOsPath(Resource resource, Boolean overwrite) {
                File file = fileFromResource(resource);
                if (file != null)
                        try {
+                               if (log.isTraceEnabled())
+                                       log.debug("Directly interpret " + resource + " as OS file "
+                                                       + file);
                                return file.getCanonicalPath();
                        } catch (IOException e1) {
                                // silent
@@ -130,24 +162,24 @@ public class FileExecutionResources implements ExecutionResources {
 
        }
 
-       public File getFile(String relativePath) {
+       protected File getFile(String relativePath) {
+               File writableBaseDir = getWritableBaseDir();
+               return new File(writableBaseDir.getPath() + File.separator
+                               + relativePath.replace('/', File.separatorChar));
+       }
 
+       public File getWritableBaseDir() {
                if (withExecutionSubdirectory) {
                        Assert.notNull(executionContext, "execution context is null");
                        String path = baseDir.getPath()
                                        + File.separator
-                                       + sdf()
-                                                       .format(
-                                                                       executionContext
-                                                                                       .getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE))
+                                       + sdf().format(
+                                                       executionContext
+                                                                       .getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE))
                                        + executionContext.getUuid();
-                       File executionDir = new File(path);
-
-                       return new File(executionDir.getPath() + File.separator
-                                       + relativePath.replace('/', File.separatorChar));
+                       return new File(path);
                } else {
-                       return new File(baseDir.getPath() + File.separator
-                                       + relativePath.replace('/', File.separatorChar));
+                       return baseDir;
                }
        }