Reduce log verbosity

[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..646a1c156201cd8cac88e9092dd59d397a40d823 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,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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;
@@ -79,10 +95,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,8 +161,13 @@ 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()
@@ -141,13 +177,9 @@ public class FileExecutionResources implements ExecutionResources {
                                                                        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;
                }
        }