Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'release/richfaces-checkstyle-3'

  • Loading branch information...
commit 98a62fa33afe578819f91be3311ebf3e737f820e 2 parents 2f1c2ba + 5d4defa
Lukáš Fryč authored
57  pom.xml
... ...
@@ -1,36 +1,37 @@
1  
-    <!--
2  
-        JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
3  
-        Inc. and individual contributors by the @authors tag. See the
4  
-        copyright.txt in the distribution for a full listing of
5  
-        individual contributors. This is free software; you can
6  
-        redistribute it and/or modify it under the terms of the GNU
7  
-        Lesser General Public License as published by the Free Software
8  
-        Foundation; either version 2.1 of the License, or (at your
9  
-        option) any later version. This software is distributed in the
10  
-        hope that it will be useful, but WITHOUT ANY WARRANTY; without
11  
-        even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12  
-        PARTICULAR PURPOSE. See the GNU Lesser General Public License
13  
-        for more details. You should have received a copy of the GNU
14  
-        Lesser General Public License along with this software; if not,
15  
-        write to the Free Software Foundation, Inc., 51 Franklin St,
16  
-        Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
17  
-        http://www.fsf.org.
18  
-    -->
19  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  1
+<!--
  2
+    JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
  3
+    Inc. and individual contributors by the @authors tag. See the
  4
+    copyright.txt in the distribution for a full listing of
  5
+    individual contributors. This is free software; you can
  6
+    redistribute it and/or modify it under the terms of the GNU
  7
+    Lesser General Public License as published by the Free Software
  8
+    Foundation; either version 2.1 of the License, or (at your
  9
+    option) any later version. This software is distributed in the
  10
+    hope that it will be useful, but WITHOUT ANY WARRANTY; without
  11
+    even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  12
+    PARTICULAR PURPOSE. See the GNU Lesser General Public License
  13
+    for more details. You should have received a copy of the GNU
  14
+    Lesser General Public License along with this software; if not,
  15
+    write to the Free Software Foundation, Inc., 51 Franklin St,
  16
+    Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
  17
+    http://www.fsf.org.
  18
+-->
  19
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  20
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20 21
     <modelVersion>4.0.0</modelVersion>
21 22
     <parent>
22 23
         <groupId>org.jboss</groupId>
23 24
         <artifactId>jboss-parent</artifactId>
24  
-        <version>5</version>
  25
+        <version>6</version>
25 26
     </parent>
26  
-    
  27
+
27 28
     <groupId>org.richfaces</groupId>
28 29
     <artifactId>richfaces-build-checkstyle</artifactId>
29  
-    <version>2</version>
  30
+    <version>3</version>
30 31
     <name>Richfaces Checkstyle</name>
31  
-    
  32
+
32 33
     <description>Contains the checkstyle settings for the RichFaces project</description>
33  
-    
  34
+
34 35
     <build>
35 36
         <plugins>
36 37
             <!-- For the release this parent pom -->
@@ -46,9 +47,9 @@
46 47
     
47 48
     <!-- SCM and distribution management -->
48 49
     <scm>
49  
-        <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/build/resources/tags/richfaces-checkstyle-2</connection>
50  
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/build/resources/tags/richfaces-checkstyle-2</developerConnection>
51  
-        <url>http://fisheye.jboss.org/browse/richfaces/modules/build/resources/tags/richfaces-checkstyle-2</url>
  50
+        <connection>scm:git:git://github.com/richfaces/checkstyle.git</connection>
  51
+        <developerConnection>scm:git:git@github.com:richfaces/checkstyle.git</developerConnection>
  52
+        <url>https://github.com/richfaces/checkstyle</url>
52 53
     </scm>
53 54
 
54  
-</project>
  55
