Undo moving Wait to webdriven, but still keeping it deprecated

Author: barancev

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

@@ -3,6 +3,7 @@ java_library(name = 'api',
     'CommandProcessor.java',
     'Selenium.java',
     'SeleniumException.java',
+    'Wait.java',
   ],
   visibility = ['PUBLIC'],
 )

java/client/src/com/thoughtworks/selenium/Wait.java

@@ -34,7 +34,7 @@
  * 
  * @author Dan Fabulich
  *
- * @deprecated Moved to com.thoughtworks.selenium.webdriven
+ * @deprecated The RC interface will be removed in Selenium 3.0. Please migrate to using WebDriver.
  */
 @Deprecated
 public abstract class Wait {

java/client/src/com/thoughtworks/selenium/build.desc

@@ -3,6 +3,7 @@ java_library(name = "api",
     "CommandProcessor.java",
     "Selenium.java",
     "SeleniumException.java",
+    "Wait.java",
   ])
 
 java_library(name = "selenium",

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

@@ -51,7 +51,6 @@ java_library(name = 'emulation-api',
     'ScriptMutator.java',
     'SeleneseCommand.java',
     'Timer.java',
-    'Wait.java',
     'Windows.java',
   ],
   deps = [

java/client/src/com/thoughtworks/selenium/webdriven/Wait.java

@@ -40,7 +40,6 @@ java_library(name = "emulation-api",
     "SeleniumMutator.java",
     "Timer.java",
     "VariableDeclaration.java",
-    "Wait.java",
     "Windows.java",
   ],
   deps = [

java/client/src/com/thoughtworks/selenium/webdriven/build.desc

@@ -17,7 +17,7 @@
 
 package com.thoughtworks.selenium.webdriven.commands;
 
-import com.thoughtworks.selenium.webdriven.Wait;
+import com.thoughtworks.selenium.Wait;
 import com.thoughtworks.selenium.webdriven.ScriptMutator;
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 

java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForCondition.java

@@ -18,7 +18,7 @@
 
 import com.google.common.base.Throwables;
 
-import com.thoughtworks.selenium.webdriven.Wait;
+import com.thoughtworks.selenium.Wait;
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 
 import org.openqa.selenium.By;

java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPageToLoad.java

@@ -17,7 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.SeleniumException;
-import com.thoughtworks.selenium.webdriven.Wait;
+import com.thoughtworks.selenium.Wait;
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 import com.thoughtworks.selenium.webdriven.Windows;
 

java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.thoughtworks.selenium.webdriven.Wait;
-import com.thoughtworks.selenium.webdriven.Wait.WaitTimedOutException;
+import com.thoughtworks.selenium.Wait;
+import com.thoughtworks.selenium.Wait.WaitTimedOutException;
 
 import org.junit.Before;
 import org.junit.Test;

java/client/test/com/thoughtworks/selenium/WaitTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.fail;
 
 import com.thoughtworks.selenium.Selenium;
+import com.thoughtworks.selenium.Wait;
 
 import org.junit.Before;
 import org.junit.Test;