Add the JSON license and update the NOTICE.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@963748 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/webconsole-plugin/LICENSE.json b/ipojo/webconsole-plugin/LICENSE.json
new file mode 100644
index 0000000..87d1411
--- /dev/null
+++ b/ipojo/webconsole-plugin/LICENSE.json
@@ -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.
diff --git a/ipojo/webconsole-plugin/NOTICE b/ipojo/webconsole-plugin/NOTICE
index 25bb50b..098b175 100644
--- a/ipojo/webconsole-plugin/NOTICE
+++ b/ipojo/webconsole-plugin/NOTICE
@@ -7,6 +7,10 @@
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 @@
III. License Summary
- Apache License 2.0
+- JSON License
+