Author: niclas Date: Thu Sep 16 18:04:56 2004 New Revision: 46226 Added: avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/ avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/checkstyle-frames.xsl (contents, props changed) avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/metro-checkstyle.xml (contents, props changed) Modified: avalon/trunk/tools/index.xml avalon/trunk/tools/magic/etc/deliverables/templates/standard.xml Log: Added checkstyle to the default build.
Modified: avalon/trunk/tools/index.xml ============================================================================== --- avalon/trunk/tools/index.xml (original) +++ avalon/trunk/tools/index.xml Thu Sep 16 18:04:56 2004 @@ -46,6 +46,77 @@ </gump> </resource> + <resource> + <info> + <group>checkstyle</group> + <name>checkstyle</name> + <version>3.4</version> + <type>jar</type> + </info> + <dependencies> + <include key="antlr" /> + <include key="bcel" /> + <include key="commons-beanutils-core" /> + <include key="commons-collections" /> + <include key="commons-logging" /> + <include key="regexp" /> + </dependencies> + </resource> + + <resource> + <info> + <group>antlr</group> + <name>antlr</name> + <version>2.7.2</version> + <type>jar</type> + </info> + </resource> + + <resource> + <info> + <group>bcel</group> + <name>bcel</name> + <version>5.1</version> + <type>jar</type> + </info> + </resource> + + <resource> + <info> + <group>commons-beanutils</group> + <name>commons-beanutils-core</name> + <version>1.7.0</version> + <type>jar</type> + </info> + </resource> + + <resource> + <info> + <group>commons-collections</group> + <name>commons-collections</name> + <version>3.1</version> + <type>jar</type> + </info> + </resource> + + <resource> + <info> + <group>commons-logging</group> + <name>commons-logging</name> + <version>1.0.4</version> + <type>jar</type> + </info> + </resource> + + <resource> + <info> + <group>regexp</group> + <name>regexp</name> + <version>1.3</version> + <type>jar</type> + </info> + </resource> + <!-- Avalon Tools. --> @@ -61,6 +132,7 @@ <include key="junit"/> <include key="ant-junit"/> <include key="ant-nodeps"/> + <include key="checkstyle"/> </dependencies> </project> Added: avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/checkstyle-frames.xsl ============================================================================== --- (empty file) +++ avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/checkstyle-frames.xsl Thu Sep 16 18:04:56 2004 @@ -0,0 +1,382 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect" + extension-element-prefixes="redirect"> + +<!-- + The Apache Software License, Version 1.1 + + Copyright (c) 2002 The Apache Software Foundation. All rights + reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The end-user documentation included with the redistribution, if + any, must include the following acknowlegement: + "This product includes software developed by the + Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowlegement may appear in the software itself, + if and wherever such third-party acknowlegements normally appear. + + 4. The names "The Jakarta Project", "Ant", and "Apache Software + Foundation" must not be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact [EMAIL PROTECTED] + + 5. Products derived from this software may not be called "Apache" + nor may "Apache" appear in their names without prior written + permission of the Apache Group. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + ==================================================================== + + This software consists of voluntary contributions made by many + individuals on behalf of the Apache Software Foundation. For more + information on the Apache Software Foundation, please see + <http://www.apache.org/>. + --> + + <xsl:output method="html" indent="yes" encoding="US-ASCII"/> + <xsl:decimal-format decimal-separator="." grouping-separator="," /> + + <xsl:param name="output.dir" select="'.'"/> + + <xsl:template match="checkstyle"> + <!-- create the index.html --> + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + + <!-- create the stylesheet.css --> + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + + <!-- create the overview-summary.html at the root --> + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="overview"/> + </redirect:write> + + <!-- create the all-classes.html at the root --> + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + + <!-- process all files --> + <xsl:apply-templates select="file"/> + </xsl:template> + + <xsl:template name="index.html"> + <html> + <head> + <title>CheckStyle Audit</title> + </head> + <frameset cols="20%,80%"> + <frame src="allclasses-frame.html" name="fileListFrame"/> + <frame src="overview-frame.html" name="fileFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </html> + </xsl:template> + + <xsl:template name="pageHeader"> + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="text-align:right"><h2>CheckStyle Audit</h2></td> + </tr> + <tr> + <td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> + </xsl:template> + + <xsl:template match="checkstyle" mode="overview"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <!-- page header --> + <xsl:call-template name="pageHeader"/> + + <!-- Summary part --> + <xsl:apply-templates select="." mode="summary"/> + <hr size="1" width="100%" align="left"/> + + <!-- File list part --> + <xsl:apply-templates select="." mode="filelist"/> + </body> + </html> + </xsl:template> + + <xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + </xsl:template> + + <!-- + Replace DOS characters in a path. + Replace '\' with '/', ':' with '_'. + --> + <xsl:template name="from-dos"> + <xsl:param name="path"/> + <xsl:value-of select="translate($path, '\:', '/_')"/> + </xsl:template> + + <!-- + Creates an all-classes.html file that contains a link to all files. + --> + <xsl:template match="checkstyle" mode="all.classes"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <h2>Files</h2> + <p><a href="overview-frame.html" target="fileFrame">Summary</a></p> + <p> + <table width="100%"> + <!-- For each file create its part --> + <xsl:apply-templates select="file" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </p> + </body> + </html> + </xsl:template> + + <xsl:template match="checkstyle" mode="filelist"> + <h3>Files</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Name</th> + <th>Errors</th> + </tr> + <xsl:apply-templates select="file" mode="filelist"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </xsl:template> + + <xsl:template match="file" mode="filelist"> + <xsl:variable name="first"> + <xsl:call-template name="isfirst"> + <xsl:with-param name="name" select="@name"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="name" select="@name" /> + + <xsl:if test="$first = 'true'"> + <xsl:variable name="new-name"> + <xsl:call-template name="from-dos"> + <xsl:with-param name="path" select="@name"/> + </xsl:call-template> + </xsl:variable> + <tr> + <xsl:call-template name="alternated-row" /> + <td nowrap="nowrap"> + <a> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="$new-name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + <td><xsl:value-of select="count(../[EMAIL PROTECTED] = $name]/error)"/></td> + </tr> + </xsl:if> + </xsl:template> + + <xsl:template match="file" mode="all.classes"> + <xsl:variable name="first"> + <xsl:call-template name="isfirst"> + <xsl:with-param name="name" select="@name"/> + </xsl:call-template> + </xsl:variable> + + <xsl:if test="$first = 'true'"> + <xsl:variable name="new-name"> + <xsl:call-template name="from-dos"> + <xsl:with-param name="path" select="@name"/> + </xsl:call-template> + </xsl:variable> + <tr> + <td nowrap="nowrap"> + <a target="fileFrame"> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="$new-name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> + </xsl:if> + </xsl:template> + + <!-- + transform string like a/b/c to ../../../ + @param path the path to transform into a descending directory path + --> + <xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'/')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'/')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'/')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> + </xsl:template> + + <xsl:template match="file"> + <xsl:variable name="first"> + <xsl:call-template name="isfirst"> + <xsl:with-param name="name" select="@name"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="name" select="@name" /> + + <xsl:if test="$first = 'true'"> + <xsl:variable name="new-name"> + <xsl:call-template name="from-dos"> + <xsl:with-param name="path" select="@name"/> + </xsl:call-template> + </xsl:variable> + <redirect:write file="{$output.dir}/files/{$new-name}.html"> + <html> + <head> + <link rel="stylesheet" type="text/css"> + <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="$new-name"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute> + </link> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>File <xsl:value-of select="@name"/></h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Error Description</th> + <th>Line</th> + </tr> + <xsl:for-each select="../[EMAIL PROTECTED] = $name]/error"> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="@message"/></td> + <td><xsl:value-of select="@line"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> + </redirect:write> + </xsl:if> + </xsl:template> + + <xsl:template match="checkstyle" mode="summary"> + <h3>Summary</h3> + <xsl:variable name="fileCount" select="count(file)"/> + <xsl:variable name="errorCount" select="count(file/error)"/> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Files</th> + <th>Errors</th> + </tr> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="$fileCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + </tr> + </table> + </xsl:template> + + <xsl:template name="alternated-row"> + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> + </xsl:attribute> + </xsl:template> + + <!-- determine if this is the first occurance of the given name in the input --> + <xsl:template name="isfirst"> + <xsl:param name="name"/> + <xsl:value-of select="count(preceding-sibling::[EMAIL PROTECTED]) = 0"/> + </xsl:template> + +</xsl:stylesheet> + Added: avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/metro-checkstyle.xml ============================================================================== --- (empty file) +++ avalon/trunk/tools/magic/etc/deliverables/templates/checkstyle/metro-checkstyle.xml Thu Sep 16 18:04:56 2004 @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> +<module name="Checker"> + <module name="TreeWalker"> + <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"> + <property name="severity" value="ignore"/> + <property name="tokens" value="METHOD_DEF, CTOR_DEF"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.GenericIllegalRegexpCheck"> + <property name="format" value="\s+$"/> + <property name="ignoreCase" value="false"/> + <property name="ignoreComments" value="false"/> + <property name="message" value="Line has trailing spaces."/> + <property name="severity" value="ignore"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.ModifierOrderCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.RedundantModifierCheck"> + <property name="severity" value="ignore"/> + <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"> + <property name="option" value="stmt"/> + <property name="severity" value="warning"/> + <property name="tokens" value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"> + <property name="maxLineLength" value="80"/> + <property name="option" value="nl"/> + <property name="severity" value="warning"/> + <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"> + <property name="option" value="alone"/> + <property name="severity" value="warning"/> + <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalInstantiationCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.RedundantThrowsCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck"> + <property name="severity" value="ignore"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"> + <property name="applyToPackage" value="true"/> + <property name="applyToPrivate" value="true"/> + <property name="applyToProtected" value="true"/> + <property name="applyToPublic" value="true"/> + <property name="format" value="^m_[a-z][a-zA-Z0-9]*$"/> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck"> + <property name="ignorePattern" value="^$"/> + <property name="max" value="80"/> + <property name="severity" value="ignore"/> + <property name="tabWidth" value="4"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"> + <property name="option" value="space"/> + <property name="severity" value="warning"/> + <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TabCharacterCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"> + <property name="severity" value="warning"/> + </module> + <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"> + <property name="severity" value="warning"/> + <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_FOR, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/> + </module> + </module> +</module> Modified: avalon/trunk/tools/magic/etc/deliverables/templates/standard.xml ============================================================================== --- avalon/trunk/tools/magic/etc/deliverables/templates/standard.xml (original) +++ avalon/trunk/tools/magic/etc/deliverables/templates/standard.xml Thu Sep 16 18:04:56 2004 @@ -30,6 +30,25 @@ <x:clean/> </target> + <target name="checkstyle" depends="info" unless="project.checkstyle.disable" > + <taskdef resource="checkstyletask.properties" > + <classpath> + <x:path key="checkstyle" resolve="true" /> + </classpath> + </taskdef> + + <mkdir dir="target/checkstyle-errors/"/> + <mkdir dir="target/checkstyle-reports/"/> + <checkstyle config="${magic.templates}/checkstyle/metro-checkstyle.xml"> + <fileset dir="${project.src}/${project.src.main}" includes="**/*.java"/> + <formatter type="xml" toFile="target/checkstyle/checkstyle_errors.xml"/> + </checkstyle> + <style in="target/checkstyle-errors/checkstyle_errors.xml" + out="target/checkstyle-reports/checkstyle_report.html" + style="${magic.templates}/checkstyle/checkstyle-frames.xsl" + /> + </target> + <target name="prepare" depends="init"> <x:prepare/> </target> @@ -46,7 +65,7 @@ <x:junit/> </target> - <target name="install" depends="test"> + <target name="install" depends="test,checkstyle"> <x:install/> </target> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]