svn commit: r963748 - in /felix/trunk/ipojo/webconsole-plugin: LICENSE.json NOTICE

[cl...@apache.org]

Author: clement
Date: Tue Jul 13 14:54:34 2010
New Revision: 963748

URL: http://svn.apache.org/viewvc?rev=963748&view=rev
Log:
Add the JSON license and update the NOTICE.

Added:
    felix/trunk/ipojo/webconsole-plugin/LICENSE.json
Modified:
    felix/trunk/ipojo/webconsole-plugin/NOTICE

Added: felix/trunk/ipojo/webconsole-plugin/LICENSE.json
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/LICENSE.json?rev=963748&view=auto
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/LICENSE.json (added)
+++ felix/trunk/ipojo/webconsole-plugin/LICENSE.json Tue Jul 13 14:54:34 2010
@@ -0,0 +1,21 @@
+Copyright (c) 2002 JSON.org
+
+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 shall be used for Good, not Evil.
+
+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.

Modified: felix/trunk/ipojo/webconsole-plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/NOTICE?rev=963748&r1=963747&r2=963748&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/NOTICE (original)
+++ felix/trunk/ipojo/webconsole-plugin/NOTICE Tue Jul 13 14:54:34 2010
@@ -7,6 +7,10 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+Licensed under the JSON License
+
 II. Used Software
 
 This product uses software developed at
@@ -20,3 +24,5 @@ Licensed under the Apache License 2.0.
 
 III. License Summary
 - Apache License 2.0
+- JSON License
+