DouniaBerrada: Moving Android library to the java tree.

r15429
trabulmonkee · Jan 6, 2012 · 40d60ac · 40d60ac
1 parent dd5598b
commit 40d60ac
Show file tree

Hide file tree

Showing 40 changed files with 77 additions and 94 deletions.
diff --git a/.classpath b/.classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="java/client/src"/>
 	<classpathentry kind="src" path="java/client/test"/>
 	<classpathentry kind="src" path="java/server/test"/>
+	<classpathentry kind="src" path="android"/>
 	<classpathentry kind="lib" path="third_party/java/junit/junit-dep-4.10.jar" sourcepath="third_party/java/junit/junit-dep-4.10-src.jar"/>
 	<classpathentry kind="lib" path="third_party/java/easymock/easymockclassextension-2.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-core-js-2.9.jar"/>
@@ -21,8 +22,8 @@
 	<classpathentry kind="lib" path="third_party/java/commons-codec/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/hamcrest/hamcrest-all-1.1.jar"/>
 	<classpathentry kind="lib" path="third_party/java/commons-logging/commons-logging-1.1.1.jar"/>
-        <classpathentry kind="lib" path="third_party/java/jna/jna-3.4.0.jar"/>
-        <classpathentry kind="lib" path="third_party/java/jna/jna-platform-3.4.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jna/jna-3.4.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jna/jna-platform-3.4.0.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar"/>
 	<classpathentry kind="lib" path="third_party/java/mx4j/mx4j-tools-3.0.1.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-webapp-7.2.0.v20101020.jar"/>

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/android/app/build.desc b/android/app/build.desc
@@ -11,7 +11,7 @@ java_library(name = "server",
   ],
   deps = [
     ":r",
-    "//android/library/src/java/org/openqa/selenium/android:android_library",
+    "//java/client/src/org/openqa/selenium/android:android_library",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/support",
     "//java/client/src/org/openqa/selenium/io",

diff --git a/android/app/build.xml b/android/app/build.xml
@@ -79,7 +79,7 @@
     <copy file="${third_party.location}/java/guava-libraries/guava-10.0.1.jar" todir="libs/"  />
     <copy file="${third_party.location}/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar" todir="libs/" />
     <copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
-    <copy file="${build.location}/android/library/src/java/org/openqa/selenium/android/android_library.jar" todir="libs" />
+    <copy file="${build.location}/java/client/src/java/org/openqa/selenium/android/android_library.jar" todir="libs" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/io/io.jar" todir="libs" />
     <copy file="${third_party.location}/java/junit/junit-dep-4.10.jar" todir="libs/" />
 

diff --git a/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java b/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java
@@ -23,7 +23,7 @@
 
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.android.AndroidWebDriver;
+import org.openqa.selenium.android.library.AndroidWebDriver;
 import org.openqa.selenium.HasTouchScreen;
 import org.openqa.selenium.html5.BrowserConnection;
 import org.openqa.selenium.html5.LocalStorage;

diff --git a/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java b/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java
@@ -16,7 +16,6 @@
 
 package org.openqa.selenium.android.app;
 
-import static java.util.logging.Level.OFF;
 import static org.openqa.selenium.logging.LogType.DRIVER;
 import static org.openqa.selenium.remote.CapabilityType.LOGGING_PREFS;
 
@@ -28,8 +27,8 @@
 import android.os.Bundle;
 import android.os.IBinder;
 
-import org.openqa.selenium.android.AndroidWebDriver;
-import org.openqa.selenium.android.Logger;
+import org.openqa.selenium.android.library.AndroidWebDriver;
+import org.openqa.selenium.android.library.Logger;
 import org.openqa.selenium.android.server.JettyService;
 import org.openqa.selenium.logging.LoggingPreferences;
 import org.openqa.selenium.remote.CapabilityType;

diff --git a/android/app/src/java/org/openqa/selenium/android/server/JettyService.java b/android/app/src/java/org/openqa/selenium/android/server/JettyService.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.openqa.selenium.android.Logger;
+import org.openqa.selenium.android.library.Logger;
 import org.openqa.selenium.android.Platform;
 import org.openqa.selenium.android.app.R;
 

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java b/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 

diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java b/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 

diff --git a/android/library/.classpath b/android/library/.classpath
diff --git a/android/library/.project b/android/library/.project
diff --git a/android/library/src/java/org/openqa/selenium/android/build.desc b/android/library/src/java/org/openqa/selenium/android/build.desc
diff --git a/java/client/src/org/openqa/selenium/android/build.desc b/java/client/src/org/openqa/selenium/android/build.desc
@@ -7,3 +7,13 @@ java_library(name = "android",
     "//java/client/src/org/openqa/selenium/remote",
   ])
 
+java_library(name = "android_library",
+  srcs = ["library/*.java"],
+  deps = [
+          "//java/client/src/org/openqa/selenium:webdriver-api",
+          "//java/client/src/org/openqa/selenium/remote:common",
+          "//java/server/src/org/openqa/selenium/remote/server:server",
+          "//third_party/java/android",
+          "//third_party/java/guava-libraries",
+          ]
+)
diff --git a/...openqa/selenium/android/AndroidAtoms.java → ...elenium/android/library/AndroidAtoms.java b/...openqa/selenium/android/AndroidAtoms.java → ...elenium/android/library/AndroidAtoms.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import java.util.EnumSet;
 import java.util.HashMap;

