Moving more RC stuff to the server

SeleniumHQ · Oct 17, 2014 · 2840d85 · 2840d85
1 parent 409512d
commit 2840d85
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 42 deletions.
diff --git a/java/client/src/org/openqa/selenium/browserlaunchers/build.desc b/java/client/src/org/openqa/selenium/browserlaunchers/build.desc
@@ -1,18 +1,4 @@
 
-java_library(name = "browserlaunchers",
-  srcs = [
-    "BrowserLauncher.java",
-  ],
-  deps = [
-    ":launcher-utils",
-    "//java/client/src/org/openqa/selenium:base",
-    "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//java/client/src/org/openqa/selenium/browserlaunchers/locators",
-    "//java/client/src/org/openqa/selenium/net",
-    "//java/client/src/org/openqa/selenium/os",
-    "//third_party/java/guava-libraries",
-  ])
-
 java_library(name = "launcher-utils",
   srcs = [
     "LauncherUtils.java",

diff --git a/java/client/src/org/openqa/selenium/build.desc b/java/client/src/org/openqa/selenium/build.desc
@@ -3,7 +3,6 @@ java_library(name = "selenium",
   deps = [
     ":webdriver-api",
     "//java/client/src/com/thoughtworks/selenium:api",
-    "//java/client/src/org/openqa/selenium/browserlaunchers",
     "//java/client/src/org/openqa/selenium/interactions",
     "//java/client/src/org/openqa/selenium/net",
   ])

diff --git a/java/server/src/org/openqa/selenium/server/BrowserSessionFactory.java b/java/server/src/org/openqa/selenium/server/BrowserSessionFactory.java
@@ -20,7 +20,7 @@
 
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
+import org.openqa.selenium.server.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.remote.server.log.PerSessionLogHandler;

diff --git a/java/server/src/org/openqa/selenium/server/SeleniumDriverResourceHandler.java b/java/server/src/org/openqa/selenium/server/SeleniumDriverResourceHandler.java
@@ -31,14 +31,14 @@
 import org.openqa.jetty.log.LogFactory;
 import org.openqa.jetty.util.StringUtil;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 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;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
 import org.openqa.selenium.server.BrowserSessionFactory.BrowserSessionInfo;
+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.InvalidBrowserExecutableException;

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.BrowserLauncher;
 import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 

diff --git a/...ium/browserlaunchers/BrowserLauncher.java → ...ver/browserlaunchers/BrowserLauncher.java b/...ium/browserlaunchers/BrowserLauncher.java → ...ver/browserlaunchers/BrowserLauncher.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 
 /**

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/BrowserLauncherFactory.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/BrowserLauncherFactory.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.Maps;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.server.DriverSessions;
 import org.openqa.selenium.server.RemoteControlConfiguration;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/DrivenSeleniumLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/DrivenSeleniumLauncher.java
@@ -27,7 +27,6 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.DriverSessions;
 import org.openqa.selenium.remote.server.Session;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxLauncher.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.BrowserLocator;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;

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.BrowserLauncher;
 import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.browserlaunchers.locators.InternetExplorerLocator;
 import org.openqa.selenium.io.FileHandler;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/InternetExplorerLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/InternetExplorerLauncher.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/MockBrowserLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/MockBrowserLauncher.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.server.DefaultRemoteCommand;
 import org.openqa.selenium.server.RemoteCommand;
 import org.openqa.selenium.server.RemoteControlConfiguration;

diff --git a/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariLauncher.java b/java/server/src/org/openqa/selenium/server/browserlaunchers/SafariLauncher.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 

diff --git a/java/server/src/org/openqa/selenium/server/build.desc b/java/server/src/org/openqa/selenium/server/build.desc
@@ -53,8 +53,8 @@ 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",
     "//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",
     "//java/server/src/cybervillains",

diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java b/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLLauncher.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.server.htmlrunner;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
+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;
@@ -28,6 +28,7 @@
 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;
 

diff --git a/...rver/test/org/openqa/selenium/server/browserlaunchers/BrowserLauncherFactoryUnitTest.java b/...rver/test/org/openqa/selenium/server/browserlaunchers/BrowserLauncherFactoryUnitTest.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**

diff --git a/java/server/test/org/openqa/selenium/server/browserlaunchers/DummyLauncher.java b/java/server/test/org/openqa/selenium/server/browserlaunchers/DummyLauncher.java
@@ -18,8 +18,6 @@
 
 package org.openqa.selenium.server.browserlaunchers;
 
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
-
 /**
  * A teeny tiny no-op launcher to get a non-null launcher for testing.
  * 

diff --git a/java/server/test/org/openqa/selenium/server/htmlrunner/HtmlLauncherUnitTest.java b/java/server/test/org/openqa/selenium/server/htmlrunner/HtmlLauncherUnitTest.java
@@ -26,9 +26,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 import org.openqa.selenium.server.SeleniumServer;
+import org.openqa.selenium.server.browserlaunchers.BrowserLauncher;
 
 import java.io.File;
 import java.io.FileWriter;

diff --git a/java/server/test/org/openqa/selenium/server/mock/DummyBrowserLauncher.java b/java/server/test/org/openqa/selenium/server/mock/DummyBrowserLauncher.java
@@ -18,8 +18,8 @@
 package org.openqa.selenium.server.mock;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.BrowserLauncher;
 import org.openqa.selenium.server.RemoteControlConfiguration;
+import org.openqa.selenium.server.browserlaunchers.BrowserLauncher;
 
 /**
  * Unlike the MockBrowserLauncher which acts like a real canned browser, the DummyBrowserLauncher

diff --git a/rb/ruby.iml b/rb/ruby.iml
@@ -6,16 +6,26 @@
       <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="ruby-1.9" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="ruby-2.1.3-p242" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.5.1, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.4.0, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.7.7, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.0.0, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v2.42.0, ruby-1.9) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket (v1.0.7, ruby-1.9) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.6, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.3, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.5.3, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ci_reporter (v1.9.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.5, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.99.0, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.99.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.99.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.99.2, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.6, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="webmock (v1.19.0, ruby-2.1.3-p242) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket (v1.2.1, ruby-2.1.3-p242) [gem]" level="application" />
   </component>
 </module>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      *
      */
-    package org.openqa.selenium.browserlaunchers;
+    package org.openqa.selenium.server.browserlaunchers;
     /**
@@ Expand Down @@