From 7de660808c81c91d486dc112980a41b1d5613a46 Mon Sep 17 00:00:00 2001 From: Joe Bowser <bowserj@apache.org> Date: Mon, 7 May 2012 14:36:13 -0700 Subject: [PATCH 1/3] Accidentally committed a vim swp file --- .../templates/project/assets/www/.main.js.swp | Bin 20480 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/templates/project/cordova/templates/project/assets/www/.main.js.swp diff --git a/bin/templates/project/cordova/templates/project/assets/www/.main.js.swp b/bin/templates/project/cordova/templates/project/assets/www/.main.js.swp deleted file mode 100644 index 07993ba278587b6fe218ade812aa770f540f8773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 From c11c4bea94d75b8f0736d148189cdce6aa1b6e42 Mon Sep 17 00:00:00 2001 From: Joe Bowser <bowserj@apache.org> Date: Mon, 7 May 2012 14:46:34 -0700 Subject: [PATCH 2/3] Adding header to test cordova.xml --- test/res/xml/cordova.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/res/xml/cordova.xml b/test/res/xml/cordova.xml index e2bc1249..8f347e7d 100755 --- a/test/res/xml/cordova.xml +++ b/test/res/xml/cordova.xml @@ -18,6 +18,20 @@ 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> + + + From 269b90ad6f926780338ff6a8aeb927f5cc989334 Mon Sep 17 00:00:00 2001 From: Joe Bowser <bowserj@apache.org> Date: Mon, 7 May 2012 14:49:21 -0700 Subject: [PATCH 3/3] updating the test plugins --- test/res/xml/plugins.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/res/xml/plugins.xml b/test/res/xml/plugins.xml index 8829164a..17074ef6 100755 --- a/test/res/xml/plugins.xml +++ b/test/res/xml/plugins.xml @@ -1,6 +1,25 @@ <?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="Activity" value="org.apache.cordova.test.ActivityPlugin"/> <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/> <plugin name="Device" value="org.apache.cordova.Device"/> <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/> @@ -16,4 +35,5 @@ <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/> <plugin name="Capture" value="org.apache.cordova.Capture"/> <plugin name="Battery" value="org.apache.cordova.BatteryListener"/> + <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/> </plugins>