Compiling and adding as a third-party dep the shaded Jetty 5 used by RC.

We really shouldn't be editing the code, and there's no good reason for us to treat the antiquated version of Jetty used by RC as anything other than a third-party dependency.
SeleniumHQ · Jul 30, 2014 · 386b699 · 386b699
1 parent 75f266f
commit 386b699
Show file tree

Hide file tree

Showing 262 changed files with 25 additions and 67,907 deletions.
diff --git a/.idea/libraries/jetty_for_rc.xml b/.idea/libraries/jetty_for_rc.xml
diff --git a/java/server/.classpath b/java/server/.classpath
@@ -13,6 +13,7 @@
 	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcprov-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcprov-jdk15on-1.48-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-5.jar" sourcepath="/third-party/java/jetty/jetty-repacked-5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mx4j/mx4j-tools-3.0.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jcip_annotations/jcip-annotations-1.0.jar" sourcepath="/third-party/java/jcip_annotations/jcip-annotations-1.0-sources.jar"/>

diff --git a/java/server/server.iml b/java/server/server.iml
@@ -17,6 +17,7 @@
     <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="library" name="jcip-annotations" level="project" />
     <orderEntry type="library" name="jetty" level="project" />
+    <orderEntry type="library" name="jetty-for-rc" level="project" />
     <orderEntry type="library" name="junit" level="project" />
     <orderEntry type="library" name="mx4j" level="project" />
     <orderEntry type="library" name="servlet-api" level="project" />

diff --git a/java/server/src/cybervillains/build.desc b/java/server/src/cybervillains/build.desc
@@ -4,8 +4,8 @@ java_library(name = "cybervillains",
     "**/*.java",
   ],
   deps = [
-    "//java/server/src/org/openqa/jetty",
     "//java/server/src/org/openqa/selenium/security",
     "//third_party/java/bouncycastle",
+    "//third_party/java/jetty:jetty-for-rc",
   ])
 
diff --git a/java/server/src/org/openqa/jetty/build.desc b/java/server/src/org/openqa/jetty/build.desc
diff --git a/java/server/src/org/openqa/jetty/html/Applet.java b/java/server/src/org/openqa/jetty/html/Applet.java
diff --git a/java/server/src/org/openqa/jetty/html/Block.java b/java/server/src/org/openqa/jetty/html/Block.java
diff --git a/java/server/src/org/openqa/jetty/html/Break.java b/java/server/src/org/openqa/jetty/html/Break.java