ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/etc/checkstyle checkstyle-config RequiredHeader.txt
Date Tue, 03 Feb 2004 23:32:39 GMT
antoine     2004/02/03 15:32:39

  Modified:    src/etc/checkstyle Tag: ANT_16_BRANCH checkstyle-config
                        RequiredHeader.txt
  Log:
  Merge from HEAD
  Apache License 2.0
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      ant/src/etc/checkstyle/checkstyle-config
  
  Index: checkstyle-config
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/checkstyle/checkstyle-config,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- checkstyle-config	5 Jul 2003 14:34:11 -0000	1.4
  +++ checkstyle-config	3 Feb 2004 23:32:39 -0000	1.4.2.1
  @@ -30,7 +30,7 @@
       <!-- required licence file -->
       <module name="Header">
           <property name="headerFile" value="${config.dir}/RequiredHeader.txt"/>
  -        <property name="ignoreLines" value="4"/>
  +        <property name="ignoreLines" value="2"/>
       </module>
   
       <!-- Import conventions -->
  
  
  
  1.1.2.1   +14 -51    ant/src/etc/checkstyle/RequiredHeader.txt
  
  Index: RequiredHeader.txt
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/checkstyle/RequiredHeader.txt,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- RequiredHeader.txt	3 Jul 2003 13:59:50 -0000	1.1
  +++ RequiredHeader.txt	3 Feb 2004 23:32:39 -0000	1.1.2.1
  @@ -1,53 +1,16 @@
  -/*
  - * The Apache Software License, Version 1.1
  +/* 
  + * Copyright Apache Software Foundation
    *
  - * Copyright (c) The Apache Software 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:
  - *
  - * 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 acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "Ant" 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 names without prior written
  - *    permission of the Apache Group.
  - *
  - * 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 (INCLUDING, 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/>.
  + *  Licensed under the Apache License, Version 2.0 (the "License");
  + *  you may not use this file except in compliance with the License.
  + *  You may obtain a copy of the License at
  + *
  + *      http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *  Unless required by applicable law or agreed to in writing, software
  + *  distributed under the License is distributed on an "AS IS" BASIS,
  + *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
  + * 
    */
  
  
  

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


Mime
View raw message