You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/06/18 22:07:44 UTC
svn commit: r669276 - in /geronimo/server/trunk: LICENSE.txt NOTICE.txt
Author: dwoods
Date: Wed Jun 18 13:07:44 2008
New Revision: 669276
URL: http://svn.apache.org/viewvc?rev=669276&view=rev
Log:
GERONIMO-4123 Updated Dojo License. NOTICE updates - Console includes code from Pluto. Dojo plugins include code from Dojo. OpenEJB/Corba plugins include code from OpenEJB.
Modified:
geronimo/server/trunk/LICENSE.txt
geronimo/server/trunk/NOTICE.txt
Modified: geronimo/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/LICENSE.txt?rev=669276&r1=669275&r2=669276&view=diff
==============================================================================
--- geronimo/server/trunk/LICENSE.txt (original)
+++ geronimo/server/trunk/LICENSE.txt Wed Jun 18 13:07:44 2008
@@ -1252,20 +1252,20 @@
== Dojo License ==
=========================================================================
-Copyright (c) 2005, The Dojo Foundation
+Copyright (c) 2005-2008, The Dojo Foundation
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
* Neither the name of the Dojo Foundation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Modified: geronimo/server/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?rev=669276&r1=669275&r2=669276&view=diff
==============================================================================
--- geronimo/server/trunk/NOTICE.txt (original)
+++ geronimo/server/trunk/NOTICE.txt Wed Jun 18 13:07:44 2008
@@ -11,6 +11,17 @@
=========================================================================
+== Apache Geronimo Dojo Notice ==
+=========================================================================
+
+Portions of the Geronimo Dojo plugins were developed by the Dojo
+Foundation.
+
+Copyright (c) 2005-2008, The Dojo Foundation
+All rights reserved.
+
+
+=========================================================================
== Apache Geronimo Web Console Notice ==
=========================================================================
@@ -20,6 +31,23 @@
Agreement", informally known as the "IBM Console CLA".
+Portions of the Web Console were developed by the Apache Pluto community.
+
+Apache Pluto Project
+Copyright 2003-2008 The Apache Software Foundation.
+
+
+=========================================================================
+== Apache Geronimo OpenEJB Notice ==
+=========================================================================
+
+Portions of the Geronimo OpenEJB and Corba plugins were developed by the
+Apache OpenEJB community.
+
+Apache OpenEJB Project
+Copyright 1999-2007 The Apache Software Foundation
+
+
=========================================================================
== Bouncy Castle Notice ==
=========================================================================
@@ -314,6 +342,16 @@
=========================================================================
+== Apache Pluto ==
+=========================================================================
+
+This product includes software developed by the Apache Software
+Foundation (http://www.apache.org/).
+
+Copyright 2003-2008 The Apache Software Foundation.
+
+
+=========================================================================
== Apache Scout ==
=========================================================================
Re: svn commit: r669276 - in /geronimo/server/trunk: LICENSE.txt NOTICE.txt
Posted by Kevan Miller <ke...@gmail.com>.
On Jun 18, 2008, at 4:07 PM, dwoods@apache.org wrote:
> Author: dwoods
> Date: Wed Jun 18 13:07:44 2008
> New Revision: 669276
>
> URL: http://svn.apache.org/viewvc?rev=669276&view=rev
> Log:
> GERONIMO-4123 Updated Dojo License. NOTICE updates - Console
> includes code from Pluto. Dojo plugins include code from Dojo.
> OpenEJB/Corba plugins include code from OpenEJB.
>
> Modified:
> geronimo/server/trunk/LICENSE.txt
> geronimo/server/trunk/NOTICE.txt
Just wanted to sending some hugs Donald's way...
:D Thanks!
--kevan