Updating release notes to be in line with latest

RELEASENOTES.md

@@ -20,6 +20,88 @@
 -->
 ## Release Notes for Cordova (Android) ##
 
+### 3.3.0 (Dec 2013) ###
+
+44 commits by 11 authors, Changes include:
+
+* Set VERSION to 3.3.0 (via coho)
+* Update JS snapshot to version 3.3.0 (via coho)
+* CB-5481 Fix for Cordova trying to get config.xml from the wrong namespace
+* Forgot Apache Headers on MessageTest
+* Set VERSION to 3.3.0-rc1 (via coho)
+* Update JS snapshot to version 3.3.0-rc1 (via coho)
+* prevent ClassNotFound exception for emtpy class name
+* CB-5487: Remote Debugging is on when your Android app is debuggable.
+* Updating the README
+* Making the object less chatty
+* Updating tests to KitKat, and making the tests more thread-safe
+* Incrementing API target
+* CB-5445: Adding onScrollChanged and the ScrollEvent object. (Forgot to add the WebView)
+* CB-5445: Adding onScrollChanged and the ScrollEvent object
+* Updated CordovaWebView to experiment with onScrollChanged messages
+* Moving the console.log out of run() method
+* CB-5422: Don't require JAVA_HOME to be defined
+* Thanks for Benn Mapes for making this process easy.  Updating the Android API level.
+* CB-5490: add javadoc target to ant script
+* CB-5471: add deprecation javadoc/annotation
+* Add javadoc comments to source classes
+* CB-5255: Checking in the Google Check, TODO: Add Amazon FireOS check
+* CB-5232 Change create script to use Cordova as a library.
+* Remove Application settings from framework/AndroidManifest.xml
+* CB-5346: remove dependency on device plugin
+* CB-5346: delete a stale file that isn't needed
+* Updating instructions to indicate that the device plugin is required to be installed via plugman
+* Fixing plugins configuration, Device shouldn't be checked in here
+* Removing device plugin
+* Removing the plugins directory after the plugins were incorrectly removed
+* This should use plugman to install plugins.  Adding path depenencies for plugins is wrong, and shouldn't be done
+* CB-5349: fixed regression in update script
+* CB-5346 Fix and cleanup broken Android unit test
+* CB-5307 Remove references to Callback and Incubator
+* CB-5302: Massive movement to get tests working again
+* Set VERSION to 3.3.0-dev (via coho)
+* CB-5301 add missing license headers
+* [CB-4996] Fix paths with spaces while launching on emulator and device
+* CB-5284 Fixing the version from coho
+* Fixing the VERSION file, it got auto-incremented by coho by accident
+* Update JS snapshot to version 2.10.0-dev (via coho)
+* Set VERSION to 2.10.0-dev (via coho)
+* CB-5209 Win: Cannot build Android app if project path contains spaces
+* CB-5209: Dirty, Dirty Fix for Building.  This works, but needs to be prettier.
+
+### 3.2.0 (Nov 2013) ####
+
+27 commits by 7 authors, Changes include:
+
+ Set VERSION to 3.2.0 (via coho)
+ * Update JS snapshot to version 3.2.0 (via coho)
+ * CB-5301 add missing license headers
+ * CB-5349: fixed regression in update script
+ * Set VERSION to 3.2.0-rc1 (via coho)
+ * Update JS snapshot to version 3.2.0-rc1 (via coho)
+ * CB-5193 Fix Android WebSQL sometime throwing SECURITY_ERR.
+ * CB-5191 Deprecate <url-filter>
+ * Updating shelljs to 0.2.6. Copy now preserves mode bits.
+ * CB-4872 - moved version script to promise model
+ * CB-4872 - make sure to copy over version scripts to project
+ * [CB-4872] - added android version scripts
+ * CB-5117: Output confirmation message if check_reqs passes.
+ * Refactoring Android project-level and platform scripts to use Q.js
+ * Updating to latest shelljs, old version doesn't preserve +x bits
+ * Remove cordova.xml fallback from Config.java (it was removed from PluginManager for 3.0)
+ * CB-5080 Find resources in a way that works with aapt's --rename-manifest-package
+ * Update JS snapshot to version 3.2.0-dev (via coho)
+ * Remove a couple incorrect lines from RELEASENOTES.md
+ * CB-4961: shell.js returns the full path on ls, rebuilding the full path isn't really needed
+ * Updating README.md to have latest Android SDK
+ * CB-4527: This was an easy fix, since the script deletes batch files
+ * [CB-4892] Fix create script only escaping the first space instead of all spaces.
+ * Fix update script to clobber cordova.js file (missing -f)
+ * Add missing copyright header for Whitelist.java.
+ * [CB-4832] Add 3.1.0 RELEASENOTES.md
+ * Update JS snapshot to version 3.2.0-dev (via coho)
+ * Set VERSION to 3.2.0-dev (via coho)
+
 ### 3.1.0 (Sept 2013) ###
 
 55 commits from 9 authors. Highlights include:

