You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by de...@apache.org on 2012/02/02 23:03:35 UTC

[2/4] git commit: CB-5: Switching license to Apache license.

CB-5: Switching license to Apache license.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/commit/6068288d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/tree/6068288d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/diff/6068288d

Branch: refs/heads/master
Commit: 6068288d968a1536d97bb37146a00152e88581b0
Parents: 64fd138
Author: Drew Walters <de...@apache.org>
Authored: Thu Feb 2 16:01:48 2012 -0600
Committer: Drew Walters <de...@apache.org>
Committed: Thu Feb 2 16:01:48 2012 -0600

----------------------------------------------------------------------
 LICENSE                                            |  332 ++++++++++++---
 NOTICE                                             |    8 +
 .../src/com/phonegap/network/Network.as            |   18 +-
 .../ext/src/com/phonegap/PhoneGapExtension.java    |   20 +-
 .../com/phonegap/accelerometer/Accelerometer.java  |   21 +-
 framework/ext/src/com/phonegap/api/IPlugin.java    |   21 +-
 framework/ext/src/com/phonegap/api/Plugin.java     |   21 +-
 .../ext/src/com/phonegap/api/PluginManager.java    |   23 +-
 .../com/phonegap/api/PluginManagerFunction.java    |   21 +-
 .../ext/src/com/phonegap/api/PluginResult.java     |   21 +-
 framework/ext/src/com/phonegap/app/App.java        |   19 +-
 .../ext/src/com/phonegap/battery/Battery.java      |   19 +-
 framework/ext/src/com/phonegap/camera/Camera.java  |   21 +-
 .../ext/src/com/phonegap/camera/CameraOptions.java |   19 +-
 .../ext/src/com/phonegap/camera/PhotoListener.java |   23 +-
 framework/ext/src/com/phonegap/device/Device.java  |   20 +-
 framework/ext/src/com/phonegap/file/Entry.java     |   22 +-
 framework/ext/src/com/phonegap/file/File.java      |   22 +-
 .../ext/src/com/phonegap/file/FileManager.java     |   23 +-
 framework/ext/src/com/phonegap/file/FileUtils.java |   23 +-
 .../src/com/phonegap/geolocation/Geolocation.java  |   21 +-
 .../phonegap/geolocation/GeolocationListener.java  |   21 +-
 .../phonegap/geolocation/GeolocationResult.java    |   21 +-
 .../phonegap/geolocation/GeolocationStatus.java    |   21 +-
 .../ext/src/com/phonegap/geolocation/Position.java |   21 +-
 .../com/phonegap/geolocation/PositionOptions.java  |   21 +-
 .../ext/src/com/phonegap/http/FileTransfer.java    |   19 +-
 .../src/com/phonegap/http/FileUploadResult.java    |   23 +-
 .../ext/src/com/phonegap/http/FileUploader.java    |   23 +-
 framework/ext/src/com/phonegap/http/HttpUtils.java |   23 +-
 framework/ext/src/com/phonegap/json4j/JSON.java    |   20 +-
 .../ext/src/com/phonegap/json4j/JSONArray.java     |   20 +-
 .../ext/src/com/phonegap/json4j/JSONArtifact.java  |   20 +-
 .../ext/src/com/phonegap/json4j/JSONException.java |   20 +-
 .../ext/src/com/phonegap/json4j/JSONObject.java    |   20 +-
 .../ext/src/com/phonegap/json4j/JSONString.java    |   20 +-
 .../ext/src/com/phonegap/json4j/JSONStringer.java  |   20 +-
 .../ext/src/com/phonegap/json4j/JSONWriter.java    |   20 +-
 .../com/phonegap/json4j/internal/JSON4JNumber.java |   20 +-
 .../json4j/internal/JSON4JPBackReader.java         |   20 +-
 .../json4j/internal/JSON4JStringReader.java        |   20 +-
 .../json4j/internal/JSON4JStringWriter.java        |   20 +-
 .../com/phonegap/json4j/internal/NumberUtil.java   |   20 +-
 .../src/com/phonegap/json4j/internal/Parser.java   |   20 +-
 .../com/phonegap/json4j/internal/Serializer.java   |   20 +-
 .../json4j/internal/SerializerVerbose.java         |   20 +-
 .../src/com/phonegap/json4j/internal/Token.java    |   20 +-
 .../com/phonegap/json4j/internal/Tokenizer.java    |   20 +-
 .../com/phonegap/media/AudioCaptureListener.java   |   22 +-
 .../com/phonegap/media/AudioCaptureOperation.java  |   22 +-
 .../ext/src/com/phonegap/media/AudioControl.java   |   22 +-
 .../ext/src/com/phonegap/media/CameraControl.java  |   22 +-
 .../ext/src/com/phonegap/media/CaptureControl.java |   22 +-
 .../ext/src/com/phonegap/media/CaptureMode.java    |   22 +-
 .../src/com/phonegap/media/CaptureOperation.java   |   22 +-
 .../com/phonegap/media/ImageCaptureListener.java   |   22 +-
 .../com/phonegap/media/ImageCaptureOperation.java  |   22 +-
 .../ext/src/com/phonegap/media/MediaCapture.java   |   22 +-
 .../ext/src/com/phonegap/media/MediaQueue.java     |   22 +-
 .../com/phonegap/media/VideoCaptureListener.java   |   22 +-
 .../com/phonegap/media/VideoCaptureOperation.java  |   22 +-
 .../com/phonegap/network/ConnectionInfoAction.java |   19 +-
 .../ext/src/com/phonegap/network/Network.java      |   21 +-
 .../com/phonegap/notification/ActivityDialog.java  |   19 +-
 .../src/com/phonegap/notification/AlertAction.java |   21 +-
 .../src/com/phonegap/notification/AlertDialog.java |   21 +-
 .../src/com/phonegap/notification/BeepAction.java  |   21 +-
 .../com/phonegap/notification/ConfirmAction.java   |   21 +-
 .../com/phonegap/notification/ConfirmDialog.java   |   21 +-
 .../com/phonegap/notification/Notification.java    |   21 +-
 .../com/phonegap/notification/ProgressDialog.java  |   19 +-
 .../com/phonegap/notification/VibrateAction.java   |   21 +-
 framework/ext/src/com/phonegap/pim/Contact.java    |   23 +-
 framework/ext/src/com/phonegap/ui/SpacerField.java |   21 +-
 .../src/com/phonegap/util/ApplicationUtils.java    |   22 +-
 framework/ext/src/com/phonegap/util/Log.java       |   21 +-
 .../ext/src/com/phonegap/util/LogFunction.java     |   21 +-
 framework/ext/src/com/phonegap/util/Logger.java    |   21 +-
 .../ext/src/com/phonegap/util/StringUtils.java     |   24 +-
 javascript/_phonegap.js                            |   21 +-
 javascript/accelerometer.js                        |   21 +-
 javascript/app.js                                  |   20 +-
 javascript/blackberry/battery.js                   |   20 +-
 javascript/blackberry/blackberryPluginManager.js   |   17 +-
 javascript/button.js                               |   19 +-
 javascript/camera.js                               |   21 +-
 javascript/capture.js                              |   20 +-
 javascript/console.js                              |   22 +-
 javascript/contact.js                              |   21 +-
 javascript/device.js                               |   21 +-
 javascript/file.js                                 |   21 +-
 javascript/filetransfer.js                         |   20 +-
 javascript/geolocation.js                          |   21 +-
 javascript/network.js                              |   21 +-
 javascript/notification.js                         |   21 +-
 javascript/playbook/battery.js                     |   19 +-
 javascript/playbook/playBookPluginManager.js       |   18 +-
 javascript/position.js                             |   21 +-
 javascript/webWorksPluginManager.js                |   17 +-
 template/project/www/index.html                    |   19 +-
 100 files changed, 1857 insertions(+), 519 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d629c1f..ee6a935 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,64 +1,268 @@
