KristianRosenvold: Upgraded grid Hub to Jetty 7.6.1

The repackaged jetty is also published to maven central.

Todo: Upgrade server as well and get rid of the inline Jetty sources.

r15959

.classpath

@@ -10,6 +10,7 @@
 	<classpathentry kind="lib" path="third_party/java/easymock/easymockclassextension-2.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-core-js-2.9.jar"/>
 	<classpathentry kind="lib" path="third_party/java/bcprov/bcprov-jdk15-135.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jetty/jetty-repacked-7.6.1.jar" sourcepath="third_party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>
 	<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-2.9.jar"/>
 	<classpathentry kind="lib" path="third_party/java/easymock/easymock-2.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpclient-4.1.2.jar" sourcepath="third_party/java/apache-httpclient/httpclient-4.1.2-sources.jar"/>

java/CHANGELOG

@@ -1,3 +1,9 @@
+v2.20.0 (In progress)
+=======
+Grid:
+  * The HUB is now upgraded to run with Jetty 7.6.1
+
+
 v2.19.0
 =======
 

java/server/src/org/openqa/grid/build.desc

@@ -9,10 +9,10 @@ java_library(name = "grid",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//java/server/src/org/openqa/jetty",
     "//java/server/src/org/openqa/grid/common",
     "//third_party/java/apache-httpclient",
     "//third_party/java/jcip-annotations",
-    "//third_party/java/yaml"
+    "//third_party/java/yaml",
+    "//third_party/java/jetty:jetty761"
   ])
 

java/server/src/org/openqa/grid/web/Hub.java

@@ -29,6 +29,8 @@
 
 import javax.servlet.Servlet;
 
+import com.google.common.collect.Maps;
+
 import org.openqa.grid.internal.Registry;
 import org.openqa.grid.internal.utils.GridHubConfiguration;
 import org.openqa.grid.web.servlet.ConsoleServlet;
@@ -40,19 +42,16 @@
 import org.openqa.grid.web.servlet.ResourceServlet;
 import org.openqa.grid.web.servlet.TestSessionStatusServlet;
 import org.openqa.grid.web.utils.ExtraServletUtil;
-import org.openqa.jetty.http.SocketListener;
-import org.openqa.jetty.jetty.Server;
-import org.openqa.jetty.jetty.servlet.WebApplicationContext;
+import org.seleniumhq.jetty7.server.Server;
+import org.seleniumhq.jetty7.server.bio.SocketConnector;
+import org.seleniumhq.jetty7.servlet.ServletContextHandler;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 import org.openqa.selenium.server.log.TerseFormatter;
 
