incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r662766 - 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 Tue, 03 Jun 2008 12:24:28 GMT
Author: bdelacretaz
Date: Tue Jun  3 05:24:26 2008
New Revision: 662766

URL: http://svn.apache.org/viewvc?rev=662766&view=rev
Log:
SLING-495 - NOTICE files generated using mknotice script

Added:
    incubator/sling/trunk/extensions/dojo-sling/module.notice.txt   (with props)
    incubator/sling/trunk/extensions/dojo/module.notice.txt   (with props)
    incubator/sling/trunk/launchpad/webapp/module.notice.txt   (with props)
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/NOTICE
    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=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/NOTICE (original)
+++ incubator/sling/trunk/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,76 @@
-Sling JCR-based applications framework
-Copyright 2007-2008 The Apache Software Foundation.
+Apache Sling (Parent)
+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.
+
+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 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 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 . 
+
+This product includes software developed at http://slf4j.org, distributed
+under the slf4j MIT-like license (http://slf4j.org/license.html). 
 
-See http://www.apache.org/legal/3party.html for the 
-ASF third-party licenses policy.
+This software contains code written by Ryan Ackley.
+Please go to http://www.textmining.org for the latest version. 
 
-See also the NOTICE files of the individual Sling modules.

Modified: incubator/sling/trunk/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/api/NOTICE (original)
+++ incubator/sling/trunk/api/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling API
+Apache Sling - Servlet Extension API
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,10 @@
 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). 
+

Modified: incubator/sling/trunk/commons/json/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/json/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/json/NOTICE (original)
+++ incubator/sling/trunk/commons/json/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JSON Library
+Apache Sling - Apache Sling JSON Library
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,9 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at http://json.org.
+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.
 

Modified: incubator/sling/trunk/commons/log/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/NOTICE (original)
+++ incubator/sling/trunk/commons/log/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling OSGi Log
+Apache Sling - OSGi LogService Implementation
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,9 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed by QOS (http://www.qos.ch)
-Copyright (c) 2004-2007 QOS.ch
\ No newline at end of file
+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). 
+

Modified: incubator/sling/trunk/commons/mime/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/mime/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/mime/NOTICE (original)
+++ incubator/sling/trunk/commons/mime/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Mime Library
+Apache Sling - MIME type mapping support
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,7 @@
 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.
+

Modified: incubator/sling/trunk/commons/osgi/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/NOTICE (original)
+++ incubator/sling/trunk/commons/osgi/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Commons OSGi
+Apache Sling - Commons OSGi support
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,7 @@
 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.
+

Modified: incubator/sling/trunk/commons/scheduler/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/NOTICE (original)
+++ incubator/sling/trunk/commons/scheduler/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Commons Scheduler
+Apache Sling - Scheduler Support
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,6 +8,15 @@
 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.
+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). 
+

Modified: incubator/sling/trunk/commons/testing/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/testing/NOTICE (original)
+++ incubator/sling/trunk/commons/testing/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Testing Utilities
+Apache Sling - testing utilities
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,35 @@
 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. 
+

Modified: incubator/sling/trunk/commons/threads/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/commons/threads/NOTICE (original)
+++ incubator/sling/trunk/commons/threads/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,16 @@
-Apache Sling Threads
+Apache Sling - Thread Support
 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.
+
+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). 
+

Modified: incubator/sling/trunk/engine/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/engine/NOTICE (original)
+++ incubator/sling/trunk/engine/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Engine
+Apache Sling - Engine Implementation
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/extensions/adapter/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/adapter/NOTICE (original)
+++ incubator/sling/trunk/extensions/adapter/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Adapter Manager
+Apache Sling - AdapterManager implementation
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,10 @@
 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). 
+

Modified: incubator/sling/trunk/extensions/apt/parser/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/parser/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/parser/NOTICE (original)
+++ incubator/sling/trunk/extensions/apt/parser/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,5 +1,5 @@
-Apache Sling APT Parser
-Copyright 2008 The Apache Software Foundation
+Apache Sling - APT parser
+Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -7,3 +7,10 @@
 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.
+

