Unshadow Jetty

SeleniumHQ · Aug 26, 2019 · c476d0a · c476d0a
1 parent b44dbfa
commit c476d0a
Show file tree

Hide file tree

Showing 21 changed files with 90 additions and 330 deletions.
diff --git a/Rakefile b/Rakefile
@@ -90,7 +90,6 @@ task '//java/client/test/org/openqa/selenium/environment/webserver:webserver:ube
 # Java targets required for release. These should all be java_export targets.
 # Generated from: bazel query 'kind(.*_publish, set(//java/... //third_party/...))'
 JAVA_RELEASE_TARGETS = %w(
-  //third_party/java/jetty:jetty-publish
   //java/server/src/org/openqa/selenium/grid:grid-publish
   //java/server/src/com/thoughtworks/selenium/webdriven:webdriven-publish
   //java/client/src/org/openqa/selenium/support:support-publish

diff --git a/java/client/src/org/openqa/selenium/tools/BUILD.bazel b/java/client/src/org/openqa/selenium/tools/BUILD.bazel
@@ -1,12 +1,3 @@
-java_binary(
-    name = "DeleteFromZip",
-    srcs = ["DeleteFromZip.java"],
-    main_class = "org.openqa.selenium.tools.DeleteFromZip",
-    visibility = ["//third_party/java/jetty:__pkg__"],
-    deps = ["//third_party/java/guava"],
-)
-
-
 java_binary(
     name = "MavenPublisher",
     srcs = ["MavenPublisher.java"],

diff --git a/java/client/src/org/openqa/selenium/tools/DeleteFromZip.java b/java/client/src/org/openqa/selenium/tools/DeleteFromZip.java
diff --git a/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java b/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java
@@ -19,7 +19,7 @@
 
 import org.openqa.selenium.environment.webserver.JettyAppServer;
 import org.openqa.selenium.build.InProject;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 
 import java.nio.file.Path;
 

diff --git a/java/client/test/org/openqa/selenium/ProxySettingTest.java b/java/client/test/org/openqa/selenium/ProxySettingTest.java
@@ -41,11 +41,11 @@
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
 import org.openqa.selenium.testing.NoDriverAfterTest;
 import org.openqa.selenium.testing.NoDriverBeforeTest;
-import org.seleniumhq.jetty9.server.Handler;
-import org.seleniumhq.jetty9.server.Request;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpObject;

diff --git a/java/client/test/org/openqa/selenium/ReferrerTest.java b/java/client/test/org/openqa/selenium/ReferrerTest.java
@@ -50,11 +50,11 @@
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
 import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
-import org.seleniumhq.jetty9.server.Handler;
-import org.seleniumhq.jetty9.server.Request;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/JettyAppServer.java b/java/client/test/org/openqa/selenium/environment/webserver/JettyAppServer.java
@@ -37,23 +37,23 @@
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.seleniumhq.jetty9.http.HttpVersion;
-import org.seleniumhq.jetty9.http.MimeTypes;
-import org.seleniumhq.jetty9.server.Connector;
-import org.seleniumhq.jetty9.server.HttpConfiguration;
-import org.seleniumhq.jetty9.server.HttpConnectionFactory;
-import org.seleniumhq.jetty9.server.SecureRequestCustomizer;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.server.SslConnectionFactory;
-import org.seleniumhq.jetty9.server.handler.AllowSymLinkAliasChecker;
-import org.seleniumhq.jetty9.server.handler.ContextHandler.ApproveAliases;
-import org.seleniumhq.jetty9.server.handler.ContextHandlerCollection;
-import org.seleniumhq.jetty9.server.handler.HandlerList;
-import org.seleniumhq.jetty9.server.handler.ResourceHandler;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
-import org.seleniumhq.jetty9.servlet.ServletHolder;
-import org.seleniumhq.jetty9.util.ssl.SslContextFactory;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
+import org.eclipse.jetty.server.handler.ContextHandler.ApproveAliases;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -312,7 +312,7 @@ public void addServlet(
       throw new RuntimeException(e);
     }
   }
-  
+
   protected ServletContextHandler addResourceHandler(String contextPath, Path resourceBase) {
     ServletContextHandler context = new ServletContextHandler();
 

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/NullLogger.java b/java/client/test/org/openqa/selenium/environment/webserver/NullLogger.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.environment.webserver;
 
 
-import org.seleniumhq.jetty9.util.log.Logger;
+import org.eclipse.jetty.util.log.Logger;
 
 public class NullLogger implements Logger {
   public void disableLogging() {

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/UploadServlet.java b/java/client/test/org/openqa/selenium/environment/webserver/UploadServlet.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.environment.webserver;
 
-import org.seleniumhq.jetty9.server.Request;
+import org.eclipse.jetty.server.Request;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/java/client/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java b/java/client/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java
@@ -36,9 +36,9 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
-import org.seleniumhq.jetty9.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/java/server/src/org/openqa/selenium/grid/module-info.txt b/java/server/src/org/openqa/selenium/grid/module-info.txt
@@ -21,7 +21,7 @@ module org.openqa.selenium.grid {
         requires io.opentracing.noop;
         // requires io.opentracing.tracerresolver;
         requires org.openqa.selenium.support;
-        requires org.seleniumhq.jetty9;
+        requires org.eclipse.jetty;
 
         requires transitive java.logging;
         requires transitive javax.servlet.api;

diff --git a/java/server/src/org/openqa/selenium/grid/server/BaseServer.java b/java/server/src/org/openqa/selenium/grid/server/BaseServer.java
@@ -21,18 +21,18 @@
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.remote.http.HttpHandler;
-import org.seleniumhq.jetty9.security.ConstraintMapping;
-import org.seleniumhq.jetty9.security.ConstraintSecurityHandler;
-import org.seleniumhq.jetty9.server.Connector;
-import org.seleniumhq.jetty9.server.HttpConfiguration;
-import org.seleniumhq.jetty9.server.HttpConnectionFactory;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
-import org.seleniumhq.jetty9.servlet.ServletHolder;
-import org.seleniumhq.jetty9.util.log.JavaUtilLog;
-import org.seleniumhq.jetty9.util.log.Log;
-import org.seleniumhq.jetty9.util.security.Constraint;
-import org.seleniumhq.jetty9.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.log.JavaUtilLog;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 import javax.servlet.Servlet;
 import java.io.UncheckedIOException;
@@ -49,7 +49,7 @@ public class BaseServer<T extends BaseServer> implements Server<T> {
   private static final Logger LOG = Logger.getLogger(BaseServer.class.getName());
   private static final int MAX_SHUTDOWN_RETRIES = 8;
 
-  private final org.seleniumhq.jetty9.server.Server server;
+  private final org.eclipse.jetty.server.Server server;
   private final ServletContextHandler servletContextHandler;
   private final URL url;
   private HttpHandler handler;
@@ -72,7 +72,7 @@ public BaseServer(BaseServerOptions options) {
     }
 
     Log.setLog(new JavaUtilLog());
-    this.server = new org.seleniumhq.jetty9.server.Server(
+    this.server = new org.eclipse.jetty.server.Server(
         new QueuedThreadPool(options.getMaxServerThreads()));
 
     this.servletContextHandler = new ServletContextHandler(ServletContextHandler.SECURITY);

diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java b/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java
@@ -37,14 +37,14 @@
 import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.opera.OperaDriver;
 import org.openqa.selenium.safari.SafariDriver;
-import org.seleniumhq.jetty9.server.Connector;
-import org.seleniumhq.jetty9.server.HttpConfiguration;
-import org.seleniumhq.jetty9.server.HttpConnectionFactory;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.server.handler.ContextHandler;
-import org.seleniumhq.jetty9.server.handler.ResourceHandler;
-import org.seleniumhq.jetty9.util.resource.PathResource;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.PathResource;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/server/test/org/openqa/selenium/Main.java b/java/server/test/org/openqa/selenium/Main.java
@@ -20,14 +20,14 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import org.openqa.selenium.remote.server.WebDriverServlet;
-import org.seleniumhq.jetty9.server.Connector;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.server.handler.ContextHandler;
-import org.seleniumhq.jetty9.server.handler.HandlerList;
-import org.seleniumhq.jetty9.server.handler.ResourceHandler;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
-import org.seleniumhq.jetty9.util.resource.Resource;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.resource.Resource;
 
 public class Main {
 

diff --git a/java/server/test/org/openqa/selenium/remote/server/auth/AuthenticatedWebDriverServer.java b/java/server/test/org/openqa/selenium/remote/server/auth/AuthenticatedWebDriverServer.java
@@ -18,18 +18,18 @@
 package org.openqa.selenium.remote.server.auth;
 
 import org.openqa.selenium.remote.server.WebDriverServlet;
-import org.seleniumhq.jetty9.security.AbstractLoginService;
-import org.seleniumhq.jetty9.security.ConstraintMapping;
-import org.seleniumhq.jetty9.security.ConstraintSecurityHandler;
-import org.seleniumhq.jetty9.security.HashLoginService;
-import org.seleniumhq.jetty9.security.authentication.BasicAuthenticator;
-import org.seleniumhq.jetty9.server.HttpConnectionFactory;
-import org.seleniumhq.jetty9.server.Server;
-import org.seleniumhq.jetty9.server.ServerConnector;
-import org.seleniumhq.jetty9.servlet.ServletContextHandler;
-import org.seleniumhq.jetty9.servlet.ServletHolder;
-import org.seleniumhq.jetty9.util.security.Constraint;
-import org.seleniumhq.jetty9.util.security.Password;
+import org.eclipse.jetty.security.AbstractLoginService;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.security.Password;
 
 import java.security.Principal;
 

diff --git a/third_party/java/jetty/BUCK b/third_party/java/jetty/BUCK
@@ -41,8 +41,8 @@ prebuilt_jar(
 genrule(
     name = "move-services",
     out = "moved-bundle.jar",
-    cmd = "mkdir tmp && cd tmp && jar xf $(location :bundle-jars) && rm -rf META-INF/services/* && echo org.seleniumhq.jetty9.http.Http1FieldPreEncoder > META-INF/services/org.seleniumhq.jetty9.http.HttpFieldPreEncoder && jar cvf $OUT *",
-    cmd_exe = "md tmp && cd tmp && jar xf $(location :bundle-jars) && del /s /q META-INF\services\* && echo org.seleniumhq.jetty9.http.Http1FieldPreEncoder > META-INF\\services\\org.seleniumhq.jetty9.http.HttpFieldPreEncoder && jar cvf $OUT *",
+    cmd = "mkdir tmp && cd tmp && jar xf $(location :bundle-jars) && rm -rf META-INF/services/* && echo org.eclipse.jetty.http.Http1FieldPreEncoder > META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder && jar cvf $OUT *",
+    cmd_exe = "md tmp && cd tmp && jar xf $(location :bundle-jars) && del /s /q META-INF\services\* && echo org.eclipse.jetty.http.Http1FieldPreEncoder > META-INF\\services\\org.eclipse.jetty.http.HttpFieldPreEncoder && jar cvf $OUT *",
 )