-import com.google.common.collect.Maps;
-
 /**
- * Jetty server. Main entry point for everything about the grid.
- * <p/>
- * Except for unit tests, this should be a singleton.
+ * Jetty server. Main entry point for everything about the grid. <p/> Except for unit tests, this
+ * should be a singleton.
  */
 public class Hub {
 
@@ -71,7 +70,7 @@ private void addServlet(String key, Class<? extends Servlet> s) {
 
   /**
    * get the registry backing up the hub state.
-   * 
+   *
    * @return The registry
    */
   public Registry getRegistry() {
@@ -81,8 +80,8 @@ public Registry getRegistry() {
   public Hub(GridHubConfiguration config) {
     String logFilename =
         config.getLogFilename() == null
-            ? RemoteControlConfiguration.getDefaultLogOutFile()
-            : config.getLogFilename();
+        ? RemoteControlConfiguration.getDefaultLogOutFile()
+        : config.getLogFilename();
     if (logFilename != null) {
       try {
         Handler logFile = new FileHandler(new File(logFilename).getAbsolutePath(), true);
@@ -122,37 +121,41 @@ public Hub(GridHubConfiguration config) {
   private void initServer() {
     try {
       server = new Server();
-      SocketListener socketListener = new SocketListener();
-      socketListener.setMaxIdleTimeMs(60000);
+      SocketConnector socketListener = new SocketConnector();
+      socketListener.setMaxIdleTime(60000);
       socketListener.setPort(port);
-      server.addListener(socketListener);
+      server.addConnector(socketListener);
+
+      ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+      root.setContextPath("/");
+      server.setHandler(root);
 
-      WebApplicationContext root = server.addWebApplication("", ".");
       root.setAttribute(Registry.KEY, registry);
 
-      root.addServlet("/*", DisplayHelpServlet.class.getName());
+      root.addServlet(DisplayHelpServlet.class.getName(), "/*");
 
-      root.addServlet("/grid/console/*", ConsoleServlet.class.getName());
-      root.addServlet("/grid/beta/console/*", org.openqa.grid.web.servlet.beta.ConsoleServlet.class.getName());
-      root.addServlet("/grid/register/*", RegistrationServlet.class.getName());
+      root.addServlet(ConsoleServlet.class.getName(), "/grid/console/*");
+      root.addServlet(org.openqa.grid.web.servlet.beta.ConsoleServlet.class.getName(),
+                      "/grid/beta/console/*");
+      root.addServlet(RegistrationServlet.class.getName(), "/grid/register/*");
       // TODO remove at some point. Here for backward compatibility of
       // tests etc.
-      root.addServlet("/grid/driver/*", DriverServlet.class.getName());
-      root.addServlet("/wd/hub/*", DriverServlet.class.getName());
-      root.addServlet("/selenium-server/driver/*", DriverServlet.class.getName());
-      root.addServlet("/grid/resources/*", ResourceServlet.class.getName());
+      root.addServlet(DriverServlet.class.getName(), "/grid/driver/*");
+      root.addServlet(DriverServlet.class.getName(), "/wd/hub/*");
+      root.addServlet(DriverServlet.class.getName(), "/selenium-server/driver/*");
+      root.addServlet(ResourceServlet.class.getName(), "/grid/resources/*");
 
-      root.addServlet("/grid/api/proxy/*", ProxyStatusServlet.class.getName());
-      root.addServlet("/grid/api/testsession/*", TestSessionStatusServlet.class.getName());
+      root.addServlet(ProxyStatusServlet.class.getName(), "/grid/api/proxy/*");
+      root.addServlet(TestSessionStatusServlet.class.getName(), "/grid/api/testsession/*");
 
       // Selenium Grid 1.0 compatibility routes for older nodes trying to
       // work with the newer hub.
-      root.addServlet("/registration-manager/register/*", RegistrationServlet.class.getName());
-      root.addServlet("/heartbeat", Grid1HeartbeatServlet.class.getName());
+      root.addServlet(RegistrationServlet.class.getName(), "/registration-manager/register/*");
+      root.addServlet(Grid1HeartbeatServlet.class.getName(), "/heartbeat");
 
       // Load any additional servlets provided by the user.
       for (Map.Entry<String, Class<? extends Servlet>> entry : extraServlet.entrySet()) {
-        root.addServlet(entry.getKey(), entry.getValue().getName());
+        root.addServlet(entry.getValue().getName(), entry.getKey());
       }
 
     } catch (Throwable e) {

java/server/src/org/openqa/grid/web/servlet/handler/WebDriverRequestHandler.java

@@ -28,14 +28,14 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.openqa.grid.internal.ExternalSessionKey;
 import org.openqa.grid.common.SeleniumProtocol;
 import org.openqa.grid.common.exception.GridException;
-import org.openqa.grid.internal.exception.NewSessionException;
-import org.openqa.grid.internal.utils.ForwardConfiguration;
+import org.openqa.grid.internal.ExternalSessionKey;
 import org.openqa.grid.internal.Registry;
 import org.openqa.grid.internal.TestSession;
-import org.openqa.jetty.jetty.servlet.ServletHttpResponse;
+import org.openqa.grid.internal.exception.NewSessionException;
+import org.openqa.grid.internal.utils.ForwardConfiguration;
+import org.seleniumhq.jetty7.server.Response;
 
 /**
  * Handles an individual request, scope is a single request and hence a single thread.
@@ -123,7 +123,7 @@ public ExternalSessionKey forwardNewSessionRequestAndUpdateRegistry(TestSession
 
     if (getResponse().containsHeader("Location")) {
       String location =
-          ((ServletHttpResponse) getResponse()).getHttpResponse().getField("Location");
+          ((Response) getResponse()).getHeader( "Location" );
       ExternalSessionKey res =  ExternalSessionKey.fromWebDriverRequest( location);
       if ( res!=null){
         return res;

maven/server/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>servlet-api-2.5</artifactId>
             <version>6.1.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>jetty-repacked</artifactId>
+            <version>7.6.1</version>
+        </dependency>
         <dependency>
             <groupId>net.jcip</groupId>
             <artifactId>jcip-annotations</artifactId>

selenium.eml

@@ -42,6 +42,11 @@
 	<lib name="bcprov-jdk15-135.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/bcprov/bcprov-jdk15-135.jar!/"/>
 	</lib>
+	<lib name="jetty-repacked-7.6.1.jar" scope="COMPILE">
+		<srcroot url="jar://$MODULE_DIR$/third_party/java/jetty/jetty-repacked-7.6.1-sources.jar!/"/>
+		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/jetty/jetty-repacked-7.6.1-sources.jar!/"/>
+		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/jetty/jetty-repacked-7.6.1.jar!/"/>
+	</lib>
 	<lib name="htmlunit-2.9.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-2.9.jar!/"/>
 	</lib>

third_party/java/jetty/build.desc

@@ -25,3 +25,10 @@ java_library(name = "lite-android",
   deps = [
     "jetty-lite-7.2.0-repackaged-for-android.jar"
   ])
+
+
+java_library(name = "jetty761",
+  deps = [
+    "jetty-repacked-7.6.1.jar",
+  ])
+