Modified: incubator/sling/trunk/extensions/apt/servlet/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/servlet/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/servlet/NOTICE (original)
+++ incubator/sling/trunk/extensions/apt/servlet/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,5 +1,5 @@
-Apache Sling APT Servlet
-Copyright 2008 The Apache Software Foundation
+Apache Sling - APT servlet
+Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -7,3 +7,10 @@
 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.
+

Modified: incubator/sling/trunk/extensions/bundleresource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/bundleresource/NOTICE (original)
+++ incubator/sling/trunk/extensions/bundleresource/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Bundle Resource Provider
+Apache Sling - Bundle Resource Provider
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/extensions/dojo-sling/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo-sling/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo-sling/NOTICE (original)
+++ incubator/sling/trunk/extensions/dojo-sling/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,9 +1,15 @@
-Apache Sling Dojo JavaScript Library
+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/).
+
 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/).

Added: 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=662766&view=auto
==============================================================================
--- incubator/sling/trunk/extensions/dojo-sling/module.notice.txt (added)
+++ incubator/sling/trunk/extensions/dojo-sling/module.notice.txt Tue Jun  3 05:24:26 2008
@@ -0,0 +1,2 @@
+This product includes software developed at
+The Dojo Foundation (http://www.dojotoolkit.org/).

Propchange: incubator/sling/trunk/extensions/dojo-sling/module.notice.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/extensions/dojo/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/dojo/NOTICE (original)
+++ incubator/sling/trunk/extensions/dojo/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,11 +1,15 @@
-Apache Sling Dojo JavaScript Library
+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/).
+
 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/).
-
-

Added: incubator/sling/trunk/extensions/dojo/module.notice.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/dojo/module.notice.txt?rev=662766&view=auto
==============================================================================
--- incubator/sling/trunk/extensions/dojo/module.notice.txt (added)
+++ incubator/sling/trunk/extensions/dojo/module.notice.txt Tue Jun  3 05:24:26 2008
@@ -0,0 +1,2 @@
+This product includes software developed at
+The Dojo Foundation (http://www.dojotoolkit.org/).

Propchange: incubator/sling/trunk/extensions/dojo/module.notice.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/extensions/event/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/NOTICE (original)
+++ incubator/sling/trunk/extensions/event/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Threads
+Apache Sling - Event Support
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,19 @@
 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.
+
+This product includes software developed at http://slf4j.org, distributed
+under the slf4j MIT-like license (http://slf4j.org/license.html). 
+

Modified: incubator/sling/trunk/extensions/httpauth/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/httpauth/NOTICE (original)
+++ incubator/sling/trunk/extensions/httpauth/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,19 @@
-Apache Sling HTTP Header Authentication
-Copyright 2008 The Apache Software Foundation
+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/).
 
 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). 
+

Modified: incubator/sling/trunk/extensions/i18n/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/i18n/NOTICE (original)
+++ incubator/sling/trunk/extensions/i18n/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,19 @@
-Apache Sling I18N
-Copyright 2008 The Apache Software Foundation
+Apache Sling - Internationalization Support
+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.
+
+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). 
+

Modified: incubator/sling/trunk/jcr/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/NOTICE (original)
+++ incubator/sling/trunk/jcr/api/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR API
+Apache Sling - Repository API Bundle
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,9 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed under the JCP from http://www.jcp.org.
-Copyright 2005 Day Management AG
+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.
+

Modified: incubator/sling/trunk/jcr/base/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/base/NOTICE (original)
+++ incubator/sling/trunk/jcr/base/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR Base Bundle
+Apache Sling - JCR Base Bundle
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/jcr/classloader/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/NOTICE (original)
+++ incubator/sling/trunk/jcr/classloader/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR Classloader
+Apache Sling - Repository ClassLoader
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/jcr/contentloader/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/contentloader/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/contentloader/NOTICE (original)
+++ incubator/sling/trunk/jcr/contentloader/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Initial Content Loader
+Apache Sling - Initial Content Loader
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,16 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software from http://kxml.sourceforge.net.
+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). 
+

Modified: incubator/sling/trunk/jcr/jackrabbit-api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-api/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-api/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-api/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR API
+Apache Sling - Jackrabbit API Bundle
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed under the JCP from http://www.jcp.org.
-Copyright 2005 Day Management AG
+See http://www.apache.org/legal/3party.html for the ASF policy on 
+third-party licenses.
+

