From 08d7a9c87a70a5d5cbef1a94a39c5b083dc316f6 Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Fri, 13 Apr 2012 15:35:43 -0400
Subject: [PATCH 1/4] Remove duplicate files from repository

We should only have these files in one place in the repo. Changes have been made to the scripts to pick up the xml files from their proper location.
---
 bin/create                                    |  4 ++
 bin/templates/project/cordova/create          |  5 +++
 .../templates/project/res/xml/cordova.xml     | 37 -------------------
 .../templates/project/res/xml/plugins.xml     | 37 -------------------
 4 files changed, 9 insertions(+), 74 deletions(-)
 delete mode 100755 bin/templates/project/cordova/templates/project/res/xml/cordova.xml
 delete mode 100644 bin/templates/project/cordova/templates/project/res/xml/plugins.xml

diff --git a/bin/create b/bin/create
index 1f2a4210..c659a013 100755
--- a/bin/create
+++ b/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
diff --git a/bin/templates/project/cordova/create b/bin/templates/project/cordova/create
index 32f1e165..5cf185b0 100755
--- a/bin/templates/project/cordova/create
+++ b/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
 
diff --git a/bin/templates/project/cordova/templates/project/res/xml/cordova.xml b/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
deleted file mode 100755
index 8f347e7d..00000000
--- a/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
+++ /dev/null
@@ -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>
-
-
-
diff --git a/bin/templates/project/cordova/templates/project/res/xml/plugins.xml b/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
deleted file mode 100644
index ce978fb4..00000000
--- a/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
+++ /dev/null
@@ -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>

From 0772a315c4b82092509b0932e60a41a687ffe23b Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Fri, 13 Apr 2012 13:08:13 -0700
Subject: [PATCH 2/4] CB-489 - Adding .js to the example, thought it was
 removed for a reason

---
 .../project/cordova/templates/project/assets/www/index.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
index 1f4c50b3..bf3e0859 100644
--- a/bin/templates/project/cordova/templates/project/assets/www/index.html
+++ b/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>

From f2c38ea0a7dfaa36220d648d1ac93fb06aa84bc2 Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Fri, 13 Apr 2012 16:36:46 -0400
Subject: [PATCH 3/4] Automatically update index.html in templates directory on
 version change

---
 framework/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/build.xml b/framework/build.xml
index 723ac589..452a8d66 100644
--- a/framework/build.xml
+++ b/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 -->

From c341cf0d47c4c24e097985fe941adabfbd1e30b7 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Tue, 17 Apr 2012 12:20:23 -0700
Subject: [PATCH 4/4] Adding fix for CB-482

---
 framework/assets/js/cordova.android.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index f0a811ab..1b879160 100644
--- a/framework/assets/js/cordova.android.js
+++ b/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) {
-                    db = null;
+                    if (ex.code === 18) {
+                        db = null;
+                    } else {
+                        throw ex;
+                    }
                 }
 
                 if (db === null) {