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=d225cd193fd87df74aa9c977a15b9fde2d3a45eb;hb=a75c0516aca20f9a8c8fdd32feee402257ff2b61;hp=aa8c9cc7bb94d980e55a34194b842ec35380aa97;hpb=31a8055cac622a55afd2668e77f00aba1d031f91;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 aa8c9cc7b..d225cd193 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,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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;
@@ -6,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -16,6 +32,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,13 +40,14 @@ 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;
-	private String prefixDatePattern = "yyyyMMdd_HHmmss_";
+	private String prefixDatePattern = "yyMMdd_HHmmss_SSS";
 	private SimpleDateFormat sdf = null;
 
 	private Boolean withExecutionSubdirectory = true;
@@ -153,14 +171,12 @@ public class FileExecutionResources implements ExecutionResources {
 
 	public File getWritableBaseDir() {
 		if (withExecutionSubdirectory) {
+			Date executionContextCreationDate = (Date) executionContext
+					.getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE);
 			Assert.notNull(executionContext, "execution context is null");
-			String path = baseDir.getPath()
-					+ File.separator
-					+ sdf()
-							.format(
-									executionContext
-											.getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE))
-					+ executionContext.getUuid();
+			String path = baseDir.getPath() + File.separator
+					+ sdf().format(executionContextCreationDate);
+			// TODO write execution id somewhere? like in a txt file
 			return new File(path);
 		} else {
 			return baseDir;