Modified: incubator/sling/trunk/jcr/jackrabbit-client/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR Jackrabbit Client
+Apache Sling - Repository Accessor
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/jcr/jackrabbit-server/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JCR Jackrabbit Server
+Apache Sling - Jackrabbit Embedded Repository
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,7 +8,27 @@
 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. 
 
-TODO TODO TODO TODO TODO TODO TODO
-Add License information on enclosed libraries !!
-TODO TODO TODO TODO TODO TODO TODO

Modified: incubator/sling/trunk/jcr/ocm/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/NOTICE (original)
+++ incubator/sling/trunk/jcr/ocm/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Object Content Mapping
+Apache Sling - Object Content Mapping
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -8,5 +8,23 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software from http://kxml.sourceforge.net.
+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). 
+

Modified: incubator/sling/trunk/jcr/resource/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/NOTICE (original)
+++ incubator/sling/trunk/jcr/resource/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Resource Resolver and Initial Content Loader
+Apache Sling - Resource Resolver
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/jcr/webdav/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/NOTICE (original)
+++ incubator/sling/trunk/jcr/webdav/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,5 +1,5 @@
-Apache Sling WebDAV
-Copyright 2008 The Apache Software Foundation
+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/).
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/launchpad/app/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/NOTICE (original)
+++ incubator/sling/trunk/launchpad/app/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Launchpad Application
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -16,100 +11,54 @@
 See http://www.apache.org/legal/3party.html for the ASF policy on 
 third-party licenses.
 
-------------------------------------------------------------------------------
-ASM notice
-------------------------------------------------------------------------------
 This product includes ASM software developed at asm.objectweb.org, distributed
 under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
 
