Author: fielding
Date: Tue Jun 3 16:56:19 2008
New Revision: 662927
URL: http://svn.apache.org/viewvc?rev=662927&view=rev
Log:
Correct the notice information. The farm tool needs to be changed
to ignore lines prefixed with '#'.
Note: we cannot redistribute Jetty under the terms here. If we
are only going to redistribute a portion of Jetty, then remove
the other parts from the Jetty notice file.
Modified:
incubator/sling/trunk/etc/notice/notices/asm.txt
incubator/sling/trunk/etc/notice/notices/bnd.txt
incubator/sling/trunk/etc/notice/notices/cglib.txt
incubator/sling/trunk/etc/notice/notices/codehaus.txt
incubator/sling/trunk/etc/notice/notices/concurrent.txt
incubator/sling/trunk/etc/notice/notices/equinox.txt
incubator/sling/trunk/etc/notice/notices/freemarker.txt
incubator/sling/trunk/etc/notice/notices/hamcrest.txt
incubator/sling/trunk/etc/notice/notices/jcr.txt
incubator/sling/trunk/etc/notice/notices/jetty.txt
incubator/sling/trunk/etc/notice/notices/jmock.txt
incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt
incubator/sling/trunk/etc/notice/notices/json.txt
incubator/sling/trunk/etc/notice/notices/junit.txt
incubator/sling/trunk/etc/notice/notices/kxml2.txt
incubator/sling/trunk/etc/notice/notices/mx4j.txt
incubator/sling/trunk/etc/notice/notices/nekohtml.txt
incubator/sling/trunk/etc/notice/notices/opensymphony.txt
incubator/sling/trunk/etc/notice/notices/pax.txt
incubator/sling/trunk/etc/notice/notices/pdfbox.txt
incubator/sling/trunk/etc/notice/notices/prefix.txt
incubator/sling/trunk/etc/notice/notices/qdox.txt
incubator/sling/trunk/etc/notice/notices/rhino.txt
incubator/sling/trunk/etc/notice/notices/slf4j.txt
incubator/sling/trunk/etc/notice/notices/textmining.txt
Modified: incubator/sling/trunk/etc/notice/notices/asm.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/asm.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/asm.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/asm.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-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 ASM software developed at asm.objectweb.org,
distributed
+# under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/bnd.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/bnd.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/bnd.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/bnd.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-This product includes software developed at http://www.aqute.biz/Code/Bnd,
-under Apache 2.0 License.
-
+# This product includes software developed at http://www.aqute.biz/Code/Bnd,
+# under Apache 2.0 License.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/cglib.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/cglib.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/cglib.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/cglib.txt Tue Jun 3 16:56:19 2008
@@ -1,4 +1,4 @@
-This product includes CGLIB software developed at cglib.sourceforge.net,
-distributed under the Apache Software License
-(http://sourceforge.net/projects/cglib).
-
+# This product includes CGLIB software developed at cglib.sourceforge.net,
+# distributed under the Apache Software License
+# (http://sourceforge.net/projects/cglib).
+# NOTICE only contains Apache notice.
Modified: incubator/sling/trunk/etc/notice/notices/codehaus.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/codehaus.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/codehaus.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/codehaus.txt Tue Jun 3 16:56:19
2008
@@ -1,2 +1,4 @@
-This product includes software developed at codehaus.org, under BSD-like
-license.
\ No newline at end of file
+# This product includes software developed at codehaus.org, under BSD-like
+# license.
+# What code?
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/concurrent.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/concurrent.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/concurrent.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/concurrent.txt Tue Jun 3 16:56:19
2008
@@ -1,5 +1,6 @@
-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 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
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/equinox.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/equinox.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/equinox.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/equinox.txt Tue Jun 3 16:56:19
2008
@@ -1,3 +1,3 @@
-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 Equinox software developed by the Eclipse foundation,
+# distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/freemarker.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/freemarker.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/freemarker.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/freemarker.txt Tue Jun 3 16:56:19
2008
@@ -1,2 +1,2 @@
-This product includes FreeMarker software developed by the Visigoth Software
-Society (http://www.visigoths.org/), under a BSD-like license.
+This product includes FreeMarker software developed by the
+Visigoth Software Society (http://www.visigoths.org/).
Modified: incubator/sling/trunk/etc/notice/notices/hamcrest.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/hamcrest.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/hamcrest.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/hamcrest.txt Tue Jun 3 16:56:19
2008
@@ -1,3 +1,3 @@
-This product includes software developed at http://code.google.com/p/hamcrest/,
-under BSD license.
-
+# This product includes software developed at
http://code.google.com/p/hamcrest/,
+# under BSD license.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/jcr.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jcr.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jcr.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jcr.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,3 @@
-This product includes software developed under the JCP from
-http://www.jcp.org. Copyright 2005 Day Management AG.
\ No newline at end of file
+# This product includes software developed under the JCP from
+# http://www.jcp.org. Copyright 2005 Day Management AG.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/jetty.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jetty.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jetty.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jetty.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,33 @@
-This product includes Jetty software developed at mortbay.org, under Apache
-License.
\ No newline at end of file
+# This product includes Jetty software developed at mortbay.org
+# http://svn.codehaus.org/jetty/jetty/trunk/LICENSES/NOTICE.txt
+==============================================================
+ Jetty Web Container
+ Copyright 1995-2006 Mort Bay Consulting Pty Ltd
+==============================================================
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is licensed under the apache 2.0
+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.
+
+The jboss integration module contains some LGPL code.
Modified: incubator/sling/trunk/etc/notice/notices/jmock.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jmock.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jmock.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jmock.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-This product includes software developed at http://jmock.org/,
-under BSD-like license (http://jmock.org/license.html).
-
+# This product includes software developed at http://jmock.org/,
+# under BSD-like license (http://jmock.org/license.html).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt Tue Jun 3
16:56:19 2008
@@ -1,3 +1,4 @@
-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.
\ No newline at end of file
+# 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.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/json.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/json.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/json.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/json.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,3 @@
-This product includes software developed at json.org, under BSD-like json.org
-license, see http://www.json.org/license.html .
\ No newline at end of file
+# This product includes software developed at json.org, under BSD-like json.org
+# license, see http://www.json.org/license.html .
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/junit.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/junit.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/junit.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/junit.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-This product includes software developed at junit.org, distributed under CPL
-license (http://sourceforge.net/projects/junit/).
-
+# This product includes software developed at junit.org, distributed under CPL
+# license (http://sourceforge.net/projects/junit/).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/kxml2.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/kxml2.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/kxml2.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/kxml2.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-This product includes kXML2 software developed at
-http://kxml.sourceforge.net/, under BSD license.
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
\ No newline at end of file
+# This product includes kXML2 software developed at
+# http://kxml.sourceforge.net/, under BSD license.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/mx4j.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/mx4j.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/mx4j.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/mx4j.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,2 @@
-This product includes software developed at http://mx4j.sourceforge.net/,
-http://kxml.sourceforge.net/, under Apache License.
\ No newline at end of file
+This product includes software developed by the
+MX4J project (http://mx4j.sourceforge.net).
Modified: incubator/sling/trunk/etc/notice/notices/nekohtml.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/nekohtml.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/nekohtml.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/nekohtml.txt Tue Jun 3 16:56:19
2008
@@ -1,2 +1,3 @@
-This product includes CyberNeko software developed at
-http://sourceforge.net/projects/nekohtml, under Apache License.
\ No newline at end of file
+# This product includes CyberNeko software developed at
+# http://sourceforge.net/projects/nekohtml, under Apache License.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/opensymphony.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/opensymphony.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/opensymphony.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/opensymphony.txt Tue Jun 3
16:56:19 2008
@@ -1,2 +1,3 @@
-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 Opensymphony
+# (http://www.opensymphony.org/quartz). Licensed under the Apache License 2.0.
+# URI points to a domain squatter.
Modified: incubator/sling/trunk/etc/notice/notices/pax.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/pax.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/pax.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/pax.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,3 @@
-This product includes Pax software developed at ops4j.org, under Apache
-License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
\ No newline at end of file
+# This product includes Pax software developed at ops4j.org, under Apache
+# License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/pdfbox.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/pdfbox.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/pdfbox.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/pdfbox.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,3 @@
-This product includes software developed at pdfbox.org, www.pdfbox.org, under
-Apache License.
\ No newline at end of file
+# This product includes software developed at pdfbox.org, www.pdfbox.org,
under
+# Apache License.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/prefix.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/prefix.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/prefix.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/prefix.txt Tue Jun 3 16:56:19 2008
@@ -1,12 +1,8 @@
-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/etc/notice/notices/qdox.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/qdox.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/qdox.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/qdox.txt Tue Jun 3 16:56:19 2008
@@ -1,2 +1,3 @@
-This product includes software developed at qdox.codehaus.org, under
-Apache License.
\ No newline at end of file
+# This product includes software developed at qdox.codehaus.org, under
+# Apache License.
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/rhino.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/rhino.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/rhino.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/rhino.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,4 @@
-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 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 .
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/slf4j.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/slf4j.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/slf4j.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/slf4j.txt Tue Jun 3 16:56:19 2008
@@ -1,3 +1,3 @@
-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 at http://slf4j.org, distributed
+# under the slf4j MIT-like license (http://slf4j.org/license.html).
+# No required notices.
Modified: incubator/sling/trunk/etc/notice/notices/textmining.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/textmining.txt?rev=662927&r1=662926&r2=662927&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/textmining.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/textmining.txt Tue Jun 3 16:56:19
2008
@@ -1,2 +1,4 @@
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version.
\ No newline at end of file
+# This software contains tm-extractors-0.4.jar written by Ryan Ackley,
+# originally pulished under the BSD license.
+# Please go to http://www.textmining.org for later versions.
+# No required notices.
