geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r669273 - in /geronimo/server/branches/2.1: ./ assemblies/geronimo-boilerplate-minimal/src/main/underlay/ plugins/console/console-portal-driver/ plugins/corba/geronimo-yoko/ plugins/mejb/geronimo-mejb/
Date Wed, 18 Jun 2008 20:02:53 GMT
Author: dwoods
Date: Wed Jun 18 13:02:52 2008
New Revision: 669273

URL: http://svn.apache.org/viewvc?rev=669273&view=rev
Log:
GERONIMO-4123 Yoko no longer in incubator.  Console includes code from Pluto.  MEJB had wrong
NOTICE file.  Server includes code copied from OpenEJB.

Removed:
    geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/DISCLAIMER.txt
Modified:
    geronimo/server/branches/2.1/LICENSE.txt
    geronimo/server/branches/2.1/NOTICE.txt
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/NOTICE.txt
    geronimo/server/branches/2.1/plugins/mejb/geronimo-mejb/NOTICE.txt

Modified: geronimo/server/branches/2.1/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/LICENSE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/LICENSE.txt (original)
+++ geronimo/server/branches/2.1/LICENSE.txt Wed Jun 18 13:02:52 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/branches/2.1/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/NOTICE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/NOTICE.txt (original)
+++ geronimo/server/branches/2.1/NOTICE.txt Wed Jun 18 13:02:52 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                                                       ==
 =========================================================================
 

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
(original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
Wed Jun 18 13:02:52 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/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
(original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
Wed Jun 18 13:02:52 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                                                       ==
 =========================================================================
 

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/NOTICE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/NOTICE.txt (original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/NOTICE.txt Wed Jun
18 13:02:52 2008
@@ -1,5 +1,8 @@
 Apache Geronimo 
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
+
+Apache Pluto Project
+Copyright 2003-2008 The Apache Software Foundation.
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/server/branches/2.1/plugins/mejb/geronimo-mejb/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/mejb/geronimo-mejb/NOTICE.txt?rev=669273&r1=669272&r2=669273&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/mejb/geronimo-mejb/NOTICE.txt (original)
+++ geronimo/server/branches/2.1/plugins/mejb/geronimo-mejb/NOTICE.txt Wed Jun 18 13:02:52
2008
@@ -4,7 +4,3 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
-
-This product includes software developed by
-The Dojo Foundation (http://dojotoolkit.org/).



Mime
View raw message