Making --dry-run work with paths that have spaces

2 files changed, 12 insertions, 15 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 69112f8f31..34715f9a7b 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,17 +663,19 @@ public class Main
     {
         StringBuilder cmd = new StringBuilder();
         cmd.append(findJavaBin());
-        for (String x : _jvmArgs)
-            cmd.append(' ').append(x);
-        cmd.append(" -Djetty.home=").append(_jettyHome);
+        for (String x : _jvmArgs) {
+            cmd.append(" \"").append(x).append("\"");
+        }
+        cmd.append(" \"-Djetty.home=").append(_jettyHome).append("\"");
         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());
+        cmd.append("   -cp \"").append(classpath.toString()).append("\"");
         cmd.append("   ").append(_config.getMainClassname());
 
         // Check if we need to pass properties as a file
@@ -681,15 +683,16 @@ 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());
+            cmd.append(" \"").append(prop_file.getAbsolutePath()).append("\"");
         }
 
         for (String xml : xmls)
         {
-            cmd.append(' ').append(xml);
+            cmd.append(" \"").append(xml).append("\"");
         }
 
         return cmd.toString();
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
index 20c170f0ce..5d658b28f2 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
@@ -13,15 +13,11 @@
 
 package org.eclipse.jetty.test.monitor;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.management.MBeanServerConnection;
-
 import org.eclipse.jetty.client.ContentExchange;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.http.HttpMethods;
@@ -35,7 +31,6 @@ import org.eclipse.jetty.monitor.jmx.MonitorAction;
 import org.eclipse.jetty.monitor.triggers.GreaterThanAttrEventTrigger;
 import org.eclipse.jetty.monitor.triggers.LessThanOrEqualToAttrEventTrigger;
 import org.eclipse.jetty.monitor.triggers.OrEventTrigger;
-import org.eclipse.jetty.toolchain.jmx.JmxServiceConnection;
 import org.eclipse.jetty.toolchain.test.JettyDistro;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -98,7 +93,7 @@ public class ProgramConfigTest
                 @Override
                 public void execute(EventTrigger trigger, EventState<?> state, long timestamp)
                 {
-                    System.out.println(counter.incrementAndGet());
+                    counter.incrementAndGet();
                 }
             };
         JMXMonitor.addMonitorActions(action);
@@ -121,7 +116,6 @@ public class ProgramConfigTest
          }
         gate.await();
         JMXMonitor.removeMonitorActions(action);
-        assertTrue(true);
     }
 
     protected static void runTest(String requestUrl, long count)