refactoring of grid command line parameters / configuration classes. …

…This is not fully backwards compatible with 2.X selenium, changes will be needed for anyone running selenium grid directly from Java.

Fixes SeleniumHQ#1773

Rakefile

@@ -155,7 +155,7 @@ task :support => [
 desc 'Build the standalone server'
 task 'selenium-server-standalone' => '//java/server/src/org/openqa/grid/selenium:selenium:uber'
 
-task 'selenium-server-standalone-v3' => '//java/server/src/org/openqa/grid/selenium:selenium-v3:uber'
+task 'selenium-server-standalone-v3' => '//java/server/src/org/openqa/grid/selenium:selenium:uber'
 
 task :ide => [ "//ide:selenium-ide-multi" ]
 task :ide_proxy_setup => [ "//javascript/selenium-atoms", "se_ide:setup_proxy" ]
@@ -545,16 +545,16 @@ task "release-v3" => [
     :clean,
     :build,
     '//java/server/src/org/openqa/selenium/remote/server:server:zip',
-    '//java/server/src/org/openqa/grid/selenium:selenium-v3:zip',
+    '//java/server/src/org/openqa/grid/selenium:selenium:zip',
     '//java/client/src/org/openqa/selenium:client-combined-v3:zip',
   ] do |t|
   # Unzip each of the deps and rename the pieces that need renaming
   renames = {
     "client-combined-v3-nodeps-srcs.jar" => "selenium-java-v3-#{version}-srcs.jar",
     "client-combined-v3-nodeps.jar" => "selenium-java-v3-#{version}.jar",
-    "selenium-v3-nodeps-srcs.jar" => "selenium-server-v3-#{version}-srcs.jar",
-    "selenium-v3-nodeps.jar" => "selenium-server-v3-#{version}.jar",
-    "selenium-v3-standalone.jar" => "selenium-server-v3-standalone-#{version}.jar",
+    "selenium-nodeps-srcs.jar" => "selenium-server-v3-#{version}-srcs.jar",
+    "selenium-nodeps.jar" => "selenium-server-v3-#{version}.jar",
+    "selenium-standalone.jar" => "selenium-server-v3-standalone-#{version}.jar",
   }
 
   t.prerequisites.each do |pre|
@@ -585,8 +585,8 @@ task "release-v3" => [
   end
 
   mkdir_p "build/dist"
-  cp "build/java/server/src/org/openqa/grid/selenium/selenium-v3-standalone.jar", "build/dist/selenium-server-v3-standalone-#{version}.jar"
-  cp "build/java/server/src/org/openqa/grid/selenium/selenium-v3.zip", "build/dist/selenium-server-v3-#{version}.zip"
+  cp "build/java/server/src/org/openqa/grid/selenium/selenium-standalone.jar", "build/dist/selenium-server-v3-standalone-#{version}.jar"
+  cp "build/java/server/src/org/openqa/grid/selenium/selenium.zip", "build/dist/selenium-server-v3-#{version}.zip"
   cp "build/java/client/src/org/openqa/selenium/client-combined-v3.zip", "build/dist/selenium-java-v3-#{version}.zip"
 end
 

java/client/src/org/openqa/selenium/remote/CapabilityType.java

@@ -35,6 +35,7 @@ public interface CapabilityType {
   String PROXY = "proxy";
   String SUPPORTS_WEB_STORAGE = "webStorageEnabled";
   String ROTATABLE = "rotatable";
+  String APPLICATION_NAME = "applicationName";
   // Enable this capability to accept all SSL certs by defaults.
   String ACCEPT_SSL_CERTS = "acceptSslCerts";
   String HAS_NATIVE_EVENTS = "nativeEvents";

java/client/test/org/openqa/selenium/BUCK

@@ -38,8 +38,10 @@ java_library(name = 'helpers',
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
+    '//java/client/src/org/openqa/selenium/browserlaunchers/locators:locators',
     '//java/client/test/org/openqa/selenium/environment:environment',
     '//java/client/test/org/openqa/selenium/testing:helpers',
+    '//java/client/src/org/openqa/selenium/support/ui:ui',
     '//third_party/java/guava:guava',
     '//third_party/java/junit:junit',
   ],

java/client/test/org/openqa/selenium/build.desc

@@ -34,6 +34,7 @@ java_library(name = "base",
     "//java/client/test/org/openqa/selenium/environment",
     "//java/client/test/org/openqa/selenium/testing",
     "//java/client/test/org/openqa/selenium/testing:annotations",
+    "//java/client/src/org/openqa/selenium/support/ui:ui",
     "//third_party/java/junit",
     "//third_party/java/hamcrest",
   ])
@@ -63,6 +64,7 @@ java_library(name = "tests",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote:common",
     "//java/client/src/org/openqa/selenium/support/ui:wait",
+    "//java/client/src/org/openqa/selenium/browserlaunchers/locators:locators",
     "//java/client/test/com/thoughtworks/selenium/webdriven:small_tests",
     "//java/client/test/org/openqa/selenium/environment",
     "//java/client/test/org/openqa/selenium/testing:junit_4",

java/client/test/org/openqa/selenium/remote/build.desc

@@ -32,7 +32,7 @@ java_test(name = "client-tests",
   deps = [
     "//java/client/src/org/openqa/selenium/logging",
     "//java/client/src/org/openqa/selenium/logging:api",
-    "//java/client/src/org/openqa/selenium/remote",
+    "//java/client/src/org/openqa/selenium/remote:augmenter",
     "//java/client/test/org/openqa/selenium:tests",
     "//third_party/java/junit",
     "//third_party/java/mockito",

java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java

@@ -60,7 +60,7 @@ public WebDriver get() {
       }
 
       if (DesiredCapabilities.firefox().getBrowserName().equals(desiredCapsToUse.getBrowserName())) {
-        boolean isMarionette = Boolean.getBoolean("webdriver.firefox.marionette");
+        boolean isMarionette = Boolean.getBoolean(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE);
         if (!isMarionette) {
           if (isInDevMode()) {
             copyFirefoxDriverDefaultsToOutputDir();

java/client/test/org/openqa/selenium/testing/drivers/build.desc

@@ -32,6 +32,7 @@ java_library(name = "drivers",
     "//javascript/firefox-driver:webdriver",
     "//third_party/java/guava",
     "//third_party/java/junit",
+    "//third_party/java/phantomjs-driver:phantomjs-driver"
   ])
 
 java_library(name = "test_selenium_server",

java/server/src/org/openqa/grid/BUCK

@@ -1,6 +1,8 @@
 java_library(name = 'grid',
   srcs = glob([
+    'common/**/*.java',
     'internal/**/*.java',
+    'shared/**/*.java',
     'web/**/*.java',
   ]),
   resources = glob([
@@ -9,16 +11,15 @@ java_library(name = 'grid',
     'images/*.ico',
     'images/*.js',
     'images/*.png',
+    'common/defaults/*.json',
   ]),
   deps = [
     '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/selenium/remote/server:server',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
-    "//java/server/src/org/openqa/grid/shared:interfaces",
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
     '//third_party/java/httpcomponents:httpclient',
@@ -27,6 +28,7 @@ java_library(name = 'grid',
     '//third_party/java/jetty:jetty-for-rc',
     '//third_party/java/servlet:servlet-api',
     '//third_party/java/yaml:snakeyaml',
+    '//third_party/java/beust:jcommander',
   ],
   visibility = [
     '//java/server/src/org/openqa/grid/selenium:classes',

java/server/src/org/openqa/grid/build.desc

@@ -1,23 +1,25 @@
 
 java_library(name = "grid",
   srcs = [
+    "common/**/*.java",
     "internal/**/*.java",
+    "shared/**/*.java",
     "web/**/*.java",
     "selenium/proxy/**/*.java",
   ],
   embedded = [
     "images/",
+    "common/defaults/",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/org/openqa/selenium/chrome",
-    "//java/server/src/org/openqa/grid/common",
-    "//java/server/src/org/openqa/grid/shared:interfaces",
     "//java/server/src/org/openqa/selenium/remote/server",
     "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/guava",
     "//third_party/java/jcip_annotations",
     "//third_party/java/yaml",
-    "//third_party/java/jetty"
+    "//third_party/java/jetty",
+    "//third_party/java/beust:jcommander"
   ])