X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FFileExecutionResources.java;h=646a1c156201cd8cac88e9092dd59d397a40d823;hb=32f9566efa0d0ce29b31ee0779faf2b42f46321a;hp=361cede76ee3e17979433316a748e0495e056ef6;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

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 361cede76..646a1c156 100644
--- 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,18 +95,33 @@ public class FileExecutionResources implements ExecutionResources {
 		return resource;
 	}
 
-	public String getAsOsPath(Resource resource, Boolean overwrite) {
-		File file = null;
+	public String getWritableOsPath(String relativePath) {
 		try {
-			file = resource.getFile();
-			return file.getCanonicalPath();
+			return getFile(relativePath).getCanonicalPath();
 		} catch (IOException e) {
-			if (log.isTraceEnabled())
-				log
-						.trace("Resource "
-								+ resource
-								+ " is not available on the file system. Retrieving it...");
+			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
+			}
+
+		if (log.isTraceEnabled())
+			log.trace("Resource " + resource
+					+ " is not available on the file system. Retrieving it...");
 
 		InputStream in = null;
 		OutputStream out = null;
@@ -116,20 +147,39 @@ public class FileExecutionResources implements ExecutionResources {
 		}
 	}
 
-	public File getFile(String relativePath) {
+	/**
+	 * Extract the underlying file from the resource.
+	 * 
+	 * @return the file or null if no files support this resource.
+	 */
+	protected File fileFromResource(Resource resource) {
+		try {
+			return resource.getFile();
+		} catch (IOException e) {
+			return null;
+		}
+
+	}
+
+	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.getCreationDate())
+			String path = baseDir.getPath()
+					+ File.separator
+					+ 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;
 		}
 	}