mwomack 2003/02/07 23:55:35 Modified: . build.properties.sample build.xml Added: . sunCodingConvention.xml Log: Moved over jalopy and checkstyle settings from jakarta-log4j cvs. Revision Changes Path 1.2 +4 -0 jakarta-log4j-sandbox/build.properties.sample Index: build.properties.sample =================================================================== RCS file: /home/cvs/jakarta-log4j-sandbox/build.properties.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.properties.sample 4 Feb 2003 06:28:16 -0000 1.1 +++ build.properties.sample 8 Feb 2003 07:55:35 -0000 1.2 @@ -13,3 +13,7 @@ # Checkstyle jar OPTIONAL; required to execute checkstyle target checkstyle.jar=d:/development/code-opensource/other/checkstyle-2.4/checkstyle-all-2.4.jar +# Jalopy OPTIONAL; required to run the jalpoy targets +jalopy.stylesheet.location=sunCodingConvention.xml +jalopy.lib=d:/development/code-opensource/other/jalopy-b10/lib + 1.2 +37 -2 jakarta-log4j-sandbox/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-log4j-sandbox/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 4 Feb 2003 06:28:16 -0000 1.1 +++ build.xml 8 Feb 2003 07:55:35 -0000 1.2 @@ -112,6 +112,41 @@ </target> <!-- ================================================================= --> + <!-- Define the set of files current styled --> + <!-- ================================================================= --> + <fileset dir="${java.source.dir}" id="styled_files"> + <include name="**/filter/*.java"/> + </fileset> + + <!-- ================================================================= --> + <!-- Runs jalopy. Available from http://jalopy.sourceforge.net --> + <!-- ================================================================= --> + <target name="runJalopy"> + <path id="jalopy.path"> + <fileset dir="${jalopy.lib}"> + <include name="*.jar" /> + </fileset> + </path> + <taskdef name="jalopy" + classname="de.hunsicker.jalopy.plugin.ant.AntPlugin" + classpathref="jalopy.path" /> + <jalopy backup="true" + classpathref="compile.classpath" + convention="${jalopy.stylesheet.location}"> + <fileset refid="styled_files"/> + </jalopy> + </target> + + <!-- ================================================================= --> + <!-- Runs jalopy preferences editor. --> + <!-- ================================================================= --> + <target name="editJalopyPreferences"> + <java classname="de.hunsicker.jalopy.swing.SettingsDialog" + classpathref="jalopy.path" + fork="true" /> + </target> + + <!-- ================================================================= --> <!-- Runs checkstyle. Available from http://checkstyle.sf.net --> <!-- ================================================================= --> <target name="checkstyle" depends="init"> @@ -124,10 +159,10 @@ <property name="checkstyle.maxmethodlen" value="500" /> <property name="checkstyle.maxconstructorlen" value="500" /> <property name="checkstyle.ignore.public.in.interface" value="true" /> - + <!-- by default checkstyle supports the Sun coding standard. --> <checkstyle> - <fileset dir="src/java/org/apache/log4j/" includes="**/*.java"/> + <fileset refid="styled_files"/> </checkstyle> </target> 1.1 jakarta-log4j-sandbox/sunCodingConvention.xml Index: sunCodingConvention.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <jalopy> <general> <compliance> <version>14</version> </compliance> <style> <description>Sun Java Coding Convention</description> <name>Sun</name> </style> </general> <internal> <version>6</version> </internal> <printer> <alignment> <methodCallChain>true</methodCallChain> <parameterMethodDeclaration>false</parameterMethodDeclaration> <ternaryOperator>true</ternaryOperator> <variableAssignment>false</variableAssignment> <variableIdentifier>false</variableIdentifier> </alignment> <braces> <empty> <cuddle>false</cuddle> <insertStatement>false</insertStatement> </empty> <insert> <dowhile>false</dowhile> <for>false</for> <ifelse>true</ifelse> <while>false</while> </insert> <remove> <block>true</block> <dowhile>false</dowhile> <for>false</for> <ifelse>false</ifelse> <while>false</while> </remove> <treatDifferent> <methodClass>false</methodClass> <methodClassIfWrapped>false</methodClassIfWrapped> </treatDifferent> </braces> <footer> <text /> </footer> <header> <text /> </header> <history> <method>timestamp</method> <policy>disabled</policy> </history> <imports> <policy>disabled</policy> </imports> <indentation> <caseFromSwitch>false</caseFromSwitch> <continuation> <block>true</block> <operator>false</operator> </continuation> <firstColumnComments>true</firstColumnComments> <label>false</label> <policy> <deep>false</deep> </policy> <sizes> <braceCuddled>1</braceCuddled> <braceLeft>1</braceLeft> <braceRight>0</braceRight> <braceRightAfter>1</braceRightAfter> <continuation>4</continuation> <deep>55</deep> <extends>-1</extends> <general>4</general> <implements>-1</implements> <leading>0</leading> <tabs>8</tabs> <throws>-1</throws> <trailingComment>1</trailingComment> </sizes> <tabs> <enable>false</enable> <onlyLeading>false</onlyLeading> </tabs> </indentation> <sorting> <declaration> <order>static|field|initializer|constructor|method|interface|class</order> </declaration> <modifier> <order>public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp</order> </modifier> </sorting> <whitespace> <after> <comma>true</comma> <semicolon>true</semicolon> <typeCast>true</typeCast> </after> <before> <braces>true</braces> <brackets>false</brackets> <bracketsTypes>false</bracketsTypes> <caseColon>false</caseColon> <operator> <not>false</not> </operator> <parentheses> <methodCall>false</methodCall> <methodDeclaration>false</methodDeclaration> <statement>true</statement> </parentheses> </before> <padding> <braces>true</braces> <brackets>false</brackets> <operator> <assignment>true</assignment> <bitwise>true</bitwise> <logical>true</logical> <mathematical>true</mathematical> <relational>true</relational> <shift>true</shift> </operator> <parenthesis>false</parenthesis> <typeCast>false</typeCast> </padding> </whitespace> <wrapping> <always> <after> <arrayElement>0</arrayElement> <braceRight>false</braceRight> <extendsTypes>false</extendsTypes> <implementsTypes>false</implementsTypes> <label>true</label> <methodCallChained>false</methodCallChained> <ternaryOperator> <first>false</first> <second>false</second> </ternaryOperator> <throwsTypes>false</throwsTypes> </after> <before> <braceLeft>false</braceLeft> <extends>false</extends> <implements>false</implements> <throws>false</throws> </before> <parameter> <methodCall>false</methodCall> <methodCallNested>false</methodCallNested> <methodDeclaration>false</methodDeclaration> </parameter> </always> <general> <beforeOperator>false</beforeOperator> <enable>true</enable> <lineLength>79</lineLength> </general> <ondemand> <after> <assignment>true</assignment> <leftParenthesis>true</leftParenthesis> <parameter>false</parameter> <types> <extends>false</extends> <implements>false</implements> <throws>false</throws> </types> </after> <before> <rightParenthesis>false</rightParenthesis> </before> <groupingParentheses>false</groupingParentheses> </ondemand> </wrapping> </printer> </jalopy>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]