You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/08/20 00:21:32 UTC

[1/7] git commit: [xml] correcting invalid xml, adding namespace

Updated Branches:
  refs/heads/master 2aec96257 -> 5d148d58c


[xml] correcting invalid xml, adding namespace

- typo in the plugin.xml is fixed resulting in a 'more' valid xml
- adding Android namespace to make it a valid xml for parsing
  by other tools


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/d6874ed7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/d6874ed7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/d6874ed7

Branch: refs/heads/master
Commit: d6874ed7b1bd3c6034e53c6505ebf38d960d7c21
Parents: 96b0c5d
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Jul 30 17:01:07 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Jul 30 17:01:13 2013 -0700

----------------------------------------------------------------------
 plugin.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/d6874ed7/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index a4acfa7..0c79ed3 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
+xmlns:android="http://schemas.android.com/apk/res/android"
            id="org.apache.cordova.core.network-information"
       version="0.1.0">
 
@@ -24,7 +25,7 @@
             <param name="firefox-package" value="Network" />
         </config-file>                                      
         
-        <source-file src="src/firefoxos/network.js" target dir="src/firefoxos" />
+        <source-file src="src/firefoxos/network.js" target-dir="src/firefoxos" />
     </platform>
             
     <!-- android -->


[6/7] git commit: CB-4595: updated version

Posted by st...@apache.org.
CB-4595: updated version


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/ddf9e692
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/ddf9e692
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/ddf9e692

Branch: refs/heads/master
Commit: ddf9e6927e46133224605a0cddeaa052ffe773f2
Parents: 9b76295
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 15:21:14 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 15:21:14 2013 -0700

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/ddf9e692/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 252fb9f..d15823b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android"
            id="org.apache.cordova.core.network-information"
-      version="0.1.0">
+      version="0.2.0">
 
     <name>Network Information</name>
     <description>Cordova Network Information Plugin</description>


[4/7] git commit: updated readme, name tag and namespace

Posted by st...@apache.org.
updated readme, name tag and namespace


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/4ea68167
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/4ea68167
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/4ea68167

Branch: refs/heads/master
Commit: 4ea68167a45aa3c0dccdc318a2edf34557a791d9
Parents: 2489358
Author: Steven Gill <st...@gmail.com>
Authored: Wed Jul 24 14:48:06 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:51:02 2013 -0700

----------------------------------------------------------------------
 README.md  | 2 +-
 plugin.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/4ea68167/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0dbf122..e1681b5 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@ cordova-plugin-network-information
 ----------------------------------
 To install this plugin, follow the [Command-line Interface Guide](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface).
 
-If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/guide_plugin_ref_plugman.md.html).
+If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/plugin_ref_plugman.md.html).

http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/4ea68167/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 62a57fd..2184d5e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android"
            id="org.apache.cordova.core.network-information"
       version="0.1.0">


[5/7] git commit: [CB-4417] Move cordova-plugin-network-information to its own Java package.

Posted by st...@apache.org.
[CB-4417] Move cordova-plugin-network-information to its own Java package.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/9b762951
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/9b762951
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/9b762951

Branch: refs/heads/master
Commit: 9b762951d4b4f396ff7f576326380d90b56d98a1
Parents: 4ea6816
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jul 31 19:57:24 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:51:03 2013 -0700

----------------------------------------------------------------------
 plugin.xml                      | 4 ++--
 src/android/NetworkManager.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/9b762951/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 2184d5e..252fb9f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -32,7 +32,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
     <platform name="android">
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="NetworkStatus">
-                <param name="android-package" value="org.apache.cordova.core.NetworkManager"/>
+                <param name="android-package" value="org.apache.cordova.networkinformation.NetworkManager"/>
             </feature>   
         </config-file>
         
@@ -40,7 +40,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
         </config-file>
 
-        <source-file src="src/android/NetworkManager.java" target-dir="src/org/apache/cordova/core" />
+        <source-file src="src/android/NetworkManager.java" target-dir="src/org/apache/cordova/networkinformation" />
         
     </platform>
 

http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/9b762951/src/android/NetworkManager.java
----------------------------------------------------------------------
diff --git a/src/android/NetworkManager.java b/src/android/NetworkManager.java
index 42282bf..e2ac500 100755
--- a/src/android/NetworkManager.java
+++ b/src/android/NetworkManager.java
@@ -16,7 +16,7 @@
        specific language governing permissions and limitations
        under the License.
 */
-package org.apache.cordova.core;
+package org.apache.cordova.networkinformation;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;


[3/7] git commit: [plugin.xml] standardizing license + meta

Posted by st...@apache.org.
[plugin.xml] standardizing license + meta


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/24893582
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/24893582
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/24893582

Branch: refs/heads/master
Commit: 2489358286e11e6b8890d956e7448e29e0e5835b
Parents: 46a22dd
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:52:52 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:52:52 2013 -0700

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/24893582/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 0c79ed3..62a57fd 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -7,7 +7,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
 
     <name>Network Information</name>
     <description>Cordova Network Information Plugin</description>
-    <license>Apache</license>
+    <license>Apache 2.0</license>
     <keywords>cordova,network,information</keywords>
     
     <js-module src="www/network.js" name="network">


[2/7] git commit: [license] adding apache license file

Posted by st...@apache.org.
[license] adding apache license file


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/46a22ddf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/46a22ddf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/46a22ddf

Branch: refs/heads/master
Commit: 46a22ddfd84581c5503e7087901c43cec39c1c36
Parents: d6874ed
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:42:09 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:42:09 2013 -0700

----------------------------------------------------------------------
 LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/46a22ddf/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 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.
\ No newline at end of file


[7/7] git commit: Merge branch 'dev'

Posted by st...@apache.org.
Merge branch 'dev'


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/5d148d58
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/5d148d58
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/5d148d58

Branch: refs/heads/master
Commit: 5d148d58c397846913156b9d78bc1d1530cc9328
Parents: 2aec962 ddf9e69
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 15:21:22 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 15:21:22 2013 -0700

----------------------------------------------------------------------
 LICENSE                         | 202 +++++++++++++++++++++++++++++++++++
 README.md                       |   2 +-
 plugin.xml                      |  11 +-
 src/android/NetworkManager.java |   2 +-
 4 files changed, 210 insertions(+), 7 deletions(-)
----------------------------------------------------------------------