+</project>
373  src/main/resources/richfaces-checkstyle/richfaces-checkstyle.xml
... ...
@@ -1,320 +1,53 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-
3  
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4  
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5  
-<module name="Checker">
6  
-    <property name="severity" value="error"/>
7  
-    <module name="Translation"/>
8  
-    <!--<module name="FileLength">-->
9  
-        <!--<property name="max" value="1000"/>-->
10  
-        <!--<property name="severity" value="warning"/>-->
11  
-    <!--</module>-->
12  
-    
13  
-    <module name="TreeWalker">
14  
-        <property name="severity" value="error"/>
15  
-
16  
-        <!-- Checks for Javadoc comments.                              -->
17  
-        <!-- See http://checkstyle.sourceforge.net/config_javadoc.html -->
18  
-        <module name="JavadocType">
19  
-            <property name="severity" value="warning"/>
20  
-        </module>
21  
-        <module name="JavadocVariable">
22  
-            <property name="scope" value="public"/>
23  
-            <property name="severity" value="warning"/>
24  
-        </module>
25  
-        <module name="JavadocStyle">
26  
-            <property name="checkEmptyJavadoc" value="true"/>
27  
-            <property name="checkFirstSentence" value="false"/>
28  
-            <property name="severity" value="warning"/>
29  
-        </module>
30  
-    </module>
31  
-
32  
-    <module name="TreeWalker">
33  
-        <!-- Checks for Naming Conventions.                           -->
34  
-        <!-- See http://checkstyle.sourceforge.net/config_naming.html -->
35  
-        <module name="ConstantName">
36  
-            <property name="severity" value="error"/>
37  
-        </module>
38  
-        <module name="LocalFinalVariableName">
39  
-            <property name="severity" value="error"/>
40  
-        </module>
41  
-        <module name="LocalVariableName">
42  
-            <property name="severity" value="error"/>
43  
-        </module>
44  
-        <module name="MemberName">
45  
-            <property name="severity" value="error"/>
46  
-        </module>
47  
-        <module name="MethodName">
48  
-            <property name="severity" value="error"/>
49  
-        </module>
50  
-        <module name="PackageName">
51  
-            <property name="severity" value="error"/>
52  
-        </module>
53  
-        <module name="ParameterName">
54  
-            <property name="severity" value="error"/>
55  
-        </module>
56  
-        <module name="StaticVariableName">
57  
-            <property name="severity" value="error"/>
58  
-        </module>
59  
-        <module name="TypeName">
60  
-            <property name="severity" value="error"/>
61  
-        </module>
62  
-    </module>
63  
-
64  
-    <module name="TreeWalker">
65  
-        <!-- Checks for imports                                       -->
66  
-        <!-- See http://checkstyle.sourceforge.net/config_import.html -->
67  
-        <module name="AvoidStarImport">
68  
-            <property name="severity" value="warning"/>
69  
-        </module>
70  
-        <module name="IllegalImport">
71  
-            <property name="severity" value="error"/>
72  
-        </module>
73  
-        <module name="RedundantImport">
74  
-            <property name="severity" value="error"/>
75  
-        </module>
76  
-        <module name="UnusedImports">
77  
-            <property name="severity" value="error"/>
78  
-        </module>
79  
-    </module>
80  
-
81  
-    <module name="TreeWalker">
82  
-        <!-- Checks for Size Violations.                             -->
83  
-        <!-- See http://checkstyle.sourceforge.net/config_sizes.html -->
84  
-        <module name="LineLength">
85  
-            <property name="max" value="120"/>
86  
-            <property name="severity" value="warning"/>
87  
-        </module>
88  
-        <module name="MethodLength">
89  
-            <property name="tokens" value="METHOD_DEF"/>
90  
-            <property name="max" value="60"/>
91  
-            <!-- I think must be 30 -->
92  
-            <property name="countEmpty" value="false"/>
93  
-            <property name="severity" value="warning"/>
94  
-        </module>
95  
-        <module name="AnonInnerLength">
96  
-            <property name="max" value="40"/>
97  
-            <property name="severity" value="error"/>
98  
-        </module>
99  
-        <module name="ParameterNumber">
100  
-            <property name="severity" value="warning"/>
101  
-        </module>
102  
-    </module>
103  
-
104  
-    <module name="TreeWalker">
105  
-        <!-- Checks for whitespace                                        -->
106  
-        <!-- See http://checkstyle.sourceforge.net/config_whitespace.html -->
107  
-        <!--<module name="TabCharacter"/>-->
108  
-        <module name="EmptyForIteratorPad">
109  
-            <property name="severity" value="info"/>
110  
-        </module>
111  
-        <module name="MethodParamPad">
112  
-            <property name="severity" value="info"/>
113  
-        </module>
114  
-        <module name="NoWhitespaceAfter">
115  
-            <property name="severity" value="info"/>
116  
-        </module>
117  
-        <module name="NoWhitespaceBefore">
118  
-            <property name="severity" value="info"/>
119  
-        </module>
120  
-        <module name="OperatorWrap">
121  
-            <property name="severity" value="info"/>
122  
-        </module>
123  
-        <module name="ParenPad">
124  
-            <property name="severity" value="info"/>
125  
-        </module>
126  
-        <module name="TypecastParenPad">
127  
-            <property name="tokens" value="RPAREN,TYPECAST"/>
128  
-            <property name="severity" value="info"/>
129  
-        </module>
130  
-        <module name="WhitespaceAfter">
131  
-            <property name="severity" value="info"/>
132  
-        </module>
133  
-        <module name="WhitespaceAround">
134  
-            <property name="tokens"
135  
-                      value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,
136  
-               BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,
137  
-               LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,
138  
-               LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,
139  
-               MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,
140  
-               SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
141  
-            <property name="severity" value="info"/>
142  
-        </module>
143  
-    </module>
144  
-
145  
-    <module name="TreeWalker">
146  
-        <!-- Modifier Checks                                            -->
147  
-        <!-- See http://checkstyle.sourceforge.net/config_modifier.html -->
148  
-        <module name="ModifierOrder">
149  
-            <property name="severity" value="error"/>
150  
-        </module>
151  
-        <module name="RedundantModifier">
152  
-            <property name="severity" value="info"/>
153  
-        </module>
154  
-
155  
-        <!-- Checks for blocks. You know, those {}'s              -->
156  
-        <!-- http://checkstyle.sourceforge.net/config_blocks.html -->
157  
-        <module name="AvoidNestedBlocks">
158  
-            <property name="allowInSwitchCase" value="true"/>
159  
-            <property name="severity" value="error"/>
160  
-        </module>
161  
-        <module name="EmptyBlock">
162  
-            <property name="option" value="text"/>
163  
-            <property name="severity" value="error"/>
164  
-        </module>
165  
-        <module name="LeftCurly">
166  
-            <property name="severity" value="error"/>
167  
-        </module>
168  
-        <module name="NeedBraces">
169  
-            <property name="severity" value="error"/>
170  
-        </module>
171  
-        <module name="RightCurly">
172  
-            <property name="severity" value="error"/>
173  
-        </module>
174  
-    </module>
175  
-
176  
-    <module name="TreeWalker">
177  
-        <!-- Checks for common coding problems               -->
178  
-        <!-- See http://checkstyle.sourceforge.net/config_coding.html -->
179  
-        <module name="CovariantEquals">
180  
-            <property name="severity" value="error"/>
181  
-        </module>
182  
-        <module name="DoubleCheckedLocking">
183  
-            <property name="severity" value="error"/>
184  
-        </module>
185  
-        <module name="EmptyStatement">
186  
-            <property name="severity" value="error"/>
187  
-        </module>
188  
-        <module name="EqualsHashCode">
189  
-            <property name="severity" value="error"/>
190  
-        </module>
191  
-        <module name="IllegalInstantiation">
192  
-            <property name="severity" value="error"/>
193  
-        </module>
194  
-        <module name="InnerAssignment">
195  
-            <property name="severity" value="error"/>
196  
-        </module>
197  
-        <module name="MagicNumber">
198  
-            <property name="ignoreNumbers" value="-1, 0, 1"/>
199  
-            <property name="severity" value="warning"/>
200  
-            <!-- TODO <property name="severity" value="error"/> -->
201  
-        </module>
202  
-        <module name="MissingSwitchDefault">
203  
-            <property name="severity" value="error"/>
204  
-        </module>
205  
-        <module name="ModifiedControlVariable">
206  
-            <property name="severity" value="error"/>
207  
-        </module>
208  
-        <module name="SimplifyBooleanExpression">
209  
-            <property name="severity" value="error"/>
210  
-        </module>
211  
-        <module name="SimplifyBooleanReturn">
212  
-            <property name="severity" value="error"/>
213  
-        </module>
214  
-        <module name="StringLiteralEquality">
215  
-            <property name="severity" value="error"/>
216  
-        </module>
217  
-        <module name="NestedIfDepth">
218  
-            <property name="max" value="3"/>
219  
-            <property name="severity" value="warning"/>
220  
-        </module>
221  
-        <module name="NestedTryDepth">
222  
-            <property name="max" value="3"/>
223  
-            <property name="severity" value="error"/>
224  
-        </module>
225  
-        <module name="IllegalCatch">
226  
-            <property name="illegalClassNames"
227  
-                      value="java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
228  
-            <property name="severity" value="error"/>
229  
-        </module>
230  
-        
231  
-        <!-- desable besause - http://jira.codehaus.org/browse/MCHECKSTYLE-111 -->
232  
-        <!-- <module name="IllegalThrows"/> -->
233  
-        <!-- <module name="RedundantThrows"> -->
234  
-            <!-- <property name="severity" value="warning"/> -->
235  
-            <!-- TODO <property name="severity" value="error"/>-->
236  
-        <!-- </module> -->
237  
-        <!--<module name="JavadocMethod">-->
238  
-            <!--<property name="scope" value="public"/>-->
239  
-            <!--<property name="severity" value="warning"/>-->
240  
-            <!--<property name="allowMissingThrowsTags" value="true"/>-->
241  
-        <!--</module>-->
242  
-
243  
-        <module name="ParameterAssignment">
244  
-            <property name="severity" value="warning"/>
245  
-            <!-- TODO <property name="severity" value="error"/>-->
246  
-        </module>
247  
-        <module name="DefaultComesLast">
248  
-            <property name="severity" value="error"/>
249  
-        </module>
250  
-        <module name="FallThrough">
251  
-            <property name="severity" value="error"/>
252  
-        </module>
253  
-        <module name="MultipleVariableDeclarations">
254  
-            <property name="severity" value="error"/>
255  
-        </module>
256  
-        <module name="UnnecessaryParentheses">
257  
-            <property name="severity" value="info"/>
258  
-        </module>
259  
-    </module>
260  
-
261  
-    <module name="TreeWalker">
262  
-        <!-- Checks for class design                                  -->
263  
-        <!-- See http://checkstyle.sourceforge.net/config_design.html -->
264  
-        <module name="FinalClass">
265  
-            <property name="severity" value="error"/>
266  
-        </module>
267  
-        <module name="HideUtilityClassConstructor">
268  
-            <property name="severity" value="error"/>
269  
-        </module>
270  
-        <module name="InterfaceIsType">
271  
-            <property name="severity" value="warning"/>
272  
-        </module>
273  
-        <module name="VisibilityModifier">
274  
-            <property name="packageAllowed" value="true"/>
275  
-            <property name="protectedAllowed" value="true"/>
276  
-            <property name="severity" value="error"/>
277  
-        </module>
278  
-    </module>
279  
-
280  
-    <module name="TreeWalker">
281  
-        <!-- Miscellaneous other checks.                               -->
282  
-        <!-- See http://checkstyle.sourceforge.net/config_metrics.html -->
283  
-        <module name="CyclomaticComplexity">
284  
-            <property name="severity" value="warning"/>
285  
-        </module>
286  
-
287  
-        <!-- Miscellaneous other checks.                   -->
288  
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
289  
-        <module name="ArrayTypeStyle">
290  
-            <property name="severity" value="error"/>
291  
-        </module>
292  
-        <module name="UpperEll">
293  
-            <property name="severity" value="error"/>
294  
-        </module>
295  
-        <module name="ParameterName">
296  
-            <property name="severity" value="error"/>
297  
-        </module>
298  
-        <module name="DeclarationOrder">
299  
-            <property name="severity" value="error"/>
300  
-        </module>
301  
-        <module name="FallThrough">
302  
-            <property name="severity" value="error"/>
303  
-        </module>
304  
-        <module name="HiddenField">
305  
-            <property name="tokens" value="VARIABLE_DEF"/>
306  
-            <property name="severity" value="info"/>
307  
-        </module>
308  
-        <module name="UncommentedMain">
309  
-            <property name="severity" value="warning"/>
310  
-        </module>
311  
-        <module name="TodoComment">
312  
-            <property name="format" value="TODO"/>
313  
-            <property name="severity" value="warning"/>
314  
-        </module>
315  
-
316  
-        <module name="Indentation">
317  
-            <property name="severity" value="error"/>
318  
-        </module>
319  
-    </module>
320  
-</module>
  1
