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/05/25 04:07:30 UTC
svn commit: r409284 - in /incubator/roller/branches/roller_3.0: LICENSE.txt
NOTICE.txt
Author: snoopdave
Date: Wed May 24 19:07:30 2006
New Revision: 409284
URL: http://svn.apache.org/viewvc?rev=409284&view=rev
Log:
Updated per Cliff's comments
Modified:
incubator/roller/branches/roller_3.0/LICENSE.txt
incubator/roller/branches/roller_3.0/NOTICE.txt
Modified: incubator/roller/branches/roller_3.0/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/LICENSE.txt?rev=409284&r1=409283&r2=409284&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/LICENSE.txt (original)
+++ incubator/roller/branches/roller_3.0/LICENSE.txt Wed May 24 19:07:30 2006
@@ -1,23 +1,28 @@
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:
+Roller is licensed under the Apache Licence Version 2.0, see below.
- * 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
+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
+ - Hibernate persistence library
+* BSD - http://www.opensource.org/licenses/bsd-license.php
+ - Code from Pebble blog server
+ - Code from Blojsom blog server
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+* JDOM license - listed at end of this file
+ - JDOM XML parser
+
+-------------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -217,13 +222,11 @@
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.
+ The JDOM 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
Modified: incubator/roller/branches/roller_3.0/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/NOTICE.txt?rev=409284&r1=409283&r2=409284&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/NOTICE.txt (original)
+++ incubator/roller/branches/roller_3.0/NOTICE.txt Wed May 24 19:07:30 2006
@@ -1,53 +1,48 @@
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 }
+This product includes software developed by
+the Apache Software Foundation (http://www.apache.org)
+Copyright (c) 2006 The Apache Software Foundation.
- * 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
+COPYRIGHT NOTICES
- * Roller depends (but does not include) the Hibernate persistence
- library, LGPL license
+* Roller includes software developed by the ROME project
+ Copyright (c) ROME development team. All rights reserved.
+* Roller includes JDOM, JDOM license
+ Copyright (c) Brett McLaughlin & Jason Hunter. All rights reserved.
+* Roller includes code from the Blojsom blog server
+ Copyright (c) David A. Czarnecki & Mark Lussier. All rights reserved
+* Roller includes code from the Pebble blog server
+ Copyright (c) 2003-2005, Simon Brown, All rights reserved.
+* Roller includes Acegi Security:
+ "This product includes software developed by the Acegi Security
+ System for Spring Project (http://acegisecurity.org)."
+* Roller includes Jython
+ Copyright (c) Jython Developers
+* Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
+
+
+CREDITS
+
+Roller committers:
+
+David M Johnson
+Lance Lanvandowska
+Matt Raible
+Anil Gangolli
+Henri Yandell
+Allen Gilliland
+Elias Torres
+Matt Schmidt
+
+Past comitters:
+
+Mindaguas Idzelis
+Jaap Van Der Molen