logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwom...@apache.org
Subject cvs commit: jakarta-log4j/src/jalopy log4j-coding-convention.xml
Date Fri, 28 Feb 2003 05:10:59 GMT
mwomack     2003/02/27 21:10:59

  Modified:    src/jalopy log4j-coding-convention.xml
  Log:
  Updated version that removes old license header and inserts full Apache 1.1 License header.
  
  Revision  Changes    Path
  1.2       +14 -3     jakarta-log4j/src/jalopy/log4j-coding-convention.xml
  
  Index: log4j-coding-convention.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/jalopy/log4j-coding-convention.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- log4j-coding-convention.xml	19 Feb 2003 05:50:54 -0000	1.1
  +++ log4j-coding-convention.xml	28 Feb 2003 05:10:58 -0000	1.2
  @@ -5,8 +5,8 @@
               <version>14</version>
           </compliance>
           <style>
  -            <description>Sun Java Coding Convention</description>
  -            <name>Sun</name>
  +            <description>Log4j Java Coding Convention</description>
  +            <name>Apache Jakarta Log4j</name>
           </style>
       </general>
       <internal>
  @@ -20,6 +20,14 @@
               <variableAssignment>false</variableAssignment>
               <variableIdentifier>false</variableIdentifier>
           </alignment>
  +        <blanklines>
  +            <after>
  +                <header>1</header>
  +            </after>
  +            <before>
  +                <header>0</header>
  +            </before>
  +        </blanklines>
           <braces>
               <empty>
                   <cuddle>false</cuddle>
  @@ -47,7 +55,10 @@
               <text />
           </footer>
           <header>
  -            <text />
  +            <keys>The Apache Software License, Version 1.1| * Copyright (C) The Apache
Software Foundation. All rights reserved.</keys>
  +            <smartMode>0</smartMode>
  +            <text>/*| * ============================================================================|
*                   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| *    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| * 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 &lt;http://www.apache.org/&gt;.|
*| */</text>
  +            <use>true</use>
           </header>
           <history>
               <method>timestamp</method>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org


Mime
View raw message