Moving proxy management stuff to the server, it is used in RC browser launchers only

Author: barancev

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/BUCK

@@ -1,7 +1,6 @@
 java_library(name = 'proxies',
   srcs = [
     'DoNotUseProxyPac.java',
-    'Maps.java',
     'Proxies.java',
   ],
   deps = [

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/build.desc

@@ -16,7 +16,6 @@ java_library(name = "browserlaunchers",
 java_library(name = "launcher-utils",
   srcs = [
     "LauncherUtils.java",
-    "MacProxyManager.java",
     "Sleeper.java",
   ],
   deps = [
@@ -32,9 +31,7 @@ java_library(name = "launcher-utils",
 java_library(name = "proxies",
   srcs = [
     "DoNotUseProxyPac.java",
-    "Maps.java",
     "Proxies.java",
-    "WindowsProxyManager.java",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:base",

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/InternetExplorerCustomProxyLauncher.java

@@ -20,7 +20,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.browserlaunchers.Sleeper;
-import org.openqa.selenium.browserlaunchers.WindowsProxyManager;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.InternetExplorerLocator;
 import org.openqa.selenium.os.WindowsProcessGroup;

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/MacProxyManager.java renamed to java/server/src/org/openqa/selenium/server/browserlaunchers/MacProxyManager.java

@@ -14,8 +14,9 @@
  *  limitations under the License.
  *
  */
-package org.openqa.selenium.browserlaunchers;
+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 for: java/client/src/org/openqa/selenium/browserlaunchers/Maps.java renamed to java/server/src/org/openqa/selenium/server/browserlaunchers/Maps.java

@@ -15,7 +15,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import java.util.HashMap;
 import java.util.Map;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/SafariCustomProfileLauncher.java

@@ -21,8 +21,6 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.browserlaunchers.LauncherUtils;
-import org.openqa.selenium.browserlaunchers.MacProxyManager;
-import org.openqa.selenium.browserlaunchers.WindowsProxyManager;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.SafariLocator;
 import org.openqa.selenium.os.CommandLine;

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/WindowsProxyManager.java renamed to java/server/src/org/openqa/selenium/server/browserlaunchers/WindowsProxyManager.java

@@ -14,9 +14,10 @@
  *  limitations under the License.
  *
  */
-package org.openqa.selenium.browserlaunchers;
+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;