Bump the Jetty version from 7 to 9

Also, handle repacking the jar ourselves. In order for eclipse
users to be able to build within the IDE, they need to repack
the jetty jar using `go repack-jetty`. IJ users need to do this
too.

Author: shs96c

.gitignore

@@ -48,6 +48,7 @@ py/selenium/webdriver/firefox/webdriver_prefs.json
 py/selenium/webdriver/firefox/x86/
 py/docs/build/
 selenium.egg-info/
+third_party/java/jetty/jetty-repacked.jar
 *.user
 *.cache
 obj/

.idea/libraries/jetty.xml

@@ -472,6 +472,49 @@ task :test_webdriverjs => [
 desc "Generate a single file with WebDriverJS' public API"
 task :webdriverjs => [ "//javascript/webdriver:webdriver" ]
 
+desc "Repack jetty"
+task "repack-jetty" => "build/third_party/java/jetty/jetty-repacked.jar"
+
+# Expose the repack task to CrazyFun.
+task "//third_party/java/jetty:repacked" => "build/third_party/java/jetty/jetty-repacked.jar"
+
+file "build/third_party/java/jetty/jetty-repacked.jar" => [
+   "third_party/java/jetty/jetty-continuation-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-http-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-io-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-jmx-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-security-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-server-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-servlet-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-servlets-9.2.13.v20150730.jar",
+   "third_party/java/jetty/jetty-util-9.2.13.v20150730.jar"
+ ] do |t|
+   print "Repacking jetty\n"
+   root = File.join("build", "third_party", "java", "jetty")
+   jarjar = File.join("third_party", "java", "jarjar", "jarjar-1.4.jar")
+   rules = File.join("third_party", "java", "jetty", "jetty-repack-rules")
+   temp = File.join(root, "temp")
+
+   # First, process the files
+   mkdir_p root
+   mkdir_p temp
+
+   t.prerequisites.each do |pre|
+     filename = File.basename(pre, ".jar")
+     out = File.join(root, "#{filename}-repacked.jar")
+     `java -jar #{jarjar} process #{rules} #{pre} #{out}`
+     `cd #{temp} && jar xf #{File.join("..", File.basename(out))}`
+   end
+
+   # Now, merge them
+   `cd #{temp} && jar cvf #{File.join("..", "jetty-repacked.jar")} *`
+
+   # And copy the artifact to third_party so that eclipse users can be made happy
+   cp "build/third_party/java/jetty/jetty-repacked.jar", "third_party/java/jetty/jetty-repacked.jar"
+end
+
+task
+
 task :release => [
     :clean,
     :build,

.idea/libraries/servlet_api.xml

@@ -13,9 +13,9 @@
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-4.1.0.jar" sourcepath="/third-party/java/jna/jna-platform-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.3.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.3-sources.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/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/servlet/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet/servlet-api-2.5-6.1.9-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
@@ -40,10 +40,10 @@
 	<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.6.6.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.6.6.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.12.v20150709.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.12.v20150709.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.12.v20150709.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.12.v20150709.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.12.v20150709.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/websocket/websocket-api-9.2.13.v20150730.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/websocket/websocket-client-9.2.13.v20150730.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/websocket/websocket-common-9.2.13.v20150730.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-io-9.2.13.v20150730.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.2.13.v20150730.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>

.idea/libraries/xml_apis.xml

@@ -41,7 +41,7 @@
     <orderEntry type="library" name="sac" level="project" />
     <orderEntry type="library" scope="TEST" name="dnsjava" level="project" />
     <orderEntry type="library" scope="TEST" name="dnssec4j" level="project" />
-    <orderEntry type="library" scope="TEST" name="jetty" level="project" />
+    <orderEntry type="library" name="jetty" level="project" />
     <orderEntry type="library" scope="TEST" name="little_proxy" level="project" />
     <orderEntry type="library" scope="TEST" name="slf4j" level="project" />
     <orderEntry type="library" name="mockito-core-1.9.5-srcs" level="project" />

Rakefile

@@ -17,8 +17,6 @@
 
 package com.thoughtworks.selenium.testing;
 
-import org.seleniumhq.jetty7.http.HttpFields;
-
 import java.io.IOException;
 import java.util.Calendar;
 
@@ -48,8 +46,8 @@ private void setAlwaysCacheHeaders(HttpServletResponse resp) {
     resp.setHeader("Cache-Control", "max-age=29723626");
     Calendar calendar = Calendar.getInstance();
     calendar.add(Calendar.YEAR, 1);
-    resp.setHeader("Expires", HttpFields.formatDate(calendar.getTimeInMillis()));
-    resp.setHeader("Last-Modified", HttpFields.__01Jan1970);
+    resp.setDateHeader("Expires", calendar.getTimeInMillis());
+    resp.setDateHeader("Last-Modified", 0);
     resp.setHeader("Pragma", "");
     resp.setHeader("ETag", "foo");
   }

java/client/.classpath

@@ -17,11 +17,11 @@
 
 package com.thoughtworks.selenium.testing;
 
-import java.io.File;
-
 import org.openqa.selenium.environment.webserver.JettyAppServer;
 import org.openqa.selenium.testing.InProject;
-import org.seleniumhq.jetty7.servlet.ServletContextHandler;
+import org.seleniumhq.jetty9.servlet.ServletContextHandler;
+
+import java.io.File;
 
 public class SeleniumAppServer extends JettyAppServer {
 

java/client/client.iml

@@ -11,7 +11,7 @@ java_test(name = 'small-tests',
   ],
 )
 
-java_test(name = 'large-tests',
+java_library(name = 'large-tests',
   srcs = [
     'StandardSeleniumTests.java',
   ],