DouniaBerrada: First step to separate the Android app code from the A…

…ndroid WebDriver library. r13807
patcadelina · Sep 9, 2011 · 156b498 · 156b498
1 parent 4b03dd0
commit 156b498
Show file tree

Hide file tree

Showing 85 changed files with 10 additions and 13 deletions.
diff --git a/android/.classpath → android/app/.classpath b/android/.classpath → android/app/.classpath
diff --git a/android/.project → android/app/.project b/android/.project → android/app/.project
diff --git a/android/AndroidManifest.xml → android/app/AndroidManifest.xml b/android/AndroidManifest.xml → android/app/AndroidManifest.xml
diff --git a/android/build.desc → android/app/build.desc b/android/build.desc → android/app/build.desc
diff --git a/android/build.xml → android/app/build.xml b/android/build.xml → android/app/build.xml
@@ -43,8 +43,14 @@
       <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
     </path>
 
-    <property name="third_party.location" value="../third_party"/>
-    <property name="build.location" value="../build" />
+    <property name="root.dir" value="../../"/>
+    <property name="third_party.location" value="${root.dir}/third_party"/>
+    <property name="build.location" value="${root.dir}/build" />
+    <property name="javascript.atoms" value="javascript/atoms"/>
+    <property name="webdriver.atoms.inject" value="javascript/webdriver-atoms/inject"/>
+    <property name="webdriver.atoms" value="javascript/webdriver-atoms"/>
+    <property name="go" value="./go"/>
+    <property name="res.raw" value="res/raw"/>
 
     <copy file="${build.location}/java/server/src/org/openqa/jetty/jetty.jar" tofile="libs/jetty.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/base.jar" tofile="libs/base.jar" />
@@ -65,16 +71,7 @@
         classname="com.android.ant.SetupTask"
         classpathref="android.antlibs" />
 
-    <!-- Building the atoms before the apk
-    compile all gos at once
-    -->
-    <property name="javascript.atoms" value="javascript/atoms"/>
-    <property name="webdriver.atoms.inject" value="javascript/webdriver-atoms/inject"/>
-    <property name="webdriver.atoms" value="javascript/webdriver-atoms"/>
-    <property name="root.dir" value="../"/>
-    <property name="go" value="./go"/>
-    <property name="res.raw" value="res/raw"/>
-
+    <!-- Building the atoms before the apk compile all gos at once -->
     <target name="-pre-compile" depends="shouldBuildAtoms" unless="atomsBuild.notRequired">
         <exec executable="${go}" dir="${root.dir}">
             <arg value="//${webdriver.atoms.inject}:webdriver-inject"/>
@@ -110,7 +107,7 @@
             <arg value="//${webdriver.atoms.inject}:clear_session_storage:android"/>
             <arg value="//${webdriver.atoms.inject}:get_session_storage_size:android"/>
         </exec>
-       
+
         <copy file="${build.location}/${webdriver.atoms.inject}/active_element_android.js" todir="${res.raw}"/>
         <copy file="${build.location}/${webdriver.atoms.inject}/clear_android.js" todir="${res.raw}"/>
         <copy file="${build.location}/${webdriver.atoms.inject}/default_content_android.js" todir="${res.raw}"/>

