X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Ftasks%2FJvmProcess.java;h=0cee0efd7b0247fdd6fd83a5aa4fffd37f07ea4e;hb=9b2422e7198df6f34282a805058dd5f497417318;hp=2be9e8ceaeaaba51b5981b015aa9cbe60d9d1878;hpb=8c0984b6c89376160effcaa5cb73ec6a1f59208c;p=gpl%2Fargeo-slc.git

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 2be9e8cea..0cee0efd7 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
@@ -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.tasks;
 
 import java.io.File;
@@ -9,16 +25,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.exec.CommandLine;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 
-public class JvmProcess extends SystemCall {
-	private final static Log log = LogFactory.getLog(JvmProcess.class);
-
+public class JvmProcess extends SystemCall implements InitializingBean {
 	private Properties systemProperties = new Properties();
 	private List<Resource> classpath = new ArrayList<Resource>();
 	private List<Resource> pBootClasspath = new ArrayList<Resource>();
@@ -27,13 +39,16 @@ public class JvmProcess extends SystemCall {
 	private List<String> jvmArgs = new ArrayList<String>();
 	private List<String> args = new ArrayList<String>();
 
-	@Override
-	protected CommandLine createCommandLine() {
-		final CommandLine cl;
+	private String systemPropertiesFileProperty = null;
+	private String systemPropertiesFileDir = null;
+	private String systemPropertiesFileName = null;
+
+	public void afterPropertiesSet() throws Exception {
+		List<Object> command = new ArrayList<Object>();
 		if (jvm != null)
-			cl = new CommandLine(asFile(jvm));
+			command.add(asFile(jvm).getPath());
 		else
-			cl = new CommandLine("java");
+			command.add("java");
 
 		if (pBootClasspath.size() > 0) {
 			StringBuffer buf = new StringBuffer("-Xbootclasspath/p:");
@@ -46,42 +61,70 @@ public class JvmProcess extends SystemCall {
 
 				buf.append(asFile(res));
 			}
-			cl.addArgument(buf.toString());
+			command.add(buf.toString());
 		}
 
 		for (String jvmArg : jvmArgs) {
-			cl.addArgument(jvmArg);
+			command.add(jvmArg);
 		}
 
-		cl.addArgument("-cp");
+		command.add("-cp");
 		StringBuffer buf = new StringBuffer("");
 		for (Resource res : classpath) {
 			if (buf.length() != 0)
 				buf.append(File.pathSeparatorChar);
 			buf.append(asFile(res));
 		}
-		cl.addArgument(buf.toString());
+		command.add(buf.toString());
 
-		for (Map.Entry<Object, Object> entry : systemProperties.entrySet()) {
-			cl.addArgument("-D" + entry.getKey() + "=" + entry.getValue());
+		if (systemPropertiesFileProperty == null) {
+			// pass system properties as argument
+			for (Map.Entry<Object, Object> entry : systemProperties.entrySet()) {
+				command.add("-D" + entry.getKey() + "=" + entry.getValue());
+			}
+		} else {
+			// write system properties in a file to work around OS limitations
+			// with command line (e.g. Win XP)
+			String dir = systemPropertiesFileDir;
+			if (dir == null)
+				dir = getExecDirToUse();
+			String fileName = systemPropertiesFileName;
+			if (fileName == null)
+				fileName = systemPropertiesFileProperty + ".properties";
+
+			// Write file
+			FileOutputStream fos = null;
+			File file = new File(dir + File.separator + fileName);
+			try {
+
+				if (!file.getParentFile().exists())
+					file.getParentFile().mkdirs();
+				fos = new FileOutputStream(file);
+				systemProperties.store(fos, "Automatically generated by "
+						+ getClass());
+				command.add("-D" + systemPropertiesFileProperty + "="
+						+ file.getCanonicalPath());
+			} catch (IOException e) {
+				throw new SlcException("Cannot write to system properties to "
+						+ file, e);
+			} finally {
+				IOUtils.closeQuietly(fos);
+			}
 		}
 
 		// Program
-		cl.addArgument(mainClass);
+		command.add(mainClass);
 
 		for (String arg : args) {
-			cl.addArgument(arg);
+			command.add(arg);
 		}
 
-		if (log.isDebugEnabled())
-			log.debug("Command line:\n" + cl.toString() + "\n");
-
-		return cl;
+		setCommand(command);
 	}
 
 	protected File asFile(Resource res) {
 		try {
-			return res.getFile().getCanonicalFile();
+			return res.getFile();
 		} catch (FileNotFoundException e) {
 			return copyToTempFile(res);
 		} catch (IOException e) {
@@ -161,4 +204,17 @@ public class JvmProcess extends SystemCall {
 		this.args = args;
 	}
 
+	public void setSystemPropertiesFileProperty(
+			String systemPropertiesFilePropertyName) {
+		this.systemPropertiesFileProperty = systemPropertiesFilePropertyName;
+	}
+
+	public void setSystemPropertiesFileDir(String systemPropertiesFileDir) {
+		this.systemPropertiesFileDir = systemPropertiesFileDir;
+	}
+
+	public void setSystemPropertiesFileName(String systemPropertiesFileName) {
+		this.systemPropertiesFileName = systemPropertiesFileName;
+	}
+
 }