incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [13/13] android commit: Remove duplicate files from repository
Date Thu, 19 Apr 2012 23:24:58 GMT
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.


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

Branch: refs/heads/CordovaWebView
Commit: 08d7a9c87a70a5d5cbef1a94a39c5b083dc316f6
Parents: eb48055
Author: macdonst <simon.macdonald@gmail.com>
Authored: Fri Apr 13 15:35:43 2012 -0400
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Fri Apr 13 15:35:49 2012 -0400

----------------------------------------------------------------------
 bin/create                                         |    4 ++
 bin/templates/project/cordova/create               |    5 ++
 .../cordova/templates/project/res/xml/cordova.xml  |   37 ---------------
 .../cordova/templates/project/res/xml/plugins.xml  |   37 ---------------
 4 files changed, 9 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/08d7a9c8/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index 1f2a421..c659a01 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

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/08d7a9c8/bin/templates/project/cordova/create
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/create b/bin/templates/project/cordova/create
index 32f1e16..5cf185b 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
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/08d7a9c8/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
deleted file mode 100755
index 8f347e7..0000000
--- 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>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/08d7a9c8/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
deleted file mode 100644
index ce978fb..0000000
--- 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>


Mime
View raw message