-PhoneGap is available under *either* the terms of the modified BSD license *or* the
-MIT License (2008). As a recipient of PhonegGap, you may choose which
-license to receive this code under (except as noted in per-module LICENSE
-files). Some modules may not be the copyright of Nitobi. These
-modules contain explicit declarations of copyright in both the LICENSE files in
-the directories in which they reside and in the code itself. No external
-contributions are allowed under licenses which are fundamentally incompatible
-with the MIT or BSD licenses that PhoneGap is distributed under.
-
-The text of the MIT and BSD licenses is reproduced below.
-
--------------------------------------------------------------------------------
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005-2011, Nitobi Software Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the name of Phonegap/Nitobi nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------------------------------------
-The MIT License
-*****************
-
-Copyright (c) <2011> <Nitobi Software Inc., et. al., >
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
\ No newline at end of file
+
+                               Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+For the template/project/lib/ant-contrib/ant-contrib-1.0b3.jar component:
+
+   The Apache Software License, Version 1.1
+
+   Copyright (c) 2001-2003 Ant-Contrib project.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+
+   3. The end-user documentation included with the redistribution, if
+      any, must include the following acknowlegement:
+         "This product includes software developed by the
+          Ant-Contrib project (http://sourceforge.net/projects/ant-contrib)."
+      Alternately, this acknowlegement may appear in the software itself,
+      if and wherever such third-party acknowlegements normally appear.
+
+   4. The name Ant-Contrib must not be used to endorse or promote products
+      derived from this software without prior written permission. For
+      written permission, please contact
+      ant-contrib-developers@lists.sourceforge.net.
+
+   5. Products derived from this software may not be called "Ant-Contrib"
+      nor may "Ant-Contrib" appear in their names without prior written
+      permission of the Ant-Contrib project.
+
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED.  IN NO EVENT SHALL THE ANT-CONTRIB PROJECT OR ITS
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+   ====================================================================
+
+For the template/project/www/json2.js component:
+
+    http://www.JSON.org/json2.js
+    2010-03-20
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..23360ce
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,8 @@
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org)
+
+This product includes software developed by
+Ant-Contrib project (http://sourceforge.net/projects/ant-contrib).

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext-air/PhoneGap_Network/src/com/phonegap/network/Network.as
----------------------------------------------------------------------
diff --git a/framework/ext-air/PhoneGap_Network/src/com/phonegap/network/Network.as b/framework/ext-air/PhoneGap_Network/src/com/phonegap/network/Network.as
index 3f2bf2d..dafb94e 100644
--- a/framework/ext-air/PhoneGap_Network/src/com/phonegap/network/Network.as
+++ b/framework/ext-air/PhoneGap_Network/src/com/phonegap/network/Network.as
@@ -1,6 +1,20 @@
 /*
- * 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.
+ * 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.
  * 
  * Copyright (c) 2011, Research In Motion Limited.
  */

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/PhoneGapExtension.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/PhoneGapExtension.java b/framework/ext/src/com/phonegap/PhoneGapExtension.java
index 86f0b07..d1fc58b 100644
--- a/framework/ext/src/com/phonegap/PhoneGapExtension.java
+++ b/framework/ext/src/com/phonegap/PhoneGapExtension.java
@@ -1,9 +1,21 @@
 /*
- * 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.
+ * 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.
  * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
  * Copyright (c) 2011, Research In Motion Limited.
  */
 package com.phonegap;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/accelerometer/Accelerometer.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/accelerometer/Accelerometer.java b/framework/ext/src/com/phonegap/accelerometer/Accelerometer.java
index 1027863..2ffdb86 100644
--- a/framework/ext/src/com/phonegap/accelerometer/Accelerometer.java
+++ b/framework/ext/src/com/phonegap/accelerometer/Accelerometer.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.accelerometer;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/api/IPlugin.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/api/IPlugin.java b/framework/ext/src/com/phonegap/api/IPlugin.java
index 94d5dbc..01de518 100644
--- a/framework/ext/src/com/phonegap/api/IPlugin.java
+++ b/framework/ext/src/com/phonegap/api/IPlugin.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.api;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/api/Plugin.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/api/Plugin.java b/framework/ext/src/com/phonegap/api/Plugin.java
index da324ff..56f5102 100644
--- a/framework/ext/src/com/phonegap/api/Plugin.java
+++ b/framework/ext/src/com/phonegap/api/Plugin.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.api;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/api/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/api/PluginManager.java b/framework/ext/src/com/phonegap/api/PluginManager.java
index 6f9c6f4..72792b7 100644
--- a/framework/ext/src/com/phonegap/api/PluginManager.java
+++ b/framework/ext/src/com/phonegap/api/PluginManager.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.api;
 
@@ -155,4 +166,4 @@ public final class PluginManager extends Scriptable {
     public String getClassForService(String serviceName) {
         return (String)this.services.get(serviceName);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/api/PluginManagerFunction.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/api/PluginManagerFunction.java b/framework/ext/src/com/phonegap/api/PluginManagerFunction.java
index 5b17b6d..ed913fb 100644
--- a/framework/ext/src/com/phonegap/api/PluginManagerFunction.java
+++ b/framework/ext/src/com/phonegap/api/PluginManagerFunction.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.api;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/api/PluginResult.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/api/PluginResult.java b/framework/ext/src/com/phonegap/api/PluginResult.java
index 3e38dde..052d1a3 100644
--- a/framework/ext/src/com/phonegap/api/PluginResult.java
+++ b/framework/ext/src/com/phonegap/api/PluginResult.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.api;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/app/App.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/app/App.java b/framework/ext/src/com/phonegap/app/App.java
index ec061fa..42f9119 100644
--- a/framework/ext/src/com/phonegap/app/App.java
+++ b/framework/ext/src/com/phonegap/app/App.java
@@ -1,9 +1,20 @@
 /*
- * 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.
+ * 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
  *
- * Copyright (c) 2005-2011, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
+ *   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.app;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/battery/Battery.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/battery/Battery.java b/framework/ext/src/com/phonegap/battery/Battery.java
index cb01de2..44b7440 100644
--- a/framework/ext/src/com/phonegap/battery/Battery.java
+++ b/framework/ext/src/com/phonegap/battery/Battery.java
@@ -1,9 +1,20 @@
 /*
- * 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.
+ * 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
  *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
+ *   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.battery;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/camera/Camera.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/camera/Camera.java b/framework/ext/src/com/phonegap/camera/Camera.java
index f71c2cc..d01163d 100644
--- a/framework/ext/src/com/phonegap/camera/Camera.java
+++ b/framework/ext/src/com/phonegap/camera/Camera.java
@@ -1,9 +1,20 @@
 /*
- * 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-2011, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
+ * 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.camera;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/camera/CameraOptions.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/camera/CameraOptions.java b/framework/ext/src/com/phonegap/camera/CameraOptions.java
index 0b4c49a..a259d6a 100644
--- a/framework/ext/src/com/phonegap/camera/CameraOptions.java
+++ b/framework/ext/src/com/phonegap/camera/CameraOptions.java
@@ -1,9 +1,20 @@
 /*
- * 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.
+ * 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
  *
- * Copyright (c) 2005-2011, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
+ *   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.camera;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/camera/PhotoListener.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/camera/PhotoListener.java b/framework/ext/src/com/phonegap/camera/PhotoListener.java
index faf0d40..7a40d97 100644
--- a/framework/ext/src/com/phonegap/camera/PhotoListener.java
+++ b/framework/ext/src/com/phonegap/camera/PhotoListener.java
@@ -1,10 +1,21 @@
 /*
- * 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-2011, Nitobi
- * Copyright (c) 2010-2011, IBM Corporation
- */ 
+ * 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.camera;
 
 import net.rim.device.api.io.file.FileSystemJournal;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/device/Device.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/device/Device.java b/framework/ext/src/com/phonegap/device/Device.java
index b6f56da..24ea899 100644
--- a/framework/ext/src/com/phonegap/device/Device.java
+++ b/framework/ext/src/com/phonegap/device/Device.java
@@ -1,9 +1,21 @@
 /*
- * 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.
+ * 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.
  * 
- * Copyright (c) 2005-2011, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
  * Copyright (c) 2011, Research In Motion Limited.
  */
 package com.phonegap.device;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/file/Entry.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/file/Entry.java b/framework/ext/src/com/phonegap/file/Entry.java
index 2727f95..f637ff8 100644
--- a/framework/ext/src/com/phonegap/file/Entry.java
+++ b/framework/ext/src/com/phonegap/file/Entry.java
@@ -1,9 +1,21 @@
 /*
- * 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) 2011, IBM Corporation
- */ 
+ * 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;
 
 import com.phonegap.json4j.JSONException;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/file/File.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/file/File.java b/framework/ext/src/com/phonegap/file/File.java
index 079f6b9..c20c8c1 100644
--- a/framework/ext/src/com/phonegap/file/File.java
+++ b/framework/ext/src/com/phonegap/file/File.java
@@ -1,9 +1,21 @@
 /*
- * 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) 2011, IBM Corporation
- */ 
+ * 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;
 
 import com.phonegap.json4j.JSONException;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/file/FileManager.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/file/FileManager.java b/framework/ext/src/com/phonegap/file/FileManager.java
index 61321df..590bf47 100644
--- a/framework/ext/src/com/phonegap/file/FileManager.java
+++ b/framework/ext/src/com/phonegap/file/FileManager.java
@@ -1,10 +1,21 @@
 /*
- * 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
- * Copyright (c) 2010-2011, IBM Corporation
- */ 
+ * 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;
 
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/file/FileUtils.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/file/FileUtils.java b/framework/ext/src/com/phonegap/file/FileUtils.java
index 6a62ab9..24ea034 100644
--- a/framework/ext/src/com/phonegap/file/FileUtils.java
+++ b/framework/ext/src/com/phonegap/file/FileUtils.java
@@ -1,10 +1,21 @@
 /*
- * 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
- * Copyright (c) 2010-2011, IBM Corporation
- */ 
+ * 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;
 
 import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/Geolocation.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/Geolocation.java b/framework/ext/src/com/phonegap/geolocation/Geolocation.java
index 54daa75..8fceb19 100644
--- a/framework/ext/src/com/phonegap/geolocation/Geolocation.java
+++ b/framework/ext/src/com/phonegap/geolocation/Geolocation.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/GeolocationListener.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/GeolocationListener.java b/framework/ext/src/com/phonegap/geolocation/GeolocationListener.java
index 305d5da..898f379 100644
--- a/framework/ext/src/com/phonegap/geolocation/GeolocationListener.java
+++ b/framework/ext/src/com/phonegap/geolocation/GeolocationListener.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/GeolocationResult.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/GeolocationResult.java b/framework/ext/src/com/phonegap/geolocation/GeolocationResult.java
index 1b592f1..8328d01 100644
--- a/framework/ext/src/com/phonegap/geolocation/GeolocationResult.java
+++ b/framework/ext/src/com/phonegap/geolocation/GeolocationResult.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/GeolocationStatus.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/GeolocationStatus.java b/framework/ext/src/com/phonegap/geolocation/GeolocationStatus.java
index 8ef3b35..77f68d3 100644
--- a/framework/ext/src/com/phonegap/geolocation/GeolocationStatus.java
+++ b/framework/ext/src/com/phonegap/geolocation/GeolocationStatus.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/Position.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/Position.java b/framework/ext/src/com/phonegap/geolocation/Position.java
index a9221b2..ff23720 100644
--- a/framework/ext/src/com/phonegap/geolocation/Position.java
+++ b/framework/ext/src/com/phonegap/geolocation/Position.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/geolocation/PositionOptions.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/geolocation/PositionOptions.java b/framework/ext/src/com/phonegap/geolocation/PositionOptions.java
index 14db88e..5f11580 100644
--- a/framework/ext/src/com/phonegap/geolocation/PositionOptions.java
+++ b/framework/ext/src/com/phonegap/geolocation/PositionOptions.java
@@ -1,9 +1,20 @@
 /*
- * 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
+ * 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.geolocation;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/http/FileTransfer.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/http/FileTransfer.java b/framework/ext/src/com/phonegap/http/FileTransfer.java
index 53164c6..39cfdae 100644
--- a/framework/ext/src/com/phonegap/http/FileTransfer.java
+++ b/framework/ext/src/com/phonegap/http/FileTransfer.java
@@ -1,9 +1,20 @@
 /*
- * 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.
+ * 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
  *
- * Copyright (c) 2005-2010, Nitobi
- * Copyright (c) 2010-2011, IBM Corporation
+ *   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.http;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/http/FileUploadResult.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/http/FileUploadResult.java b/framework/ext/src/com/phonegap/http/FileUploadResult.java
index 5230324..634cc76 100644
--- a/framework/ext/src/com/phonegap/http/FileUploadResult.java
+++ b/framework/ext/src/com/phonegap/http/FileUploadResult.java
@@ -1,10 +1,21 @@
 /*
- * 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
- * Copyright (c) 2010, IBM Corporation
- */ 
+ * 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.http;
 
 import com.phonegap.json4j.JSONException;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/http/FileUploader.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/http/FileUploader.java b/framework/ext/src/com/phonegap/http/FileUploader.java
index 2aeafbf..7ffed43 100644
--- a/framework/ext/src/com/phonegap/http/FileUploader.java
+++ b/framework/ext/src/com/phonegap/http/FileUploader.java
@@ -1,10 +1,21 @@
 /*
- * 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
- * Copyright (c) 2010, IBM Corporation
- */ 
+ * 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.http;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/http/HttpUtils.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/http/HttpUtils.java b/framework/ext/src/com/phonegap/http/HttpUtils.java
index da6c82f..829645c 100644
--- a/framework/ext/src/com/phonegap/http/HttpUtils.java
+++ b/framework/ext/src/com/phonegap/http/HttpUtils.java
@@ -1,10 +1,21 @@
 /*
- * 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
- * Copyright (c) 2010, IBM Corporation
- */ 
+ * 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.http;
 
 import javax.microedition.io.HttpConnection;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSON.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSON.java b/framework/ext/src/com/phonegap/json4j/JSON.java
index 8b18f34..3e2f2be 100644
--- a/framework/ext/src/com/phonegap/json4j/JSON.java
+++ b/framework/ext/src/com/phonegap/json4j/JSON.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONArray.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONArray.java b/framework/ext/src/com/phonegap/json4j/JSONArray.java
index c1d175a..664f1df 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONArray.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONArray.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONArtifact.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONArtifact.java b/framework/ext/src/com/phonegap/json4j/JSONArtifact.java
index cedd714..69f85be 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONArtifact.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONArtifact.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONException.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONException.java b/framework/ext/src/com/phonegap/json4j/JSONException.java
index 3030468..fa978d0 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONException.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONException.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONObject.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONObject.java b/framework/ext/src/com/phonegap/json4j/JSONObject.java
index e6053ac..ddf49e2 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONObject.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONObject.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONString.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONString.java b/framework/ext/src/com/phonegap/json4j/JSONString.java
index dab8a38..0492392 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONString.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONString.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONStringer.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONStringer.java b/framework/ext/src/com/phonegap/json4j/JSONStringer.java
index 17fcb77..37ea796 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONStringer.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONStringer.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/JSONWriter.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/JSONWriter.java b/framework/ext/src/com/phonegap/json4j/JSONWriter.java
index dcc7785..bf91b48 100644
--- a/framework/ext/src/com/phonegap/json4j/JSONWriter.java
+++ b/framework/ext/src/com/phonegap/json4j/JSONWriter.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/internal/JSON4JNumber.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/internal/JSON4JNumber.java b/framework/ext/src/com/phonegap/json4j/internal/JSON4JNumber.java
index 0c474ef..2353463 100644
--- a/framework/ext/src/com/phonegap/json4j/internal/JSON4JNumber.java
+++ b/framework/ext/src/com/phonegap/json4j/internal/JSON4JNumber.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j.internal;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/6068288d/framework/ext/src/com/phonegap/json4j/internal/JSON4JPBackReader.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/com/phonegap/json4j/internal/JSON4JPBackReader.java b/framework/ext/src/com/phonegap/json4j/internal/JSON4JPBackReader.java
index 103de48..87b0546 100644
--- a/framework/ext/src/com/phonegap/json4j/internal/JSON4JPBackReader.java
+++ b/framework/ext/src/com/phonegap/json4j/internal/JSON4JPBackReader.java
@@ -1,8 +1,20 @@
 /*
- * 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) 2011, IBM Corporation
+ * 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.json4j.internal;