Expand checkstyle license checks

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1057695 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index da9e4a4..5ebb319 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -425,10 +425,15 @@
     <checkstyle config="res/checkstyle/checkstyle.xml">
       <fileset dir="." >
         <patternset refid="text.files" />
+        <include name="**/*.bat"/>
+        <include name="**/*.sh"/>
+        <exclude name="bin/setenv.*"/>
         <exclude name=".*/**"/>
         <exclude name="output/**"/>
         <exclude name="modules/**"/>
         <exclude name="**/*.mdl"/>
+        <exclude name="**/*_2.xml"/>
+        <exclude name="res/checkstyle/header-al2.txt"/>
         <!-- Exclude auto-generated files -->
         <exclude name="java/org/apache/el/parser/ELParser*.java" />
         <exclude name="java/org/apache/el/parser/JJTELParserState.java" />

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 7dcea35..b9a23b1 100644 (file)
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -26,7 +26,8 @@
   <!-- Headers -->
   <module name="RegexpHeader">
     <property name="headerFile" value="${basedir}/res/checkstyle/header-al2.txt"/>
-    <property name="fileExtensions" value="java"/>
+    <property name="multiLines" value="1, 2, 3, 4"/>
+    <property name="fileExtensions" value="java,xml,jsp,txt,sh,bat"/>
   </module>
 
   <!-- Whitespace -->

diff --git a/res/checkstyle/header-al2.txt b/res/checkstyle/header-al2.txt
index 23b24ec..7234793 100644 (file)
--- a/res/checkstyle/header-al2.txt
+++ b/res/checkstyle/header-al2.txt
@@ -1,16 +1,19 @@
+^<\?xml.*>$
+^@echo off$
+^#!
 ^\W*$
-^\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
-^\W*contributor license agreements\.  See the NOTICE file distributed with$
-^\W*this work for additional information regarding copyright ownership\.$
-^\W*The ASF licenses this file to You under the Apache License, Version 2\.0$
-^\W*\(the "License"\); you may not use this file except in compliance with$
-^\W*the License\.  You may obtain a copy of the License at$
-^\W*$
-^\W*http://www.apache.org/licenses/LICENSE-2\.0$
-^\W*$
-^\W*Unless required by applicable law or agreed to in writing, software$
-^\W*distributed under the License is distributed on an "AS IS" BASIS,$
-^\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
-^\W*See the License for the specific language governing permissions and$
-^\W*limitations under the License\.$
-^\W*$
\ No newline at end of file
+^(rem)?\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
+^(rem)?\W*contributor license agreements\.  See the NOTICE file distributed with$
+^(rem)?\W*this work for additional information regarding copyright ownership\.$
+^(rem)?\W*The ASF licenses this file to You under the Apache License, Version 2\.0$
+^(rem)?\W*\(the "License"\); you may not use this file except in compliance with$
+^(rem)?\W*the License\.  You may obtain a copy of the License at$
+^(rem)?\W*$
+^(rem)?\W*http://www.apache.org/licenses/LICENSE-2\.0$
+^(rem)?\W*$
+^(rem)?\W*Unless required by applicable law or agreed to in writing, software$
+^(rem)?\W*distributed under the License is distributed on an "AS IS" BASIS,$
+^(rem)?\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
+^(rem)?\W*See the License for the specific language governing permissions and$
+^(rem)?\W*limitations under the License\.$
+^(rem)?\W*$
\ No newline at end of file