Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A1BED8E6 for ; Wed, 11 Jul 2012 18:24:06 +0000 (UTC) Received: (qmail 42117 invoked by uid 500); 11 Jul 2012 18:24:06 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 42092 invoked by uid 500); 11 Jul 2012 18:24:06 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 42085 invoked by uid 99); 11 Jul 2012 18:24:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2012 18:24:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3639BDEB8; Wed, 11 Jul 2012 18:24:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: android commit: Combining plugins.xml and cordova.xml to make config.xml Message-Id: <20120711182406.3639BDEB8@tyr.zones.apache.org> Date: Wed, 11 Jul 2012 18:24:05 +0000 (UTC) Updated Branches: refs/heads/master 2eb4c5e96 -> b486711d6 Combining plugins.xml and cordova.xml to make config.xml 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/b486711d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/b486711d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/b486711d Branch: refs/heads/master Commit: b486711d68dc6426b58142143f938090605afbeb Parents: 2eb4c5e Author: Joe Bowser Authored: Wed Jul 11 11:23:31 2012 -0700 Committer: Joe Bowser Committed: Wed Jul 11 11:23:31 2012 -0700 ---------------------------------------------------------------------- framework/res/xml/config.xml | 54 +++++++++++++++ .../src/org/apache/cordova/CordovaWebView.java | 7 ++- .../src/org/apache/cordova/api/PluginManager.java | 17 +++-- 3 files changed, 72 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/b486711d/framework/res/xml/config.xml ---------------------------------------------------------------------- diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml new file mode 100644 index 0000000..d37aba5 --- /dev/null +++ b/framework/res/xml/config.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/b486711d/framework/src/org/apache/cordova/CordovaWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index ca0dd6d..b3ad35c 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -596,7 +596,12 @@ public class CordovaWebView extends WebView { * */ private void loadConfiguration() { - int id = getResources().getIdentifier("cordova", "xml", this.cordova.getActivity().getPackageName()); + int id = getResources().getIdentifier("config", "xml", this.cordova.getActivity().getPackageName()); + if(id == 0) + { + id = getResources().getIdentifier("cordova", "xml", this.cordova.getActivity().getPackageName()); + Log.i("CordovaLog", "config.xml missing, reverting to cordova.xml"); + } if (id == 0) { LOG.i("CordovaLog", "cordova.xml missing. Ignoring..."); return; http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/b486711d/framework/src/org/apache/cordova/api/PluginManager.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/api/PluginManager.java b/framework/src/org/apache/cordova/api/PluginManager.java index b9df52d..a48de67 100755 --- a/framework/src/org/apache/cordova/api/PluginManager.java +++ b/framework/src/org/apache/cordova/api/PluginManager.java @@ -92,9 +92,16 @@ public class PluginManager { * Load plugins from res/xml/plugins.xml */ public void loadPlugins() { - int id = this.ctx.getActivity().getResources().getIdentifier("plugins", "xml", this.ctx.getActivity().getPackageName()); + int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getPackageName()); + if(id == 0) + { + id = this.ctx.getActivity().getResources().getIdentifier("plugins", "xml", this.ctx.getActivity().getPackageName()); + LOG.i(TAG, "Using plugins.xml instead of config.xml. plugins.xml will eventually be deprecated"); + } 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; @@ -361,9 +368,9 @@ public class PluginManager { } private void pluginConfigurationMissing() { - System.err.println("====================================================================================="); - System.err.println("ERROR: plugin.xml is missing. Add res/xml/plugins.xml to your project."); - System.err.println("https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-android.git;a=blob;f=framework/res/xml/plugins.xml"); - System.err.println("====================================================================================="); + LOG.e(TAG, "====================================================================================="); + LOG.e(TAG, "ERROR: plugin.xml is missing. Add res/xml/plugins.xml to your project."); + LOG.e(TAG, "https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-android.git;a=blob;f=framework/res/xml/plugins.xml"); + LOG.e(TAG, "====================================================================================="); } }