cziegeler    2004/03/02 07:25:29

  Modified:    lib      jars.xml
  Added:       lib/optional log4j-1.2.8.jar.license log4j-1.2.8.jar
  Removed:     lib/optional logfactor5-1.2.8.jar
               src/blocks/deli/lib log4j-1.2.8.jar log4j-1.2.8.jar.license
  Log:
  Remove duplicate jar and move log4j to optional and make it available to 
other blocks
  
  Revision  Changes    Path
  1.1                  cocoon-2.1/lib/optional/log4j-1.2.8.jar.license
  
  Index: log4j-1.2.8.jar.license
  ===================================================================
  /*
   * 
============================================================================
   *                   The Apache Software License, Version 1.1
   * 
============================================================================
   * 
   *    Copyright (C) 1999 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 "log4j" 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
   *    [EMAIL PROTECTED]
   * 
   * 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
   * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY 
DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES 
(INCLU-
   * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; 
LOSS
   * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND 
ON
   * 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.  For more  information on 
the 
   * Apache Software Foundation, please see <http://www.apache.org/>.
   *
   */
  
  
  
  1.1                  cocoon-2.1/lib/optional/log4j-1.2.8.jar
  
        <<Binary file>>
  
  
  1.179     +2 -12     cocoon-2.1/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -u -r1.178 -r1.179
  --- jars.xml  2 Mar 2004 12:11:45 -0000       1.178
  +++ jars.xml  2 Mar 2004 15:25:29 -0000       1.179
  @@ -317,16 +317,6 @@
     </file>
   
     <file>
  -    <title>LogFactor5</title>
  -    <description>
  -      LogFactor5 is a graphical logkit browser, distributed as a part of 
Log4J.
  -    </description>
  -    <used-by>Cocoon logging</used-by>
  -    <lib>optional/logfactor5-1.2.8.jar</lib>
  -    
<homepage>http://jakarta.apache.org/log4j/docs/lf5/overview.html</homepage>
  -  </file>
  -
  -  <file>
       <title>The XSLT processor</title>
       <description>
         Xalan is an XSLT processor that fully supports the W3C specs.
  @@ -555,7 +545,7 @@
       <title>Log4j</title>
       <description>Logging for java</description>
       <used-by>DELI (deli block)</used-by>
  -    <lib>deli/lib/log4j-1.2.8.jar</lib>
  +    <lib>optional/log4j-1.2.8.jar</lib>
       <homepage>http://jakarta.apache.org/log4j</homepage>
     </file>
   
  
  
  

Reply via email to