diff --git a/.gitignore b/.gitignore index 06496d7a..7bd73298 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ example ./test tmp *.tmp +test/libs/*.jar diff --git a/bin/BOOM b/bin/BOOM index fa33b0a3..266d8311 100755 --- a/bin/BOOM +++ b/bin/BOOM @@ -1,4 +1,21 @@ #! /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. +# +# ./bin/create cd ./example && ./cordova/debug && ./cordova/log diff --git a/bin/bench b/bin/bench index 9a2663eb..e0de3848 100755 --- a/bin/bench +++ b/bin/bench @@ -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. +# +# # # Creates an app in `./bench` that posts results to http://cordova-bench.heroku.com with current cordova/Android sha. # diff --git a/bin/create b/bin/create index c659a013..84122a54 100755 --- a/bin/create +++ b/bin/create @@ -1,4 +1,20 @@ #! /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. # # create a cordova/android project # diff --git a/bin/create.js b/bin/create.js index 708eec2b..24e70325 100644 --- a/bin/create.js +++ b/bin/create.js @@ -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. +*/ + /* * create a cordova/android project * @@ -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 +*/ diff --git a/bin/create.xml b/bin/create.xml index a7193854..720697ca 100644 --- a/bin/create.xml +++ b/bin/create.xml @@ -1,4 +1,23 @@ + + @@ -76,4 +95,4 @@ - \ No newline at end of file + diff --git a/bin/templates/project/cordova/create b/bin/templates/project/cordova/create index 5cf185b0..ebacf8b5 100755 --- a/bin/templates/project/cordova/create +++ b/bin/templates/project/cordova/create @@ -1,4 +1,21 @@ #! /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. +# # # create a cordova/android project # diff --git a/bin/templates/project/cordova/debug b/bin/templates/project/cordova/debug index 0bac2c79..ff6e0a3e 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 diff --git a/bin/templates/project/cordova/emulate b/bin/templates/project/cordova/emulate index 21d7b9c4..1021af50 100755 --- a/bin/templates/project/cordova/emulate +++ b/bin/templates/project/cordova/emulate @@ -1,4 +1,23 @@ #! /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. +# +# + #Available Android Virtual Devices: # Name: default @@ -9,4 +28,4 @@ # get the name of the first virtual device or use command line arg or use "default" -emulator -cpu-delay 0 -no-boot-anim -cache ./tmp/cache -avd default > /dev/null 2>&1 & # put the avd's chatty ass in the background \ No newline at end of file +emulator -cpu-delay 0 -no-boot-anim -cache ./tmp/cache -avd default > /dev/null 2>&1 & # put the avd's chatty ass in the background diff --git a/bin/templates/project/cordova/log b/bin/templates/project/cordova/log index 2ff1e3ab..da599b93 100755 --- a/bin/templates/project/cordova/log +++ b/bin/templates/project/cordova/log @@ -1,3 +1,21 @@ #! /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. +# +# adb logcat diff --git a/bin/templates/project/cordova/templates/Activity.java b/bin/templates/project/cordova/templates/Activity.java index 60ad6a23..d37247be 100644 --- a/bin/templates/project/cordova/templates/Activity.java +++ b/bin/templates/project/cordova/templates/Activity.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 __ID__; import android.app.Activity; diff --git a/bin/templates/project/cordova/templates/project/AndroidManifest.xml b/bin/templates/project/cordova/templates/project/AndroidManifest.xml index 9d02e59d..0cff488c 100644 --- a/bin/templates/project/cordova/templates/project/AndroidManifest.xml +++ b/bin/templates/project/cordova/templates/project/AndroidManifest.xml @@ -1,4 +1,22 @@ + + @@ -20,4 +38,4 @@ Next page - \ No newline at end of file + diff --git a/test/assets/www/backbuttonmultipage/sample2.html b/test/assets/www/backbuttonmultipage/sample2.html index ad6f9600..397ac704 100755 --- a/test/assets/www/backbuttonmultipage/sample2.html +++ b/test/assets/www/backbuttonmultipage/sample2.html @@ -1,3 +1,21 @@ + @@ -20,4 +38,4 @@ Next page - \ No newline at end of file + diff --git a/test/assets/www/backbuttonmultipage/sample3.html b/test/assets/www/backbuttonmultipage/sample3.html index 2238536e..ba2b4640 100755 --- a/test/assets/www/backbuttonmultipage/sample3.html +++ b/test/assets/www/backbuttonmultipage/sample3.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/background/index.html b/test/assets/www/background/index.html index 62d7bbb8..2a073a65 100755 --- a/test/assets/www/background/index.html +++ b/test/assets/www/background/index.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/background/index2.html b/test/assets/www/background/index2.html index f0dd2b9f..addf6eb3 100755 --- a/test/assets/www/background/index2.html +++ b/test/assets/www/background/index2.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/cordova.js b/test/assets/www/cordova.js index 960b7826..874ed18a 100755 --- a/test/assets/www/cordova.js +++ b/test/assets/www/cordova.js @@ -1,2 +1,21 @@ -document.write(''); -document.write(''); +/* + 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. +*/ + +document.write(''); +document.write(''); diff --git a/test/assets/www/htmlnotfound/error.html b/test/assets/www/htmlnotfound/error.html index 3e9a61a8..c1f13298 100755 --- a/test/assets/www/htmlnotfound/error.html +++ b/test/assets/www/htmlnotfound/error.html @@ -1 +1,19 @@ -This is an error page. \ No newline at end of file + +This is an error page. diff --git a/test/assets/www/iframe/index.html b/test/assets/www/iframe/index.html index b98773cf..0b3c3d74 100755 --- a/test/assets/www/iframe/index.html +++ b/test/assets/www/iframe/index.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/iframe/index2.html b/test/assets/www/iframe/index2.html index ab0a430d..abe692b4 100755 --- a/test/assets/www/iframe/index2.html +++ b/test/assets/www/iframe/index2.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/index.html b/test/assets/www/index.html index 1fa149ef..0fd4eafa 100755 --- a/test/assets/www/index.html +++ b/test/assets/www/index.html @@ -1,20 +1,38 @@ + Cordova Tests - - - - + + + + diff --git a/test/assets/www/jqmtabbackbutton/index.html b/test/assets/www/jqmtabbackbutton/index.html index ee3bcfaa..057cea7f 100755 --- a/test/assets/www/jqmtabbackbutton/index.html +++ b/test/assets/www/jqmtabbackbutton/index.html @@ -1,3 +1,21 @@ + @@ -46,4 +64,4 @@ function onDeviceReady() { - \ No newline at end of file + diff --git a/test/assets/www/jqmtabbackbutton/tab1.html b/test/assets/www/jqmtabbackbutton/tab1.html index 4d321424..ea7e3a91 100755 --- a/test/assets/www/jqmtabbackbutton/tab1.html +++ b/test/assets/www/jqmtabbackbutton/tab1.html @@ -1,3 +1,21 @@ + @@ -26,4 +44,4 @@ Tab 1 content. - \ No newline at end of file + diff --git a/test/assets/www/jqmtabbackbutton/tab2.html b/test/assets/www/jqmtabbackbutton/tab2.html index a701b435..afd7c026 100755 --- a/test/assets/www/jqmtabbackbutton/tab2.html +++ b/test/assets/www/jqmtabbackbutton/tab2.html @@ -1,3 +1,21 @@ + @@ -27,4 +45,4 @@ Tab 2 content. - \ No newline at end of file + diff --git a/test/assets/www/jqmtabbackbutton/tab3.html b/test/assets/www/jqmtabbackbutton/tab3.html index c07cd904..9ed47df1 100755 --- a/test/assets/www/jqmtabbackbutton/tab3.html +++ b/test/assets/www/jqmtabbackbutton/tab3.html @@ -1,3 +1,21 @@ + @@ -27,4 +45,4 @@ Tab 3 content. - \ No newline at end of file + diff --git a/test/assets/www/lifecycle/index.html b/test/assets/www/lifecycle/index.html index cd061549..d9659244 100755 --- a/test/assets/www/lifecycle/index.html +++ b/test/assets/www/lifecycle/index.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/lifecycle/index2.html b/test/assets/www/lifecycle/index2.html index ee79cf3f..bfa3ed8e 100755 --- a/test/assets/www/lifecycle/index2.html +++ b/test/assets/www/lifecycle/index2.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/main.js b/test/assets/www/main.js index bfc89a07..aa1b226c 100755 --- a/test/assets/www/main.js +++ b/test/assets/www/main.js @@ -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. +*/ + var deviceInfo = function() { document.getElementById("platform").innerHTML = device.platform; document.getElementById("version").innerHTML = device.version; diff --git a/test/assets/www/master.css b/test/assets/www/master.css index 60a8451e..c3e3c452 100755 --- a/test/assets/www/master.css +++ b/test/assets/www/master.css @@ -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. +*/ + body { background:#222 none repeat scroll 0 0; color:#666; @@ -23,32 +42,32 @@ font-size:.95em; margin:5px 0; } - + #stage.theme{ padding-top:3px; } /* Definition List */ #stage.theme > dl{ - padding-top:10px; - clear:both; - margin:0; - list-style-type:none; - padding-left:10px; - overflow:auto; + padding-top:10px; + clear:both; + margin:0; + list-style-type:none; + padding-left:10px; + overflow:auto; } #stage.theme > dl > dt{ - font-weight:bold; - float:left; - margin-left:5px; + font-weight:bold; + float:left; + margin-left:5px; } #stage.theme > dl > dd{ - width:45px; - float:left; - color:#a87; - font-weight:bold; + width:45px; + float:left; + color:#a87; + font-weight:bold; } /* Content Styling */ @@ -66,7 +85,7 @@ } #stage.theme > h2{ - clear:both; + clear:both; margin:0; padding:3px; font-size:1em; @@ -75,23 +94,23 @@ /* Stage Buttons */ #stage.theme a.btn{ - border: 1px solid #555; - -webkit-border-radius: 5px; - border-radius: 5px; - text-align:center; - display:block; - float:left; - background:#444; - width:150px; - color:#9ab; - font-size:1.1em; - text-decoration:none; - padding:1.2em 0; - margin:3px 0px 3px 5px; + border: 1px solid #555; + -webkit-border-radius: 5px; + border-radius: 5px; + text-align:center; + display:block; + float:left; + background:#444; + width:150px; + color:#9ab; + font-size:1.1em; + text-decoration:none; + padding:1.2em 0; + margin:3px 0px 3px 5px; } #stage.theme a.btn.large{ - width:308px; - padding:1.2em 0; + width:308px; + padding:1.2em 0; } /* Stage Buttons */ diff --git a/test/assets/www/menus/index.html b/test/assets/www/menus/index.html index e79c7314..38322bc7 100755 --- a/test/assets/www/menus/index.html +++ b/test/assets/www/menus/index.html @@ -1,4 +1,22 @@ + diff --git a/test/assets/www/splashscreen/index.html b/test/assets/www/splashscreen/index.html index b594c1e4..8d2cd9fb 100755 --- a/test/assets/www/splashscreen/index.html +++ b/test/assets/www/splashscreen/index.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/userwebview/index.html b/test/assets/www/userwebview/index.html index 9e68f67e..51eec6ad 100755 --- a/test/assets/www/userwebview/index.html +++ b/test/assets/www/userwebview/index.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/whitelist/index.html b/test/assets/www/whitelist/index.html index bab52310..cf09d4c4 100755 --- a/test/assets/www/whitelist/index.html +++ b/test/assets/www/whitelist/index.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/whitelist/index2.html b/test/assets/www/whitelist/index2.html index ffd991e7..1ba780b7 100755 --- a/test/assets/www/whitelist/index2.html +++ b/test/assets/www/whitelist/index2.html @@ -1,3 +1,21 @@ + diff --git a/test/assets/www/xhr/index.html b/test/assets/www/xhr/index.html index 37ac942d..9eddb1d5 100755 --- a/test/assets/www/xhr/index.html +++ b/test/assets/www/xhr/index.html @@ -1,3 +1,21 @@ + diff --git a/test/build.xml b/test/build.xml index 2cd0b5ea..edede821 100755 --- a/test/build.xml +++ b/test/build.xml @@ -1,4 +1,22 @@ + +