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

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-03-12 11:11:59 -0400 (Thu, 12 Mar 2009)
New Revision: 85787

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml
Log:
[JBJCA-45] Integrate checkstyle

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-03-12 14:27:07 UTC (rev 85786)
+++ projects/jboss-jca/trunk/build.xml	2009-03-12 15:11:59 UTC (rev 85787)
@@ -68,7 +68,6 @@
   <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.commons-logging" value="1.0.3"/>
   <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"/>
@@ -162,7 +161,7 @@
   <!-- ================================= 
        Target: checkstyle
        ================================= -->
-  <target name="checkstyle" depends="resolve">
+  <target name="checkstyle" depends="jars">
     <taskdef name="checkstyle"
              classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
              classpathref="qe.lib.path.id"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2009-03-12 14:27:07 UTC (rev 85786)
+++ projects/jboss-jca/trunk/ivy.xml	2009-03-12 15:11:59 UTC (rev 85787)
@@ -38,11 +38,10 @@
   <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="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="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="commons-logging" name="commons-logging" rev="${version.commons-logging}" conf="qe->default"/>
     <dependency org="com.google.code.google-collections" name="google-collect" rev="${version.google-collect}" 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"/>

Modified: projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml
===================================================================
--- projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml	2009-03-12 14:27:07 UTC (rev 85786)
+++ projects/jboss-jca/trunk/tools/checkstyle/checkstyle.xml	2009-03-12 15:11:59 UTC (rev 85787)
@@ -70,9 +70,6 @@
     <module name="JavadocType">
       <property name="scope" value="package"/>
     </module>
-    <module name="JavadocPackage">
-      <property name="allowLegacy" value="true"/>
-    </module>
 
     <!-- JLS -->
     <module name="ModifierOrder"/>
@@ -158,7 +155,9 @@
   </module>
 
   <!-- Enforce package documentation -->
-  <!-- <module name="PackageHtml"/> -->
+  <module name="JavadocPackage">
+    <property name="allowLegacy" value="true"/>
+  </module>
 
   <!-- NewlineAtEndOfFile -->
   <module name="NewlineAtEndOfFile">