logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwom...@apache.org
Subject cvs commit: jakarta-log4j sunCodingConvention.xml build.properties.sample build.xml
Date Wed, 05 Feb 2003 05:42:21 GMT
mwomack     2003/02/04 21:42:21

  Modified:    .        build.properties.sample build.xml
  Added:       .        sunCodingConvention.xml
  Log:
  Changes to incorporate jalopy targets which can be used to format source code (Thanks Yoav
Shapira)
  Added a "styled_files" file path definition that is used for both jalopy and checkstyle
targets.
  
  Revision  Changes    Path
  1.5       +12 -11    jakarta-log4j/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/build.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.properties.sample	9 Oct 2002 22:50:01 -0000	1.4
  +++ build.properties.sample	5 Feb 2003 05:42:20 -0000	1.5
  @@ -1,29 +1,30 @@
  -
  -# The jaxp interface and a jaxp parser are required
  -# to build the DOMConfigurator
  +# JAXP OPTIONAL; required to build the DOMConfigurator
   jaxp.home=/java/jaxp-1.1
   jaxp.jaxp.jar=${jaxp.home}/jaxp.jar
   jaxp.parser.jar=${jaxp.home}/crimson.jar
   
  -# JavaMail API Required to build the SMTPAppender
  +# JavaMail API OPTIONAL; required to build the SMTPAppender
   javamail.jar=/java/javamail-1.2/mail.jar
   activation.jar=/java/jaf-1.0.1/activation.jar
   
  -
  -# JMS interfaces are required to be on the classpath
  +# JMS OPTIONAL; required to build the JMSAppender.
   # in order to build the JMSAppender.
   jms.jar=/java/JMQ1.1/lib/jms.jar
   
  -# Required to build the org.apace.log4j.jmx package.
  +# JMX OPTIONAL; required to build the org.apace.log4j.jmx package.
   jmx.jar=/java/jmx/lib/jmxri.jar
   jmx-extra.jar=/java/jmx/lib/jmxtools.jar
   
  +# Checkstyle OPTIONAL; required to run the checkstyle target
  + Available from http://checkstyle.sf.net
  +checkstyle.jar=/java/checkstyle-2.2/checkstyle-all-2.2.jar
  +
  +# Jalopy OPTIONAL; required to run the jalpoy targets
  +jalopy.stylesheet.location=sunCodingConvention.xml
  +jalopy.lib=d:/development/code-opensource/other/jalopy-b10/lib
  +
   # jakarta-site2 module is used to transform xml files to html using
   # Anakia. You do not need to worry about this property unless you
   # intend to build the log4j web site yourself.
   jakarta-site2=../jakarta-site2
  -
  -# Required to run Checkstyle. Available from http://checkstyle.sf.net
  -checkstyle.jar=/java/checkstyle-2.2/checkstyle-all-2.2.jar
  -
   
  
  
  
  1.46      +42 -3     jakarta-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/build.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- build.xml	5 Feb 2003 03:56:47 -0000	1.45
  +++ build.xml	5 Feb 2003 05:42:20 -0000	1.46
  @@ -74,7 +74,7 @@
   
     <!-- Construct compile classpath -->
     <path id="compile.classpath">
  -    <pathelement location="${build.home}/classes"/>
  +    <pathelement location="${javac.dest}/classes"/>
       <pathelement location="${javamail.jar}"/>
       <pathelement location="${activation.jar}"/>
       <pathelement location="${jaxp.jaxp.jar}"/>
  @@ -274,6 +274,46 @@
     </target>
   
     <!-- ================================================================= -->
  +  <!-- Define Jalopy code formatting task.                               -->
  +  <!-- ================================================================= -->
  +  <path id="jalopy.path">
  +    <fileset dir="${jalopy.lib}">
  +      <include name="*.jar" />
  +    </fileset>
  +  </path>
  +  
  +  <!-- ================================================================= -->
  +  <!-- Define the set of files current styled                            -->
  +  <!-- ================================================================= -->
  +  <fileset dir="${java.source.dir}" id="styled_files">
  +  	<include name="**/plugins/*.java"/>
  +  </fileset>
  +
  +  <taskdef name="jalopy"
  +           classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
  +           classpathref="jalopy.path" />
  +
  +  <!-- ================================================================= -->
  +  <!-- Runs jalopy.  Available from http://jalopy.sourceforge.net        -->
  +  <!-- ================================================================= -->
  +  <target name="runJalopy">
  +    <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">
  @@ -289,8 +329,7 @@
   		
       <!-- by default checkstyle supports the Sun coding standard. -->
       <checkstyle>
  -      <fileset dir="src/java/org/apache/log4j/chainsaw" includes="**/*.java"/>
  -      <fileset dir="src/java/org/apache/log4j/plugins" includes="**/*.java"/>
  +      <fileset refid="styled_files"/>
       </checkstyle>
     </target>
   
  
  
  
  1.1                  jakarta-log4j/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: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org


Mime
View raw message