VERSION

@@ -1 +1 @@
-3.3.0-dev
+3.3.0

bin/templates/cordova/version

@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "3.3.0-dev";
+var VERSION = "3.3.0";
 
 console.log(VERSION);

framework/assets/www/cordova.js

@@ -1,5 +1,5 @@
 // Platform: android
-// 3.3.0-dev-aac4947
+// 3.3.0
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.3.0-dev-aac4947';
+var CORDOVA_JS_BUILD_LABEL = '3.3.0';
 // file: lib/scripts/require.js
 
 /*jshint -W079 */
@@ -34,7 +34,7 @@ var require,
         requireStack = [],
     // Map of module ID -> index into requireStack of modules currently being built.
         inProgressModules = {},
-        SEPERATOR = ".";
+        SEPARATOR = ".";
 
 
 
@@ -44,7 +44,7 @@ var require,
                 var resultantId = id;
                 //Its a relative path, so lop off the last portion and add the id (minus "./")
                 if (id.charAt(0) === ".") {
-                    resultantId = module.id.slice(0, module.id.lastIndexOf(SEPERATOR)) + SEPERATOR + id.slice(2);
+                    resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
                 }
                 return require(resultantId);
             };
@@ -552,7 +552,7 @@ function include(parent, objects, clobber, merge) {
                 include(result, obj.children, clobber, merge);
             }
         } catch(e) {
-            utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+            utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
         }
     });
 }

framework/src/org/apache/cordova/Config.java

@@ -68,10 +68,15 @@ public class Config {
             return;
         }
 
+        // First checking the class namespace for config.xml
         int id = action.getResources().getIdentifier("config", "xml", action.getClass().getPackage().getName());
         if (id == 0) {
-            LOG.i("CordovaLog", "config.xml missing. Ignoring...");
+            // If we couldn't find config.xml there, we'll look in the namespace from AndroidManifest.xml
-            return;
+            id = action.getResources().getIdentifier("config", "xml", action.getPackageName());
+            if (id == 0) {
+                LOG.i("CordovaLog", "config.xml missing. Ignoring...");
+                return;
+            }
         }
 
         // Add implicitly allowed URLs

framework/src/org/apache/cordova/CordovaWebView.java

@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {
 
     public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.3.0-dev";
+    public static final String CORDOVA_VERSION = "3.3.0";
 
     private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
     private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();

framework/src/org/apache/cordova/PluginManager.java

@@ -110,11 +110,16 @@ public class PluginManager {
      * Load plugins from res/xml/config.xml
      */
     public void loadPlugins() {
+        // First checking the class namespace for config.xml
         int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getClass().getPackage().getName());
         if (id == 0) {
-            this.pluginConfigurationMissing();
+            // If we couldn't find config.xml there, we'll look in the namespace from AndroidManifest.xml
-            //We have the error, we need to exit without crashing!
+            id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getPackageName());
-            return;
+            if (id == 0) {
+                this.pluginConfigurationMissing();
+                //We have the error, we need to exit without crashing!
+                return;
+            }
         }
         XmlResourceParser xml = this.ctx.getActivity().getResources().getXml(id);
         int eventType = -1;

test/src/org/apache/cordova/test/junit/MessageTest.java

@@ -1,3 +1,21 @@
+/*
+       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.
+*/
 package org.apache.cordova.test.junit;
 
 import org.apache.cordova.CordovaPlugin;