You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/04/28 05:12:40 UTC
svn commit: r397748 - in /incubator/roller/branches/roller_2.2: LICENSE.txt
NOTICE.txt README.txt
Author: snoopdave
Date: Thu Apr 27 20:12:38 2006
New Revision: 397748
URL: http://svn.apache.org/viewcvs?rev=397748&view=rev
Log:
bringing LICENSE and NOTICE files into compliance
Added:
incubator/roller/branches/roller_2.2/NOTICE.txt
Modified:
incubator/roller/branches/roller_2.2/LICENSE.txt
incubator/roller/branches/roller_2.2/README.txt
Modified: incubator/roller/branches/roller_2.2/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.2/LICENSE.txt?rev=397748&r1=397747&r2=397748&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.2/LICENSE.txt (original)
+++ incubator/roller/branches/roller_2.2/LICENSE.txt Thu Apr 27 20:12:38 2006
@@ -1,3 +1,20 @@
+LICENSE.txt - Roller licensing terms
+
+ Roller is licensed under the Apache Licence Version 2.0, see below.
+
+ PLEASE NOTE: Although Roller itself is under the Apache license, Roller
+ depends on and contains some components that are licensed under the more
+ restrictive terms of the LGPL licence. See the NOTICE.txt file for a list
+ of third party components included in Roller. These license are used by
+ components used in Roller:
+
+ * LGPL - http://www.opensource.org/licenses/lgpl-license.php
+ * BSD - http://www.opensource.org/licenses/bsd-license.php
+ * JDOM license - listed at end of this file
+ * Jython license - http://www.jython.org/license.html
+
+
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -199,3 +216,58 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+
+
+
+
+ Copyright (C) 2000-2002 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <license AT jdom DOT org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <pm AT jdom DOT org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``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 JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS 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.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter AT jdom DOT org> and
+ Brett McLaughlin <brett AT jdom DOT org>. For more information on
+ the JDOM Project, please see <http://www.jdom.org/>.
Added: incubator/roller/branches/roller_2.2/NOTICE.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.2/NOTICE.txt?rev=397748&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.2/NOTICE.txt (added)
+++ incubator/roller/branches/roller_2.2/NOTICE.txt Thu Apr 27 20:12:38 2006
@@ -0,0 +1,59 @@
+NOTICE.txt - Roller credits and copyright notices
+
+ Roller is Copyright (c) 2002-2006 by the Roller project members:
+ David M Johnson
+ Lance Lanvandowska
+ Matt Raible
+ Anil Gangolli
+ Henri Yandell
+ Allen Gilliland
+ Elias Torres
+ Matt Schmidt
+ Past members:
+ Mindaguas Idzelis
+ Jaap Van Der Molen
+
+THIRD PARTY COMPONENTS
+
+ * Roller includes software developed by the Apache Software Foundation
+ Copyright (c) The Apache Software Foundation. All rights reserved.
+
+ * Roller includes software developed by the ROME project, Apache license
+ Copyright (c) ROME development team. All rights reserved.
+
+ * Roller includes JDOM, JDOM license (BSD style)
+ Copyright (c) Brett McLaughlin & Jason Hunter. All rights reserved.
+
+ * Roller includes code from the Blojsom blog server, BSD License
+ Copyright (c) David A. Czarnecki & Mark Lussier. All rights reserved
+
+ * Roller includes code from the Pebble blog server, BSD license
+ Copyright (c) 2003-2005, Simon Brown, All rights reserved.
+
+ * Roller includes Acegi Security, ASL 2.0 License:
+ "This product includes software developed by the Acegi Security
+ System for Spring Project (http://acegisecurity.org)."
+
+ * Roller includes Jython, Copyright (c) Jython Developers
+ Combined license { Jython Software License (BSD style)
+ Apache Software License JPython 1.1 License }
+
+ * Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
+ License is http://creativecommons.org/licenses/by/2.5/
+
+THIRD PARTY LGPL COMPONENTS
+
+ * Roller includes the Hibernate persistence library, LGPL license
+
+ * Roller includes the Ekit HTML editor by Howard Kistler, LGPL license
+
+ * Roller includes the Jazzy spellchecker, LGPL license
+
+ * Roller includes the JSPWiki Wiki Engine, LGPL license
+
+ * Roller includes the Radeox Wiki Engine, LGPL license
+
+
+
+
+
Modified: incubator/roller/branches/roller_2.2/README.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.2/README.txt?rev=397748&r1=397747&r2=397748&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.2/README.txt (original)
+++ incubator/roller/branches/roller_2.2/README.txt Thu Apr 27 20:12:38 2006
@@ -1,7 +1,12 @@
README.txt
- This release of Roller is not endorsed by the Apache Software Foundation.
- Roller is in the Apache Incubator and is not an official Apache project.
+ Roller is an effort undergoing incubation at the Apache Software
+ Foundation (ASF). Incubation is required of all newly accepted projects
+ until a further review indicates that the infrastructure, communications,
+ and decision making process have stabilized in a manner consistent with
+ other successful ASF projects. While incubation status is not necessarily a
+ reflection of the completeness or stability of the code, it does indicate
+ that the project has yet to be fully endorsed by the ASF.
To install Roller, follow the instructions in the Installation Guide:
http://rollerweblogger.org/wiki/Wiki.jsp?page=InstallationGuide
@@ -9,67 +14,9 @@
To use Roller, follow the instructions in the Users Guide:
http://rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide
-LICENSING TERMS
-
- Roller itself is licensed under the Apache Licence Version 2.0, please
- see the included file LICENSE.txt for the full text of the Apache license.
+See also
- PLEASE NOTE: Although Roller itself is under the Apache license, Roller
- depends on and contains some components that are licensed under the more
- restrictive terms of the LGPL licence.
+ NOTICE.txt - Roller credits and copyright notices
+ LICENSE.txt - Roller licensing terms
-CREDITS AND COPYRIGHT NOTICES
-
- Roller is Copyright (c) 2002-2006 by the Roller project members:
- David M Johnson
- Lance Lanvandowska
- Matt Raible
- Anil Gangolli
- Henri Yandell
- Allen Gilliland
- Elias Torres
- Matt Schmidt
- Past members:
- Mindaguas Idzelis
- Jaap Van Der Molen
-
-THIRD PARTY COMPONENTS
-
- * Roller includes software developed by the Apache Software Foundation
- Copyright (c) The Apache Software Foundation. All rights reserved.
-
- * Roller includes software developed by the ROME project, Apache license
- Copyright (c) ROME development team. All rights reserved.
-
- * Roller includes JDOM, JDOM license (BSD style)
- Copyright (c) Brett McLaughlin & Jason Hunter. All rights reserved.
-
- * Roller includes code from the Blojsom blog server, BSD License
- Copyright (c) David A. Czarnecki & Mark Lussier. All rights reserved
-
- * Roller includes code from the Pebble blog server, BSD license
- Copyright (c) 2003-2005, Simon Brown, All rights reserved.
-
- * Roller includes Acegi Security, ASL 2.0 License:
- "This product includes software developed by the Acegi Security
- System for Spring Project (http://acegisecurity.org)."
-
- * Roller includes Jython, Copyright (c) Jython Developers
- Combined license { Jython Software License (BSD style)
- Apache Software License JPython 1.1 License }
-
- * Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
- License is http://creativecommons.org/licenses/by/2.5/
-
-THIRD PARTY LGPL COMPONENTS
-
- * Roller includes the Hibernate persistence library, LGPL license
-
- * Roller includes the Ekit HTML editor by Howard Kistler, LGPL license
-
- * Roller includes the Jazzy spellchecker, LGPL license
-
- * Roller includes the JSPWiki Wiki Engine, LGPL license
-
- * Roller includes the Radeox Wiki Engine, LGPL license