You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/04/14 17:52:17 UTC

svn commit: r647863 - in /incubator/sling/trunk: jcr/ocm/ jcr/resource/ jcr/webdav/ sling/adapter/ sling/bundleresource/ sling/core/ sling/event/ sling/httpauth/ sling/i18n/ sling/sample/ sling/scheduler/ sling/servlet-resolver/ sling/servlets-default/...

Author: cziegeler
Date: Mon Apr 14 08:52:14 2008
New Revision: 647863

URL: http://svn.apache.org/viewvc?rev=647863&view=rev
Log:
Update notice files.

Added:
    incubator/sling/trunk/sling/i18n/NOTICE   (with props)
    incubator/sling/trunk/sling/scheduler/NOTICE   (with props)
    incubator/sling/trunk/sling/servlets-default/NOTICE   (with props)
    incubator/sling/trunk/sling/servlets-post/NOTICE   (with props)
Removed:
    incubator/sling/trunk/jcr/resource/LICENSE.json
Modified:
    incubator/sling/trunk/jcr/ocm/NOTICE
    incubator/sling/trunk/jcr/resource/NOTICE
    incubator/sling/trunk/jcr/webdav/NOTICE
    incubator/sling/trunk/sling/adapter/NOTICE
    incubator/sling/trunk/sling/bundleresource/NOTICE
    incubator/sling/trunk/sling/core/NOTICE
    incubator/sling/trunk/sling/event/NOTICE
    incubator/sling/trunk/sling/httpauth/NOTICE
    incubator/sling/trunk/sling/sample/NOTICE
    incubator/sling/trunk/sling/servlet-resolver/NOTICE
    incubator/sling/trunk/sling/threads/NOTICE

Modified: incubator/sling/trunk/jcr/ocm/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/NOTICE (original)
+++ incubator/sling/trunk/jcr/ocm/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,11 +1,12 @@
 Apache Sling Object Content Mapping
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Copyright 2007-2008 The Apache Software Foundation
 
 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.
 
 This product includes software from http://kxml.sourceforge.net.
 Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.

Modified: incubator/sling/trunk/jcr/resource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/NOTICE (original)
+++ incubator/sling/trunk/jcr/resource/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,14 +1,12 @@
 Apache Sling Resource Resolver and Initial Content Loader
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Copyright 2007-2008 The Apache Software Foundation
 
 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.
+
 This product includes software from http://kxml.sourceforge.net.
 Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
\ No newline at end of file

Modified: incubator/sling/trunk/jcr/webdav/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/NOTICE (original)
+++ incubator/sling/trunk/jcr/webdav/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,8 +1,9 @@
 Apache Sling WebDAV
 Copyright 2008 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 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/sling/adapter/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/NOTICE (original)
+++ incubator/sling/trunk/sling/adapter/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,5 +1,9 @@
 Apache Sling Adapter Manager
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
+
+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/sling/bundleresource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/bundleresource/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/bundleresource/NOTICE (original)
+++ incubator/sling/trunk/sling/bundleresource/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,5 +1,9 @@
 Apache Sling Bundle Resource Provider
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
+
+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/sling/core/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/NOTICE (original)
+++ incubator/sling/trunk/sling/core/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,8 +1,9 @@
-Apache Sling
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Sling Core
+Copyright 2007-2008 The Apache Software Foundation
 
 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/sling/event/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/NOTICE (original)
+++ incubator/sling/trunk/sling/event/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,26 +1,9 @@
 Apache Sling Threads
 Copyright 2007-2008 The Apache Software Foundation
 
-
-I. Included Software
+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.
-
-
-II. Used Software
-
-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.
-
-This product uses software developed at
-slf4j (http://www.sl4j.org)
-Licensed under the MIT License.
-
-
-III. License Summary
-- Apache License 2.0
-- MIT License
\ No newline at end of file

Modified: incubator/sling/trunk/sling/httpauth/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/httpauth/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/httpauth/NOTICE (original)
+++ incubator/sling/trunk/sling/httpauth/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,5 +1,6 @@
 Apache Sling HTTP Header Authentication
-Copyright 2007 The Apache Software Foundation
+Copyright 2008 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.

Added: incubator/sling/trunk/sling/i18n/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/i18n/NOTICE?rev=647863&view=auto
==============================================================================
--- incubator/sling/trunk/sling/i18n/NOTICE (added)
+++ incubator/sling/trunk/sling/i18n/NOTICE Mon Apr 14 08:52:14 2008
@@ -0,0 +1,6 @@
+Apache Sling I18N
+Copyright 2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.

Propchange: incubator/sling/trunk/sling/i18n/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/sling/sample/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/sample/NOTICE (original)
+++ incubator/sling/trunk/sling/sample/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,5 +1,6 @@
 Apache Sling Sample
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.

Added: incubator/sling/trunk/sling/scheduler/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/NOTICE?rev=647863&view=auto
==============================================================================
--- incubator/sling/trunk/sling/scheduler/NOTICE (added)
+++ incubator/sling/trunk/sling/scheduler/NOTICE Mon Apr 14 08:52:14 2008
@@ -0,0 +1,13 @@
+Apache Sling Scheduler
+Copyright 2007-2008 The Apache Software Foundation
+
+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.
+
+This product includes software developed at
+Opensymphony (http://www.opensymphony.org/quartz).
+Licensed under the Apache License 2.0.

Propchange: incubator/sling/trunk/sling/scheduler/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/sling/servlet-resolver/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/NOTICE (original)
+++ incubator/sling/trunk/sling/servlet-resolver/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,5 +1,9 @@
 Apache Sling Servlet Resolver
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
+
+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.

Added: incubator/sling/trunk/sling/servlets-default/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-default/NOTICE?rev=647863&view=auto
==============================================================================
--- incubator/sling/trunk/sling/servlets-default/NOTICE (added)
+++ incubator/sling/trunk/sling/servlets-default/NOTICE Mon Apr 14 08:52:14 2008
@@ -0,0 +1,9 @@
+Apache Sling Default Get Servlets
+Copyright 2007-2008 The Apache Software Foundation
+
+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.

Propchange: incubator/sling/trunk/sling/servlets-default/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/sling/servlets-post/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-post/NOTICE?rev=647863&view=auto
==============================================================================
--- incubator/sling/trunk/sling/servlets-post/NOTICE (added)
+++ incubator/sling/trunk/sling/servlets-post/NOTICE Mon Apr 14 08:52:14 2008
@@ -0,0 +1,9 @@
+Apache Sling Default Post Servlets
+Copyright 2007-2008 The Apache Software Foundation
+
+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.

Propchange: incubator/sling/trunk/sling/servlets-post/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/sling/threads/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/threads/NOTICE?rev=647863&r1=647862&r2=647863&view=diff
==============================================================================
--- incubator/sling/trunk/sling/threads/NOTICE (original)
+++ incubator/sling/trunk/sling/threads/NOTICE Mon Apr 14 08:52:14 2008
@@ -1,26 +1,6 @@
 Apache Sling Threads
 Copyright 2007-2008 The Apache Software Foundation
 
-
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-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.
-
-This product uses software developed at
-slf4j (http://www.sl4j.org)
-Licensed under the MIT License.
-
-
-III. License Summary
-- Apache License 2.0
-- MIT License
\ No newline at end of file