fixing buck build

SeleniumHQ · Mar 15, 2016 · bfbe973 · bfbe973
1 parent d57dcdc
commit bfbe973
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -31,6 +31,7 @@ java_library(name = 'grid',
     '//third_party/java/beust:jcommander',
   ],
   visibility = [
+    '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/server/test/org/openqa/grid/...',
   ],

diff --git a/java/server/src/org/openqa/grid/selenium/BUCK b/java/server/src/org/openqa/grid/selenium/BUCK
@@ -1,5 +1,5 @@
 java_binary(name = 'selenium',
-  main_class = 'org.openqa.grid.selenium.GridLauncher',
+  main_class = 'org.openqa.grid.selenium.GridLauncherV3',
   deps = [
     ':classes',
   ],
@@ -16,10 +16,11 @@ java_library(name = 'classes',
     '//java/server/src/org/openqa/grid:grid',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
-    '//java/server/src/org/openqa/selenium/server:server',
+    '//java/server/src/org/openqa/selenium/remote/server:server',
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
     '//third_party/java/servlet:servlet-api',
+    '//third_party/java/beust:jcommander',
   ],
   visibility = [
     '//java/server/test/org/openqa/grid/e2e:tests',

diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -60,6 +60,7 @@ java_library(name = 'server',
   ],
   visibility = [
     '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/selenium:classes',
     '//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',
@@ -89,7 +90,7 @@ java_library(name = 'standalone-server-lib',
     ':server',
     ':sessions',
     '//java/client/src/org/openqa/selenium/remote:api',
-    '//java/server/src/org/openqa/grid',
+    '//java/server/src/org/openqa/grid:grid',
     '//third_party/java/beust:jcommander',
     '//third_party/java/jetty:jetty',
     '//third_party/java/servlet:servlet-api',

diff --git a/third_party/java/beust/BUCK b/third_party/java/beust/BUCK
@@ -4,6 +4,8 @@ prebuilt_jar(
   binary_jar = 'jcommander-1.48.jar',
   source_jar = 'jcommander-1.48-sources.jar',
   visibility = [
+    '//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',
     '//third_party/java/testng:testng'
   ],

diff --git a/third_party/third_party.iml b/third_party/third_party.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>