Author: olamy
Date: Tue Dec 18 11:28:50 2012
New Revision: 1423413
URL: http://svn.apache.org/viewvc?rev=1423413&view=rev
Log:
fix checkstyle configuration
Modified:
commons/proper/cli/trunk/pom.xml
commons/proper/cli/trunk/src/conf/HEADER.txt
commons/proper/cli/trunk/src/conf/checkstyle.xml
Modified: commons/proper/cli/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/pom.xml?rev=1423413&r1=1423412&r2=1423413&view=diff
==============================================================================
--- commons/proper/cli/trunk/pom.xml (original)
+++ commons/proper/cli/trunk/pom.xml Tue Dec 18 11:28:50 2012
@@ -206,7 +206,7 @@
<configuration>
<configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- <headerFile>${basedir}/src/conf/HEADER.txt</headerFile>
+ <headerLocation>${basedir}/src/conf/HEADER.txt</headerLocation>
</configuration>
</plugin>
<plugin>
@@ -266,7 +266,7 @@
<id>setup-checkout</id>
<activation>
<file>
- <missing>${scmPubCheckoutDirectory}</missing>
+ <missing>${commons.scmPubCheckoutDirectory}</missing>
</file>
</activation>
<build>
Modified: commons/proper/cli/trunk/src/conf/HEADER.txt
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/conf/HEADER.txt?rev=1423413&r1=1423412&r2=1423413&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/conf/HEADER.txt (original)
+++ commons/proper/cli/trunk/src/conf/HEADER.txt Tue Dec 18 11:28:50 2012
@@ -1,16 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
+^/\*\s*$
+^ \* Licensed to the Apache Software Foundation \(ASF\) under one\s*$
+^ \* or more contributor license agreements. See the NOTICE file\s*$
+^ \* distributed with this work for additional information\s*$
+^ \* regarding copyright ownership. The ASF licenses this file\s*$
+^ \* to you under the Apache License, Version 2.0 \(the\s*$
+^ \* "License"\)\; you may not use this file except in compliance\s*$
+^ \* with the License. You may obtain a copy of the License at\s*$
+^ \*\s*$
+^ \*\s+http://www\.apache\.org/licenses/LICENSE-2\.0\s*$
+^ \*\s*$
+^ \* Unless required by applicable law or agreed to in writing,\s*$
+^ \* software distributed under the License is distributed on an\s*$
+^ \* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\s*$
+^ \* KIND, either express or implied. See the License for the\s*$
+^ \* specific language governing permissions and limitations\s*$
+^ \* under the License.\s*$
+^ \*/\s*$
+^\s*$
Modified: commons/proper/cli/trunk/src/conf/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/conf/checkstyle.xml?rev=1423413&r1=1423412&r2=1423413&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/conf/checkstyle.xml (original)
+++ commons/proper/cli/trunk/src/conf/checkstyle.xml Tue Dec 18 11:28:50 2012
@@ -37,6 +37,12 @@ limitations under the License.
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="RegexpHeader">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
+
<!-- Exceptions -->
<!--
<module name="SuppressionFilter">
@@ -44,6 +50,10 @@ limitations under the License.
</module>
-->
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -71,17 +81,6 @@ limitations under the License.
<module name="StaticVariableName"/>
<module name="TypeName"/>
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="Header">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>
@@ -107,7 +106,7 @@ limitations under the License.
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
- <module name="TabCharacter"/>
+
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround">
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL,
GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO,
LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN,
MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST,
SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
