Moving Proxies utility class to server

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

Hide file tree

Showing 18 changed files with 2 additions and 18 deletions.
diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/BUCK b/java/client/src/org/openqa/selenium/browserlaunchers/BUCK
@@ -1,7 +1,6 @@
 java_library(name = 'proxies',
   srcs = [
     'DoNotUseProxyPac.java',
-    'Proxies.java',
   ],
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',

diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/build.desc b/java/client/src/org/openqa/selenium/browserlaunchers/build.desc
@@ -2,7 +2,6 @@
 java_library(name = "proxies",
   srcs = [
     "DoNotUseProxyPac.java",
-    "Proxies.java",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:base",

diff --git a/java/client/test/org/openqa/selenium/ProxyTest.java b/java/client/test/org/openqa/selenium/ProxyTest.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Proxy.ProxyType;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/BrowserOptions.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/BrowserOptions.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;

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,7 +19,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.Proxies;
 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,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 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/KonquerorLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/KonquerorLauncher.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/LauncherUtils.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/LauncherUtils.java
@@ -21,7 +21,6 @@
 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/OperaCustomProfileLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/OperaCustomProfileLauncher.java
@@ -18,7 +18,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;

diff --git a/...qa/selenium/browserlaunchers/Proxies.java → ...nium/server/browserlaunchers/Proxies.java b/...qa/selenium/browserlaunchers/Proxies.java → ...nium/server/browserlaunchers/Proxies.java
@@ -15,7 +15,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.remote.CapabilityType.ForSeleniumServer.AVOIDING_PROXY;
@@ -25,6 +25,7 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.browserlaunchers.DoNotUseProxyPac;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.CapabilityType.ForSeleniumServer;
 import org.openqa.selenium.remote.DesiredCapabilities;

diff --git a/...g/openqa/selenium/server/browserlaunchers/ProxyInjectionFirefoxCustomProfileLauncher.java b/...g/openqa/selenium/server/browserlaunchers/ProxyInjectionFirefoxCustomProfileLauncher.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.server.ApplicationRegistry;

diff --git a/...a/selenium/server/browserlaunchers/ProxyInjectionInternetExplorerCustomProxyLauncher.java b/...a/selenium/server/browserlaunchers/ProxyInjectionInternetExplorerCustomProxyLauncher.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**

diff --git a/...rg/openqa/selenium/server/browserlaunchers/ProxyInjectionSafariCustomProfileLauncher.java b/...rg/openqa/selenium/server/browserlaunchers/ProxyInjectionSafariCustomProfileLauncher.java
@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/WindowsProxyManager.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/WindowsProxyManager.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.os.CommandLine;

diff --git a/...ver/test/org/openqa/selenium/server/browserlaunchers/BrowserConfigurationOptionsTest.java b/...ver/test/org/openqa/selenium/server/browserlaunchers/BrowserConfigurationOptionsTest.java
@@ -28,7 +28,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 public class BrowserConfigurationOptionsTest {

diff --git a/java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherUtilsUnitTest.java b/java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherUtilsUnitTest.java
@@ -22,7 +22,6 @@
 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.Proxies;
 import org.openqa.selenium.io.FileHandler;
 
 import java.io.File;

diff --git a/java/server/test/org/openqa/selenium/server/browserlaunchers/ProxyUtilsTest.java b/java/server/test/org/openqa/selenium/server/browserlaunchers/ProxyUtilsTest.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 
 public class ProxyUtilsTest {
   @Test