roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r409434 - in /incubator/roller/branches/roller_3.0: LICENSE.txt NOTICE.txt
Date Thu, 25 May 2006 19:06:04 GMT
Author: snoopdave
Date: Thu May 25 12:06:04 2006
New Revision: 409434

URL: http://svn.apache.org/viewvc?rev=409434&view=rev
Log:
Minor tweaks to license/copyright files

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=409434&r1=409433&r2=409434&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/LICENSE.txt (original)
+++ incubator/roller/branches/roller_3.0/LICENSE.txt Thu May 25 12:06:04 2006
@@ -2,21 +2,18 @@
 
 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:
+PLEASE NOTE: Although Roller itself is under the Apache license, Roller depends 
+on one component that is licensed under the more restrictive terms of the LGPL 
+licence (http://www.opensource.org/licenses/lgpl-license.php): which is the 
+Hibernate persistence library.
 
-* LGPL - http://www.opensource.org/licenses/lgpl-license.php
-    - Hibernate persistence library
+Roller also uses the JDOM XML parser library, licensed under the 
+terms of the JDOM license (a BSD-like license listed at end of this file).
 
-* BSD - http://www.opensource.org/licenses/bsd-license.php
-    - Code from Pebble blog server
-    - Code from Blojsom blog server
+And Roller contains some snippets of code from the Blojsom and Pebble
+blog servers, which are both licensed under the terms of the BSD licence 
+(http://www.opensource.org/licenses/bsd-license.php).
 
-* JDOM license - listed at end of this file
-    - JDOM XML parser
 
 -------------------------------------------------------------------------------
 

Modified: incubator/roller/branches/roller_3.0/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/NOTICE.txt?rev=409434&r1=409433&r2=409434&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/NOTICE.txt (original)
+++ incubator/roller/branches/roller_3.0/NOTICE.txt Thu May 25 12:06:04 2006
@@ -2,32 +2,28 @@
 
 This product includes software developed by 
 the Apache Software Foundation (http://www.apache.org)
-Copyright (c) 2006 The Apache Software Foundation. 
+Copyright 2006 The Apache Software Foundation. 
 
 
 COPYRIGHT NOTICES
 
 * Roller includes software developed by the ROME project
-    Copyright (c) ROME development team. All rights reserved.
+    Copyright 2003-2006 ROME development team. All rights reserved.
 
-* Roller includes JDOM, JDOM license
-    Copyright (c) Brett McLaughlin & Jason Hunter. All rights reserved.
+* Roller includes the JDOM XML parser
+    Copyright 2004 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:
+* 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
+    System for Spring Project (http://acegisecurity.org)"
 
 * Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
 
+* Roller includes snippets of code from the Blojsom blog server
+    Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved
+
+* Roller includes snippets of code from the Pebble blog server
+    Copyright 2003 Simon Brown, All rights reserved.
 
 CREDITS
 



Mime
View raw message