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 2013/02/06 17:59:42 UTC

svn commit: r1443068 [3/3] - in /karaf/branches/karaf-2.3.x: ./ admin/command/ admin/core/ admin/management/ archetypes/assembly/ archetypes/blueprint/ archetypes/bundle/ archetypes/command/ archetypes/feature/ archetypes/kar/ client/ demos/branding/sh...

Modified: karaf/branches/karaf-2.3.x/tooling/cmdhelp-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/cmdhelp-maven-plugin/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/cmdhelp-maven-plugin/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/tooling/cmdhelp-maven-plugin/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/util/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/util/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/util/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/util/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/webconsole/admin/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/admin/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/admin/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/webconsole/admin/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/webconsole/branding/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/branding/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/branding/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/webconsole/branding/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/webconsole/console/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/console/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/console/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/webconsole/console/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/webconsole/features/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/features/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/features/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/webconsole/features/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ 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).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License