-
-------------------------------------------------------------------------------
-CGLIB notice
-------------------------------------------------------------------------------
 This product includes CGLIB software developed at cglib.sourceforge.net,
 distributed under the Apache Software License 
 (http://sourceforge.net/projects/cglib).
 
-
-------------------------------------------------------------------------------
-Codehaus notice
-------------------------------------------------------------------------------
 This product includes software developed at codehaus.org, under BSD-like 
 license.
-------------------------------------------------------------------------------
-Concurrent library notice
-------------------------------------------------------------------------------
+
 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, used with permission see
+code which is used with permission, see
 http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
 
-------------------------------------------------------------------------------
-Jetty notice
-------------------------------------------------------------------------------
+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.
-------------------------------------------------------------------------------
-JSON notice
-------------------------------------------------------------------------------
+
 This product includes software developed at json.org, under BSD-like json.org
 license, see http://www.json.org/license.html .
-------------------------------------------------------------------------------
-JUnit notice
-------------------------------------------------------------------------------
+
 This product includes software developed at junit.org, distributed under CPL 
 license (http://sourceforge.net/projects/junit/).
 
-CPL is a reciprocal license, but this product uses that software in binary 
-form only, without modifications.
-
+This product includes kXML2 software developed at 
+http://kxml.sourceforge.net/, under BSD license. 
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
 
-------------------------------------------------------------------------------
-kXML2 notice
-------------------------------------------------------------------------------
-This product includes kXML2 software developed at http://kxml.sourceforge.net/, 
-under BSD license.
-------------------------------------------------------------------------------
-CyberNeko notice
-------------------------------------------------------------------------------
 This product includes CyberNeko software developed at
 http://sourceforge.net/projects/nekohtml, under Apache License. 
-------------------------------------------------------------------------------
-Pax notice
-------------------------------------------------------------------------------
+
 This product includes Pax software developed at ops4j.org, under Apache
 License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-------------------------------------------------------------------------------
-PDFBox notice
-------------------------------------------------------------------------------
+
 This product includes software developed at pdfbox.org, www.pdfbox.org, under 
 Apache License.
-------------------------------------------------------------------------------
-Rhino notice
-------------------------------------------------------------------------------
+
 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 .
-
-MPL (http://www.mozilla.org/MPL/) is a reciprocal license, but this product 
-uses that software in binary form only, without modifications.
+see http://developer.mozilla.org/en/docs/Rhino_License . 
 
-
-------------------------------------------------------------------------------
-slf4j notice
-------------------------------------------------------------------------------
 This product includes software developed at http://slf4j.org, distributed
 under the slf4j MIT-like license (http://slf4j.org/license.html). 
 
-
-------------------------------------------------------------------------------
-Textmining notice
-------------------------------------------------------------------------------
-Although the latest tm-extractors software is under LGPL license, it 
-seems like the version 0.4 that we're using is under the BSD-like license
-found at http://www.searchblox.com/TEXT_MINING_license.html.
-
-TODO: verify this, and find a workaround if needed (SLING-494).
+This software contains code written by Ryan Ackley.
+Please go to http://www.textmining.org for the latest version. 
 

Modified: incubator/sling/trunk/launchpad/base/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/NOTICE (original)
+++ incubator/sling/trunk/launchpad/base/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Launchpad Base
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -16,13 +11,6 @@
 See http://www.apache.org/legal/3party.html for the ASF policy on 
 third-party licenses.
 
-------------------------------------------------------------------------------
-Equinox notice
-------------------------------------------------------------------------------
 This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license.
-
-EPL (http://www.eclipse.org/legal/epl-v10.html) is a reciprocal license, but 
-this product uses that software in binary form only, without modifications.
-
+distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
 

Modified: incubator/sling/trunk/launchpad/content/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/content/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/content/NOTICE (original)
+++ incubator/sling/trunk/launchpad/content/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Launchpad Content
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 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=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/jcrapp/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Launchpad Application
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -16,69 +11,37 @@
 See http://www.apache.org/legal/3party.html for the ASF policy on 
 third-party licenses.
 
-------------------------------------------------------------------------------
-Concurrent library notice
-------------------------------------------------------------------------------
 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, used with permission see
+code which is used with permission, see
 http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
 
-------------------------------------------------------------------------------
-Jetty notice
-------------------------------------------------------------------------------
+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.
-------------------------------------------------------------------------------
-JSON notice
-------------------------------------------------------------------------------
+
 This product includes software developed at json.org, under BSD-like json.org
 license, see http://www.json.org/license.html .
-------------------------------------------------------------------------------
-JUnit notice
-------------------------------------------------------------------------------
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
-
-CPL is a reciprocal license, but this product uses that software in binary 
-form only, without modifications.
-
-
-------------------------------------------------------------------------------
-kXML2 notice
-------------------------------------------------------------------------------
-This product includes kXML2 software developed at http://kxml.sourceforge.net/, 
-under BSD license.
-------------------------------------------------------------------------------
-CyberNeko notice
-------------------------------------------------------------------------------
+
+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. 
-------------------------------------------------------------------------------
-Pax notice
-------------------------------------------------------------------------------
+
 This product includes Pax software developed at ops4j.org, under Apache
 License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
-------------------------------------------------------------------------------
-PDFBox notice
-------------------------------------------------------------------------------
+
 This product includes software developed at pdfbox.org, www.pdfbox.org, under 
 Apache License.
-------------------------------------------------------------------------------
-slf4j notice
-------------------------------------------------------------------------------
+
 This product includes software developed at http://slf4j.org, distributed
 under the slf4j MIT-like license (http://slf4j.org/license.html). 
 
-
-------------------------------------------------------------------------------
-Textmining notice
-------------------------------------------------------------------------------
-Although the latest tm-extractors software is under LGPL license, it 
-seems like the version 0.4 that we're using is under the BSD-like license
-found at http://www.searchblox.com/TEXT_MINING_license.html.
-
-TODO: verify this, and find a workaround if needed (SLING-494).
+This software contains code written by Ryan Ackley.
+Please go to http://www.textmining.org for the latest version. 
 

Modified: incubator/sling/trunk/launchpad/webapp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/webapp/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Launchpad Web Application
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -16,41 +11,56 @@
 See http://www.apache.org/legal/3party.html for the ASF policy on 
 third-party licenses.
 
-------------------------------------------------------------------------------
-Equinox notice
-------------------------------------------------------------------------------
 This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license.
+distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
 
-EPL (http://www.eclipse.org/legal/epl-v10.html) is a reciprocal license, but 
-this product uses that software in binary form only, without modifications.
+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). 
 
-------------------------------------------------------------------------------
-JUnit notice
-------------------------------------------------------------------------------
-This product includes software developed at junit.org, distributed under CPL 
-license (http://sourceforge.net/projects/junit/).
+This product includes ASM software developed at asm.objectweb.org, distributed
+under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
 
-CPL is a reciprocal license, but this product uses that software in binary 
-form only, without modifications.
+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.
 
-------------------------------------------------------------------------------
-Rhino notice
-------------------------------------------------------------------------------
-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 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 .
 
-MPL (http://www.mozilla.org/MPL/) is a reciprocal license, but this product 
-uses that software in binary form only, without modifications.
+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 . 
 
-------------------------------------------------------------------------------
-slf4j notice
-------------------------------------------------------------------------------
 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. 

Added: incubator/sling/trunk/launchpad/webapp/module.notice.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/module.notice.txt?rev=662766&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/module.notice.txt (added)
+++ incubator/sling/trunk/launchpad/webapp/module.notice.txt Tue Jun  3 05:24:26 2008
@@ -0,0 +1,44 @@
+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). 
+
+This software contains code written by Ryan Ackley.
+Please go to http://www.textmining.org for the latest version. 

Propchange: incubator/sling/trunk/launchpad/webapp/module.notice.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-jcrocm-plugin/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,23 +1,19 @@
-Apache Sling Maven JCROCM Plugin
+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/).
 
-
-I. Included Software
-
 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.
 
-II. Used Software
-
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
+This product includes software developed at codehaus.org, under BSD-like 
+license.
 
+This product includes software developed at qdox.codehaus.org, under 
+Apache License.
 
-III. License Summary
-- Apache License 2.0

Modified: incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-jspc-plugin/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,24 +1,22 @@
-Apache Sling JSP Compiler Maven Plugin
+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/).
 
-
-I. Included Software
-
 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.
 
-II. Used Software
+This product includes software developed at codehaus.org, under BSD-like 
+license.
 
-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 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). 
 
-III. License Summary
-- Apache License 2.0

Modified: incubator/sling/trunk/maven/maven-sling-plugin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/NOTICE (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,24 +1,16 @@
-Apache Sling Maven Plugin
+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/).
 
-
-I. Included Software
-
 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.
 
-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 includes software developed at codehaus.org, under BSD-like 
+license.
 
-III. License Summary
-- Apache License 2.0

Modified: incubator/sling/trunk/osgi/obr/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/NOTICE (original)
+++ incubator/sling/trunk/osgi/obr/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling OSGi Commons
+Apache Sling - OSGi Bundle Repository
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,17 @@
 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). 
+

Modified: incubator/sling/trunk/parent/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/parent/NOTICE (original)
+++ incubator/sling/trunk/parent/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Parent Pom
+Apache Sling (Parent)
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,7 @@
 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.
+

Modified: incubator/sling/trunk/samples/path-based-rtp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/path-based-rtp/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/samples/path-based-rtp/NOTICE (original)
+++ incubator/sling/trunk/samples/path-based-rtp/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Samples Path Based RTP
+Apache Sling - Sample Path Based Resource Type Provider
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/samples/simple-demo/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/simple-demo/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/samples/simple-demo/NOTICE (original)
+++ incubator/sling/trunk/samples/simple-demo/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,30 @@
-Apache Sling Sample
+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/).
+
 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). 
+

Modified: incubator/sling/trunk/samples/webloader/service/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/webloader/service/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/samples/webloader/service/NOTICE (original)
+++ incubator/sling/trunk/samples/webloader/service/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,19 @@
-Apache Sling Webloader Sample Service
-Copyright 2008 The Apache Software Foundation
+Apache Sling - Webloader Service
+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.
+
+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). 
+