diff --git a/android/default.properties → android/app/default.properties b/android/default.properties → android/app/default.properties
diff --git a/...en/org/openqa/selenium/android/app/R.java → ...en/org/openqa/selenium/android/app/R.java b/...en/org/openqa/selenium/android/app/R.java → ...en/org/openqa/selenium/android/app/R.java
diff --git a/android/prebuilt/android-server.apk → android/app/prebuilt/app/android-server.apk b/android/prebuilt/android-server.apk → android/app/prebuilt/app/android-server.apk
diff --git a/android/res/drawable/alert_dialog_icon.png → ...id/app/res/drawable/alert_dialog_icon.png b/android/res/drawable/alert_dialog_icon.png → ...id/app/res/drawable/alert_dialog_icon.png
diff --git a/android/res/drawable/ic_menu_add.png → android/app/res/drawable/ic_menu_add.png b/android/res/drawable/ic_menu_add.png → android/app/res/drawable/ic_menu_add.png
diff --git a/android/res/drawable/ic_menu_delete.png → android/app/res/drawable/ic_menu_delete.png b/android/res/drawable/ic_menu_delete.png → android/app/res/drawable/ic_menu_delete.png
diff --git a/android/res/drawable/ic_menu_share.png → android/app/res/drawable/ic_menu_share.png b/android/res/drawable/ic_menu_share.png → android/app/res/drawable/ic_menu_share.png
diff --git a/android/res/drawable/selenium_icon.png → android/app/res/drawable/selenium_icon.png b/android/res/drawable/selenium_icon.png → android/app/res/drawable/selenium_icon.png
diff --git a/android/res/layout/single_session_layout.xml → .../app/res/layout/single_session_layout.xml b/android/res/layout/single_session_layout.xml → .../app/res/layout/single_session_layout.xml
diff --git a/android/res/raw/active_element_android.js → ...oid/app/res/raw/active_element_android.js b/android/res/raw/active_element_android.js → ...oid/app/res/raw/active_element_android.js
diff --git a/android/res/raw/clear_android.js → android/app/res/raw/clear_android.js b/android/res/raw/clear_android.js → android/app/res/raw/clear_android.js
diff --git a/...id/res/raw/clear_local_storage_android.js → ...pp/res/raw/clear_local_storage_android.js b/...id/res/raw/clear_local_storage_android.js → ...pp/res/raw/clear_local_storage_android.js
diff --git a/.../res/raw/clear_session_storage_android.js → .../res/raw/clear_session_storage_android.js b/.../res/raw/clear_session_storage_android.js → .../res/raw/clear_session_storage_android.js
diff --git a/android/res/raw/default_content_android.js → ...id/app/res/raw/default_content_android.js b/android/res/raw/default_content_android.js → ...id/app/res/raw/default_content_android.js
diff --git a/android/res/raw/execute_script_android.js → ...oid/app/res/raw/execute_script_android.js b/android/res/raw/execute_script_android.js → ...oid/app/res/raw/execute_script_android.js
diff --git a/android/res/raw/find_element_android.js → android/app/res/raw/find_element_android.js b/android/res/raw/find_element_android.js → android/app/res/raw/find_element_android.js
diff --git a/android/res/raw/find_elements_android.js → android/app/res/raw/find_elements_android.js b/android/res/raw/find_elements_android.js → android/app/res/raw/find_elements_android.js
diff --git a/...id/res/raw/frame_by_id_or_name_android.js → ...pp/res/raw/frame_by_id_or_name_android.js b/...id/res/raw/frame_by_id_or_name_android.js → ...pp/res/raw/frame_by_id_or_name_android.js
diff --git a/android/res/raw/frame_by_index_android.js → ...oid/app/res/raw/frame_by_index_android.js b/android/res/raw/frame_by_index_android.js → ...oid/app/res/raw/frame_by_index_android.js
diff --git a/...id/res/raw/get_attribute_value_android.js → ...pp/res/raw/get_attribute_value_android.js b/...id/res/raw/get_attribute_value_android.js → ...pp/res/raw/get_attribute_value_android.js
diff --git a/...res/raw/get_local_storage_item_android.js → ...res/raw/get_local_storage_item_android.js b/...res/raw/get_local_storage_item_android.js → ...res/raw/get_local_storage_item_android.js
diff --git a/...res/raw/get_local_storage_keys_android.js → ...res/raw/get_local_storage_keys_android.js b/...res/raw/get_local_storage_keys_android.js → ...res/raw/get_local_storage_keys_android.js
diff --git a/...res/raw/get_local_storage_size_android.js → ...res/raw/get_local_storage_size_android.js b/...res/raw/get_local_storage_size_android.js → ...res/raw/get_local_storage_size_android.js
diff --git a/...s/raw/get_session_storage_item_android.js → ...s/raw/get_session_storage_item_android.js b/...s/raw/get_session_storage_item_android.js → ...s/raw/get_session_storage_item_android.js
diff --git a/...s/raw/get_session_storage_keys_android.js → ...s/raw/get_session_storage_keys_android.js b/...s/raw/get_session_storage_keys_android.js → ...s/raw/get_session_storage_keys_android.js
diff --git a/...s/raw/get_session_storage_size_android.js → ...s/raw/get_session_storage_size_android.js b/...s/raw/get_session_storage_size_android.js → ...s/raw/get_session_storage_size_android.js
diff --git a/android/res/raw/get_size_android.js → android/app/res/raw/get_size_android.js b/android/res/raw/get_size_android.js → android/app/res/raw/get_size_android.js
diff --git a/android/res/raw/get_text_android.js → android/app/res/raw/get_text_android.js b/android/res/raw/get_text_android.js → android/app/res/raw/get_text_android.js
diff --git a/...s/raw/get_top_left_coordinates_android.js → ...s/raw/get_top_left_coordinates_android.js b/...s/raw/get_top_left_coordinates_android.js → ...s/raw/get_top_left_coordinates_android.js
diff --git a/.../raw/get_value_of_css_property_android.js → .../raw/get_value_of_css_property_android.js b/.../raw/get_value_of_css_property_android.js → .../raw/get_value_of_css_property_android.js
diff --git a/android/res/raw/is_displayed_android.js → android/app/res/raw/is_displayed_android.js b/android/res/raw/is_displayed_android.js → android/app/res/raw/is_displayed_android.js
diff --git a/android/res/raw/is_enabled_android.js → android/app/res/raw/is_enabled_android.js b/android/res/raw/is_enabled_android.js → android/app/res/raw/is_enabled_android.js
diff --git a/android/res/raw/is_selected_android.js → android/app/res/raw/is_selected_android.js b/android/res/raw/is_selected_android.js → android/app/res/raw/is_selected_android.js
diff --git a/android/res/raw/javascript_xpath.js → android/app/res/raw/javascript_xpath.js b/android/res/raw/javascript_xpath.js → android/app/res/raw/javascript_xpath.js
diff --git a/.../raw/remove_local_storage_item_android.js → .../raw/remove_local_storage_item_android.js b/.../raw/remove_local_storage_item_android.js → .../raw/remove_local_storage_item_android.js
diff --git a/...aw/remove_session_storage_item_android.js → ...aw/remove_session_storage_item_android.js b/...aw/remove_session_storage_item_android.js → ...aw/remove_session_storage_item_android.js
diff --git a/...res/raw/set_local_storage_item_android.js → ...res/raw/set_local_storage_item_android.js b/...res/raw/set_local_storage_item_android.js → ...res/raw/set_local_storage_item_android.js
diff --git a/...s/raw/set_session_storage_item_android.js → ...s/raw/set_session_storage_item_android.js b/...s/raw/set_session_storage_item_android.js → ...s/raw/set_session_storage_item_android.js
diff --git a/android/res/raw/submit_android.js → android/app/res/raw/submit_android.js b/android/res/raw/submit_android.js → android/app/res/raw/submit_android.js
diff --git a/android/res/values/strings.xml → android/app/res/values/strings.xml b/android/res/values/strings.xml → android/app/res/values/strings.xml
diff --git a/android/res/xml/preferences.xml → android/app/res/xml/preferences.xml b/android/res/xml/preferences.xml → android/app/res/xml/preferences.xml
diff --git a/.../selenium/android/ActivityController.java → .../selenium/android/ActivityController.java b/.../selenium/android/ActivityController.java → .../selenium/android/ActivityController.java
diff --git a/.../selenium/android/AndroidCoordinates.java → .../selenium/android/AndroidCoordinates.java b/.../selenium/android/AndroidCoordinates.java → .../selenium/android/AndroidCoordinates.java
diff --git a/...penqa/selenium/android/AndroidDriver.java → ...penqa/selenium/android/AndroidDriver.java b/...penqa/selenium/android/AndroidDriver.java → ...penqa/selenium/android/AndroidDriver.java
diff --git a/...a/selenium/android/AndroidNavigation.java → ...a/selenium/android/AndroidNavigation.java b/...a/selenium/android/AndroidNavigation.java → ...a/selenium/android/AndroidNavigation.java
diff --git a/...a/selenium/android/AndroidWebElement.java → ...a/selenium/android/AndroidWebElement.java b/...a/selenium/android/AndroidWebElement.java → ...a/selenium/android/AndroidWebElement.java
diff --git a/...va/org/openqa/selenium/android/Atoms.java → ...va/org/openqa/selenium/android/Atoms.java b/...va/org/openqa/selenium/android/Atoms.java → ...va/org/openqa/selenium/android/Atoms.java
diff --git a/...rg/openqa/selenium/android/DomWindow.java → ...rg/openqa/selenium/android/DomWindow.java b/...rg/openqa/selenium/android/DomWindow.java → ...rg/openqa/selenium/android/DomWindow.java
diff --git a/...ium/android/JavascriptResultNotifier.java → ...ium/android/JavascriptResultNotifier.java b/...ium/android/JavascriptResultNotifier.java → ...ium/android/JavascriptResultNotifier.java
diff --git a/...enium/android/app/JavascriptExecutor.java → ...enium/android/app/JavascriptExecutor.java b/...enium/android/app/JavascriptExecutor.java → ...enium/android/app/JavascriptExecutor.java
diff --git a/...nium/android/app/JavascriptInterface.java → ...nium/android/app/JavascriptInterface.java b/...nium/android/app/JavascriptInterface.java → ...nium/android/app/JavascriptInterface.java
diff --git a/...qa/selenium/android/app/MainActivity.java → ...qa/selenium/android/app/MainActivity.java b/...qa/selenium/android/app/MainActivity.java → ...qa/selenium/android/app/MainActivity.java
diff --git a/...nium/android/app/NetworkStateHandler.java → ...nium/android/app/NetworkStateHandler.java b/...nium/android/app/NetworkStateHandler.java → ...nium/android/app/NetworkStateHandler.java
diff --git a/...elenium/android/app/WebDriverWebView.java → ...elenium/android/app/WebDriverWebView.java b/...elenium/android/app/WebDriverWebView.java → ...elenium/android/app/WebDriverWebView.java
diff --git a/...m/android/app/WebDriverWebViewClient.java → ...m/android/app/WebDriverWebViewClient.java b/...m/android/app/WebDriverWebViewClient.java → ...m/android/app/WebDriverWebViewClient.java
diff --git a/.../selenium/android/app/WebViewManager.java → .../selenium/android/app/WebViewManager.java b/.../selenium/android/app/WebViewManager.java → .../selenium/android/app/WebViewManager.java
diff --git a/.../selenium/android/events/AndroidKeys.java → .../selenium/android/events/AndroidKeys.java b/.../selenium/android/events/AndroidKeys.java → .../selenium/android/events/AndroidKeys.java
diff --git a/...um/android/events/AndroidTouchScreen.java → ...um/android/events/AndroidTouchScreen.java b/...um/android/events/AndroidTouchScreen.java → ...um/android/events/AndroidTouchScreen.java
diff --git a/.../selenium/android/events/TouchScreen.java → .../selenium/android/events/TouchScreen.java b/.../selenium/android/events/TouchScreen.java → .../selenium/android/events/TouchScreen.java
diff --git a/...elenium/android/events/WebViewAction.java → ...elenium/android/events/WebViewAction.java b/...elenium/android/events/WebViewAction.java → ...elenium/android/events/WebViewAction.java
diff --git a/...um/android/html5/AndroidLocalStorage.java → ...um/android/html5/AndroidLocalStorage.java b/...um/android/html5/AndroidLocalStorage.java → ...um/android/html5/AndroidLocalStorage.java
diff --git a/.../android/html5/AndroidSessionStorage.java → .../android/html5/AndroidSessionStorage.java b/.../android/html5/AndroidSessionStorage.java → .../android/html5/AndroidSessionStorage.java
diff --git a/.../android/server/AndroidDriverServlet.java → .../android/server/AndroidDriverServlet.java b/.../android/server/AndroidDriverServlet.java → .../android/server/AndroidDriverServlet.java
diff --git a/...lenium/android/server/HealthzServlet.java → ...lenium/android/server/HealthzServlet.java b/...lenium/android/server/HealthzServlet.java → ...lenium/android/server/HealthzServlet.java
diff --git a/...selenium/android/server/JettyService.java → ...selenium/android/server/JettyService.java b/...selenium/android/server/JettyService.java → ...selenium/android/server/JettyService.java
diff --git a/...enium/android/server/WebDriverBinder.java → ...enium/android/server/WebDriverBinder.java b/...enium/android/server/WebDriverBinder.java → ...enium/android/server/WebDriverBinder.java
diff --git a/...ver/handler/AndroidWebElementHandler.java → ...ver/handler/AndroidWebElementHandler.java b/...ver/handler/AndroidWebElementHandler.java → ...ver/handler/AndroidWebElementHandler.java
diff --git a/...m/android/server/handler/DragElement.java → ...m/android/server/handler/DragElement.java b/...m/android/server/handler/DragElement.java → ...m/android/server/handler/DragElement.java
diff --git a/...ndroid/server/handler/GetCssProperty.java → ...ndroid/server/handler/GetCssProperty.java b/...ndroid/server/handler/GetCssProperty.java → ...ndroid/server/handler/GetCssProperty.java
diff --git a/...d/server/handler/GetElementDisplayed.java → ...d/server/handler/GetElementDisplayed.java b/...d/server/handler/GetElementDisplayed.java → ...d/server/handler/GetElementDisplayed.java
diff --git a/...id/server/handler/GetElementLocation.java → ...id/server/handler/GetElementLocation.java b/...id/server/handler/GetElementLocation.java → ...id/server/handler/GetElementLocation.java
diff --git a/...ndroid/server/handler/GetElementSize.java → ...ndroid/server/handler/GetElementSize.java b/...ndroid/server/handler/GetElementSize.java → ...ndroid/server/handler/GetElementSize.java
diff --git a/...roid/server/handler/HoverOverElement.java → ...roid/server/handler/HoverOverElement.java b/...roid/server/handler/HoverOverElement.java → ...roid/server/handler/HoverOverElement.java
diff --git a/...um/android/server/handler/NewSession.java → ...um/android/server/handler/NewSession.java b/...um/android/server/handler/NewSession.java → ...um/android/server/handler/NewSession.java
diff --git a/...ndroid/sessions/SessionCookieManager.java → ...ndroid/sessions/SessionCookieManager.java b/...ndroid/sessions/SessionCookieManager.java → ...ndroid/sessions/SessionCookieManager.java
diff --git a/.../openqa/selenium/android/util/Logger.java → .../openqa/selenium/android/util/Logger.java b/.../openqa/selenium/android/util/Logger.java → .../openqa/selenium/android/util/Logger.java
diff --git a/...penqa/selenium/android/util/Platform.java → ...penqa/selenium/android/util/Platform.java b/...penqa/selenium/android/util/Platform.java → ...penqa/selenium/android/util/Platform.java
diff --git a/...qa/selenium/android/util/SimpleTimer.java → ...qa/selenium/android/util/SimpleTimer.java b/...qa/selenium/android/util/SimpleTimer.java → ...qa/selenium/android/util/SimpleTimer.java
diff --git a/...openqa/selenium/android/util/Sleeper.java → ...openqa/selenium/android/util/Sleeper.java b/...openqa/selenium/android/util/Sleeper.java → ...openqa/selenium/android/util/Sleeper.java
diff --git a/...selenium/android/util/XPathInstaller.java → ...selenium/android/util/XPathInstaller.java b/...selenium/android/util/XPathInstaller.java → ...selenium/android/util/XPathInstaller.java