You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/09/07 00:48:10 UTC

android commit: Reverting to the previously known to work config.xml, we'll introduce the new format in 2.2

Updated Branches:
  refs/heads/master d4b248fbe -> c6fa7e4aa


Reverting to the previously known to work config.xml, we'll introduce the new format in 2.2


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/c6fa7e4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/c6fa7e4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/c6fa7e4a

Branch: refs/heads/master
Commit: c6fa7e4aade2998c0dc53c6135c1be7138d2f9f5
Parents: d4b248f
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Sep 6 15:47:53 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Sep 6 15:47:53 2012 -0700

----------------------------------------------------------------------
 framework/res/xml/config.xml |   94 +++++++++----------------------------
 1 files changed, 23 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/c6fa7e4a/framework/res/xml/config.xml
----------------------------------------------------------------------
diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml
index 57dbdc4..4ff6b7e 100644
--- a/framework/res/xml/config.xml
+++ b/framework/res/xml/config.xml
@@ -17,7 +17,7 @@
        specific language governing permissions and limitations
        under the License.
 -->
-<widget xmlns="http://www.w3.org/ns/widgets">
+<cordova>
     <!--
     access elements control the Android whitelist.
     Domains are assumed blocked unless set otherwise
@@ -27,77 +27,29 @@
 
     <!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
     <!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
-    <!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+    <access origin=".*"/>
 
     <log level="DEBUG"/>
     <preference name="useBrowserHistory" value="false" />
-    <feature name="http://example.org/api/app">
-        <param name="service" value="App" />
-        <param name="package" value="org.apache.cordova.App" />
-    </feature>
-    <feature name="http://example.org/api/geolocation">
-        <param name="service" value="Geolocation" />
-        <param name="package" value="org.apache.cordova.GeoBroker" />
-    </feature>
-    <feature name="http://example.org/api/device">
-        <param name="service" value="Device" />
-        <param name="package" value="org.apache.cordova.Device" />
-    </feature>
-    <feature name="http://example.org/api/accelerometer">
-        <param name="service" value="Accelerometer" />
-        <param name="package" value="org.apache.cordova.AccelListener" />
-    </feature>
-    <feature name="http://example.org/api/compass">
-        <param name="service" value="Compass" />
-        <param name="package" value="org.apache.cordova.CompassListener" />
-    </feature>
-    <feature name="http://example.org/api/media">
-        <param name="service" value="Media" />
-        <param name="package" value="org.apache.cordova.Media" />
-    </feature>
-    <feature name="http://example.org/api/camera">
-        <param name="service" value="Camera" />
-        <param name="package" value="org.apache.cordova.Camera" />
-    </feature>
-    <feature name="http://example.org/api/contacts">
-        <param name="service" value="Contacts" />
-        <param name="package" value="org.apache.cordova.ContactManager" />
-    </feature>
-    <feature name="http://example.org/api/file">
-        <param name="service" value="File" />
-        <param name="package" value="org.apache.cordova.FileUtils" />
-    </feature>
-    <feature name="http://example.org/api/networkstatus">
-        <param name="service" value="NetworkStatus" />
-        <param name="package" value="org.apache.cordova.NetworkManager" />
-    </feature>
-    <feature name="http://example.org/api/notification">
-        <param name="service" value="Notification" />
-        <param name="package" value="org.apache.cordova.Notification" />
-    </feature>
-    <feature name="http://example.org/api/storage">
-        <param name="service" value="Storage" />
-        <param name="package" value="org.apache.cordova.Storage" />
-    </feature>
-    <feature name="http://example.org/api/temperature">
-        <param name="service" value="Temperature" />
-        <param name="package" value="org.apache.cordova.TempListener" />
-    </feature>
-    <feature name="http://example.org/api/filetransfer">
-        <param name="service" value="FileTransfer" />
-        <param name="package" value="org.apache.cordova.FileTransfer" />
-    </feature>
-    <feature name="http://example.org/api/capture">
-        <param name="service" value="Capture" />
-        <param name="package" value="org.apache.cordova.Capture" />
-    </feature>
-    <feature name="http://example.org/api/battery">
-        <param name="service" value="Battery" />
-        <param name="package" value="org.apache.cordova.BatteryListener" />
-    </feature>
-    <feature name="http://example.org/api/splashscreen">
-        <param name="service" value="SpashScreen" />
-        <param name="package" value="org.apache.cordova.SplashScreen" />
-    </feature>
-</widget>
+    <preference name="exit-on-suspend" value="false" />
+<plugins>
+    <plugin name="App" value="org.apache.cordova.App"/>
+    <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
+    <plugin name="Device" value="org.apache.cordova.Device"/>
+    <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
+    <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
+    <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
+    <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
+    <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
+    <plugin name="File" value="org.apache.cordova.FileUtils"/>
+    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
+    <plugin name="Notification" value="org.apache.cordova.Notification"/>
+    <plugin name="Storage" value="org.apache.cordova.Storage"/>
+    <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
+    <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
+    <plugin name="Capture" value="org.apache.cordova.Capture"/>
+    <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
+    <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
+</plugins>
+</cordova>