incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r663025 - in /incubator/sling/trunk: ./ api/ commons/json/ commons/log/ commons/mime/ commons/osgi/ commons/scheduler/ commons/testing/ commons/threads/ engine/ extensions/adapter/ extensions/apt/parser/ extensions/apt/servlet/ extensions/b...
Date Wed, 04 Jun 2008 08:05:22 GMT
Author: bdelacretaz
Date: Wed Jun  4 01:05:20 2008
New Revision: 663025

URL: http://svn.apache.org/viewvc?rev=663025&view=rev
Log:
SLING-495 - NOTICE files updated according to changes in revision 662927

Removed:
    incubator/sling/trunk/launchpad/webapp/module.notice.txt
Modified:
    incubator/sling/trunk/NOTICE
    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/engine/NOTICE
    incubator/sling/trunk/extensions/adapter/NOTICE
    incubator/sling/trunk/extensions/apt/parser/NOTICE
    incubator/sling/trunk/extensions/apt/servlet/NOTICE
    incubator/sling/trunk/extensions/bundleresource/NOTICE
    incubator/sling/trunk/extensions/dojo-sling/NOTICE
    incubator/sling/trunk/extensions/dojo-sling/module.notice.txt
    incubator/sling/trunk/extensions/dojo/NOTICE
    incubator/sling/trunk/extensions/dojo/module.notice.txt
    incubator/sling/trunk/extensions/event/NOTICE
    incubator/sling/trunk/extensions/httpauth/NOTICE
    incubator/sling/trunk/extensions/i18n/NOTICE
    incubator/sling/trunk/jcr/api/NOTICE
    incubator/sling/trunk/jcr/base/NOTICE
    incubator/sling/trunk/jcr/classloader/NOTICE
    incubator/sling/trunk/jcr/contentloader/NOTICE
    incubator/sling/trunk/jcr/jackrabbit-api/NOTICE
    incubator/sling/trunk/jcr/jackrabbit-client/NOTICE
    incubator/sling/trunk/jcr/jackrabbit-server/NOTICE
    incubator/sling/trunk/jcr/ocm/NOTICE
    incubator/sling/trunk/jcr/resource/NOTICE
    incubator/sling/trunk/jcr/webdav/NOTICE
    incubator/sling/trunk/launchpad/app/NOTICE
    incubator/sling/trunk/launchpad/base/NOTICE
    incubator/sling/trunk/launchpad/content/NOTICE
    incubator/sling/trunk/launchpad/jcrapp/NOTICE
    incubator/sling/trunk/launchpad/webapp/NOTICE
    incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE
    incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE
    incubator/sling/trunk/maven/maven-sling-plugin/NOTICE
    incubator/sling/trunk/osgi/obr/NOTICE
    incubator/sling/trunk/parent/NOTICE
    incubator/sling/trunk/samples/path-based-rtp/NOTICE
    incubator/sling/trunk/samples/simple-demo/NOTICE
    incubator/sling/trunk/samples/webloader/service/NOTICE
    incubator/sling/trunk/samples/webloader/ui/NOTICE
    incubator/sling/trunk/scripting/api/NOTICE
    incubator/sling/trunk/scripting/core/NOTICE
    incubator/sling/trunk/scripting/freemarker/NOTICE
    incubator/sling/trunk/scripting/javascript/NOTICE
    incubator/sling/trunk/scripting/jsp-taglib/NOTICE
    incubator/sling/trunk/scripting/jsp/NOTICE
    incubator/sling/trunk/scripting/jst/NOTICE
    incubator/sling/trunk/scripting/ruby/NOTICE
    incubator/sling/trunk/scripting/velocity/NOTICE
    incubator/sling/trunk/servlets/get/NOTICE
    incubator/sling/trunk/servlets/post/NOTICE
    incubator/sling/trunk/servlets/resolver/NOTICE

