felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r733665 - in /felix/trunk/webconsole: LICENSE.kxml2 NOTICE
Date Mon, 12 Jan 2009 10:01:13 GMT
Author: fmeschbe
Date: Mon Jan 12 02:01:11 2009
New Revision: 733665

URL: http://svn.apache.org/viewvc?rev=733665&view=rev
Log:
FELIX-863 Merge license information from enclosed bundlerpository bundle
into the main license information and update copyright years

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

Added: felix/trunk/webconsole/LICENSE.kxml2
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/LICENSE.kxml2?rev=733665&view=auto
==============================================================================
--- felix/trunk/webconsole/LICENSE.kxml2 (added)
+++ felix/trunk/webconsole/LICENSE.kxml2 Mon Jan 12 02:01:11 2009
@@ -0,0 +1,19 @@
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+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. 

Modified: felix/trunk/webconsole/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/NOTICE?rev=733665&r1=733664&r2=733665&view=diff
==============================================================================
--- felix/trunk/webconsole/NOTICE (original)
+++ felix/trunk/webconsole/NOTICE Mon Jan 12 02:01:11 2009
@@ -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



Mime
View raw message