diff options
author | Thomas Becker | 2012-01-30 13:33:42 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2012-01-30 16:17:53 +0000 |
commit | 40963a884e32766b878056b83a97fe5130828051 (patch) | |
tree | b8ca34a64bfb04995a5d7ecbab351f2eddf46bba /jetty-start | |
parent | 49198a8a5c428bc18424d7a5ff75cc2a21cce261 (diff) | |
download | org.eclipse.jetty.project-40963a884e32766b878056b83a97fe5130828051.tar.gz org.eclipse.jetty.project-40963a884e32766b878056b83a97fe5130828051.tar.xz org.eclipse.jetty.project-40963a884e32766b878056b83a97fe5130828051.zip |
Revert "Making --dry-run work with paths that have spaces"
This reverts commit 3df95d45c27c924c1f0e76c4c16a3f796ddf2470.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Diffstat (limited to 'jetty-start')
-rw-r--r-- | jetty-start/src/main/java/org/eclipse/jetty/start/Main.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 34715f9a7b..69112f8f31 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -663,19 +663,17 @@ public class Main { StringBuilder cmd = new StringBuilder(); cmd.append(findJavaBin()); - for (String x : _jvmArgs) { - cmd.append(" \"").append(x).append("\""); - } - cmd.append(" \"-Djetty.home=").append(_jettyHome).append("\""); + for (String x : _jvmArgs) + cmd.append(' ').append(x); + cmd.append(" -Djetty.home=").append(_jettyHome); for (String p : _sysProps) { - cmd.append(" \"-D").append(p); + cmd.append(" -D").append(p); String v = System.getProperty(p); if (v != null && v.length() > 0) cmd.append('=').append(v); - cmd.append("\""); } - cmd.append(" -cp \"").append(classpath.toString()).append("\""); + cmd.append(" -cp ").append(classpath.toString()); cmd.append(" ").append(_config.getMainClassname()); // Check if we need to pass properties as a file @@ -683,16 +681,15 @@ public class Main if (properties.size() > 0) { File prop_file = File.createTempFile("start",".properties"); - if (!_dryRun) { + if (!_dryRun) prop_file.deleteOnExit(); - } properties.store(new FileOutputStream(prop_file),"start.jar properties"); - cmd.append(" \"").append(prop_file.getAbsolutePath()).append("\""); + cmd.append(" ").append(prop_file.getAbsolutePath()); } for (String xml : xmls) { - cmd.append(" \"").append(xml).append("\""); + cmd.append(' ').append(xml); } return cmd.toString(); |