From cb2dbcb84319cdbf46f874d35d7add39f536120a Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Fri, 18 Oct 2013 00:42:38 +0200
Subject: [PATCH] add graceful Jetty shutdown option - as Jetty stop is not
 synced, yet - include jetty jars and servlet-3.0 api jar  in Eclipse
 .classpath

---
 .classpath                                     | 10 +++++++++-
 source/net/yacy/http/Jetty8HttpServerImpl.java |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index ed310fa86..d3665f212 100644
--- a/.classpath
+++ b/.classpath
@@ -13,6 +13,14 @@
 	<classpathentry excluding="collection1/" kind="src" path="htroot/solr"/>
 	<classpathentry kind="src" path="htroot/gsa"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/jetty-continuation-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-http-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-io-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-security-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-server-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlet-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlets-8.1.13.v20130916.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-util-8.1.13.v20130916.jar"/>	
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>
 	<classpathentry kind="lib" path="lib/webcat-0.1-swf.jar"/>
@@ -34,7 +42,7 @@
 	<classpathentry kind="lib" path="lib/commons-io-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-compress-1.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api-2.5-20081211.jar"/>
+	<classpathentry kind="lib" path="lib/javax.servlet-3.0.0.v201112011016.jar"/>
 	<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/>
diff --git a/source/net/yacy/http/Jetty8HttpServerImpl.java b/source/net/yacy/http/Jetty8HttpServerImpl.java
index 81b60a722..5bc25f87d 100644
--- a/source/net/yacy/http/Jetty8HttpServerImpl.java
+++ b/source/net/yacy/http/Jetty8HttpServerImpl.java
@@ -128,6 +128,9 @@ public class Jetty8HttpServerImpl implements YaCyHttpServer {
      */
     @Override
     public void startupServer() throws Exception {
+        // option to finish running requests on shutdown
+        server.setGracefulShutdown(3000);
+        server.setStopAtShutdown(true);
         server.start();
     }
 
@@ -136,7 +139,7 @@ public class Jetty8HttpServerImpl implements YaCyHttpServer {
      */
     @Override
     public void stop() throws Exception {
-        server.stop();
+        server.stop();  
         server.join();
     }