forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r170846 - /forrest/trunk/lib/core
Date Thu, 19 May 2005 00:48:54 GMT
Author: crossley
Date: Wed May 18 17:48:54 2005
New Revision: 170846

URL: http://svn.apache.org/viewcvs?rev=170846&view=rev
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=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt (original)
+++ forrest/trunk/lib/core/avalon-framework-api-4.1.5.jar.license.txt Wed May 18 17:48:54
2005
@@ -1,36 +1,35 @@
-/*
-
  ============================================================================
                    The Apache Software License, Version 1.1
  ============================================================================
- 
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- 
+
+ Copyright (C) 1997-2003 The Apache Software Foundation.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without modifica-
  tion, are permitted provided that the following conditions are met:
- 
+
  1. Redistributions of  source code must  retain the above copyright  notice,
     this list of conditions and the following disclaimer.
- 
+
  2. 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.
- 
+
  3. The end-user documentation included with the redistribution, if any, must
     include  the following  acknowledgment:  "This product includes  software
     developed  by the  Apache Software Foundation  (http://www.apache.org/)."
     Alternately, this  acknowledgment may  appear in the software itself,  if
     and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    or promote products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
- 
+
+ 4. The  names   "Apache",   "Avalon",  "Excalibur",  "Fortress",  "Phoenix",
+    "Merlin" and "Apache Software Foundation" must not be used  to endorse or
+    promote  products  derived  from  this  software  without  prior  written
+    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.
- 
+
  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  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 TORT
  (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
-*/
+ on  behalf of the Apache Software  Foundation. For more  information on the
+ 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=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt (original)
+++ forrest/trunk/lib/core/avalon-framework-impl-4.1.5.jar.license.txt Wed May 18 17:48:54
2005
@@ -1,36 +1,35 @@
-/*
-
  ============================================================================
                    The Apache Software License, Version 1.1
  ============================================================================
- 
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- 
+
+ Copyright (C) 1997-2003 The Apache Software Foundation.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without modifica-
  tion, are permitted provided that the following conditions are met:
- 
+
  1. Redistributions of  source code must  retain the above copyright  notice,
     this list of conditions and the following disclaimer.
- 
+
  2. 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.
- 
+
  3. The end-user documentation included with the redistribution, if any, must
     include  the following  acknowledgment:  "This product includes  software
     developed  by the  Apache Software Foundation  (http://www.apache.org/)."
     Alternately, this  acknowledgment may  appear in the software itself,  if
     and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    or promote products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
- 
+
+ 4. The  names   "Apache",   "Avalon",  "Excalibur",  "Fortress",  "Phoenix",
+    "Merlin" and "Apache Software Foundation" must not be used  to endorse or
+    promote  products  derived  from  this  software  without  prior  written
+    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.
- 
+
  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  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 TORT
  (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
-*/
+ on  behalf of the Apache Software  Foundation. For more  information on the
+ 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.jar.license.txt?rev=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- 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
  ============================================================================
  
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modifica-
  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.
  
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    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 not 
+    be used to endorse or promote products derived from this software without
+    prior written 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
@@ -43,8 +43,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
+ on  behalf of the Apache Software  Foundation. For more  information on the 
+ Apache Software Foundation, please see <http://www.apache.org/>.
  
 */

Modified: forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt?rev=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- forrest/trunk/lib/core/excalibur-instrument-1.0.jar.license.txt (original)
+++ 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
  ============================================================================
  
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modifica-
  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.
  
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    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 not 
+    be used to endorse or promote products derived from this software without
+    prior written 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
@@ -43,8 +43,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
+ on  behalf of the Apache Software  Foundation. For more  information on the 
+ Apache Software Foundation, please see <http://www.apache.org/>.
  
 */

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=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- 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:48:54 2005
@@ -4,7 +4,7 @@
                    The Apache Software License, Version 1.1
  ============================================================================
  
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modifica-
  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.
  
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    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 not 
+    be used to endorse or promote products derived from this software without
+    prior written 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
@@ -43,8 +43,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
+ on  behalf of the Apache Software  Foundation. For more  information on the 
+ Apache Software Foundation, please see <http://www.apache.org/>.
  
 */

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.0.jar.license.txt?rev=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- 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
  ============================================================================
  
- Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modifica-
  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.
  
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
-    Framework" and "Apache Software Foundation"  must not be used to endorse
-    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 not 
+    be used to endorse or promote products derived from this software without
+    prior written 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
@@ -43,8 +43,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
+ on  behalf of the Apache Software  Foundation. For more  information on the 
+ Apache Software Foundation, please see <http://www.apache.org/>.
  
 */

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=170846&r1=170845&r2=170846&view=diff
==============================================================================
--- 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
  ============================================================================
  
- Copyright (C) 1999-2001 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modifica-
  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.
  
  This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
+ on  behalf of the Apache Software  Foundation. For more  information on the 
+ Apache Software Foundation, please see <http://www.apache.org/>.
  
 */



Mime
View raw message