You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/02/01 03:14:28 UTC
svn commit: r1238903 - in
/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF:
LICENSE NOTICE
Author: mfranklin
Date: Wed Feb 1 02:14:28 2012
New Revision: 1238903
URL: http://svn.apache.org/viewvc?rev=1238903&view=rev
Log:
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require a (separate) notice.
- Added OpenLDAP license which is part of the apacheds-schema-bootstrap distribution
- Added required notices
Modified:
incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE
Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE?rev=1238903&r1=1238902&r2=1238903&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE Wed Feb 1 02:14:28 2012
@@ -18,7 +18,60 @@ for this software is http://www.jcip.net
Any republication or derived work distributed in source code form
must include the copyright and license notice.
- ===============================================================================
+===============================================================================
+
+For OpenLDAP inclusions in apacheds
+
+The OpenLDAP Public License
+ Version 2.8, 17 August 2003
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions in source form must retain copyright statements
+ and notices,
+
+2. Redistributions in binary form must reproduce applicable copyright
+ statements and notices, this list of conditions, and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution, and
+
+3. Redistributions must contain a verbatim copy of this document.
+
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number. You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission. Title
+to copyright in this Software shall at all times remain with copyright
+holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+California, USA. All Rights Reserved. Permission to copy and
+distribute verbatim copies of this document is granted.
+
+
+===============================================================================
For the Serp component:
Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE?rev=1238903&r1=1238902&r2=1238903&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE Wed Feb 1 02:14:28 2012
@@ -18,7 +18,7 @@ This product includes unmodified, binary
Google Inc (http://code.google.com/p/google-guice), which is licensed under the Apache 2 license.
This product includes unmodified, binary redistributions of software (Java Concurrency in Practice) developed by
-Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under the Apache 2 license.
+Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under the Creative Commons Attribution License.
This product includes unmodified, binary redisributions of software (org.json.*) developed by
JSON.org (http://json.org)
@@ -45,3 +45,43 @@ An original copy of the license can be f
This product includes unmodified, binary redistributions of software (ICU4J) developed by
the ICU Project (http://site.icu-project.org), which is licensed under the X License.
An original copy of the license can be found at http://source.icu-project.org/repos/icu/icu4j/tags/release-4-8/main/shared/licenses/license.html
+
+This product includes binary distributions which include source developed at the OpenLDAP foundation and retain the following
+attributions:
+
+ Portions Copyright 1998-2008 Kurt D. Zeilenga.
+ Portions Copyright 1998-2006 Net Boolean Incorporated.
+ Portions Copyright 2001-2006 IBM Corporation.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted only as authorized by the OpenLDAP
+ Public License.
+
+ ---
+
+ Portions Copyright 1999-2007 Howard Y.H. Chu.
+ Portions Copyright 1999-2007 Symas Corporation.
+ Portions Copyright 1998-2003 Hallvard B. Furuseth.
+ Portions Copyright 2007 Gavin Henry
+ Portions Copyright 2007 Suretec Systems
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that this notice is preserved.
+ The names of the copyright holders may not be used to endorse or
+ promote products derived from this software without their specific
+ prior written permission. This software is provided ``as is''
+ without express or implied warranty.
+
+ ---
+
+ Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms are permitted
+ provided that this notice is preserved and that due credit is given
+ to the University of Michigan at Ann Arbor. The name of the
+ University may not be used to endorse or promote products derived
+ from this software without specific prior written permission. This
+ software is provided ``as is'' without express or implied warranty.
\ No newline at end of file
Re: svn commit: r1238903 - in
/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF:
LICENSE NOTICE
Posted by "Franklin, Matthew B." <mf...@mitre.org>.
This one was a bit tricky, but I checked the SVN repo and these notices
are part of the source distro, meaning they are including them in source
and we must also include them.
On 1/31/12 9:14 PM, "mfranklin@apache.org" <mf...@apache.org> wrote:
>Author: mfranklin
>Date: Wed Feb 1 02:14:28 2012
>New Revision: 1238903
>
>URL: http://svn.apache.org/viewvc?rev=1238903&view=rev
>Log:
>RAVE-437: Check and cleanup of NOTICE files to only include 3rd party
>usages which require a (separate) notice.
> - Added OpenLDAP license which is part of the
>apacheds-schema-bootstrap distribution
> - Added required notices
>
>Modified:
>
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICE
>NSE
>
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTI
>CE
>
>Modified:
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICE
>NSE
>URL:
>http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/app
>ended-resources/META-INF/LICENSE?rev=1238903&r1=1238902&r2=1238903&view=di
>ff
>==========================================================================
>====
>---
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICE
>NSE (original)
>+++
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICE
>NSE Wed Feb 1 02:14:28 2012
>@@ -18,7 +18,60 @@ for this software is http://www.jcip.net
> Any republication or derived work distributed in source code form
> must include the copyright and license notice.
>
>-
>==========================================================================
>=====
>+=========================================================================
>======
>+
>+For OpenLDAP inclusions in apacheds
>+
>+The OpenLDAP Public License
>+ Version 2.8, 17 August 2003
>+
>+Redistribution and use of this software and associated documentation
>+("Software"), with or without modification, are permitted provided
>+that the following conditions are met:
>+
>+1. Redistributions in source form must retain copyright statements
>+ and notices,
>+
>+2. Redistributions in binary form must reproduce applicable copyright
>+ statements and notices, this list of conditions, and the following
>+ disclaimer in the documentation and/or other materials provided
>+ with the distribution, and
>+
>+3. Redistributions must contain a verbatim copy of this document.
>+
>+The OpenLDAP Foundation may revise this license from time to time.
>+Each revision is distinguished by a version number. You may use
>+this Software under terms of this license revision or under the
>+terms of any subsequent revision of the license.
>+
>+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
>+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
>+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
>+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
>+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
>+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
>+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
>+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
>+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+POSSIBILITY OF SUCH DAMAGE.
>+
>+The names of the authors and copyright holders must not be used in
>+advertising or otherwise to promote the sale, use or other dealing
>+in this Software without specific, written prior permission. Title
>+to copyright in this Software shall at all times remain with copyright
>+holders.
>+
>+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
>+
>+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
>+California, USA. All Rights Reserved. Permission to copy and
>+distribute verbatim copies of this document is granted.
>+
>+
>+=========================================================================
>======
>
> For the Serp component:
>
>
>Modified:
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTI
>CE
>URL:
>http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/app
>ended-resources/META-INF/NOTICE?rev=1238903&r1=1238902&r2=1238903&view=dif
>f
>==========================================================================
>====
>---
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTI
>CE (original)
>+++
>incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTI
>CE Wed Feb 1 02:14:28 2012
>@@ -18,7 +18,7 @@ This product includes unmodified, binary
> Google Inc (http://code.google.com/p/google-guice), which is licensed
>under the Apache 2 license.
>
> This product includes unmodified, binary redistributions of software
>(Java Concurrency in Practice) developed by
>-Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under
>the Apache 2 license.
>+Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under
>the Creative Commons Attribution License.
>
> This product includes unmodified, binary redisributions of software
>(org.json.*) developed by
> JSON.org (http://json.org)
>@@ -45,3 +45,43 @@ An original copy of the license can be f
> This product includes unmodified, binary redistributions of software
>(ICU4J) developed by
> the ICU Project (http://site.icu-project.org), which is licensed under
>the X License.
> An original copy of the license can be found at
>http://source.icu-project.org/repos/icu/icu4j/tags/release-4-8/main/shared
>/licenses/license.html
>+
>+This product includes binary distributions which include source
>developed at the OpenLDAP foundation and retain the following
>+attributions:
>+
>+ Portions Copyright 1998-2008 Kurt D. Zeilenga.
>+ Portions Copyright 1998-2006 Net Boolean Incorporated.
>+ Portions Copyright 2001-2006 IBM Corporation.
>+ All rights reserved.
>+
>+ Redistribution and use in source and binary forms, with or without
>+ modification, are permitted only as authorized by the OpenLDAP
>+ Public License.
>+
>+ ---
>+
>+ Portions Copyright 1999-2007 Howard Y.H. Chu.
>+ Portions Copyright 1999-2007 Symas Corporation.
>+ Portions Copyright 1998-2003 Hallvard B. Furuseth.
>+ Portions Copyright 2007 Gavin Henry
>+ Portions Copyright 2007 Suretec Systems
>+ All rights reserved.
>+
>+ Redistribution and use in source and binary forms, with or without
>+ modification, are permitted provided that this notice is preserved.
>+ The names of the copyright holders may not be used to endorse or
>+ promote products derived from this software without their specific
>+ prior written permission. This software is provided ``as is''
>+ without express or implied warranty.
>+
>+ ---
>+
>+ Portions Copyright (c) 1992-1996 Regents of the University of
>Michigan.
>+ All rights reserved.
>+
>+ Redistribution and use in source and binary forms are permitted
>+ provided that this notice is preserved and that due credit is given
>+ to the University of Michigan at Ann Arbor. The name of the
>+ University may not be used to endorse or promote products derived
>+ from this software without specific prior written permission. This
>+ software is provided ``as is'' without express or implied warranty.
>\ No newline at end of file
>
>