You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by "Roy T. Fielding" <fi...@gbiv.com> on 2008/06/02 23:44:56 UTC
Re: svn commit: r662458 - in /incubator/sling/trunk/launchpad: app/NOTICE base/NOTICE content/NOTICE jcrapp/NOTICE webapp/NOTICE
Unnecessary whitespace, headers, horizontal rules, page breaks,
instructions on how to edit, and related nonsense should never
appear in the NOTICE file that is required by our license to be
displayed by downstream binary distributions like an About box.
....Roy
On Jun 2, 2008, at 8:10 AM, bdelacretaz@apache.org wrote:
> Author: bdelacretaz
> Date: Mon Jun 2 08:10:53 2008
> New Revision: 662458
>
> URL: http://svn.apache.org/viewvc?rev=662458&view=rev
> Log:
> SLING-495, NOTICE for launchpad modules
>
> Modified:
> 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
>
> Modified: incubator/sling/trunk/launchpad/app/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/
> app/NOTICE?rev=662458&r1=662457&r2=662458&view=diff
> ======================================================================
> ========
> --- incubator/sling/trunk/launchpad/app/NOTICE (original)
> +++ incubator/sling/trunk/launchpad/app/NOTICE Mon Jun 2 08:10:53
> 2008
> @@ -1,5 +1,10 @@
> -Apache Sling Launchpad App
> +---------------------------------------------------------------------
> ---------
> +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/).
> @@ -8,3 +13,103 @@
> 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.
> +
> +---------------------------------------------------------------------
> ---------
> +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
> +http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-
> u.c.license.pdf
> +
> +---------------------------------------------------------------------
> ---------
> +Jetty notice
> +---------------------------------------------------------------------
> ---------
> +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 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.
> +
> +
> +---------------------------------------------------------------------
> ---------
> +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).
> +
>
> Modified: incubator/sling/trunk/launchpad/base/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/
> base/NOTICE?rev=662458&r1=662457&r2=662458&view=diff
> ======================================================================
> ========
> --- incubator/sling/trunk/launchpad/base/NOTICE (original)
> +++ incubator/sling/trunk/launchpad/base/NOTICE Mon Jun 2 08:10:53
> 2008
> @@ -1,5 +1,10 @@
> -Apache Sling Launchpad Base
> +---------------------------------------------------------------------
> ---------
> +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/).
> @@ -8,3 +13,16 @@
> 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.
> +
> +---------------------------------------------------------------------
> ---------
> +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.
> +
> +
>
> Modified: incubator/sling/trunk/launchpad/content/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/
> content/NOTICE?rev=662458&r1=662457&r2=662458&view=diff
> ======================================================================
> ========
> --- incubator/sling/trunk/launchpad/content/NOTICE (original)
> +++ incubator/sling/trunk/launchpad/content/NOTICE Mon Jun 2
> 08:10:53 2008
> @@ -1,5 +1,10 @@
> -Apache Sling Launchpad Content
> +---------------------------------------------------------------------
> ---------
> +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/).
> @@ -8,3 +13,6 @@
> 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/launchpad/jcrapp/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/
> jcrapp/NOTICE?rev=662458&r1=662457&r2=662458&view=diff
> ======================================================================
> ========
> --- incubator/sling/trunk/launchpad/jcrapp/NOTICE (original)
> +++ incubator/sling/trunk/launchpad/jcrapp/NOTICE Mon Jun 2
> 08:10:53 2008
> @@ -1,7 +1,84 @@
> -Apache Sling Launchpad JCR App
> +---------------------------------------------------------------------
> ---------
> +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/).
>
> 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.
> +
> +---------------------------------------------------------------------
> ---------
> +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
> +http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-
> u.c.license.pdf
> +
> +---------------------------------------------------------------------
> ---------
> +Jetty notice
> +---------------------------------------------------------------------
> ---------
> +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 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).
> +
>
> Modified: incubator/sling/trunk/launchpad/webapp/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/
> webapp/NOTICE?rev=662458&r1=662457&r2=662458&view=diff
> ======================================================================
> ========
> --- incubator/sling/trunk/launchpad/webapp/NOTICE (original)
> +++ incubator/sling/trunk/launchpad/webapp/NOTICE Mon Jun 2
> 08:10:53 2008
> @@ -1,5 +1,10 @@
> -Apache Sling Launchpad Webapp
> +---------------------------------------------------------------------
> ---------
> +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/).
> @@ -8,3 +13,44 @@
> 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.
> +
> +---------------------------------------------------------------------
> ---------
> +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.
> +
> +
> +---------------------------------------------------------------------
> ---------
> +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.
> +
> +
> +---------------------------------------------------------------------
> ---------
> +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.
> +
> +
> +---------------------------------------------------------------------
> ---------
> +slf4j notice
> +---------------------------------------------------------------------
> ---------
> +This product includes software developed at http://slf4j.org,
> distributed
> +under the slf4j MIT-like license (http://slf4j.org/license.html).
> +
> +
>
>
Re: svn commit: r662458 - in /incubator/sling/trunk/launchpad: app/NOTICE base/NOTICE content/NOTICE jcrapp/NOTICE webapp/NOTICE
Posted by Bertrand Delacretaz <bd...@apache.org>.
On Mon, Jun 2, 2008 at 11:44 PM, Roy T. Fielding <fi...@gbiv.com> wrote:
>... Unnecessary whitespace, headers, horizontal rules, page breaks,
> instructions on how to edit, and related nonsense should never
> appear in the NOTICE file...
I was afraid this would come up...I'll fix this, you're right that if
people display the NOTICE as is (as they should), this is ugly.
-Bertrand
Re: svn commit: r662458 - in /incubator/sling/trunk/launchpad: app/NOTICE
base/NOTICE content/NOTICE jcrapp/NOTICE webapp/NOTICE
Posted by Carsten Ziegeler <cz...@apache.org>.
I'm also wondering if we really need to mention stuff that is only used
during the build but not contained in the release, like junit?
Carsten
Roy T. Fielding wrote:
> Unnecessary whitespace, headers, horizontal rules, page breaks,
> instructions on how to edit, and related nonsense should never
> appear in the NOTICE file that is required by our license to be
> displayed by downstream binary distributions like an About box.
>
> ....Roy
>
--
Carsten Ziegeler
cziegeler@apache.org