incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Copying new XML into the templates for 1.6.1. Turns out tags are broken
Date Thu, 12 Apr 2012 21:33:44 GMT
Updated Branches:
  refs/heads/master ac06892de -> e4a52de0a


Copying new XML into the templates for 1.6.1.  Turns out tags are broken


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/e4a52de0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e4a52de0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e4a52de0

Branch: refs/heads/master
Commit: e4a52de0a50da4bacdef619422beb3fe4f214e38
Parents: ac06892
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Apr 12 14:33:29 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Apr 12 14:33:29 2012 -0700

----------------------------------------------------------------------
 .../cordova/templates/project/res/xml/cordova.xml  |   34 ++++++++++++++-
 .../cordova/templates/project/res/xml/plugins.xml  |   20 ++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e4a52de0/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/xml/cordova.xml b/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
index c7b5000..8f347e7 100755
--- a/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
+++ b/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
@@ -1,5 +1,37 @@
 <?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 origin="http://127.0.0.1*"/>
+	<!--  
+	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>
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e4a52de0/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/res/xml/plugins.xml b/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
index 4c651ee..ce978fb 100644
--- a/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
+++ b/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
@@ -1,4 +1,22 @@
 <?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"/>
@@ -9,7 +27,7 @@
     <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="Network Status" value="org.apache.cordova.NetworkManager"/>
+    <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"/>


Mime
View raw message