Author: cziegeler
Date: Tue Jun 10 07:28:07 2008
New Revision: 666121
URL: http://svn.apache.org/viewvc?rev=666121&view=rev
Log:
SLING-521: Restore more notice files.
Added:
incubator/sling/trunk/commons/json/LICENSE.json (with props)
Removed:
incubator/sling/trunk/commons/log/module.notice.txt
Modified:
incubator/sling/trunk/api/NOTICE
incubator/sling/trunk/commons/json/NOTICE
incubator/sling/trunk/commons/log/NOTICE
incubator/sling/trunk/commons/mime/NOTICE
incubator/sling/trunk/commons/osgi/NOTICE
incubator/sling/trunk/commons/scheduler/NOTICE
incubator/sling/trunk/commons/testing/NOTICE
incubator/sling/trunk/commons/threads/NOTICE
incubator/sling/trunk/extensions/adapter/NOTICE
incubator/sling/trunk/extensions/bundleresource/NOTICE
Modified: incubator/sling/trunk/api/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/api/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/api/NOTICE (original)
+++ incubator/sling/trunk/api/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,11 @@
-Apache Sling - Servlet Extension API
+Apache Sling API
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
Added: incubator/sling/trunk/commons/json/LICENSE.json
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/json/LICENSE.json?rev=666121&view=auto
==============================================================================
--- incubator/sling/trunk/commons/json/LICENSE.json (added)
+++ incubator/sling/trunk/commons/json/LICENSE.json Tue Jun 10 07:28:07 2008
@@ -0,0 +1,20 @@
+Copyright (c) 2002 JSON.org
+
+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 shall be used for Good, not Evil.
+
+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
Propchange: incubator/sling/trunk/commons/json/LICENSE.json
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sling/trunk/commons/json/LICENSE.json
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/sling/trunk/commons/json/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/json/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/json/NOTICE (original)
+++ incubator/sling/trunk/commons/json/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,12 @@
-Apache Sling - Apache Sling JSON Library
+Apache Sling JSON Library
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
+This product includes software developed at http://json.org.
Modified: incubator/sling/trunk/commons/log/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/NOTICE (original)
+++ incubator/sling/trunk/commons/log/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,13 +1,18 @@
-Apache Sling - OSGi LogService Implementation
+Apache Sling OSGi Log
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-This product includes software developed at
-the OSGi Alliance (http://www.osgi.org/).
+This product includes software developed by QOS (http://www.qos.ch)
+Copyright (c) 2004-2007 QOS.ch
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/commons/mime/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/mime/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/mime/NOTICE (original)
+++ incubator/sling/trunk/commons/mime/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,10 +1,9 @@
-Apache Sling - MIME type mapping support
+Apache Sling Mime Library
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/commons/osgi/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/NOTICE (original)
+++ incubator/sling/trunk/commons/osgi/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,10 +1,9 @@
-Apache Sling - Commons OSGi support
+Apache Sling Commons OSGi
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/commons/scheduler/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/NOTICE (original)
+++ incubator/sling/trunk/commons/scheduler/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,13 @@
-Apache Sling - Scheduler Support
+Apache Sling Commons Scheduler
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
+This product includes software developed at
+Opensymphony (http://www.opensymphony.org/quartz).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/commons/testing/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/testing/NOTICE (original)
+++ incubator/sling/trunk/commons/testing/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,9 @@
-Apache Sling - testing utilities
-
-Apache Sling
-Copyright 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Sling Testing Utilities
+Copyright 2007-2008 The Apache Software Foundation
Apache Sling is based on source code originally developed
by Day Software (http://www.day.com/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/commons/threads/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/commons/threads/NOTICE (original)
+++ incubator/sling/trunk/commons/threads/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,9 @@
-Apache Sling - Thread Support
-
-Apache Sling
-Copyright 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Sling Threads
+Copyright 2007-2008 The Apache Software Foundation
Apache Sling is based on source code originally developed
by Day Software (http://www.day.com/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/extensions/adapter/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/adapter/NOTICE (original)
+++ incubator/sling/trunk/extensions/adapter/NOTICE Tue Jun 10 07:28:07 2008
@@ -1,11 +1,9 @@
-Apache Sling - AdapterManager implementation
-
-Apache Sling
-Copyright 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Sling Adapter Manager
+Copyright 2007-2008 The Apache Software Foundation
Apache Sling is based on source code originally developed
by Day Software (http://www.day.com/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
Modified: incubator/sling/trunk/extensions/bundleresource/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource/NOTICE?rev=666121&r1=666120&r2=666121&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/bundleresource/NOTICE (original)
+++ incubator/sling/trunk/extensions/bundleresource/NOTICE Tue Jun 10 07:28:07
2008
@@ -1,11 +1,10 @@
-Apache Sling - Bundle Resource Provider
+Apache Sling Bundle Resource Provider
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
+Licensed under the Apache License 2.0.