Modified: incubator/sling/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/NOTICE (original)
+++ incubator/sling/trunk/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,76 +1,46 @@
 Apache Sling (Parent)
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes ASM software developed at asm.objectweb.org, distributed
-under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License 
-(http://sourceforge.net/projects/cglib).
+==============================================================
+ Jetty Web Container 
+ Copyright 1995-2006 Mort Bay Consulting Pty Ltd
+==============================================================
 
-This product includes software developed at codehaus.org, under BSD-like 
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is licensed under the apache 2.0
 license.
 
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes Jetty software developed at mortbay.org, under Apache
-License.
-
-This product includes software developed at json.org, under BSD-like json.org
-license, see http://www.json.org/license.html .
-
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software developed at http://mx4j.sourceforge.net/, 
-http://kxml.sourceforge.net/, under Apache License.
-
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes software developed at Opensymphony 
-(http://www.opensymphony.org/quartz). Licensed under the Apache License 2.0.
-
-This product includes Pax software developed at ops4j.org, under Apache
-License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes software developed at qdox.codehaus.org, under 
-Apache License.
-
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
+The javax.servlet package used by Jetty is copyright 
+Sun Microsystems, Inc and Apache Software Foundation. It is 
+distributed under the Common Development and Distribution License.
+You can obtain a copy of the license at 
+https://glassfish.dev.java.net/public/CDDLv1.0.html.
+
+The UnixCrypt.java code ~Implements the one way cryptography used by
+Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
+modified April 2001  by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt 
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
+
+The default JSP implementation is provided by the Glassfish JSP engine
+from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
+Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
+
+Some portions of the code are Copyright:
+  2006 Tim Vernum 
+  1999 Jason Gilbert.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+The jboss integration module contains some LGPL code.
 
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 
+This product includes software developed by the
+MX4J project (http://mx4j.sourceforge.net).
 

Modified: incubator/sling/trunk/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/api/NOTICE (original)
+++ incubator/sling/trunk/api/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Servlet Extension API
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/commons/json/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/json/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/json/NOTICE (original)
+++ incubator/sling/trunk/commons/json/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Apache Sling JSON Library
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/commons/log/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/NOTICE (original)
+++ incubator/sling/trunk/commons/log/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - OSGi LogService Implementation
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/commons/mime/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/mime/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/mime/NOTICE (original)
+++ incubator/sling/trunk/commons/mime/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling - MIME type mapping support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/commons/osgi/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/NOTICE (original)
+++ incubator/sling/trunk/commons/osgi/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling - Commons OSGi support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/commons/scheduler/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/NOTICE (original)
+++ incubator/sling/trunk/commons/scheduler/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,22 +1,13 @@
 Apache Sling - Scheduler Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed at http://mx4j.sourceforge.net/, 
-http://kxml.sourceforge.net/, under Apache License.
 
-This product includes software developed at Opensymphony 
-(http://www.opensymphony.org/quartz). Licensed under the Apache License 2.0.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
+This product includes software developed by the
+MX4J project (http://mx4j.sourceforge.net).
 

Modified: incubator/sling/trunk/commons/testing/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/testing/NOTICE (original)
+++ incubator/sling/trunk/commons/testing/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,41 +1,11 @@
 Apache Sling - testing utilities
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
 
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
-
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/commons/threads/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/commons/threads/NOTICE (original)
+++ incubator/sling/trunk/commons/threads/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Thread Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/engine/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/engine/NOTICE (original)
+++ incubator/sling/trunk/engine/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Engine Implementation
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/adapter/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/adapter/NOTICE (original)
+++ incubator/sling/trunk/extensions/adapter/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - AdapterManager implementation
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/apt/parser/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/parser/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/parser/NOTICE (original)
+++ incubator/sling/trunk/extensions/apt/parser/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - APT parser
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at codehaus.org, under BSD-like 
-license.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/apt/servlet/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/servlet/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/servlet/NOTICE (original)
+++ incubator/sling/trunk/extensions/apt/servlet/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - APT servlet
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at codehaus.org, under BSD-like 
-license.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/bundleresource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/bundleresource/NOTICE (original)
+++ incubator/sling/trunk/extensions/bundleresource/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Bundle Resource Provider
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/dojo-sling/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo-sling/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo-sling/NOTICE (original)
+++ incubator/sling/trunk/extensions/dojo-sling/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,15 +1,10 @@
 Apache Sling - Dojo Data Exension
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at
-The Dojo Foundation (http://www.dojotoolkit.org/).
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/extensions/dojo-sling/module.notice.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo-sling/module.notice.txt?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo-sling/module.notice.txt (original)
+++ incubator/sling/trunk/extensions/dojo-sling/module.notice.txt Wed Jun  4 01:05:20 2008
@@ -1,2 +1,3 @@
-This product includes software developed at
-The Dojo Foundation (http://www.dojotoolkit.org/).
+# This file lists additional dependencies that must
+# be used to generate the NOTICE file
+dojo:dojo-release

Modified: incubator/sling/trunk/extensions/dojo/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo/NOTICE (original)
+++ incubator/sling/trunk/extensions/dojo/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,15 +1,10 @@
 Apache Sling - Dojo JavaScript Library
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at
-The Dojo Foundation (http://www.dojotoolkit.org/).
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/extensions/dojo/module.notice.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo/module.notice.txt?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo/module.notice.txt (original)
+++ incubator/sling/trunk/extensions/dojo/module.notice.txt Wed Jun  4 01:05:20 2008
@@ -1,2 +1,3 @@
-This product includes software developed at
-The Dojo Foundation (http://www.dojotoolkit.org/).
+# This file lists additional dependencies that must
+# be used to generate the NOTICE file
+dojo:dojo-release

Modified: incubator/sling/trunk/extensions/event/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/NOTICE (original)
+++ incubator/sling/trunk/extensions/event/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,25 +1,14 @@
 Apache Sling - Event Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes software developed at http://mx4j.sourceforge.net/, 
-http://kxml.sourceforge.net/, under Apache License.
-
-This product includes software developed at Opensymphony 
-(http://www.opensymphony.org/quartz). Licensed under the Apache License 2.0.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+This product includes software developed by the
+MX4J project (http://mx4j.sourceforge.net).
 

Modified: incubator/sling/trunk/extensions/httpauth/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/httpauth/NOTICE (original)
+++ incubator/sling/trunk/extensions/httpauth/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - HTTP Header Authentication
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/extensions/i18n/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/i18n/NOTICE (original)
+++ incubator/sling/trunk/extensions/i18n/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Internationalization Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/NOTICE (original)
+++ incubator/sling/trunk/jcr/api/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Repository API Bundle
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/base/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/base/NOTICE (original)
+++ incubator/sling/trunk/jcr/base/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - JCR Base Bundle
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/classloader/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/NOTICE (original)
+++ incubator/sling/trunk/jcr/classloader/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Repository ClassLoader
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/contentloader/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/contentloader/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/contentloader/NOTICE (original)
+++ incubator/sling/trunk/jcr/contentloader/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,23 +1,11 @@
 Apache Sling - Initial Content Loader
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/jackrabbit-api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-api/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-api/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-api/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling - Jackrabbit API Bundle
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/jcr/jackrabbit-client/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Repository Accessor
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/jackrabbit-server/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,34 +1,11 @@
 Apache Sling - Jackrabbit Embedded Repository
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
-
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/ocm/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/NOTICE (original)
+++ incubator/sling/trunk/jcr/ocm/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,30 +1,11 @@
 Apache Sling - Object Content Mapping
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes ASM software developed at asm.objectweb.org, distributed
-under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
-
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License 
-(http://sourceforge.net/projects/cglib).
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/resource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/NOTICE (original)
+++ incubator/sling/trunk/jcr/resource/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Resource Resolver
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/jcr/webdav/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/NOTICE (original)
+++ incubator/sling/trunk/jcr/webdav/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Simple WebDAV Access to repositories
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/launchpad/app/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/NOTICE (original)
+++ incubator/sling/trunk/launchpad/app/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,64 +1,43 @@
 Apache Sling - Launchpad Application
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
 
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes ASM software developed at asm.objectweb.org, distributed
-under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License 
-(http://sourceforge.net/projects/cglib).
+==============================================================
+ Jetty Web Container 
+ Copyright 1995-2006 Mort Bay Consulting Pty Ltd
+==============================================================
 
-This product includes software developed at codehaus.org, under BSD-like 
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is licensed under the apache 2.0
 license.
 
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes Jetty software developed at mortbay.org, under Apache
-License.
-
-This product includes software developed at json.org, under BSD-like json.org
-license, see http://www.json.org/license.html .
-
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes Pax software developed at ops4j.org, under Apache
-License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+The javax.servlet package used by Jetty is copyright 
+Sun Microsystems, Inc and Apache Software Foundation. It is 
+distributed under the Common Development and Distribution License.
+You can obtain a copy of the license at 
+https://glassfish.dev.java.net/public/CDDLv1.0.html.
+
+The UnixCrypt.java code ~Implements the one way cryptography used by
+Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
+modified April 2001  by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt 
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
+
+The default JSP implementation is provided by the Glassfish JSP engine
+from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
+Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
+
+Some portions of the code are Copyright:
+  2006 Tim Vernum 
+  1999 Jason Gilbert.
 
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 
+The jboss integration module contains some LGPL code.
 

Modified: incubator/sling/trunk/launchpad/base/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/NOTICE (original)
+++ incubator/sling/trunk/launchpad/base/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Launchpad Base
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/launchpad/content/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/NOTICE (original)
+++ incubator/sling/trunk/launchpad/content/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling - Launchpad Content
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/launchpad/jcrapp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/jcrapp/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,47 +1,10 @@
-Apache Sling - Launchpad Application
-Copyright 2007-2008 The Apache Software Foundation
+Apache Sling - Launchpad Jackrabbit Server
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes Jetty software developed at mortbay.org, under Apache
-License.
-
-This product includes software developed at json.org, under BSD-like json.org
-license, see http://www.json.org/license.html .
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes Pax software developed at ops4j.org, under Apache
-License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
-
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/launchpad/webapp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/webapp/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,66 +1,11 @@
 Apache Sling - Launchpad Web Application
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
-
-This product includes ASM software developed at asm.objectweb.org, distributed
-under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
-
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License 
-(http://sourceforge.net/projects/cglib).
-
-This product includes software developed at codehaus.org, under BSD-like 
-license.
-
-This product includes concurrent library software developed by Doug Lea, 
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-That code is public domain and includes classes adapted from Sun JDK source
-code which is used with permission, see
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
 
-This product includes Jetty software developed at mortbay.org, under Apache
-License.
-
-This product includes software developed at json.org, under BSD-like json.org
-license, see http://www.json.org/license.html .
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License. 
-
-This product includes Pax software developed at ops4j.org, under Apache
-License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-
-This product includes software developed at pdfbox.org, www.pdfbox.org, under 
-Apache License.
-
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version. 

Modified: incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Maven Plugin to create Jackrabbit OCM descriptors
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at codehaus.org, under BSD-like 
-license.
-
-This product includes software developed at qdox.codehaus.org, under 
-Apache License.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,22 +1,11 @@
 Apache Sling - Maven Plugin for Compiling JSP Sources into Bundles
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed at codehaus.org, under BSD-like 
-license.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/maven/maven-sling-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Maven Plugin for Supporting Bundle Development
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at codehaus.org, under BSD-like 
-license.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/osgi/obr/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/NOTICE (original)
+++ incubator/sling/trunk/osgi/obr/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,23 +1,11 @@
 Apache Sling - OSGi Bundle Repository
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed at http://www.aqute.biz/Code/Bnd, 
-under Apache 2.0 License. 
 
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/parent/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/parent/NOTICE (original)
+++ incubator/sling/trunk/parent/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling (Parent)
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/samples/path-based-rtp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/path-based-rtp/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/samples/path-based-rtp/NOTICE (original)
+++ incubator/sling/trunk/samples/path-based-rtp/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Sample Path Based Resource Type Provider
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/samples/simple-demo/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/simple-demo/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/samples/simple-demo/NOTICE (original)
+++ incubator/sling/trunk/samples/simple-demo/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,30 +1,11 @@
 Apache Sling - Sample Apache Sling Application
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes ASM software developed at asm.objectweb.org, distributed
-under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
-
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License 
-(http://sourceforge.net/projects/cglib).
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes kXML2 software developed at 
-http://kxml.sourceforge.net/, under BSD license. 
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/samples/webloader/service/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/webloader/service/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/samples/webloader/service/NOTICE (original)
+++ incubator/sling/trunk/samples/webloader/service/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Webloader Service
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/samples/webloader/ui/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/webloader/ui/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/samples/webloader/ui/NOTICE (original)
+++ incubator/sling/trunk/samples/webloader/ui/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,13 +1,10 @@
 Apache Sling - Webloader User Interface
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
+Based on source code originally developed by
+Day Software (http://www.day.com/).

Modified: incubator/sling/trunk/scripting/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/api/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/api/NOTICE (original)
+++ incubator/sling/trunk/scripting/api/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Scripting Implementation API
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/core/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/NOTICE (original)
+++ incubator/sling/trunk/scripting/core/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,22 +1,11 @@
 Apache Sling - Scripting Core implementation
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/freemarker/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/freemarker/NOTICE (original)
+++ incubator/sling/trunk/scripting/freemarker/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,13 @@
 Apache Sling - Scripting - Freemarker Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes FreeMarker software developed by the Visigoth Software 
-Society (http://www.visigoths.org/), under a BSD-like license.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
+This product includes FreeMarker software developed by the
+Visigoth Software Society (http://www.visigoths.org/).
 

Modified: incubator/sling/trunk/scripting/javascript/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/NOTICE (original)
+++ incubator/sling/trunk/scripting/javascript/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,23 +1,11 @@
 Apache Sling - Scripting - JavaScript Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/jsp-taglib/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp-taglib/NOTICE (original)
+++ incubator/sling/trunk/scripting/jsp-taglib/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Scripting - JSP Support, Core Tag Library
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/jsp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/NOTICE (original)
+++ incubator/sling/trunk/scripting/jsp/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Scripting - JSP Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/jst/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jst/NOTICE (original)
+++ incubator/sling/trunk/scripting/jst/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,23 +1,11 @@
 Apache Sling - Scripting - JST Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
-
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
 
-This product includes Rhino software developed at mozilla.org 
-(http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License . 
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/ruby/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/NOTICE (original)
+++ incubator/sling/trunk/scripting/ruby/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,17 +1,11 @@
 Apache Sling - Scripting - Ruby Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed at jruby.codehaus.org, distributed 
-under a tri-license (CPL/GPL/LGPL). CPL is a reciprocal license, but this 
-product uses it in binary form only, with no modifications.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/scripting/velocity/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/velocity/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/velocity/NOTICE (original)
+++ incubator/sling/trunk/scripting/velocity/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,16 +1,11 @@
 Apache Sling - Scripting - Velocity Support
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/servlets/get/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/get/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/get/NOTICE (original)
+++ incubator/sling/trunk/servlets/get/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 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/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/servlets/post/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/post/NOTICE (original)
+++ incubator/sling/trunk/servlets/post/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 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/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 

Modified: incubator/sling/trunk/servlets/resolver/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/NOTICE?rev=663025&r1=663024&r2=663025&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/NOTICE (original)
+++ incubator/sling/trunk/servlets/resolver/NOTICE Wed Jun  4 01:05:20 2008
@@ -1,19 +1,11 @@
 Apache Sling - Servlet Resolver
-Copyright 2007-2008 The Apache Software Foundation
 
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+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.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on 
-third-party licenses.
 
-This product includes software developed under the JCP from 
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html). 
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 



Mime
View raw message