[jboss-cvs] JBossAS SVN: r87796 - in projects/jboss-jca/trunk: tools/checkstyle and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 24 08:24:54 EDT 2009


Author: jesper.pedersen
Date: 2009-04-24 08:24:53 -0400 (Fri, 24 Apr 2009)
New Revision: 87796

Added:
   projects/jboss-jca/trunk/tools/checkstyle/lib/
   projects/jboss-jca/trunk/tools/checkstyle/lib/antlr.jar
   projects/jboss-jca/trunk/tools/checkstyle/lib/checkstyle.jar
   projects/jboss-jca/trunk/tools/checkstyle/lib/commons-beanutils-core.jar
   projects/jboss-jca/trunk/tools/checkstyle/lib/commons-cli.jar
   projects/jboss-jca/trunk/tools/checkstyle/lib/commons-logging.jar
   projects/jboss-jca/trunk/tools/checkstyle/lib/google-collect-snapshot.jar
Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml
Log:
[JBJCA-51] Checkstyle 5.0

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-04-24 12:13:23 UTC (rev 87795)
+++ projects/jboss-jca/trunk/build.xml	2009-04-24 12:24:53 UTC (rev 87796)
@@ -62,14 +62,9 @@
   <!-- ================================= 
        Versions              
        ================================= -->
-  <property name="version.antlr" value="2.7.6"/>
   <property name="version.apache-log4j" value="1.2.14"/>
   <property name="version.apache-logging" value="1.1.0.jboss"/>
-  <property name="version.checkstyle" value="5.0-beta01"/>
-  <property name="version.commons-beanutils" value="1.7.0"/>
-  <property name="version.commons-cli" value="1.1"/>
   <property name="version.easymock" value="2.4"/>
-  <property name="version.google-collect" value="snapshot-20080321"/>
   <property name="version.javassist" value="3.10.0.GA"/>
   <property name="version.jaxb.api" value="2.0"/>
   <property name="version.jaxb.impl" value="2.1"/>
@@ -120,10 +115,8 @@
     </fileset>
  </path>
 
-  <path id="qe.lib.path.id">
-    <fileset dir="${lib.dir}/qe">
-      <include name="**/*.jar"/>
-    </fileset>
+  <path id="checkstyle.lib.path.id">
+    <fileset dir="${tools.dir}/checkstyle/lib"/>
     <fileset dir="${target.dir}">
       <include name="**/*.jar"/>
     </fileset>
@@ -215,13 +208,13 @@
   <target name="checkstyle" depends="jars">
     <taskdef name="checkstyle"
              classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
-             classpathref="qe.lib.path.id"/>
+             classpathref="checkstyle.lib.path.id"/>
 
     <mkdir dir="${reports.dir}/checkstyle" />
 
     <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml"
                 failOnViolation="false"
-                classpathref="qe.lib.path.id">
+                classpathref="checkstyle.lib.path.id">
       <fileset dir="${basedir}"
                includes="**/*.java"/>
       <formatter type="plain"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2009-04-24 12:13:23 UTC (rev 87795)
+++ projects/jboss-jca/trunk/ivy.xml	2009-04-24 12:24:53 UTC (rev 87796)
@@ -32,17 +32,11 @@
   <configurations>
     <conf name="standalone" transitive="false"/>
     <conf name="test" extends="standalone" transitive="false"/>
-    <conf name="qe" transitive="false"/>
   </configurations>
 
   <dependencies>
-    <dependency org="antlr" name="antlr" rev="${version.antlr}" conf="qe->default"/>
     <dependency org="apache-log4j" name="log4j" rev="${version.apache-log4j}" conf="standalone->default"/>
     <dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="*"/>
-    <dependency org="checkstyle" name="checkstyle" rev="${version.checkstyle}" conf="qe->default"/>
-    <dependency org="com.google.code.google-collections" name="google-collect" rev="${version.google-collect}" conf="qe->default"/>
-    <dependency org="commons-beanutils" name="commons-beanutils-core" rev="${version.commons-beanutils}" conf="qe->default"/>
-    <dependency org="commons-cli" name="commons-cli" rev="${version.commons-cli}" conf="qe->default"/>
     <dependency org="javassist" name="javassist" rev="${version.javassist}" conf="standalone->default"/>
     <dependency org="javax.xml" name="jaxb-api" rev="${version.jaxb.api}" conf="standalone->default"/>
     <dependency org="javax.xml" name="jaxb-impl" rev="${version.jaxb.impl}" conf="standalone->default"/>

Modified: projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml
===================================================================
--- projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml	2009-04-24 12:13:23 UTC (rev 87795)
+++ projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml	2009-04-24 12:24:53 UTC (rev 87796)
@@ -128,21 +128,10 @@
       <property name="tokens" value="CTOR_DEF"/>
       <property name="max" value="150"/>
     </module>
-    <module name="FileLength">
-      <property name="max" value="10000"/>
-    </module>
     <module name="ParameterNumber">
       <property name="max" value="20"/>
     </module>
 
-    <!-- Don't allow tabs -->
-    <module name="TabCharacter"/>
-
-    <!-- Enforce License Header -->
-    <module name="RegexpHeader">
-      <property name="headerFile" value="${basedir}/tools/checkstyle/HEADER"/>
-    </module>
-
     <!-- Indentation -->
     <module name="Indentation">
       <property name="basicOffset" value="3"/>
@@ -154,6 +143,21 @@
 
   </module>
 
+  <!-- Enforce License Header -->
+  <module name="RegexpHeader">
+    <property name="headerFile" value="${basedir}/tools/checkstyle/HEADER"/>
+  </module>
+
+  <!-- Enforce file length -->
+  <module name="FileLength">
+    <property name="max" value="10000"/>
+  </module>
+
+  <!-- Don't allow tabs -->
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
   <!-- Enforce package documentation -->
   <module name="JavadocPackage">
     <property name="allowLegacy" value="true"/>

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/antlr.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/antlr.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/checkstyle.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/checkstyle.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-beanutils-core.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-beanutils-core.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-cli.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-cli.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/checkstyle/lib/google-collect-snapshot.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/checkstyle/lib/google-collect-snapshot.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jboss-cvs-commits mailing list