From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 28 Jul 2009 18:24:06 +0000 (+0000)
Subject: Add generate script
X-Git-Tag: argeo-slc-2.1.7~1587
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=d97c350e280087a06a5add83055a752143f2b3ab;p=gpl%2Fargeo-slc.git

Add generate script

git-svn-id: https://svn.argeo.org/slc/trunk@2827 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
index 1dc91bf5d..be986f777 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
@@ -30,7 +30,7 @@ public class JvmProcess extends SystemCall implements InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		List<Object> command = new ArrayList<Object>();
 		if (jvm != null)
-			command.add(asFile(jvm).getAbsolutePath());
+			command.add(asFile(jvm).getPath());
 		else
 			command.add("java");
 
@@ -108,7 +108,7 @@ public class JvmProcess extends SystemCall implements InitializingBean {
 
 	protected File asFile(Resource res) {
 		try {
-			return res.getFile().getCanonicalFile();
+			return res.getFile();
 		} catch (FileNotFoundException e) {
 			return copyToTempFile(res);
 		} catch (IOException e) {
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java
index d5470c882..4d7e5d05d 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java
@@ -198,7 +198,7 @@ public class SystemCall extends TreeSRelatedHelper implements Runnable,
 					+ generateScript);
 			try {
 				FileUtils.writeStringToFile(scriptFile,
-						(osConsole != null ? osConsole : "")
+						(osConsole != null ? osConsole + " " : "")
 								+ commandLine.toString());
 			} catch (IOException e) {
 				throw new SlcException("Could not generate script "