Renaming the Jetty7AppServer to remove the version number.

It's enough to know it uses Jetty.
johnferro · Sep 8, 2015 · 62c0fe6 · 62c0fe6
1 parent e0b55cf
commit 62c0fe6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java b/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java
@@ -19,11 +19,11 @@
 
 import java.io.File;
 
-import org.openqa.selenium.environment.webserver.Jetty7AppServer;
+import org.openqa.selenium.environment.webserver.JettyAppServer;
 import org.openqa.selenium.testing.InProject;
 import org.seleniumhq.jetty7.servlet.ServletContextHandler;
 
-public class SeleniumAppServer extends Jetty7AppServer {
+public class SeleniumAppServer extends JettyAppServer {
 
   private static final String RC_CONTEXT_PATH = "/selenium-server";
 
@@ -45,7 +45,7 @@ protected String getMainContextPath(String relativeUrl) {
   }
 
   public static void main(String[] args) {
-    Jetty7AppServer server = new SeleniumAppServer();
+    JettyAppServer server = new SeleniumAppServer();
 
     server.listenOn(getHttpPortFromEnv());
     System.out.println(String.format("Starting server on port %d", getHttpPortFromEnv()));

diff --git a/java/client/test/org/openqa/selenium/environment/InProcessTestEnvironment.java b/java/client/test/org/openqa/selenium/environment/InProcessTestEnvironment.java
@@ -18,14 +18,14 @@
 package org.openqa.selenium.environment;
 
 import org.openqa.selenium.environment.webserver.AppServer;
-import org.openqa.selenium.environment.webserver.Jetty7AppServer;
+import org.openqa.selenium.environment.webserver.JettyAppServer;
 
 public class InProcessTestEnvironment implements TestEnvironment {
 
   private AppServer appServer;
 
   public InProcessTestEnvironment() {
-    appServer = new Jetty7AppServer();
+    appServer = new JettyAppServer();
     appServer.start();
   }
 

diff --git a/...nvironment/webserver/Jetty7AppServer.java → ...environment/webserver/JettyAppServer.java b/...nvironment/webserver/Jetty7AppServer.java → ...environment/webserver/JettyAppServer.java
@@ -37,7 +37,7 @@
 import javax.servlet.Filter;
 import javax.servlet.Servlet;
 
-public class Jetty7AppServer implements AppServer {
+public class JettyAppServer implements AppServer {
 
   private static final String HOSTNAME_FOR_TEST_ENV_NAME = "HOSTNAME";
   private static final String ALTERNATIVE_HOSTNAME_FOR_TEST_ENV_NAME = "ALTERNATIVE_HOSTNAME";
@@ -60,7 +60,7 @@ public class Jetty7AppServer implements AppServer {
   private ContextHandlerCollection handlers;
   private final String hostName;
 
-  public Jetty7AppServer() {
+  public JettyAppServer() {
     this(detectHostname());
   }
 
@@ -69,7 +69,7 @@ public static String detectHostname() {
     return hostnameFromProperty == null ? "localhost" : hostnameFromProperty;
   }
 
-  public Jetty7AppServer(String hostName) {
+  public JettyAppServer(String hostName) {
     this.hostName = hostName;
     // Be quiet. Unless we want things to be chatty
     if (!Boolean.getBoolean("webdriver.debug")) {
@@ -258,7 +258,7 @@ protected static int getHttpsPortFromEnv() {
   }
 
   public static void main(String[] args) {
-    Jetty7AppServer server = new Jetty7AppServer(detectHostname());
+    JettyAppServer server = new JettyAppServer(detectHostname());
 
     server.listenOn(getHttpPortFromEnv());
     System.out.println(String.format("Starting server on port %d", getHttpPortFromEnv()));

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/build.desc b/java/client/test/org/openqa/selenium/environment/webserver/build.desc
@@ -3,12 +3,11 @@ java_library(
   srcs = [ 
     "AppServer.java",
 
-    "Jetty7AppServer.java",
     "BasicAuth.java",
     "CookieServlet.java",
     "EncodingServlet.java",
     "GeneratedJsTestServlet.java",
-    "Jetty7AppServer.java",
+    "JettyAppServer.java",
     "KillSwitchServlet.java",
     "ManifestServlet.java",
     "Utf8Servlet.java",
@@ -44,7 +43,7 @@ java_library(
 
 java_binary(name = "WebServer",
   deps = [":webserver"],
-  main_class = "org.openqa.selenium.environment.webserver.Jetty7AppServer")
+  main_class = "org.openqa.selenium.environment.webserver.JettyAppServer")
 
 java_test(name = "webserver_test",
   srcs = [