diff --git a/.../selenium/android/AndroidCoordinates.java → ...m/android/library/AndroidCoordinates.java b/.../selenium/android/AndroidCoordinates.java → ...m/android/library/AndroidCoordinates.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.Point;
 import org.openqa.selenium.interactions.internal.Coordinates;

diff --git a/.../openqa/selenium/android/AndroidKeys.java → ...selenium/android/library/AndroidKeys.java b/.../openqa/selenium/android/AndroidKeys.java → ...selenium/android/library/AndroidKeys.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.view.KeyEvent;
 

diff --git a/...selenium/android/AndroidLocalStorage.java → .../android/library/AndroidLocalStorage.java b/...selenium/android/AndroidLocalStorage.java → .../android/library/AndroidLocalStorage.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.html5.LocalStorage;
 

diff --git a/.../openqa/selenium/android/AndroidLogs.java → ...selenium/android/library/AndroidLogs.java b/.../openqa/selenium/android/AndroidLogs.java → ...selenium/android/library/AndroidLogs.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 

diff --git a/...lenium/android/AndroidSessionStorage.java → ...ndroid/library/AndroidSessionStorage.java b/...lenium/android/AndroidSessionStorage.java → ...ndroid/library/AndroidSessionStorage.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.html5.SessionStorage;
 

diff --git a/.../selenium/android/AndroidTouchScreen.java → ...m/android/library/AndroidTouchScreen.java b/.../selenium/android/AndroidTouchScreen.java → ...m/android/library/AndroidTouchScreen.java
@@ -16,7 +16,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 

diff --git a/...qa/selenium/android/AndroidWebDriver.java → ...ium/android/library/AndroidWebDriver.java b/...qa/selenium/android/AndroidWebDriver.java → ...ium/android/library/AndroidWebDriver.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -895,7 +895,7 @@ private String executeJavascriptInWebView(final String script) {
     resultReady = false;
     activity.runOnUiThread(new Runnable() {
       public void run() {
-        org.openqa.selenium.android.JavascriptExecutor.executeJs(
+        org.openqa.selenium.android.library.JavascriptExecutor.executeJs(
             webview, notifier, script);
       }
     });

diff --git a/...a/selenium/android/AndroidWebElement.java → ...um/android/library/AndroidWebElement.java b/...a/selenium/android/AndroidWebElement.java → ...um/android/library/AndroidWebElement.java
@@ -16,7 +16,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 

diff --git a/...openqa/selenium/android/ChromeClient.java → ...elenium/android/library/ChromeClient.java b/...openqa/selenium/android/ChromeClient.java → ...elenium/android/library/ChromeClient.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.os.Message;
 import android.webkit.JsPromptResult;

diff --git a/...rg/openqa/selenium/android/DomWindow.java → ...a/selenium/android/library/DomWindow.java b/...rg/openqa/selenium/android/DomWindow.java → ...a/selenium/android/library/DomWindow.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 class DomWindow {
   private final String key;

diff --git a/.../openqa/selenium/android/EventSender.java → ...selenium/android/library/EventSender.java b/.../openqa/selenium/android/EventSender.java → ...selenium/android/library/EventSender.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.util.Log;

diff --git a/.../selenium/android/JavascriptExecutor.java → ...m/android/library/JavascriptExecutor.java b/.../selenium/android/JavascriptExecutor.java → ...m/android/library/JavascriptExecutor.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.webkit.WebView;

diff --git a/...selenium/android/JavascriptInterface.java → .../android/library/JavascriptInterface.java b/...selenium/android/JavascriptInterface.java → .../android/library/JavascriptInterface.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 /**
  * Custom module that is added to the WebView's JavaScript engine to enable callbacks to java

diff --git a/...ium/android/JavascriptResultNotifier.java → ...oid/library/JavascriptResultNotifier.java b/...ium/android/JavascriptResultNotifier.java → ...oid/library/JavascriptResultNotifier.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 interface JavascriptResultNotifier {
   void notifyResultReady(String result);

diff --git a/...a/org/openqa/selenium/android/Logger.java → ...enqa/selenium/android/library/Logger.java b/...a/org/openqa/selenium/android/Logger.java → ...enqa/selenium/android/library/Logger.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import java.util.logging.Level;
 

diff --git a/...selenium/android/NetworkStateHandler.java → .../android/library/NetworkStateHandler.java b/...selenium/android/NetworkStateHandler.java → .../android/library/NetworkStateHandler.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;

diff --git a/...elenium/android/SessionCookieManager.java → ...android/library/SessionCookieManager.java b/...elenium/android/SessionCookieManager.java → ...android/library/SessionCookieManager.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Sets;
 

diff --git a/...g/openqa/selenium/android/ViewClient.java → .../selenium/android/library/ViewClient.java b/...g/openqa/selenium/android/ViewClient.java → .../selenium/android/library/ViewClient.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.graphics.Bitmap;
 import android.net.http.SslError;

diff --git a/...qa/selenium/android/WebDriverWebView.java → ...ium/android/library/WebDriverWebView.java b/...qa/selenium/android/WebDriverWebView.java → ...ium/android/library/WebDriverWebView.java
@@ -15,7 +15,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.util.Log;
 import android.view.KeyEvent;