+<?xml version="1.0"?>
  2
+<!DOCTYPE module PUBLIC
  3
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
  4
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
  5
+
  6
+<module name="Checker">
  7
+    <module name="FileTabCharacter">
  8
+        <property name="eachLine" value="true"/>
  9
+    </module>
  10
+
  11
+    <module name="RegexpSingleline">
  12
+        <!-- \s matches whitespace character, $ matches end of line. -->
  13
+        <property name="format" value="\s+$"/>
  14
+        <property name="message" value="Line has trailing spaces."/>
  15
+    </module>
  16
+
  17
+    <module name="TreeWalker">
  18
+
  19
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
  20
+
  21
+        <!-- Checks for imports                              -->
  22
+        <module name="AvoidStarImport"/>
  23
+        <module name="RedundantImport"/>
  24
+        <!-- Disabled until checkstyle can recognize imports which are used only by javadoc -->
  25
+        <!--<module name="UnusedImports"/>-->
  26
+
  27
+        <!-- Modifier Checks                                    -->
  28
+        <module name="ModifierOrder"/>
  29
+        <module name="RedundantModifier"/>
  30
+
  31
+        <!-- Checks for blocks. You know, those {}'s         -->
  32
+        <module name="LeftCurly"/>
  33
+
  34
+        <!-- Checks for common coding problems               -->
  35
+        <!-- Disabled until http://sourceforge.net/tracker/?func=detail&aid=2843447&group_id=29721&atid=397078 is fixed-->
  36
+        <!--<module name="DoubleCheckedLocking"/>-->
  37
+        <module name="EmptyStatement"/>
  38
+        <module name="EqualsHashCode"/>
  39
+        <module name="IllegalInstantiation"/>
  40
+        <module name="RedundantThrows">
  41
+            <property name="allowUnchecked" value="true"/>
  42
+        </module>
  43
+
  44
+        <!-- Miscellaneous other checks.                   -->
  45
+        <module name="UpperEll"/>
  46
+        <module name="PackageAnnotation"/>
  47
+        <module name="CovariantEquals"/>
  48
+        <module name="ArrayTypeStyle"/>
  49
+
  50
+    </module>
  51
+
  52
+</module>
  53
+

0 notes on commit 98a62fa

Please sign in to comment.
Something went wrong with that request. Please try again.