Author: markt
Date: Tue Jan 11 15:29:58 2011
New Revision: 1057695
URL: http://svn.apache.org/viewvc?rev=1057695&view=rev
Log:
Expand checkstyle license checks
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/res/checkstyle/header-al2.txt
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1057695&r1=1057694&r2=1057695&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 11 15:29:58 2011
@@ -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" />
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1057695&r1=1057694&r2=1057695&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Tue Jan 11 15:29:58 2011
@@ -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 -->
Modified: tomcat/trunk/res/checkstyle/header-al2.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/header-al2.txt?rev=1057695&r1=1057694&r2=1057695&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/header-al2.txt (original)
+++ tomcat/trunk/res/checkstyle/header-al2.txt Tue Jan 11 15:29:58 2011
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
