You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/06/04 04:08:16 UTC
[1/2] git commit: Move config.xml into template-overrides/
Repository: cordova-app-harness
Updated Branches:
refs/heads/master 5385919a6 -> fbf4f1817
Move config.xml into template-overrides/
Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/fbf4f181
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/fbf4f181
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/fbf4f181
Branch: refs/heads/master
Commit: fbf4f181787805d1028f022c49536dce7d87f1d5
Parents: e1722eb
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 3 16:30:58 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 3 21:48:26 2014 -0400
----------------------------------------------------------------------
config.xml | 24 ------------------------
createproject.sh | 2 +-
template-overrides/config.xml | 24 ++++++++++++++++++++++++
3 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/fbf4f181/config.xml
----------------------------------------------------------------------
diff --git a/config.xml b/config.xml
deleted file mode 100644
index 5eb4f0d..0000000
--- a/config.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<widget id="{ID}" version="{VERSION}" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
- <name>{NAME}</name>
- <content src="cdvah/harnessmenu.html" />
- <access origin="*" />
-</widget>
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/fbf4f181/createproject.sh
----------------------------------------------------------------------
diff --git a/createproject.sh b/createproject.sh
index 446b3a1..af13fec 100755
--- a/createproject.sh
+++ b/createproject.sh
@@ -55,7 +55,7 @@ fi
"$CORDOVA" create "$DIR_NAME" "$APP_ID" "$APP_NAME" --link-to "$AH_PATH/www" || exit 1
cd "$DIR_NAME"
-cp "$AH_PATH/config.xml" . || exit 1
+cp "$AH_PATH/template-overrides/config.xml" . || exit 1
perl -i -pe "s/{ID}/$APP_ID/g" config.xml || exit 1
perl -i -pe "s/{NAME}/$APP_NAME/g" config.xml || exit 1
perl -i -pe "s/{VERSION}/$APP_VERSION/g" config.xml || exit 1
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/fbf4f181/template-overrides/config.xml
----------------------------------------------------------------------
diff --git a/template-overrides/config.xml b/template-overrides/config.xml
new file mode 100644
index 0000000..5eb4f0d
--- /dev/null
+++ b/template-overrides/config.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+<widget id="{ID}" version="{VERSION}" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+ <name>{NAME}</name>
+ <content src="cdvah/harnessmenu.html" />
+ <access origin="*" />
+</widget>
[2/2] git commit: Small fix to UriRemap to remove double forward
slash for plugin assets
Posted by ag...@apache.org.
Small fix to UriRemap to remove double forward slash for plugin assets
Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/e1722eb9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/e1722eb9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/e1722eb9
Branch: refs/heads/master
Commit: e1722eb98e499130049c6df0cb1d7c5224853aec
Parents: 5385919
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 3 13:52:10 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 3 21:48:26 2014 -0400
----------------------------------------------------------------------
www/cdvah/js/Installer.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/e1722eb9/www/cdvah/js/Installer.js
----------------------------------------------------------------------
diff --git a/www/cdvah/js/Installer.js b/www/cdvah/js/Installer.js
index 28acb24..d339d33 100644
--- a/www/cdvah/js/Installer.js
+++ b/www/cdvah/js/Installer.js
@@ -144,8 +144,7 @@
UrlRemap.aliasUri(harnessPrefixPattern, harnessPrefixPattern, appWwwUrl, false /* redirect */, true /* allowFurtherRemapping */);
// Set-up app-harness: scheme to point at the harness.
- UrlRemap.aliasUri('^app-harness:///cdvah/index.html', '^app-harness://', harnessWwwUrl, true, false);
- return UrlRemap.aliasUri('^app-harness:', '^app-harness://', harnessWwwUrl, false, false)
+ return UrlRemap.aliasUri('^app-harness:', '^app-harness:///', harnessWwwUrl, false, false)
.then(function() {
return startLocation;
});