Moving LauncherUtils to the server

SeleniumHQ · Oct 17, 2014 · 8799151 · 8799151
1 parent dc16876
commit 8799151
Show file tree

Hide file tree

Showing 30 changed files with 16 additions and 49 deletions.
diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/build.desc b/java/client/src/org/openqa/selenium/browserlaunchers/build.desc
@@ -1,19 +1,4 @@
 
-java_library(name = "launcher-utils",
-  srcs = [
-    "LauncherUtils.java",
-    "Sleeper.java",
-  ],
-  deps = [
-    ":proxies",
-    "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//java/client/src/org/openqa/selenium/io",
-    "//java/client/src/org/openqa/selenium/net",
-    "//java/client/src/org/openqa/selenium/os",
-    "//java/client/src/org/openqa/selenium/remote:base",
-    "//third_party/java/guava-libraries",
-  ])
-
 java_library(name = "proxies",
   srcs = [
     "DoNotUseProxyPac.java",

diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/locators/build.desc b/java/client/src/org/openqa/selenium/browserlaunchers/locators/build.desc
@@ -2,6 +2,7 @@
 java_library(name = "locators",
   srcs = [ "*.java" ],
   deps = [
-    "//java/client/src/org/openqa/selenium/browserlaunchers:launcher-utils",
+    "//java/client/src/org/openqa/selenium/io",
     "//java/client/src/org/openqa/selenium/os",
+    "//java/client/src/org/openqa/selenium/remote:base",
   ])
diff --git a/java/client/test/org/openqa/selenium/browserlaunchers/RcBrowserLauncherTests.java b/java/client/test/org/openqa/selenium/browserlaunchers/RcBrowserLauncherTests.java
@@ -25,7 +25,6 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses(value = {
     FirefoxLocatorUnitTest.class,
-    LauncherUtilsUnitTest.class,
     ProxyPacTest.class,
     SingleBrowserLocatorUnitTest.class
 })

diff --git a/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java b/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java
@@ -20,7 +20,7 @@
 
 import org.openqa.grid.common.exception.GridException;
 import org.openqa.grid.internal.Registry;
-import org.openqa.selenium.browserlaunchers.Sleeper;
+import org.openqa.selenium.server.browserlaunchers.Sleeper;
 
 import java.io.IOException;
 

diff --git a/java/server/src/org/openqa/selenium/server/SeleniumDriverResourceHandler.java b/java/server/src/org/openqa/selenium/server/SeleniumDriverResourceHandler.java
@@ -31,7 +31,6 @@
 import org.openqa.jetty.log.LogFactory;
 import org.openqa.jetty.util.StringUtil;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.DriverSessions;
@@ -42,6 +41,7 @@
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
 import org.openqa.selenium.server.browserlaunchers.BrowserOptions;
 import org.openqa.selenium.server.browserlaunchers.InvalidBrowserExecutableException;
+import org.openqa.selenium.server.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.commands.AddCustomRequestHeaderCommand;
 import org.openqa.selenium.server.commands.CaptureEntirePageScreenshotToStringCommand;
 import org.openqa.selenium.server.commands.CaptureNetworkTrafficCommand;

diff --git a/java/server/src/org/openqa/selenium/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/server/SeleniumServer.java
@@ -29,7 +29,6 @@
 import org.openqa.jetty.jetty.Server;
 import org.openqa.jetty.jetty.servlet.ServletHandler;
 import org.openqa.jetty.util.MultiException;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.internal.BuildInfo;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.remote.server.DefaultDriverSessions;
@@ -38,6 +37,7 @@
 import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.remote.server.log.LoggingOptions;
 import org.openqa.selenium.server.BrowserSessionFactory.BrowserSessionInfo;
+import org.openqa.selenium.server.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.cli.RemoteControlLauncher;
 import org.openqa.selenium.server.htmlrunner.HTMLLauncher;
 import org.openqa.selenium.server.htmlrunner.HTMLResultsListener;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/AbstractBrowserLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/AbstractBrowserLauncher.java
@@ -20,7 +20,6 @@
 
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxChromeLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxChromeLauncher.java
@@ -19,9 +19,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.Proxies;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.os.CommandLine;

diff --git a/.../server/src/org/openqa/selenium/server/browserlaunchers/FirefoxCustomProfileLauncher.java b/.../server/src/org/openqa/selenium/server/browserlaunchers/FirefoxCustomProfileLauncher.java
@@ -17,9 +17,7 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.Proxies;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.os.CommandLine;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/GoogleChromeLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/GoogleChromeLauncher.java
@@ -20,7 +20,6 @@
 import com.google.common.collect.Lists;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.GoogleChromeLocator;
 import org.openqa.selenium.io.FileHandler;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.locators.InternetExplorerLocator;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.os.CommandLine;

diff --git a/.../src/org/openqa/selenium/server/browserlaunchers/InternetExplorerCustomProxyLauncher.java b/.../src/org/openqa/selenium/server/browserlaunchers/InternetExplorerCustomProxyLauncher.java
@@ -19,7 +19,6 @@
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.InternetExplorerLocator;
 import org.openqa.selenium.os.WindowsProcessGroup;

diff --git a/...enium/browserlaunchers/LauncherUtils.java → ...erver/browserlaunchers/LauncherUtils.java b/...enium/browserlaunchers/LauncherUtils.java → ...erver/browserlaunchers/LauncherUtils.java
@@ -16,11 +16,12 @@
 */
 
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.net.Urls;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/MacProxyManager.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/MacProxyManager.java
@@ -16,7 +16,6 @@
  */
 package org.openqa.selenium.server.browserlaunchers;
 
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.os.CommandLine;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/OperaCustomProfileLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/OperaCustomProfileLauncher.java
@@ -18,9 +18,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.Proxies;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/ResourceExtractor.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/ResourceExtractor.java
@@ -21,7 +21,6 @@
 import com.google.common.io.Resources;
 
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.server.ClassPathResource;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariCustomProfileLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariCustomProfileLauncher.java
@@ -20,7 +20,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.SafariLocator;
 import org.openqa.selenium.os.CommandLine;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariFileBasedLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariFileBasedLauncher.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.server.RemoteControlConfiguration;

diff --git a/...qa/selenium/browserlaunchers/Sleeper.java → ...nium/server/browserlaunchers/Sleeper.java b/...qa/selenium/browserlaunchers/Sleeper.java → ...nium/server/browserlaunchers/Sleeper.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 /**
  * Primitives for sleeping

diff --git a/java/server/src/org/openqa/selenium/server/build.desc b/java/server/src/org/openqa/selenium/server/build.desc
@@ -53,7 +53,6 @@ java_library(name = "base",
     "//java/client/src/com/thoughtworks/selenium:api",
     "//java/client/src/com/thoughtworks/selenium/webdriven",
     "//java/client/src/org/openqa/selenium:codecs",
-    "//java/client/src/org/openqa/selenium/browserlaunchers:launcher-utils",
     "//java/client/src/org/openqa/selenium/browserlaunchers/locators",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/support",

diff --git a/...r/src/org/openqa/selenium/server/commands/CaptureEntirePageScreenshotToStringCommand.java b/...r/src/org/openqa/selenium/server/commands/CaptureEntirePageScreenshotToStringCommand.java
@@ -18,9 +18,9 @@
 
 package org.openqa.selenium.server.commands;
 
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.internal.Base64Encoder;
 import org.openqa.selenium.server.IOHelper;
+import org.openqa.selenium.server.browserlaunchers.LauncherUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java b/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java
@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncher;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.net.Urls;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -28,9 +27,9 @@
 import org.openqa.selenium.server.RemoteControlConfiguration;
 import org.openqa.selenium.server.SeleniumCommandTimedOutException;
 import org.openqa.selenium.server.SeleniumServer;
-import org.openqa.selenium.server.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
 import org.openqa.selenium.server.browserlaunchers.BrowserOptions;
+import org.openqa.selenium.server.browserlaunchers.Sleeper;
 
 import java.io.File;
 import java.io.FileWriter;

diff --git a/java/server/test/org/openqa/selenium/server/RcServerUnitTests.java b/java/server/test/org/openqa/selenium/server/RcServerUnitTests.java
@@ -24,6 +24,7 @@
 import org.openqa.selenium.server.browserlaunchers.BrowserConfigurationOptionsTest;
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactoryUnitTest;
 import org.openqa.selenium.server.browserlaunchers.FirefoxChromeLauncherUnitTest;
+import org.openqa.selenium.server.browserlaunchers.LauncherUtilsUnitTest;
 import org.openqa.selenium.server.browserlaunchers.MacProxyManagerUnitTest;
 import org.openqa.selenium.server.browserlaunchers.MakeProxyPacUnitTest;
 import org.openqa.selenium.server.browserlaunchers.WindowsProxyManagerUnitTest;
@@ -46,6 +47,7 @@
     FrameGroupCommandQueueUnitTest.class,
     FsResourceLocatorUnitTest.class,
     HTMLSuiteResultUnitTest.class,
+    LauncherUtilsUnitTest.class,
     LoggingTests.class,
     MacProxyManagerUnitTest.class,
     MakeProxyPacUnitTest.class,

diff --git a/.../openqa/selenium/server/browserlaunchers/FirefoxCustomProfileLauncherIntegrationTest.java b/.../openqa/selenium/server/browserlaunchers/FirefoxCustomProfileLauncherIntegrationTest.java
@@ -18,7 +18,6 @@
 
 package org.openqa.selenium.server.browserlaunchers;
 
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 import java.util.ArrayList;

diff --git a/.../test/org/openqa/selenium/server/browserlaunchers/GoogleChromeLauncherFunctionalTest.java b/.../test/org/openqa/selenium/server/browserlaunchers/GoogleChromeLauncherFunctionalTest.java
@@ -17,11 +17,10 @@
 
 package org.openqa.selenium.server.browserlaunchers;
 
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**
- * {@link org.openqa.selenium.server.browserlaunchers.GoogleChromeLaunhcer} functional test class.
+ * {@link org.openqa.selenium.server.browserlaunchers.GoogleChromeLauncher} functional test class.
  * 
  * <p>
  * If no local proxy server (such as Selenium Server) is running during this test, there won't be a

diff --git a/...a/selenium/server/browserlaunchers/InternetExplorerCustomProxyLauncherFunctionalTest.java b/...a/selenium/server/browserlaunchers/InternetExplorerCustomProxyLauncherFunctionalTest.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.junit.Test;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**

diff --git a/java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherFunctionalTestCase.java b/java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherFunctionalTestCase.java
@@ -20,10 +20,9 @@
 
 import org.apache.commons.logging.Log;
 import org.openqa.jetty.log.LogFactory;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 
 /**
- * {@link org.openqa.selenium.server.browserlaunchers.Firefox2Launcher} integration test class.
+ * {@link org.openqa.selenium.server.browserlaunchers.SafariLauncherIntegrationTest} integration test class.
  */
 public class LauncherFunctionalTestCase {
 

diff --git a/...owserlaunchers/LauncherUtilsUnitTest.java → ...owserlaunchers/LauncherUtilsUnitTest.java b/...owserlaunchers/LauncherUtilsUnitTest.java → ...owserlaunchers/LauncherUtilsUnitTest.java
@@ -16,12 +16,13 @@
 */
 
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import com.google.common.base.Throwables;
 import com.google.common.io.Files;
 
 import org.junit.Test;
+import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;

diff --git a/java/server/test/org/openqa/selenium/server/browserlaunchers/MakeProxyPacUnitTest.java b/java/server/test/org/openqa/selenium/server/browserlaunchers/MakeProxyPacUnitTest.java
@@ -26,7 +26,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 

diff --git a/...erver/test/org/openqa/selenium/server/browserlaunchers/SafariLauncherIntegrationTest.java b/...erver/test/org/openqa/selenium/server/browserlaunchers/SafariLauncherIntegrationTest.java
@@ -21,7 +21,6 @@
 import org.apache.commons.logging.Log;
 import org.junit.Test;
 import org.openqa.jetty.log.LogFactory;
-import org.openqa.selenium.browserlaunchers.Sleeper;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**