Merge branch 'master' of github.com:callback/callback-android

framework/assets/js/accelerometer.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("accelerometer")) {

framework/assets/js/app.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("app")) {

framework/assets/js/battery.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("battery")) {

framework/assets/js/camera.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("camera")) {

framework/assets/js/capture.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("capture")) {

framework/assets/js/compass.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("compass")) {

framework/assets/js/contact.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("contact")) {

framework/assets/js/crypto.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 // TODO: Needs to be commented

framework/assets/js/device.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("device")) {

framework/assets/js/file.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("file")) {

framework/assets/js/filetransfer.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("filetransfer")) {

framework/assets/js/geolocation.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("geolocation")) {

framework/assets/js/header.txt

@@ -1,7 +1,19 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010, IBM Corporation
+ *
+ *     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.
  */
+

framework/assets/js/media.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("media")) {

framework/assets/js/network.js

@@ -1,11 +1,23 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
+
 if (!PhoneGap.hasResource("network")) {
 PhoneGap.addResource("network");
 

framework/assets/js/notification.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("notification")) {

framework/assets/js/phonegap.js.base

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 // Version 1.2.0

framework/assets/js/position.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 if (!PhoneGap.hasResource("position")) {

framework/assets/js/storage.js

@@ -1,9 +1,20 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ *     Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *     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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * Copyright (c) 2010-2011, IBM Corporation
+ *
+ *     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.
  */
 
 /*

framework/src/com/phonegap/AccelListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.util.List;

framework/src/com/phonegap/App.java

@@ -1,10 +1,22 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/AudioHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import android.content.Context;

framework/src/com/phonegap/AudioPlayer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import android.media.AudioManager;

framework/src/com/phonegap/BatteryListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/CallbackServer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.BufferedReader;

framework/src/com/phonegap/CameraLauncher.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.ByteArrayOutputStream;

framework/src/com/phonegap/Capture.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2011, IBM Corporation
+       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 com.phonegap;
 
 import java.io.File;

framework/src/com/phonegap/CompassListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.util.List;

framework/src/com/phonegap/ContactAccessor.java

@@ -1,11 +1,3 @@
-// Taken from Android Tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *

framework/src/com/phonegap/ContactAccessorSdk5.java

@@ -1,12 +1,3 @@
-// Taken from Android tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- * Copyright (c) 2011, Giant Leap Technologies AS
- */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *

framework/src/com/phonegap/ContactManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/CryptoHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/Device.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.util.TimeZone;

framework/src/com/phonegap/DirectoryManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.File;

framework/src/com/phonegap/DroidGap.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       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 com.phonegap;
 
 import java.util.HashMap;

framework/src/com/phonegap/ExifHelper.java

@@ -1,9 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2011, IBM Corporation
+       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 com.phonegap;
 
 import java.io.IOException;

framework/src/com/phonegap/FileTransfer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.DataInputStream;

framework/src/com/phonegap/FileUploadResult.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONException;

framework/src/com/phonegap/FileUtils.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       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 com.phonegap;
 
 import java.io.*;

framework/src/com/phonegap/GapView.java

@@ -0,0 +1,38 @@
+package com.phonegap;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.EditText;
+
+public class GapView extends WebView {
+
+	public GapView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	protected void attachViewToParent(View child, int index, ViewGroup.LayoutParams params)
+	{
+		if(child.getClass() != EditText.class)
+			super.attachViewToParent(child, index, params);
+		else
+		{
+			super.attachViewToParent(child, index, params);
+		}
+	}
+	
+	@Override
+	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params)
+	{
+		return super.addViewInLayout(child, index, params);
+	}
+	
+	@Override
+	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params, boolean preventRequestLayout)
+	{
+		return super.addViewInLayout(child, index, params);
+	}
+}

framework/src/com/phonegap/GeoBroker.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.util.HashMap;

framework/src/com/phonegap/GeoListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import android.content.Context;

framework/src/com/phonegap/GpsListener.java

@@ -1,10 +1,22 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import com.phonegap.api.PhonegapActivity;

framework/src/com/phonegap/HttpHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.EOFException;

framework/src/com/phonegap/NetworkListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import com.phonegap.api.PhonegapActivity;

framework/src/com/phonegap/NetworkManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/Notification.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/StandAlone.java

@@ -1,9 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       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 com.phonegap;
 
 import java.lang.reflect.Field;

framework/src/com/phonegap/Storage.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/TempListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.util.List;

framework/src/com/phonegap/WebViewReflect.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap;
 
 import java.io.IOException;

framework/src/com/phonegap/api/IPlugin.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import org.json.JSONArray;

framework/src/com/phonegap/api/LOG.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import android.util.Log;

framework/src/com/phonegap/api/PhonegapActivity.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import android.app.Activity;

framework/src/com/phonegap/api/Plugin.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import org.json.JSONArray;

framework/src/com/phonegap/api/PluginManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import java.io.IOException;

framework/src/com/phonegap/api/PluginResult.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       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 com.phonegap.api;
 
 import org.json.JSONArray;

framework/src/com/phonegap/file/EncodingException.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 com.phonegap.file;
 
 public class EncodingException extends Exception {

framework/src/com/phonegap/file/FileExistsException.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 com.phonegap.file;
 
 public class FileExistsException extends Exception {

framework/src/com/phonegap/file/InvalidModificationException.java

@@ -1,3 +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.
+*/
+
+
 package com.phonegap.file;
 
 public class InvalidModificationException extends Exception {

framework/src/com/phonegap/file/NoModificationAllowedException.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 com.phonegap.file;
 
 public class NoModificationAllowedException extends Exception {

framework/src/com/phonegap/file/TypeMismatchException.java

@@ -1,3 +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.
+*/
+
+
 package com.phonegap.file;
 
 public class TypeMismatchException extends Exception {