From fe09ca0e66497755f6f7a29079d59cda3a3086f5 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 6 Nov 2012 14:35:37 +1100 Subject: [PATCH 1/2] 391623 Add option to --stop to wait for target jetty to stop --- .../java/org/eclipse/jetty/start/Main.java | 20 ++++++------------- .../org/eclipse/jetty/start/usage.txt | 5 +---- 2 files changed, 7 insertions(+), 18 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 3aa0483d23d..8323e53852f 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 @@ -179,21 +179,13 @@ public class Main _showUsage = true; continue; } - + if ("--stop".equals(arg)) - { - int port = Integer.parseInt(Config.getProperty("STOP.PORT","-1")); - String key = Config.getProperty("STOP.KEY",null); - stop(port,key); - return null; - } - - if ("--stop-wait".equals(arg)) { int port = Integer.parseInt(Config.getProperty("STOP.PORT","-1")); String key = Config.getProperty("STOP.KEY",null); int timeout = Integer.parseInt(Config.getProperty("STOP.WAIT", "0")); - stop(port,key, true, timeout); + stop(port,key,timeout); return null; } @@ -1015,11 +1007,11 @@ public class Main */ public void stop(int port, String key) { - stop (port,key,false, 0); + stop (port,key, 0); } - public void stop (int port, String key, boolean wait, int timeout) + public void stop (int port, String key, int timeout) { int _port = port; String _key = key; @@ -1038,7 +1030,7 @@ public class Main } Socket s = new Socket(InetAddress.getByName("127.0.0.1"),_port); - if (wait && timeout > 0) + if (timeout > 0) s.setSoTimeout(timeout*1000); try { @@ -1046,7 +1038,7 @@ public class Main out.write((_key + "\r\nstop\r\n").getBytes()); out.flush(); - if (wait) + if (timeout > 0) { System.err.println("Waiting"+(timeout > 0 ? (" "+timeout+"sec") : "")+" for jetty to stop"); LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt index 54c32d45ce9..5af648a37cd 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt +++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt @@ -26,9 +26,6 @@ Command Line Options: --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 @@ -99,7 +96,7 @@ Properties: STOP.WAIT=[number] The time (in seconds) to wait for confirmation that the running Jetty server has stopped. If not specified, the stopper will wait indefinitely. Use in - conjunction with the --stop-wait option. + conjunction with the --stop option. DEBUG=true Enable debug on the start mechanism and sets the From 581779a9df7de4f2066dce5dea1c542d2d187317 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 6 Nov 2012 07:37:07 -0600 Subject: [PATCH 2/2] reset --- VERSION.txt | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1765a1822dd..7f2af822831 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,33 +1,4 @@ -jetty-7.6.9-SNAPSHOT - -jetty-7.6.8.v20121105 - 05 November 2012 - + 371170 MongoSessionManager LastAccessTimeTest fails - + 388675 Non utf8 encoded query strings not decoded to parameter map using - queryEncoding - + 389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system - property in javadoc for StdErrLog - + 389956 Bad __context set in WebAppContext.start sequence with respect to ENC - setup - + 389965 OPTIONS should allow spaces in comma separated list - + 390161 Apply DeferredAuthentication fix to jaspi - + 390560 The method AnnotationParser.getAnnotationHandlers(String) always - returns a empty collection. - + 391483 fix bad javadoc example in shutdown handler - + 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same - response - + 391623 Add option to --stop to wait for target jetty to stop - + 392239 Allow no error-code or exception for error-pages - + 392525 Add option to --stop-wait to specify timeout - + 392641 JDBC Sessions not scavenged if expired during downtime - + 392812 MongoSessionIDManager never purges old sessions - + 393014 Mongodb purgevalid using query for purgeinvalid - + 393015 Mongodb purge not rescheduled - + 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server - + 393218 add xsd=application/xml mime mapping to defaults - + 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls - + 393368 min websocket version - + 393383 delay onClose call until closeOut is done - + 393494 HashSessionManager can't delete unrestorable sessions on Windows +jetty-7.6.8-SNAPSHOT jetty-7.6.7.v20120910 - 10 September 2012 + 388895 Update dependencies for jetty-jndi