FELIX-863 Merge license information from enclosed bundlerpository bundle
into the main license information and update copyright years
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@733665 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/NOTICE b/webconsole/NOTICE
index 97636e2..c040077 100644
--- a/webconsole/NOTICE
+++ b/webconsole/NOTICE
@@ -1,5 +1,5 @@
Apache Felix OSGi Web Console
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2009 The Apache Software Foundation
I. Included Software
@@ -10,24 +10,30 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
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
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
III. License Summary
- Apache License 2.0
+- BSD License
- JSON License
- MIT License
\ No newline at end of file