You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/12/07 16:43:37 UTC

svn commit: r1043106 - in /tomcat/trunk: build.xml checkstyle.xml test/org/apache/catalina/valves/Benchmarks.java test/org/apache/tomcat/util/http/CookiesBaseTest.java

Author: markt
Date: Tue Dec  7 15:43:37 2010
New Revision: 1043106

URL: http://svn.apache.org/viewvc?rev=1043106&view=rev
Log:
Add checkstyle rule for modifier order and fix remaining issues in current code base

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/checkstyle.xml
    tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
    tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1043106&r1=1043105&r2=1043106&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Dec  7 15:43:37 2010
@@ -431,6 +431,8 @@
         <exclude name="output/**"/>
         <exclude name="modules/**"/>
         <exclude name="**/*.mdl"/>
+        <!-- Exclude auto-generated files with known errors -->
+        <exclude name="java/org/apache/el/parser/ELParser.java" />
         <!-- Exclude these else Gump runs validate on them -->
         <exclude name="**/org/apache/tomcat/dbcp/**"/>
         <exclude name="**/tomcat-deps/**"/>

Modified: tomcat/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=1043106&r1=1043105&r2=1043106&view=diff
==============================================================================
--- tomcat/trunk/checkstyle.xml (original)
+++ tomcat/trunk/checkstyle.xml Tue Dec  7 15:43:37 2010
@@ -44,9 +44,7 @@
     <module name="UnusedImports"/>
     
     <!--  Modifiers -->
-    <!-- ~250 errors
     <module name="ModifierOrder"/>
-    -->
     <!-- ~1750 errors
     <module name="RedundantModifier"/>
     -->

Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1043106&r1=1043105&r2=1043106&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Tue Dec  7 15:43:37 2010
@@ -182,7 +182,7 @@ public class Benchmarks extends TestCase
         benchmark.doTest(5, tests);
     }
 
-    private static abstract class TimeDateElementBenchmarkTestBase {
+    private abstract static class TimeDateElementBenchmarkTestBase {
         protected static final String months[] = { "Jan", "Feb", "Mar", "Apr",
                 "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=1043106&r1=1043105&r2=1043106&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Tue Dec  7 15:43:37 2010
@@ -30,7 +30,7 @@ import org.apache.catalina.startup.Tomca
 
 /**
  * Base Test case for {@link Cookies}. <b>Note</b> because of the use of
- * <code>final static</code> constants in {@link Cookies}, each of these tests
+ * <code>static final</code> constants in {@link Cookies}, each of these tests
  * must be executed in a new JVM instance. The tests have been place in separate
  * classes to facilitate this when running the unit tests via Ant.
  */



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org