Author: jukka
Date: Mon Jun 16 06:51:07 2008
New Revision: 668160
URL: http://svn.apache.org/viewvc?rev=668160&view=rev
Log:
SLING-539: Merge LICENSE.* information to LICENSE files
- SLF4J license
- Note that the log bundle contains also OSGi classes!
Removed:
incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE.slf4j
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE.slf4j
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE.slf4j
Modified:
incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/commons/log/src/main/resources/META-INF/NOTICE
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
Modified: incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE
(original)
+++ incubator/sling/trunk/commons/log/src/main/resources/META-INF/LICENSE Mon
Jun 16 06:51:07 2008
@@ -200,3 +200,34 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+APACHE SLING SUBCOMPONENTS:
+
+Apache Sling includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+SLF4J logging libraries
+
+ Copyright (c) 2004-2007 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.
Modified: incubator/sling/trunk/commons/log/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/resources/META-INF/NOTICE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/resources/META-INF/NOTICE
(original)
+++ incubator/sling/trunk/commons/log/src/main/resources/META-INF/NOTICE Mon
Jun 16 06:51:07 2008
@@ -7,4 +7,9 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 OSGi Alliance
+This product includes SLF4J logging libraries (http://www.slf4j.org/).
+Copyright (c) 2004-2007 QOS.ch.
Modified:
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
(original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE Mon
Jun 16 06:51:07 2008
@@ -232,3 +232,27 @@
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.
+
+SLF4J logging libraries
+
+ Copyright (c) 2004-2007 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.
Modified: incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE Mon
Jun 16 06:51:07 2008
@@ -13,8 +13,8 @@
This product includes software developed at
Pax Web (http://wiki.ops4j.org/confluence/display/ops4j/Pax+Web).
-This product includes software developed by QOS (http://www.qos.ch)
-Copyright (c) 2004-2007 QOS.ch
+This product includes SLF4J logging libraries (http://www.slf4j.org/).
+Copyright (c) 2004-2007 QOS.ch.
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
(original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE Mon
Jun 16 06:51:07 2008
@@ -232,3 +232,27 @@
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.
+
+SLF4J logging libraries
+
+ Copyright (c) 2004-2007 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.
Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE?rev=668160&r1=668159&r2=668160&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE Mon
Jun 16 06:51:07 2008
@@ -10,8 +10,8 @@
This product contains code derived from JSON in Java code from JSON.org.
Copyright (c) 2002 JSON.org
-This product includes software developed by QOS (http://www.qos.ch)
-Copyright (c) 2004-2007 QOS.ch
+This product includes SLF4J logging libraries (http://www.slf4j.org/).
+Copyright (c) 2004-2007 QOS.ch.
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
