Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 94037 invoked from network); 19 May 2005 01:21:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 May 2005 01:21:03 -0000 Received: (qmail 11638 invoked by uid 500); 19 May 2005 00:49:12 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 11588 invoked by uid 500); 19 May 2005 00:49:12 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 11555 invoked by uid 99); 19 May 2005 00:49:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 18 May 2005 17:49:05 -0700 Received: (qmail 58202 invoked by uid 65534); 19 May 2005 00:48:55 -0000 Message-ID: <20050519004855.58201.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r170846 - /forrest/trunk/lib/core Date: Thu, 19 May 2005 00:48:54 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: crossley Date: Wed May 18 17:48:54 2005 New Revision: 170846 URL: http://svn.apache.org/viewcvs?rev=3D170846&view=3Drev Log: Replace some Excalibur and Avalon licenses with the correct file. Modified: forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt forrest/trunk/lib/core/excalibur-i18n-1.1.jar.license.txt forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt forrest/trunk/lib/core/excalibur-io-1.1.jar.license.txt forrest/trunk/lib/core/excalibur-naming-1.0.jar.license.txt forrest/trunk/lib/core/logkit-1.2.2.jar.license.txt Modified: forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/avalon-framework-= api-4.1.5.jar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt (orig= inal) +++ forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt Wed M= ay 18 17:48:54 2005 @@ -1,36 +1,35 @@ -/* - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -=20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. -=20 + + Copyright (C) 1997-2003 The Apache Software Foundation. + All rights reserved. + Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: -=20 + 1. Redistributions of source code must retain the above copyright noti= ce, this list of conditions and the following disclaimer. -=20 + 2. Redistributions in binary form must reproduce the above copyright noti= ce, this list of conditions and the following disclaimer in the documentat= ion and/or other materials provided with the distribution. -=20 + 3. The end-user documentation included with the redistribution, if any, m= ust include the following acknowledgment: "This product includes softw= are developed by the Apache Software Foundation (http://www.apache.org/= )=2E" Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. -=20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. -=20 + + 4. The names "Apache", "Avalon", "Excalibur", "Fortress", "Phoeni= x", + "Merlin" and "Apache Software Foundation" must not be used to endorse= or + promote products derived from this software without prior writ= ten + permission. For written permission, please contact apache@apache.org. + 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the Apache Software Foundation. -=20 + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTI= ES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY = AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL = THE @@ -41,10 +40,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR T= ORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE= OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -=20 + This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . -=20 -*/ + on behalf of the Apache Software Foundation. For more information on t= he + Apache Software Foundation, please see http://www.apache.org/. Modified: forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/avalon-framework-= impl-4.1.5.jar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt (ori= ginal) +++ forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt Wed = May 18 17:48:54 2005 @@ -1,36 +1,35 @@ -/* - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -=20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. -=20 + + Copyright (C) 1997-2003 The Apache Software Foundation. + All rights reserved. + Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: -=20 + 1. Redistributions of source code must retain the above copyright noti= ce, this list of conditions and the following disclaimer. -=20 + 2. Redistributions in binary form must reproduce the above copyright noti= ce, this list of conditions and the following disclaimer in the documentat= ion and/or other materials provided with the distribution. -=20 + 3. The end-user documentation included with the redistribution, if any, m= ust include the following acknowledgment: "This product includes softw= are developed by the Apache Software Foundation (http://www.apache.org/= )=2E" Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. -=20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. -=20 + + 4. The names "Apache", "Avalon", "Excalibur", "Fortress", "Phoeni= x", + "Merlin" and "Apache Software Foundation" must not be used to endorse= or + promote products derived from this software without prior writ= ten + permission. For written permission, please contact apache@apache.org. + 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the Apache Software Foundation. -=20 + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTI= ES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY = AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL = THE @@ -41,10 +40,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR T= ORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE= OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -=20 + This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . -=20 -*/ + on behalf of the Apache Software Foundation. For more information on t= he + Apache Software Foundation, please see http://www.apache.org/. Modified: forrest/trunk/lib/core/excalibur-i18n-1.1.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-i18n-1.= 1=2Ejar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/excalibur-i18n-1.1.jar.license.txt (original) +++ forrest/trunk/lib/core/excalibur-i18n-1.1.jar.license.txt Wed May 18 17= :48:54 2005 @@ -4,7 +4,7 @@ The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserv= ed. =20 Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: @@ -22,10 +22,10 @@ Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. =20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. + 4. The names "LogKit", "Jakarta" and "Apache Software Foundation" must n= ot=20 + be used to endorse or promote products derived from this software with= out + prior written permission. For written permission, please contact=20 + apache@apache.org. =20 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the @@ -43,8 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =20 This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . + on behalf of the Apache Software Foundation. For more information on t= he=20 + Apache Software Foundation, please see . =20 */ Modified: forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrum= ent-1.0.jar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt (origin= al) +++ forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt Wed May= 18 17:48:54 2005 @@ -4,7 +4,7 @@ The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserv= ed. =20 Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: @@ -22,10 +22,10 @@ Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. =20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. + 4. The names "LogKit", "Jakarta" and "Apache Software Foundation" must n= ot=20 + be used to endorse or promote products derived from this software with= out + prior written permission. For written permission, please contact=20 + apache@apache.org. =20 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the @@ -43,8 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =20 This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . + on behalf of the Apache Software Foundation. For more information on t= he=20 + Apache Software Foundation, please see . =20 */ Modified: forrest/trunk/lib/core/excalibur-io-1.1.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-io-1.1.= jar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/excalibur-io-1.1.jar.license.txt (original) +++ forrest/trunk/lib/core/excalibur-io-1.1.jar.license.txt Wed May 18 17:4= 8:54 2005 @@ -4,7 +4,7 @@ The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserv= ed. =20 Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: @@ -22,10 +22,10 @@ Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. =20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. + 4. The names "LogKit", "Jakarta" and "Apache Software Foundation" must n= ot=20 + be used to endorse or promote products derived from this software with= out + prior written permission. For written permission, please contact=20 + apache@apache.org. =20 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the @@ -43,8 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =20 This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . + on behalf of the Apache Software Foundation. For more information on t= he=20 + Apache Software Foundation, please see . =20 */ Modified: forrest/trunk/lib/core/excalibur-naming-1.0.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-naming-= 1=2E0.jar.license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/excalibur-naming-1.0.jar.license.txt (original) +++ forrest/trunk/lib/core/excalibur-naming-1.0.jar.license.txt Wed May 18 = 17:48:54 2005 @@ -4,7 +4,7 @@ The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 - Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserv= ed. =20 Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: @@ -22,10 +22,10 @@ Alternately, this acknowledgment may appear in the software itself, = if and wherever such third-party acknowledgments normally appear. =20 - 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon - Framework" and "Apache Software Foundation" must not be used to endor= se - or promote products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. + 4. The names "LogKit", "Jakarta" and "Apache Software Foundation" must n= ot=20 + be used to endorse or promote products derived from this software with= out + prior written permission. For written permission, please contact=20 + apache@apache.org. =20 5. Products derived from this software may not be called "Apache", nor = may "Apache" appear in their name, without prior written permission of = the @@ -43,8 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =20 This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . + on behalf of the Apache Software Foundation. For more information on t= he=20 + Apache Software Foundation, please see . =20 */ Modified: forrest/trunk/lib/core/logkit-1.2.2.jar.license.txt URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/logkit-1.2.2.jar.= license.txt?rev=3D170846&r1=3D170845&r2=3D170846&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- forrest/trunk/lib/core/logkit-1.2.2.jar.license.txt (original) +++ forrest/trunk/lib/core/logkit-1.2.2.jar.license.txt Wed May 18 17:48:54= 2005 @@ -4,7 +4,7 @@ The Apache Software License, Version 1.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 - Copyright (C) 1999-2001 The Apache Software Foundation. All rights reserv= ed. + Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserv= ed. =20 Redistribution and use in source and binary forms, with or without modifi= ca- tion, are permitted provided that the following conditions are met: @@ -43,8 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =20 This software consists of voluntary contributions made by many individu= als - on behalf of the Apache Software Foundation and was originally created= by - Stefano Mazzocchi . For more information on the Apa= che=20 - Software Foundation, please see . + on behalf of the Apache Software Foundation. For more information on t= he=20 + Apache Software Foundation, please see . =20 */