391623 Add option to --stop to wait for target jetty to stop

jetty-start/src/main/java/org/eclipse/jetty/start/Main.java

@@ -30,6 +30,7 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.LineNumberReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
@@ -181,9 +182,17 @@ public class Main
             {
                 int port = Integer.parseInt(Config.getProperty("STOP.PORT","-1"));
                 String key = Config.getProperty("STOP.KEY",null);
-                stop(port,key);
+                stop(port,key, false);
                 return null;
             }
+            
+            if ("--stop-wait".equals(arg))
+            {
+                int port = Integer.parseInt(Config.getProperty("STOP.PORT","-1"));
+                String key = Config.getProperty("STOP.KEY",null);
+                stop(port,key, true);
+                return null;  
+            }
 
             if ("--version".equals(arg) || "-v".equals(arg) || "--info".equals(arg))
             {
@@ -1002,6 +1011,12 @@ public class Main
      * Stop a running jetty instance.
      */
     public void stop(int port, String key)
+    {
+        stop (port,key,false);
+    }
+    
+    
+    public void stop (int port, String key, boolean wait)
     {
         int _port = port;
         String _key = key;
@@ -1025,6 +1040,14 @@ public class Main
                 OutputStream out = s.getOutputStream();
                 out.write((_key + "\r\nstop\r\n").getBytes());
                 out.flush();
+
+                if (wait)
+                {
+                    LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream()));
+                    String response=lin.readLine();
+                    if ("Stopped".equals(response))
+                        System.err.println("Stopped");
+                }
             }
             finally
             {

jetty-start/src/main/java/org/eclipse/jetty/start/Monitor.java

@@ -17,6 +17,7 @@
 //
 
 package org.eclipse.jetty.start;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.net.InetAddress;
@@ -113,21 +114,23 @@ public class Monitor extends Thread
                 Config.debug("command=" + cmd);
                 if ("stop".equals(cmd))
                 {
-                    try {socket.close();}catch(Exception e){e.printStackTrace();}
-                    try {_socket.close();}catch(Exception e){e.printStackTrace();}
                     if (_process!=null)
                     {
                         //if we have a child process, wait for it to finish before we stop
                         try
                         {
-                        _process.destroy();
-                        _process.waitFor();
+                            _process.destroy();
+                            _process.waitFor();
+
                         }
                         catch (InterruptedException e)
                         {
                             System.err.println("Interrupted waiting for child to terminate");
                         }
                     }
+                    socket.getOutputStream().write("Stopped\r\n".getBytes());
+                    try {socket.close();}catch(Exception e){e.printStackTrace();}
+                    try {_socket.close();}catch(Exception e){e.printStackTrace();}
                     System.exit(0);
                 }
                 else if ("status".equals(cmd))

jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt

@@ -24,7 +24,10 @@ Command Line Options:
                    contains -X or -D arguments, but creates an extra
                    JVM instance.
                      
-  --stop           Stop the running Jetty instance.
+  --stop           Send a stop signal to the running Jetty instance.
+  
+  --stop-wait      Send a stop signal to the running Jetty instance, waiting for
+                   confirmation that it is stopping.
   
   --daemon         Start in daemon mode with stderr and stdout 
                    redirected to ${jetty.log}/start.log