You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/05/07 19:57:04 UTC
android commit: Working towards Apache compliance
Updated Branches:
refs/heads/master 216f6a9b3 -> a08711691
Working towards Apache compliance
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/a0871169
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/a0871169
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/a0871169
Branch: refs/heads/master
Commit: a087116915cecc8d5579287fdc9a0d4239583188
Parents: 216f6a9
Author: Joe Bowser <bo...@apache.org>
Authored: Mon May 7 10:56:37 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon May 7 10:56:37 2012 -0700
----------------------------------------------------------------------
bin/create.js | 21 ++++++++++++++-
bin/create.xml | 21 ++++++++++++++-
bin/templates/project/cordova/debug | 18 ++++++++++++
framework/src/org/apache/cordova/SplashScreen.java | 19 +++++++++++++
test/AndroidManifest.xml | 18 ++++++++++++
test/build.xml | 18 ++++++++++++
test/res/layout/main.xml | 18 ++++++++++++
test/res/xml/cordova.xml | 18 ++++++++++++
8 files changed, 149 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index 708eec2..24e7032 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -1,4 +1,23 @@
/*
+ 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.
+*/
+
+/*
* create a cordova/android project
*
* USAGE
@@ -85,4 +104,4 @@ replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
# leave the id for launching
touch $PROJECT_PATH/package-activity
echo $PACKAGE/$PACKAGE.$ACTIVITY > $PROJECT_PATH/package-activity
-*/
\ No newline at end of file
+*/
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/bin/create.xml
----------------------------------------------------------------------
diff --git a/bin/create.xml b/bin/create.xml
index a719385..720697c 100644
--- a/bin/create.xml
+++ b/bin/create.xml
@@ -1,4 +1,23 @@
<?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.
+-->
+
<project name="cordova" default="create" basedir="../">
<property name="project.path" value="${basedir}/example"/>
@@ -76,4 +95,4 @@
<replaceregexp file="${manifest.path}" match="__ACTIVITY__" replace="${activity}" />
<replaceregexp file="${manifest.path}" match="__PACKAGE__" replace="${package}" />
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/bin/templates/project/cordova/debug
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/debug b/bin/templates/project/cordova/debug
index 0bac2c7..ff6e0a3 100755
--- a/bin/templates/project/cordova/debug
+++ b/bin/templates/project/cordova/debug
@@ -1,4 +1,22 @@
#! /bin/sh
+# 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/config
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/framework/src/org/apache/cordova/SplashScreen.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/SplashScreen.java b/framework/src/org/apache/cordova/SplashScreen.java
index a8d3fc8..a53bb71 100644
--- a/framework/src/org/apache/cordova/SplashScreen.java
+++ b/framework/src/org/apache/cordova/SplashScreen.java
@@ -1,3 +1,22 @@
+/*
+ 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.
+*/
+
package org.apache.cordova;
import org.apache.cordova.api.Plugin;
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index b92fc01..21a8d8f 100755
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.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.
+-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
package="org.apache.cordova.test" android:versionName="1.1" android:versionCode="5">
<supports-screens
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/test/build.xml
----------------------------------------------------------------------
diff --git a/test/build.xml b/test/build.xml
index 2cd0b5e..edede82 100755
--- a/test/build.xml
+++ b/test/build.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.
+-->
<project name="tests" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/test/res/layout/main.xml
----------------------------------------------------------------------
diff --git a/test/res/layout/main.xml b/test/res/layout/main.xml
index d3063e0..721cf4e 100755
--- a/test/res/layout/main.xml
+++ b/test/res/layout/main.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.
+-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a0871169/test/res/xml/cordova.xml
----------------------------------------------------------------------
diff --git a/test/res/xml/cordova.xml b/test/res/xml/cordova.xml
index c7b5000..e2bc124 100755
--- a/test/res/xml/cordova.xml
+++ b/test/res/xml/cordova.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.
+-->
<cordova>
<access origin="http://127.0.0.1*"/>
<log level="DEBUG"/>