You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/12/18 15:51:17 UTC
svn commit: r1423453 - in /karaf/webconsole/trunk: LICENSE NOTICE
Author: jbonofre
Date: Tue Dec 18 14:51:16 2012
New Revision: 1423453
URL: http://svn.apache.org/viewvc?rev=1423453&view=rev
Log:
[KARAF-2057] Fix LICENSE and NOTICE files
Modified:
karaf/webconsole/trunk/LICENSE
karaf/webconsole/trunk/NOTICE
Modified: karaf/webconsole/trunk/LICENSE
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/LICENSE?rev=1423453&r1=1423452&r2=1423453&view=diff
==============================================================================
--- karaf/webconsole/trunk/LICENSE (original)
+++ karaf/webconsole/trunk/LICENSE Tue Dec 18 14:51:16 2012
@@ -201,3 +201,25 @@
See the License for the specific language governing permissions and
limitations under the License.
+For slf4j
+Copyright (c) 2004-2011 QOS.ch
+All rights reserved.
+
+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: karaf/webconsole/trunk/NOTICE
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/NOTICE?rev=1423453&r1=1423452&r2=1423453&view=diff
==============================================================================
--- karaf/webconsole/trunk/NOTICE (original)
+++ karaf/webconsole/trunk/NOTICE Tue Dec 18 14:51:16 2012
@@ -1,20 +1,13 @@
Apache Karaf Webconsole
-Copyright 2011 The Apache Software Foundation
+Copyright 2011-2012 The Apache Software Foundation
-I. Included Software
+I. Used Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2010).
@@ -28,6 +21,7 @@ This product uses software developed at
SLF4J (http://www.slf4j.org/).
Licensed under the MIT License.
-III. License Summary
+II. License Summary
- Apache License 2.0
+- MIT License