Really, for-real fixing the Java build

Author: jimevans

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

@@ -66,7 +66,7 @@ java_library(name = "tests",
  deps = [
  ":base",
  "//java/client/src/org/openqa/selenium/interactions",
- "//java/client/src/com/thoughtworks/selenium/webdriven:api",
+ "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
  "//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/test/org/openqa/selenium/testing/build.desc

@@ -42,7 +42,7 @@ java_library(name = "util",
  "InProject.java",
  ],
  deps = [
- "//java/client/src/org/openqa/selenium:webdriver-api",
+ "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
  "//java/client/src/org/openqa/selenium/remote",
  ])
 

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

@@ -9,7 +9,6 @@ java_library(name = "test-webdriver",
  "//java/client/src/org/openqa/selenium:webdriver-api",
  "//java/client/src/org/openqa/selenium/remote",
  "//java/client/src/org/openqa/selenium/support",
- "//java/client/src/org/openqa/selenium/internal/seleniumemulation",
  "//java/client/test/org/openqa/selenium:base",
  "//java/client/test/org/openqa/selenium/testing:junit_4",
  "//third_party/java/junit",

java/client/test/org/openqa/selenium/v1/internal/seleniumemulation/build.desc

@@ -9,6 +9,6 @@ java_library(name = "small_tests",
  deps = [
  "//java/client/src/com/thoughtworks/selenium:api",
  "//java/client/src/org/openqa/selenium:webdriver-api",
- "//java/client/src/org/openqa/selenium/internal/seleniumemulation",
+ "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
  "//third_party/java/junit",
  ])

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

@@ -3,7 +3,7 @@ java_binary(name = "selenium",
  main_class = "org.openqa.grid.selenium.GridLauncher",
  srcs = [ "**/*.java" ],
  deps = [
- "//java/client/src/org/openqa/selenium:webdriver-api",
+ "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
  "//java/client/src/org/openqa/selenium/firefox",
  "//java/server/src/org/openqa/selenium/remote/server",
  "//java/server/src/org/openqa/selenium/server",