avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/zip ant.properties.sample build.xml
Date Sun, 24 Mar 2002 00:26:12 GMT
jefft       02/03/23 16:26:12

  Modified:    all      ant.properties.sample
               cache    ant.properties.sample build.xml project.properties
               cli      ant.properties.sample build.xml
               extension ant.properties.sample build.xml
               i18n     ant.properties.sample build.xml
               io       ant.properties.sample build.xml
               naming   ant.properties.sample build.xml
               tar      ant.properties.sample build.xml
               template-product ant.properties.sample
               zip      ant.properties.sample build.xml
  Added:       .        ant.properties.sample
  Log:
  Propagate changes to template-product/build.xml and
  template-product/ant.properties.sample to other components. In most cases,
  build.xml is identical (unfortunately not all).
  
  Revision  Changes    Path
  1.4       +43 -29    jakarta-avalon-excalibur/ant.properties.sample
  
  
  
  
  1.3       +1 -1      jakarta-avalon-excalibur/all/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	5 Feb 2002 11:02:15 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:11 -0000	1.3
  @@ -1,4 +1,4 @@
  -# This file is a sample .ant.properties file used for building ant.
  +# This file is a sample .ant.properties file used for building Excalibur.
   # Modify it for your own needs and copy it to .ant.properties 
   #
   # <-- starts a comment
  
  
  
  1.3       +23 -6     jakarta-avalon-excalibur/cache/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:11 -0000	1.3
  @@ -1,14 +1,23 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +# Avalon framework jar. Defaulted in build.xml
  +framework.jar=${basedir}/../../jakarta-avalon/tools/ext/avalon-framework.jar
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +38,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.7       +58 -51    jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	22 Mar 2002 09:37:16 -0000	1.6
  +++ build.xml	24 Mar 2002 00:26:11 -0000	1.7
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Cache" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -13,6 +13,10 @@
       <property file="../ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
   
  +    <!-- Default property values -->
  +    <property name="framework.jar"
  +        value="${basedir}/../../jakarta-avalon/tools/ext/avalon-framework.jar"/>
  +
       <!-- Settings used to configure compile environment -->
       <property name="build.debug" value="on"/>
       <property name="build.optimize" value="off"/>
  @@ -130,9 +134,9 @@
           <mkdir dir="${build.tests}"/>
   
           <junit fork="true"
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes"
  -               dir="${build.tests}">
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -181,67 +185,70 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
  +
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, checkstyle-report, javadocs" description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -289,4 +296,4 @@
           <delete dir="${dist.base}" />
       </target>
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  
  1.3       +0 -1      jakarta-avalon-excalibur/cache/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	19 Mar 2002 20:03:53 -0000	1.2
  +++ project.properties	24 Mar 2002 00:26:11 -0000	1.3
  @@ -2,4 +2,3 @@
   Name=Cache
   version=1.0
   year=2001-2002
  -framework.jar=../../jakarta-avalon/tools/ext/avalon-framework.jar
  
  
  
  1.3       +21 -6     jakarta-avalon-excalibur/cli/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:11 -0000	1.3
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.20      +61 -61    jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	21 Mar 2002 14:19:21 -0000	1.19
  +++ build.xml	24 Mar 2002 00:26:11 -0000	1.20
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur CLI" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -12,7 +12,7 @@
       <property file="ant.properties"/>
       <property file="../ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -    
  +
       <!-- Settings used to configure compile environment -->
       <property name="build.debug" value="on"/>
       <property name="build.optimize" value="off"/>
  @@ -123,15 +123,15 @@
       </target>
   
       <target name="test" depends="compile" description="Perform the unit tests">
  -        
  +
           <echo message="Performing Unit Tests" />
  -        
  +
           <mkdir dir="${build.tests}"/>
  -        
  -        <junit fork="true" 
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes" 
  -               dir="${build.tests}">
  +
  +        <junit fork="true"
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -144,13 +144,13 @@
                   </fileset>
               </batchtest>
           </junit>
  -        
  +
       </target>
   
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -        
  +
           <mkdir dir="${build.reports}/junit"/>
  -        
  +
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
  @@ -165,7 +165,7 @@
               <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -        
  +
       </target>
   
       <target name="jdepend" if="do.jdepend" description="Generate Dependency Analysis Report">
  @@ -180,64 +180,64 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
  +
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, jdepend, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.3       +21 -6     jakarta-avalon-excalibur/extension/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.23      +83 -61    jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	22 Mar 2002 09:37:16 -0000	1.22
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.23
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Extension" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -58,7 +58,7 @@
   
           <mkdir dir="${build.classes}"/>
   
  -        <!-- Compile all classes excluding the tests.  They are compiled in their own task -->
  +        <!-- Compile all classes including the tests. -->
           <javac srcdir="${java.dir}"
               destdir="${build.classes}"
               debug="${build.debug}"
  @@ -123,15 +123,15 @@
       </target>
   
       <target name="test" depends="compile" description="Perform the unit tests">
  -        
  +
           <echo message="Performing Unit Tests" />
  -        
  +
           <mkdir dir="${build.tests}"/>
  -        
  -        <junit fork="true" 
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes" 
  -               dir="${build.tests}">
  +
  +        <junit fork="true"
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -144,13 +144,13 @@
                   </fileset>
               </batchtest>
           </junit>
  -        
  +
       </target>
   
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -        
  +
           <mkdir dir="${build.reports}/junit"/>
  -        
  +
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
  @@ -165,7 +165,7 @@
               <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -        
  +
       </target>
   
       <target name="jdepend" if="do.jdepend" description="Generate Dependency Analysis Report">
  @@ -180,69 +180,70 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
  +
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, jdepend, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -250,6 +251,27 @@
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
           </zip>
   
  +        <!--
  +          Not supported by released ant but when it is we should enable this across
  +          all of the products
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +          <tarfileset dir="${dist.dir}"
  +                      prefix="${dist.name}"
  +                      username="avalon"
  +                      group="avalon"/>
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +              src="${dist.name}-bin.tar"/>
  +        <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +               src="${dist.name}-bin.tar"/>
  +
  +        <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +
  +        <checksum fileext=".md5">
  +          <fileset dir="${dist.base}" />
  +        </checksum>
  +        -->
           <delete dir="${dist.dir}" />
   
       </target>
  
  
  
  1.3       +21 -6     jakarta-avalon-excalibur/i18n/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.23      +85 -62    jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	22 Mar 2002 09:37:16 -0000	1.22
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.23
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur i18n" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -12,7 +12,7 @@
       <property file="ant.properties"/>
       <property file="../ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -    
  +
       <!-- Settings used to configure compile environment -->
       <property name="build.debug" value="on"/>
       <property name="build.optimize" value="off"/>
  @@ -49,12 +49,13 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -        
  +
       <target name="main" depends="dist" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
       <!-- Compiles the source code -->
       <target name="compile" description="Compiles the source code">
  +
           <mkdir dir="${build.classes}"/>
   
           <!-- Compile all classes including the tests. -->
  @@ -122,15 +123,15 @@
       </target>
   
       <target name="test" depends="compile" description="Perform the unit tests">
  -        
  +
           <echo message="Performing Unit Tests" />
  -        
  +
           <mkdir dir="${build.tests}"/>
  -        
  -        <junit fork="true" 
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes" 
  -               dir="${build.tests}">
  +
  +        <junit fork="true"
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -143,13 +144,13 @@
                   </fileset>
               </batchtest>
           </junit>
  -        
  +
       </target>
   
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -        
  +
           <mkdir dir="${build.reports}/junit"/>
  -        
  +
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
  @@ -164,7 +165,7 @@
               <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -        
  +
       </target>
   
       <target name="jdepend" if="do.jdepend" description="Generate Dependency Analysis Report">
  @@ -179,69 +180,70 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
  +
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, jdepend, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -249,6 +251,27 @@
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
           </zip>
   
  +        <!--
  +          Not supported by released ant but when it is we should enable this across
  +          all of the products
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +          <tarfileset dir="${dist.dir}"
  +                      prefix="${dist.name}"
  +                      username="avalon"
  +                      group="avalon"/>
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +              src="${dist.name}-bin.tar"/>
  +        <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +               src="${dist.name}-bin.tar"/>
  +
  +        <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +
  +        <checksum fileext=".md5">
  +          <fileset dir="${dist.base}" />
  +        </checksum>
  +        -->
           <delete dir="${dist.dir}" />
   
       </target>
  
  
  
  1.3       +21 -6     jakarta-avalon-excalibur/io/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.24      +83 -60    jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	22 Mar 2002 09:37:17 -0000	1.23
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.24
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur IO" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -49,7 +49,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -        
  +
       <target name="main" depends="dist" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -123,15 +123,15 @@
       </target>
   
       <target name="test" depends="compile" description="Perform the unit tests">
  -        
  +
           <echo message="Performing Unit Tests" />
  -        
  +
           <mkdir dir="${build.tests}"/>
  -        
  -        <junit fork="true" 
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes" 
  -               dir="${build.tests}">
  +
  +        <junit fork="true"
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -144,13 +144,13 @@
                   </fileset>
               </batchtest>
           </junit>
  -        
  +
       </target>
   
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -        
  +
           <mkdir dir="${build.reports}/junit"/>
  -        
  +
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
  @@ -165,6 +165,7 @@
               <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  +
       </target>
   
       <target name="jdepend" if="do.jdepend" description="Generate Dependency Analysis Report">
  @@ -179,69 +180,70 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
  +
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, jdepend, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -249,6 +251,27 @@
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
           </zip>
   
  +        <!--
  +          Not supported by released ant but when it is we should enable this across
  +          all of the products
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +          <tarfileset dir="${dist.dir}"
  +                      prefix="${dist.name}"
  +                      username="avalon"
  +                      group="avalon"/>
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +              src="${dist.name}-bin.tar"/>
  +        <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +               src="${dist.name}-bin.tar"/>
  +
  +        <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +
  +        <checksum fileext=".md5">
  +          <fileset dir="${dist.base}" />
  +        </checksum>
  +        -->
           <delete dir="${dist.dir}" />
   
       </target>
  
  
  
  1.3       +21 -6     jakarta-avalon-excalibur/naming/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Mar 2002 01:27:30 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/21 01:27:30 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.24      +83 -60    jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	22 Mar 2002 09:37:17 -0000	1.23
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.24
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Naming" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  @@ -49,7 +49,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -        
  +
       <target name="main" depends="dist" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -130,15 +130,15 @@
       </target>
   
       <target name="test" depends="compile" description="Perform the unit tests">
  -        
  +
           <echo message="Performing Unit Tests" />
  -        
  +
           <mkdir dir="${build.tests}"/>
  -        
  -        <junit fork="true" 
  -               haltonfailure="${junit.failonerror}"
  -               printsummary="yes" 
  -               dir="${build.tests}">
  +
  +        <junit fork="true"
  +            haltonfailure="${junit.failonerror}"
  +            printsummary="yes"
  +            dir="${build.tests}">
               <classpath refid="project.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  @@ -151,13 +151,13 @@
                   </fileset>
               </batchtest>
           </junit>
  -        
  +
       </target>
   
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -        
  +
           <mkdir dir="${build.reports}/junit"/>
  -        
  +
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
  @@ -172,6 +172,7 @@
               <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  +
       </target>
   
       <target name="jdepend" if="do.jdepend" description="Generate Dependency Analysis Report">
  @@ -186,69 +187,70 @@
           </jdepend>
   
           <mkdir dir="${build.reports}/jdepend"/>
  -        <style in="${build.dir}/jdepend-results.xml" 
  -               processor="trax" 
  -               out="${build.reports}/jdepend/delete-me.txt" 
  -               style="${ant.home}/etc/jdepend-frames.xsl"/>
  +        <style in="${build.dir}/jdepend-results.xml"
  +            processor="trax"
  +            out="${build.reports}/jdepend/delete-me.txt"
  +            style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  -	<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -    
  +    <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
           <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -		<taskdef name="checkstyle"
  -			classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -			<classpath refid="project.class.path"/>
  -		</taskdef>
  -		<checkstyle
  -			lcurlyType="nl"
  -			lcurlyMethod="nl"
  -			lcurlyOther="nl"
  -			rcurly="ignore"
  -			allowProtected="false"
  -			allowPackage="false"
  -			allowNoAuthor="false"
  -			maxLineLen="100"
  -			maxMethodLen="100"
  -			maxConstructorLen="100"
  -			memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -			staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -			constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -			ignoreImportLen="true"
  -			allowTabs="false"
  -			javadocScope="protected"
  -			ignoreWhitespace="true"
  -			cacheFile="checkstyle.cache"
  -			failOnViolation="false"
  -			ignoreCastWhitespace="true">
  -			<fileset dir="${java.dir}">
  -				<include name="**/*.java"/>
  -			</fileset>
  +        <taskdef name="checkstyle"
  +            classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +        <checkstyle
  +            lcurlyType="nl"
  +            lcurlyMethod="nl"
  +            lcurlyOther="nl"
  +            rcurly="ignore"
  +            allowProtected="false"
  +            allowPackage="false"
  +            allowNoAuthor="false"
  +            maxLineLen="100"
  +            maxMethodLen="100"
  +            maxConstructorLen="100"
  +            memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +            staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +            constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +            ignoreImportLen="true"
  +            allowTabs="false"
  +            javadocScope="protected"
  +            ignoreWhitespace="true"
  +            cacheFile="checkstyle.cache"
  +            failOnViolation="false"
  +            ignoreCastWhitespace="true">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
               <formatter type="plain"/>
               <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  -		</checkstyle>
  -	</target>
  +        </checkstyle>
  +    </target>
   
  -	<target name="checkstyle-report" 
  -            depends="checkstyle" 
  -            if="do.checkstyle" 
  -            description="Generate Checkstyle Report">
  -
  -		<mkdir dir="${build.reports}/checkstyle"/>
  -		<style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  -			out="${build.reports}/checkstyle/delete-me.html"/>
  +    <target name="checkstyle-report"
  +        depends="checkstyle"
  +        if="do.checkstyle"
  +        description="Generate Checkstyle Report">
  +
  +        <mkdir dir="${build.reports}/checkstyle"/>
  +        <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
  +            out="${build.reports}/checkstyle/delete-me.html"/>
   
  -	</target>
  +    </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, jdepend, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="jar, test-reports, jdepend, checkstyle-report, javadocs"
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -256,6 +258,27 @@
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
           </zip>
   
  +        <!--
  +          Not supported by released ant but when it is we should enable this across
  +          all of the products
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +          <tarfileset dir="${dist.dir}"
  +                      prefix="${dist.name}"
  +                      username="avalon"
  +                      group="avalon"/>
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +              src="${dist.name}-bin.tar"/>
  +        <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +               src="${dist.name}-bin.tar"/>
  +
  +        <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +
  +        <checksum fileext=".md5">
  +          <fileset dir="${dist.base}" />
  +        </checksum>
  +        -->
           <delete dir="${dist.dir}" />
   
       </target>
  
  
  
  1.2       +21 -6     jakarta-avalon-excalibur/tar/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	21 Mar 2002 13:35:35 -0000	1.1
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.2
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/21 13:35:35 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.2 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.3       +1 -1      jakarta-avalon-excalibur/tar/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	21 Mar 2002 14:19:21 -0000	1.2
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Tar" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  
  
  
  1.3       +13 -6     jakarta-avalon-excalibur/template-product/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	23 Mar 2002 13:18:35 -0000	1.2
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  @@ -1,13 +1,20 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/23 13:18:35 jefft Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
  +
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
   
   
   # ----- Compile Control Flags -----
  
  
  
  1.2       +21 -6     jakarta-avalon-excalibur/zip/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	22 Mar 2002 12:16:10 -0000	1.1
  +++ ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.2
  @@ -1,14 +1,21 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the top-level source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/22 12:16:10 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component, and
  +# override the defaults in ../ant.properties.
  +#
  +# $Id: ant.properties.sample,v 1.2 2002/03/24 00:26:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  +# --------------------------------------------------
  +#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
   
   # ----- Compile Control Flags -----
   build.debug=on
  @@ -29,7 +36,15 @@
   junit.jar=${junit.lib}/junit.jar
   
   
  +
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
   # ----- Checkstyle, version 2.1 or later -----
  +
  +# Uncomment the 'do.checkstyle' flag property to enable checkstyle
  +# do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
   checkstyle.lib=${checkstyle.home}
   checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/zip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	22 Mar 2002 12:16:10 -0000	1.1
  +++ build.xml	24 Mar 2002 00:26:12 -0000	1.2
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Zip" default="main" basedir=".">
  +<project default="main" basedir=".">
   
       <!-- load per-project properties -->
       <property file="project.properties"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message