Modified: incubator/sling/trunk/samples/webloader/ui/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/webloader/ui/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/samples/webloader/ui/NOTICE (original)
+++ incubator/sling/trunk/samples/webloader/ui/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,13 @@
-Apache Sling Webloader Sample Service UI
-Copyright 2008 The Apache Software Foundation
+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/).
 
 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.
+

Modified: incubator/sling/trunk/scripting/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/api/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/api/NOTICE (original)
+++ incubator/sling/trunk/scripting/api/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Scripting API
+Apache Sling - Scripting Implementation API
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,10 @@
 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). 
+

Modified: incubator/sling/trunk/scripting/core/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/NOTICE (original)
+++ incubator/sling/trunk/scripting/core/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Script Resolver
+Apache Sling - Scripting Core implementation
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,16 @@
 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). 
+

Modified: incubator/sling/trunk/scripting/freemarker/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/freemarker/NOTICE (original)
+++ incubator/sling/trunk/scripting/freemarker/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,19 @@
-Apache Sling FreeMarker Scripting Support
+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/).
+
 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 by
-the Visigoth Software Society (http://www.visigoths.org/).
+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). 
 

Modified: incubator/sling/trunk/scripting/javascript/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/NOTICE (original)
+++ incubator/sling/trunk/scripting/javascript/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,9 +1,23 @@
-Apache Sling JavaScript (Rhino) Scripting Support
+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/).
+
 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
