You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/10/21 13:34:27 UTC

svn commit: r1025958 - in /myfaces/myfaces-build-tools/trunk/other/checkstyle-rules: ./ pom.xml src/main/resources/default/myfaces-checks-minimal.xml src/main/resources/default/myfaces-checks-standard.xml

Author: struberg
Date: Thu Oct 21 11:34:27 2010
New Revision: 1025958

URL: http://svn.apache.org/viewvc?rev=1025958&view=rev
Log:
MYFACES-2953 upgrade rule syntax for checkstyle-5.x

We need to do this since the old maven-checkstyle-plugin
isn't working with maven-3 anymore

Modified:
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/   (props changed)
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-minimal.xml
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml

Propchange: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 21 11:34:27 2010
@@ -0,0 +1,10 @@
+target
+*.iml
+*.ipr
+*.iws
+.idea
+.git
+.gitignore
+.project
+.settings
+.classpath

Modified: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml?rev=1025958&r1=1025957&r2=1025958&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml Thu Oct 21 11:34:27 2010
@@ -30,7 +30,7 @@
       -->
     <groupId>org.apache.myfaces</groupId>
     <artifactId>myfaces</artifactId>
-    <version>6</version>
+    <version>9</version>
   </parent>
 
   <groupId>org.apache.myfaces.buildtools</groupId>

Modified: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-minimal.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-minimal.xml?rev=1025958&r1=1025957&r2=1025958&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-minimal.xml (original)
+++ myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-minimal.xml Thu Oct 21 11:34:27 2010
@@ -32,6 +32,17 @@
 
 <module name="Checker">
 
+    <!-- Checks for Headers                              -->
+    <!-- See http://checkstyle.sf.net/config_header.html -->
+    <module name="Header">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <module name="FileTabCharacter"/>
+
     <module name="TreeWalker">
 
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -40,12 +51,6 @@
           <property name="format" value="^_?[A-Z][a-zA-Z0-9]*$"/>
         </module>
 
-        <module name="Header">
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
-
-        <module name="TabCharacter"/>
-
         <module name="UpperEll"/>
 
     </module>

Modified: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml?rev=1025958&r1=1025957&r2=1025958&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml (original)
+++ myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml Thu Oct 21 11:34:27 2010
@@ -41,6 +41,30 @@
     <!-- 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="Header">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <module name="FileTabCharacter"/>
+        
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="FileLength">
+        <property name="fileExtensions" value="java"/>
+    </module>
+    <module name="LineLength">
+        <property name="max" value="120" />
+        <property name="ignorePattern" value="@version|@see"/>
+    </module>
+        
+        
     <module name="TreeWalker">
 
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -86,14 +110,6 @@
           <property name="format" value="^_?[A-Z][a-zA-Z0-9]*$"/>
         </module>
 
-
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
-
-
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport"/>
@@ -102,13 +118,6 @@
         <module name="UnusedImports"/>
 
 
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
-        <module name="LineLength">
-          <property name="max" value="120" />
-          <property name="ignorePattern" value="@version|@see"/>
-        </module>
         <module name="MethodLength">
           <property name="max" value="200" />
         </module>
@@ -117,10 +126,6 @@
         </module>
 
 
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="TabCharacter"/>
-
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <!-- module name="ModifierOrder"/ -->