Get the Buck build compiling again

Author: shs96c

java/client/src/org/openqa/selenium/browserlaunchers/locators/BUCK

@@ -9,6 +9,7 @@ java_library(name = 'locators',
   ],
   visibility = [
     '//java/client/src/org/openqa/selenium/safari:safari',
+    '//java/client/test/org/openqa/selenium:helpers',
     '//java/server/src/org/openqa/selenium/server:server',
   ],
 )

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

@@ -41,7 +41,6 @@ java_library(name = 'helpers',
     '//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/server/src/org/openqa/grid/BUCK

@@ -33,6 +33,7 @@ java_library(name = 'grid',
   visibility = [
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/src/org/openqa/selenium/server:server',
     '//java/server/test/org/openqa/grid/...',
   ],
 )

java/server/src/org/openqa/selenium/remote/server/BUCK

@@ -64,6 +64,7 @@ java_library(name = 'server',
     '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
     '//java/server/src/org/openqa/selenium/server:server',
     '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
+    '//java/server/test/org/openqa/grid:test',
   ],
 )
 
@@ -97,6 +98,7 @@ java_library(name = 'standalone-server-lib',
   ],
   visibility = [
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/test/org/openqa/grid/e2e:tests',
   ],
 )
 

java/server/src/org/openqa/selenium/server/BUCK

@@ -24,7 +24,7 @@ java_library(name = 'server',
     '//java/server/src/org/openqa/selenium/remote/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:sessions',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
-    '//java/server/src/org/openqa/grid',
+    '//java/server/src/org/openqa/grid:grid',
     ':selenium-core',
     '//third_party/java/commons-logging:commons-logging',
     '//third_party/java/guava:guava',

java/server/test/org/openqa/grid/BUCK

@@ -8,10 +8,10 @@ java_test(name = 'grid',
   deps = [
     ':test',
     '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/common:common',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:capabilities',
     '//java/client/src/org/openqa/selenium/remote:remote',
+    '//third_party/java/beust:jcommander',
     '//third_party/java/junit:junit',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/gson:gson',
@@ -24,17 +24,14 @@ java_library(name = 'test',
     'internal/**/*.java',
     'plugin/**/*.java',
   ], excludes = SUITES),
-  resources = [
-    'internal/configuration/grid_configuration_test1.yml',
-    'internal/configuration/grid_configuration_test2.yml',
-  ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium:selenium',
-    '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/common:common',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/selenium/remote/server:server',
+    '//third_party/java/beust:jcommander',
     '//third_party/java/gson:gson',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/junit:junit',

java/server/test/org/openqa/grid/common/BUCK

@@ -11,10 +11,12 @@ java_test(name = 'common',
 java_library(name = 'tests',
   srcs = glob(['*.java'], excludes = SUITES),
   deps = [
-    '//java/server/src/org/openqa/grid/common:common',
+    '//java/server/src/org/openqa/grid:grid',
     '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/remote:capabilities',
+    '//third_party/java/beust:jcommander',
+    '//third_party/java/gson:gson',
     '//third_party/java/junit:junit',
   ],
 )

java/server/test/org/openqa/grid/e2e/BUCK

@@ -16,14 +16,14 @@ java_library(name = 'tests',
     '//java/client/src/org/openqa/selenium/firefox:firefox',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/server/src/org/openqa/selenium/server:server',
     '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/grid/selenium:classes',
-    '//java/server/src/org/openqa/grid/shared:interfaces',
-    '//third_party/java/htmlunit:htmlunit-driver',
+    '//third_party/java/beust:jcommander',
     '//third_party/java/guava:guava',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/junit:junit',
     '//third_party/java/mockito:mockito',

third_party/java/beust/BUCK

@@ -7,6 +7,7 @@ prebuilt_jar(
     '//java/server/src/org/openqa/grid:grid',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
+    '//java/server/test/...',
     '//third_party/java/testng:testng'
   ],
 )