svn commit: r708138 - in /felix/trunk/webconsole: LICENSE.jquery NOTICE

[cz...@apache.org]

Author: cziegeler
Date: Mon Oct 27 04:21:12 2008
New Revision: 708138

URL: http://svn.apache.org/viewvc?rev=708138&view=rev
Log:
FELIX-790 - Updating license informatio for jquery.

Added:
    felix/trunk/webconsole/LICENSE.jquery
Modified:
    felix/trunk/webconsole/NOTICE

Added: felix/trunk/webconsole/LICENSE.jquery
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/LICENSE.jquery?rev=708138&view=auto
==============================================================================
--- felix/trunk/webconsole/LICENSE.jquery (added)
+++ felix/trunk/webconsole/LICENSE.jquery Mon Oct 27 04:21:12 2008
@@ -0,0 +1,20 @@
+Copyright (c) 2008 John Resig, http://jquery.com/
+
+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

Modified: felix/trunk/webconsole/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/NOTICE?rev=708138&r1=708137&r2=708138&view=diff
==============================================================================
--- felix/trunk/webconsole/NOTICE (original)
+++ felix/trunk/webconsole/NOTICE Mon Oct 27 04:21:12 2008
@@ -11,6 +11,8 @@
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
+This product includes software from http://www.jquery.com
+Licensed under the MIT License
 
 II. Used Software
 
@@ -22,4 +24,5 @@
 
 III. License Summary
 - Apache License 2.0
-- JSON License
\ No newline at end of file
+- JSON License
+- MIT License
\ No newline at end of file