Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView

bin/create

@@ -34,6 +34,10 @@ cp ./framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/.cordova/android/cor
 # copy in cordova.jar
 cp ./framework/cordova-$VERSION.jar $PROJECT_PATH/.cordova/android/cordova-$VERSION.jar
 
+# copy in res/xml
+cp ./framework/res/xml/cordova.xml $PROJECT_PATH/.cordova/android/cordova.xml
+cp ./framework/res/xml/plugins.xml $PROJECT_PATH/.cordova/android/plugins.xml
+
 # app properties
 cat > $PROJECT_PATH/.cordova/config <<eom
 VERSION=$VERSION

bin/templates/project/cordova/create

@@ -25,6 +25,11 @@ cp ./.cordova/android/cordova-$VERSION.js ./assets/www
 # copy in cordova.jar
 cp ./.cordova/android/cordova-$VERSION.jar ./libs
 
+# copy in res/xml
+mkdir ./res/xml
+cp ./.cordova/android/cordova.xml ./res/xml
+cp ./.cordova/android/plugins.xml ./res/xml
+
 # copy in default activity
 cat ./cordova/templates/Activity.java > $ACTIVITY_PATH
 

bin/templates/project/cordova/templates/project/assets/www/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
       <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>

bin/templates/project/cordova/templates/project/res/xml/cordova.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<cordova>
-	<!--  
-	access elements control the Android whitelist.  
-	Domains are assumed blocked unless set otherwise
-	 -->
-
-    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
-
-	<!-- <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 -->
-
-    <log level="DEBUG"/>
-    <preference name="classicRender" value="true" />
-</cordova>
-
-
-

bin/templates/project/cordova/templates/project/res/xml/plugins.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<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"/>
-</plugins>

framework/assets/js/cordova.android.js

@@ -1,6 +1,6 @@
-// commit 9451ff3c5517ba9ba4a2c062633686bb3a993f52
+// commit b2de4baa76a94ecb916619a536339ffee9ef6843
 
-// File generated at :: Thu Apr 12 2012 16:36:23 GMT-0700 (PDT)
+// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -1005,7 +1005,11 @@ module.exports = {
                     db = originalOpenDatabase(name, version, desc, size);
                 } 
                 catch (ex) {
+                    if (ex.code === 18) {
                         db = null;
+                    } else {
+                        throw ex;
+                    }
                 }
 
                 if (db === null) {

framework/build.xml

@@ -122,6 +122,7 @@
       <!-- update project files to reference cordova-x.x.x.min.js -->
       <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
          <fileset file="assets/www/index.html" /> 
+         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" /> 
       </replaceregexp>
 
       <!-- This is sketchy, but it works, ${dblQuote} does not -->