-mozilla.org (http://www.mozilla.org/).
+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). 
+

Modified: incubator/sling/trunk/scripting/jsp-taglib/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp-taglib/NOTICE (original)
+++ incubator/sling/trunk/scripting/jsp-taglib/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JSP Taglib
+Apache Sling - Scripting - JSP Support, Core Tag Library
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/scripting/jsp/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/NOTICE (original)
+++ incubator/sling/trunk/scripting/jsp/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling JSP Scripting
+Apache Sling - Scripting - JSP Support
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/scripting/jst/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jst/NOTICE (original)
+++ incubator/sling/trunk/scripting/jst/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,23 @@
-Apache Sling JST Scripting
+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/).
+
 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). 
+

Modified: incubator/sling/trunk/scripting/ruby/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/NOTICE (original)
+++ incubator/sling/trunk/scripting/ruby/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,10 +1,5 @@
-------------------------------------------------------------------------------
 Apache Sling - Scripting - Ruby Support
 Copyright 2007-2008 The Apache Software Foundation
-------------------------------------------------------------------------------
-Do not edit this NOTICE file directly, it is generated from the scripts
-found under etc/notice - see the scripts there for more info.
-------------------------------------------------------------------------------
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
@@ -16,11 +11,7 @@
 See http://www.apache.org/legal/3party.html for the ASF policy on 
 third-party licenses.
 
-------------------------------------------------------------------------------
-Codehaus JRuby notice
-------------------------------------------------------------------------------
 This product includes software developed at jruby.codehaus.org, distributed 
-under a tri-license (CPL/GPL/LGPL).
+under a tri-license (CPL/GPL/LGPL). CPL is a reciprocal license, but this 
+product uses it in binary form only, with no modifications.
 
-CPL is a reciprocal license, but this product uses it in binary form only,
-with no modifications.

Modified: incubator/sling/trunk/scripting/velocity/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/velocity/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/velocity/NOTICE (original)
+++ incubator/sling/trunk/scripting/velocity/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,6 +1,16 @@
-Apache Sling Velocity Scripting Support
+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/).
+
 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.
+

Modified: incubator/sling/trunk/servlets/get/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/get/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/get/NOTICE (original)
+++ incubator/sling/trunk/servlets/get/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Default Get Servlets
+Apache Sling - Default GET Servlets
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/servlets/post/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/post/NOTICE (original)
+++ incubator/sling/trunk/servlets/post/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Default Post Servlets
+Apache Sling - Default POST Servlets
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+

Modified: incubator/sling/trunk/servlets/resolver/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/NOTICE?rev=662766&r1=662765&r2=662766&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/NOTICE (original)
+++ incubator/sling/trunk/servlets/resolver/NOTICE Tue Jun  3 05:24:26 2008
@@ -1,4 +1,4 @@
-Apache Sling Servlet Resolver
+Apache Sling - Servlet Resolver
 Copyright 2007-2008 The Apache Software Foundation
 
 Based on source code originally developed by
@@ -7,3 +7,13 @@
 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). 
+



Mime
View raw message