Start deleting tests that are no longer relevant

.buckconfig

@@ -45,23 +45,20 @@
   remote   = //java/client/src/org/openqa/selenium/remote:remote
   safari   = //java/client/src/org/openqa/selenium/safari:safari
 
-  grid          = //java/server/src/org/openqa/grid/selenium:selenium
   grid-tng      = //java/server/src/org/openqa/selenium/grid:selenium
   leg-rc        = //java/client/src/com/thoughtworks/selenium:legacy-selenium-client
   rc-server     = //java/server/src/org/openqa/selenium/server:rc
   selenium-java = //java/client/src/org/openqa/selenium:selenium
 
-  selenium-server-standalone = //java/server/src/org/openqa/grid/selenium:selenium
+  selenium-server-standalone = //java/server/src/org/openqa/selenium/remote/server:standalone-server
   htmlrunner = //java/server/src/org/openqa/selenium/server/htmlrunner:selenium-runner
 
   # Tests
   chrome-test   = //java/client/test/org/openqa/selenium/chrome:chrome
   firefox-test  = //java/client/test/org/openqa/selenium/firefox:marionette
   legacy-firefox-test = //java/client/test/org/openqa/selenium/firefox:test-synthesized
-  internal-grid-test = //java/server/test/org/openqa/grid/common:common //java/server/test/org/openqa/grid:grid //java/server/test/org/openqa/grid/e2e:e2e
-  grid-test     = //java/client/test/org/openqa/selenium/remote:remote-driver-grid-tests
   htmlunit-test = //java/client/test/org/openqa/selenium/htmlunit:htmlunit
   ie-test       = //java/client/test/org/openqa/selenium/ie:ie
   opera-test    = //java/client/test/org/openqa/selenium/opera:opera
   safari-test   = //java/client/test/org/openqa/selenium/safari:safari
-  java-small-tests = //java/client/test/org/openqa/selenium:small-tests //java/client/test/org/openqa/selenium/json:small-tests //java/client/test/org/openqa/selenium/support:small-tests //java/client/test/org/openqa/selenium/remote:small-tests //java/server/test/org/openqa/grid/selenium/node:node //java/server/test/org/openqa/grid/selenium/proxy:proxy //java/server/test/org/openqa/selenium/remote/server:small-tests //java/server/test/org/openqa/selenium/remote/server/log:test
+  java-small-tests = //java/client/test/org/openqa/selenium:small-tests //java/client/test/org/openqa/selenium/json:small-tests //java/client/test/org/openqa/selenium/support:small-tests //java/client/test/org/openqa/selenium/remote:small-tests //java/server/test/org/openqa/selenium/remote/server:small-tests //java/server/test/org/openqa/selenium/remote/server/log:test

.travis.yml

@@ -86,7 +86,7 @@ matrix:
     - env: MARIONETTE=1 SELENIUM_BROWSER=firefox NPM=test
       <<: *node
       <<: *firefox-latest
-    - env: BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test grid-test htmlunit-test ie-test opera-test java-small-tests //java/client/test/org/openqa/selenium/testing/drivers/..."
+    - env: BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test htmlunit-test ie-test opera-test java-small-tests //java/client/test/org/openqa/selenium/testing/drivers/..."
       <<: *java
     - env: BUCK="test //java/client/test/org/openqa/selenium/atoms:test"
       <<: *java
@@ -104,11 +104,6 @@ matrix:
       <<: *firefox-nightly
     - env: MARIONETTE=1 BUCK="test --labels small --always-exclude //java/..."
       <<: *java
-    - env: BUCK="test internal-grid-test"
-      <<: *java
-    - env: MARIONETTE=1 BUCK="test grid-test"
-      <<: *java
-      <<: *firefox-nightly
     - env: CHROME=1 BUCK="test chrome-test"
       <<: *java
       <<: *chrome

java/client/src/com/thoughtworks/selenium/webdriven/BUCK

@@ -42,7 +42,6 @@ java_library(
         "//java/client/src/com/thoughtworks/selenium/...",
         "//java/client/test/com/thoughtworks/selenium/...",
         "//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet",
-        "//java/server/src/org/openqa/grid/selenium:classes",
         "//java/server/src/org/openqa/selenium/server/htmlrunner:htmlrunner",
     ],
 )

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

@@ -64,7 +64,6 @@ java_library(
         "//java/client/src/org/openqa/selenium/support:support",
     ],
     visibility = [
-        "//java/server/src/org/openqa/grid/selenium:classes",
         "//java/server/test/org/openqa/selenium:lib",
     ],
 )
@@ -87,7 +86,7 @@ zip_file(
 java_binary(
     name = "client-combined-" + SE_VERSION,
     blacklist = [
-        "^(?!com.thoughtworks.selenium.*|org.openqa.selenium.*|org.openqa.grid.*)",
+        "^(?!com.thoughtworks.selenium.*|org.openqa.selenium.*)",
     ],
     deps = [
         ":client-combined",

java/client/src/org/openqa/selenium/tools/BUCK

@@ -17,7 +17,6 @@ java_binary(
     ],
     visibility = [
         "//java/client/src/org/openqa/selenium:client-combined-sources",
-        "//java/server/src/org/openqa/grid/selenium:selenium-server-sources",
         "//java/server/src/org/openqa/selenium/grid:selenium-server-sources",
     ],
 )

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

@@ -29,7 +29,6 @@ java_library(
         "//java/client/test/org/openqa/selenium:helpers",
         "//java/client/test/org/openqa/selenium/build:build",
         "//java/client/test/org/openqa/selenium/testing:annotations",
-        "//java/server/src/org/openqa/grid/selenium:selenium",
         "//third_party/java/guava:guava",
         "//third_party/java/selenium:htmlunit-driver",
         "//third_party/java/junit:junit",

java/server/src/com/thoughtworks/selenium/BUCK

@@ -12,7 +12,6 @@ java_library(
         "//java/server/src/org/openqa/selenium/server/htmlrunner:htmlrunner",
     ],
     visibility = [
-        "//java/server/src/org/openqa/grid/selenium:classes",
         "//java/server/test/org/openqa/selenium:lib",
     ],
 )