jvanzyl     2002/06/27 12:59:49

  Modified:    src/templates/build/plugins/checkstyle plugin.jelly
  Log:
  Getting the checkstyle task to work.
  
  Revision  Changes    Path
  1.2       +22 -43    
jakarta-turbine-maven/src/templates/build/plugins/checkstyle/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/checkstyle/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly      26 Jun 2002 21:18:35 -0000      1.1
  +++ plugin.jelly      27 Jun 2002 19:59:49 -0000      1.2
  @@ -6,54 +6,34 @@
     <!-- C H E C K S T Y L E                                               -->
     <!-- ================================================================== -->
   
  +  <taskdef
  +    name="dvsl"
  +    classname="org.apache.tools.dvsl.DVSLTask">
  +    <classpath refid="maven-classpath"/>
  +  </taskdef>
  +
  +  <taskdef
  +    name="checkstyle"
  +    classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +    <classpath refid="maven-classpath"/>
  +  </taskdef>
  +
     <goal name="checkstyle">
   
  -    <j:if test="${flags.sourcesPresent}">
  +    <!-- <j:if test="${flags.sourcesPresent}"> -->
   
  -    <!--
  -      ignorePublicInInterface="${maven.checkstyle.ignore.public.in.interface}"
  -    -->
  +    <echo>!!!! ${pom.build.sourceDirectory}</echo>
  +    <echo>!!!! ${maven.checkstyle.includes}</echo>
  +    <echo>!!!! ${maven.checkstyle.excludes}</echo>
   
       <checkstyle
  -      lcurlyType="${maven.checkstyle.lcurly.type}"
  -      lcurlyMethod="${maven.checkstyle.lcurly.method}"
  -      lcurlyOther="${maven.checkstyle.lcurly.other}"
  -      rcurly="${maven.checkstyle.rcurly}"
  -      parenPad="${maven.checkstyle.paren.pad}"
  -      allowTabs="${maven.checkstyle.allow.tabs}"
  -      allowProtected="${maven.checkstyle.allow.protected}"
  -      allowPackage="${maven.checkstyle.allow.package}"
  -      allowNoAuthor="${maven.checkstyle.allow.no.author}"
  -      maxLineLen="${maven.checkstyle.max.line.len}"
  -      tabWidth="${maven.checkstyle.tab.width}"
  -      ignoreLineLengthPattern="${maven.checkstyle.ignore.line.len.pattern}"
  -      maxMethodLen="${maven.checkstyle.max.method.len}"
  -      maxConstructorLen="${maven.checkstyle.max.constructor.len}"
  -      maxFileLen="${maven.checkstyle.max.file.len}"
  -      ignoreImportLen="${maven.checkstyle.ignore.import.len}"
  -      memberPattern="${maven.checkstyle.member.pattern}"
  -      publicMemberPattern="${maven.checkstyle.public.member.pattern}"
  -      paramPattern="${maven.checkstyle.param.pattern}"
  -      constPattern="${maven.checkstyle.const.pattern}"
  -      staticPattern="${maven.checkstyle.static.pattern}"
  -      typePattern="${maven.checkstyle.type.pattern}"
  -      methodPattern="${maven.checkstyle.method.pattern}"
  -      localVarPattern="${maven.checkstyle.local.var.pattern}"
  -      headerFile="${maven.checkstyle.header.file}"
  -      headerLinesRegexp="${maven.checkstyle.header.lines.regexp}"
  -      headerIgnoreLine="${maven.checkstyle.header.ignore.line}"
  -      javadocScope="${maven.checkstyle.javadoc.scope}"
  -      requirePackageHtml="${maven.checkstyle.require.package.html}"
  -      ignoreImports="${maven.checkstyle.ignore.imports}"
  -      illegalImports="${maven.checkstyle.illegal.imports}"
  -      ignoreWhitespace="${maven.checkstyle.ignore.whitespace}"
  -      ignoreCastWhitespace="${maven.checkstyle.ignore.cast.whitespace}"
  -      ignoreBraces="${maven.checkstyle.ignore.braces}"
  +      properties="${maven.checkstyle.properties}"
         failOnViolation="${maven.checkstyle.fail.on.violation}"
         cacheFile="${maven.checkstyle.cache.file}" >
  -      <fileset dir="${maven.build.sourceDirectory}"
  -        includes="${maven.checkstyle.includes}"
  -        excludes="${maven.checkstyle.excludes}"/>
  +      <fileset dir="${pom.build.sourceDirectory}">
  +        <include name="${maven.checkstyle.includes}"/>
  +        <exclude name="${maven.checkstyle.excludes}"/>
  +      </fileset>
         <formatter type="xml" toFile="${maven.build.dir}/checkstyle-raw-report.xml"/>
         <formatter type="plain" 
toFile="${maven.build.dir}/checkstyle-raw-report.txt"/>
       </checkstyle>
  @@ -64,13 +44,12 @@
         toolboxfile="${maven.home}/stylesheets/toolbox.props"
         in="${maven.build.dir}/checkstyle-raw-report.xml"
         out="${maven.gen.docs}/checkstyle-report.xml">
  -
         <classpath>
           <path refid="maven-classpath"/>
         </classpath>
       </dvsl>
   
  -    </j:if>
  +    <!-- </j:if> -->
   
     </goal>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to