You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2003/05/19 18:53:04 UTC

cvs commit: avalon-excalibur/thread build.xml

leosutic    2003/05/19 09:53:03

  Modified:    component build.xml
               configuration build.xml
               event    build.xml
               extension build.xml
               i18n     build.xml
               instrument build.xml
               instrument-client build.xml
               instrument-manager build.xml
               logger   build.xml
               monitor  build.xml
               pool     build.xml
               sourceresolve build.xml
               store    build.xml
               thread   build.xml
  Log:
  Removed reference to non-existing ../avalon/KEYS.
  
  Revision  Changes    Path
  1.44      +187 -189  avalon-excalibur/component/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/component/build.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- build.xml	16 Apr 2003 22:19:57 -0000	1.43
  +++ build.xml	19 May 2003 16:52:59 -0000	1.44
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
   <project name="Excalibur Component" default="main" basedir=".">
  -
  +    
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
       <property file="${basedir}/ant.properties"/>
  @@ -9,7 +9,7 @@
       <property file="${basedir}/../libraries.properties"/>
       <property file="${basedir}/../default.properties"/>
       <property file="${basedir}/default.properties"/>
  -
  +    
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
  @@ -24,18 +24,18 @@
           <pathelement location="${util.concurrent.jar}"/>
           <pathelement location="${commons-collections.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -
  +        
           <!-- Optional jars -->
           <pathelement location="${servlet.jar}"/>
  -
  +        
           <pathelement path="${java.class.path}"/>
       </path>
  -
  +    
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
           <pathelement location="${tools.jar}"/>
       </path>
  -
  +    
       <path id="test.class.path">
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
  @@ -43,31 +43,31 @@
           <path refid="project.class.path"/>
       </path>
       <property name="cp" refid="test.class.path"/>
  -
  +    
       <target name="main" depends="test,jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  -
  +    
       <!-- Checks the environment for existing resources -->
       <target name="check-environment">
           <available property="servlet.present" classname="javax.servlet.Servlet">
               <classpath refid="project.class.path"/>
           </available>
       </target>
  -
  +    
       <!-- Check that if we want servlet logging support, our logkit.jar has it enabled too -->
       <target name="dependencies.servlet" if="servlet.present">
  -            <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -                <property name="proj.jar.name" value="logkit.jar"/>
  -                <property name="class" value="org.apache.log.output.ServletOutputLogTarget"/>
  -                <property name="classpath" value="${cp}"/>
  -                <property name="remedy" value="Recompile ${Name} with servlet support enabled, or disable servlet support in ${Name} by setting a blank 'servlet.jar' property in ant.properties"/>
  -            </ant>
  -        </target>
  -
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +            <property name="proj.jar.name" value="logkit.jar"/>
  +            <property name="class" value="org.apache.log.output.ServletOutputLogTarget"/>
  +            <property name="classpath" value="${cp}"/>
  +            <property name="remedy" value="Recompile ${Name} with servlet support enabled, or disable servlet support in ${Name} by setting a blank 'servlet.jar' property in ant.properties"/>
  +        </ant>
  +    </target>
  +    
       <target name="dependencies.optional"
           depends="check-environment,dependencies.servlet"
           description="Checks if dependencies for optional components are present"/>
  -
  +    
       <target name="dependencies" depends="dependencies.optional" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  @@ -77,14 +77,14 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
       </target>
  -
  +    
       <target name="dependencies-test" depends="dist-jar, dependencies"
           description="Check unit test dependencies" unless="skip.dependencies">
           <!-- Need the jar to prevent recursive deps. -->
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
       </target>
  -
  +    
       <target name="servlet-warn" unless="servlet.present"
           description="Outputs a warning if javax.servlet.* classes are missing during compilation">
           <echo>*********************************************************************************</echo>
  @@ -100,12 +100,12 @@
           <echo>*********************************************************************************</echo>
           <echo/>
       </target>
  -
  +    
       <!-- Compiles the source code -->
       <target name="compile" depends="dependencies, servlet-warn" description="Compiles the source code">
  -
  +        
           <mkdir dir="${build.classes}"/>
  -
  +        
           <!-- Compile all classes excluding the tests. -->
           <javac srcdir="${java.dir}"
               destdir="${build.classes}"
  @@ -116,9 +116,9 @@
               <classpath refid="project.class.path" />
               <include name="**/*.java"/>
               <exclude name="org/apache/avalon/excalibur/component/servlet/**"
  -                     unless="servlet.present"/>
  +                unless="servlet.present"/>
           </javac>
  -
  +        
           <!-- copy resources to same location as .class files -->
           <copy todir="${build.classes}">
               <fileset dir="${java.dir}">
  @@ -126,20 +126,20 @@
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
           <mkdir dir="${build.testsrc}"/>
  -
  +        
           <!-- Copy over all of the tests applying test filters -->
           <copy todir="${build.testsrc}">
               <fileset dir="${test.dir}"/>
           </copy>
  -
  +        
           <mkdir dir="${build.testclasses}"/>
  -
  +        
           <!-- Compile all test classes. -->
           <javac srcdir="${build.testsrc}"
               destdir="${build.testclasses}"
  @@ -150,16 +150,16 @@
               <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
  -
  +        
           <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Copies and filters the license. Used by jar and dist -->
       <target name="prepare-conf">
           <mkdir dir="${build.conf}"/>
  @@ -169,49 +169,49 @@
                   <filter token="year" value="${year}"/>
               </filterset>
           </copy>
  -</target>
  -
  +    </target>
  +    
       <target name="jar-testcase" depends="compile, prepare-conf" description="Generates the testlet jar file">
           <mkdir dir="${build.lib}"/>
  -
  +        
           <jar jarfile="${build.lib}/${jar.testcase.name}"
               basedir="${build.classes}"
               compress="${build.compress}">
               <manifest>
  -              <attribute name="Extension-Name" value="${name.testcase}"/>
  -              <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Specification-Version" value="1.0"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Vendor-Id" value="ASF"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Extension-Name" value="${name.testcase}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="1.0"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
               </manifest>
  -	    <include name="**/testcase/**"/>
  -	    <exclude name="**/component/servlet/**"/>
  +            <include name="**/testcase/**"/>
  +            <exclude name="**/component/servlet/**"/>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
       </target>
  -
  +    
       <!-- Creates all the servlet .jar file -->
       <target name="jar-servlet" depends="compile, prepare-conf" if="servlet.present"
           description="Generates the servlet jar file">
  -
  +        
           <mkdir dir="${build.lib}"/>
  -
  +        
           <jar jarfile="${build.lib}/${jar.servlet.name}"
               basedir="${build.classes}"
               compress="${build.compress}">
               <manifest>
  -              <attribute name="Extension-Name" value="${name.servlet}"/>
  -              <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Specification-Version" value="1.0"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Vendor-Id" value="ASF"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Extension-Name" value="${name.servlet}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="1.0"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
               </manifest>
  -	    <exclude name="**/testcase/**"/>
  +            <exclude name="**/testcase/**"/>
               <include name="**/component/servlet/**"/>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
  @@ -219,66 +219,66 @@
               </zipfileset>
           </jar>
       </target>
  -
  +    
       <!-- Creates all the .jar file -->
       <target name="jar" depends="compile, prepare-conf, jar-servlet, jar-testcase" description="Generates the jar files">
  -
  +        
           <mkdir dir="${build.lib}"/>
  -
  +        
           <jar jarfile="${build.lib}/${jar.name}"
               basedir="${build.classes}"
               compress="${build.compress}">
               <manifest>
  -              <attribute name="Extension-Name" value="${name}"/>
  -              <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Specification-Version" value="1.0"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Vendor-Id" value="ASF"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Extension-Name" value="${name}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="1.0"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
               </manifest>
  -	    <exclude name="**/component/servlet/**"/>
  -	    <exclude name="**/testcase/**"/>
  +            <exclude name="**/component/servlet/**"/>
  +            <exclude name="**/testcase/**"/>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
       </target>
  -
  -
  +    
  +    
       <target name="big-jar" depends="jar" description="Build the big jar with all dependencies included">
  -      <copy file="${altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${altrmi-common.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${altrmi-server-impl.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${altrmi-server-interfaces.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${altrmi-client-impl.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${altrmi-client-interfaces.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-i18n.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-instrument.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-instrument-manager.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-instrument-manager-interfaces.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${excalibur-pool.jar}" todir="${build.dir}/tempjars"/>
  -      <copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
  -
  -      <jar destfile="${build.lib}/${name}-complete-${version}.jar" duplicate="preserve">
  -        <manifest>
  -          <attribute name="Extension-Name" value="${name}-complete"/>
  -          <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -          <attribute name="Specification-Version" value="1.0"/>
  -          <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -          <attribute name="Implementation-Version" value="${package-version}"/>
  -          <attribute name="Implementation-Vendor-Id" value="ASF"/>
  -        </manifest>
  -        <zipgroupfileset dir="${build.dir}/tempjars">
  -          <include name="*.jar"/>
  -        </zipgroupfileset>
  -      </jar>
  +        <copy file="${altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${altrmi-common.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${altrmi-server-impl.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${altrmi-server-interfaces.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${altrmi-client-impl.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${altrmi-client-interfaces.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-i18n.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-instrument.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-instrument-manager.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-instrument-manager-interfaces.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${excalibur-pool.jar}" todir="${build.dir}/tempjars"/>
  +        <copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
  +        
  +        <jar destfile="${build.lib}/${name}-complete-${version}.jar" duplicate="preserve">
  +            <manifest>
  +                <attribute name="Extension-Name" value="${name}-complete"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="1.0"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +            </manifest>
  +            <zipgroupfileset dir="${build.dir}/tempjars">
  +                <include name="*.jar"/>
  +            </zipgroupfileset>
  +        </jar>
       </target>
  -
  +    
       <!-- Creates all the Javadocs -->
       <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  -
  +        
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
               sourcepath="${java.dir}"
  @@ -297,22 +297,22 @@
               </doclet>
           </javadoc>
       </target>
  -
  +    
       <target name="test" depends="compile-test" description="Perform the unit tests" unless="skip.tests">
  -
  +        
           <echo message="Performing Unit Tests" />
  -
  +        
           <mkdir dir="${build.tests}"/>
  -
  +        
           <junit fork="true"
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
               <classpath refid="test.class.path"/>
  -
  +            
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
               <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
  -
  +            
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
  @@ -320,34 +320,34 @@
                   </fileset>
               </batchtest>
           </junit>
  -
  +        
       </target>
  -
  +    
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkBSF"/>
  -
  +        
           <mkdir dir="${build.reports}/junit"/>
  -
  +        
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
               </fileset>
               <report format="frames" todir="${build.reports}/junit"/>
           </junitreport>
  -
  +        
           <!-- Clean up the xml reports used by the junitreport task -->
           <!--
           <delete>
  -            <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  -            <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -
  +        
       </target>
  -
  +    
       <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"
  @@ -382,66 +382,65 @@
               <formatter type="xml" toFile="${build.dir}/checkstyle-results.xml"/>
           </checkstyle>
       </target>
  -
  +    
       <target name="checkstyle-report"
           depends="checkstyle"
           if="do.checkstyle"
           description="Generate Checkstyle Report">
  -
  +        
           <mkdir dir="${build.reports}/checkstyle"/>
           <property name="checkstyle.pathhack" location="."/>
           <style style="${tools.dir}/etc/checkstyle-frames.xsl" in="${build.dir}/checkstyle-results.xml"
               out="${build.reports}/checkstyle/delete-me.html">
               <param name="pathhack" expression="${checkstyle.pathhack}"/>
           </style>
  -
  +        
       </target>
  -
  +    
       <!-- Creates the distribution -->
       <target name="dist"
           depends="dist-jar, test-reports, checkstyle-report, docs, javadocs"
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle reports)">
  -
  -
  +        
  +        
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
           </zip>
  -
  +        
           <mkdir dir="${dist.base}"/>
  -
  +        
           <zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
  -
  -	<checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  -
  +        
  +        <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  +        
           <!--
  -          Not supported by released ant but when it is we should enable this across
  -          all of the products
  +        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"/>
  +        <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"/>
  +        src="${dist.name}-bin.tar"/>
           <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  -               src="${dist.name}-bin.tar"/>
  -
  +        src="${dist.name}-bin.tar"/>
  +        
           <delete file="${dist.base}/${dist.name}-bin.tar"/>
  -
  +        
           <checksum fileext=".md5">
  -          <fileset dir="${dist.base}" />
  +        <fileset dir="${dist.base}" />
           </checksum>
           -->
       </target>
  -
  +    
       <!-- Creates a mini jar-only distribution -->
       <target name="dist-jar" depends="big-jar">
           <mkdir dir="${dist.dir}"/>
  @@ -451,67 +450,66 @@
               </fileset>
           </copy>
       </target>
  -
  +    
       <!-- Creates a minimal distribution -->
       <target name="dist.lite"
           depends="dist-jar, test, javadocs"
           description="Generates a minimal distribution (jar + javadocs)">
  -
  +        
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
       </target>
  -
  +    
       <!-- Setup the filters -->
       <target name="setup-filters">
  -      <filter token="Name" value="Avalon ${Name}"/>
  -      <filter token="name" value="${dir-name}"/>
  -      <filter token="version" value="${version}"/>
  -      <filter token="year" value="${year}"/>
  -      <filter token="status" value="${status}"/>
  -      <filter token="release" value="${release}"/>
  -      <filter token="short-version" value="${short.version}"/>
  -
  -      <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -      <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -      <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -      <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -      <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -      <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -      <filter token="year" value="${year}"/>
  -      <filter token="AVALON_BASE" value="${avalon.base}"/>
  -      <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -      <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -      <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -      <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -      <filter token="TESTLET_BASE" value="${testlet.base}"/>
  +        <filter token="Name" value="Avalon ${Name}"/>
  +        <filter token="name" value="${dir-name}"/>
  +        <filter token="version" value="${version}"/>
  +        <filter token="year" value="${year}"/>
  +        <filter token="status" value="${status}"/>
  +        <filter token="release" value="${release}"/>
  +        <filter token="short-version" value="${short.version}"/>
  +        
  +        <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  +        <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  +        <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  +        <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  +        <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  +        <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  +        
  +        <filter token="year" value="${year}"/>
  +        <filter token="AVALON_BASE" value="${avalon.base}"/>
  +        <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +        <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  +        <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  +        <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  +        <filter token="TESTLET_BASE" value="${testlet.base}"/>
       </target>
  -
  -
  +    
  +    
       <!-- Prepares the documentation directory -->
       <target name="docs" depends="setup-filters" description="Generates the Docs">
  -    <ant antfile="${basedir}/../forrestbuild.xml"/>
  -
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  -
  +        <ant antfile="${basedir}/../forrestbuild.xml"/>
  +        
  +        <copy todir="${docs.dir}">
  +            <fileset dir="${build.docs}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +        
       </target>
  -
  +    
       <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  -
  -      <mkdir dir="../site/dist/docs/${dir-name}"/>
  -      <copy todir="../site/dist/docs/${dir-name}">
  -        <fileset dir="${docs.dir}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  -
  +        
  +        <mkdir dir="../site/dist/docs/${dir-name}"/>
  +        <copy todir="../site/dist/docs/${dir-name}">
  +            <fileset dir="${docs.dir}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +        
       </target>
  -
  +    
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  @@ -523,9 +521,9 @@
               <fileset dir="." includes="**/*~" defaultexcludes="no"/>
           </delete>
       </target>
  -
  +    
       <target name="real-clean" depends="clean" description="Cleans up the project, including distributions">
           <delete dir="${dist.base}" />
       </target>
  -
  +    
   </project>
  
  
  
  1.20      +0 -2      avalon-excalibur/configuration/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/configuration/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	16 Apr 2003 22:20:06 -0000	1.19
  +++ build.xml	19 May 2003 16:53:00 -0000	1.20
  @@ -268,7 +268,6 @@
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
  @@ -304,7 +303,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  
  
  
  1.50      +3 -5      avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/event/build.xml,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- build.xml	16 Apr 2003 22:20:26 -0000	1.49
  +++ build.xml	19 May 2003 16:53:01 -0000	1.50
  @@ -285,7 +285,6 @@
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
  @@ -299,9 +298,9 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	<checksum fileext=".md5">
  -	  <fileset dir="${dist.base}"/>
  -	</checksum>
  +    <checksum fileext=".md5">
  +      <fileset dir="${dist.base}"/>
  +    </checksum>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -323,7 +322,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  
  
  
  1.60      +1 -1      avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/extension/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	16 May 2003 11:49:22 -0000	1.59
  +++ build.xml	19 May 2003 16:53:01 -0000	1.60
  @@ -292,7 +292,7 @@
           description="Generates a minimal distribution (jar + javadocs)">
           
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  +
           
       </target>
       
  
  
  
  1.58      +0 -1      avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- build.xml	13 May 2003 10:19:29 -0000	1.57
  +++ build.xml	19 May 2003 16:53:01 -0000	1.58
  @@ -292,7 +292,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  
  
  
  1.55      +1 -4      avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- build.xml	16 Apr 2003 22:21:16 -0000	1.54
  +++ build.xml	19 May 2003 16:53:02 -0000	1.55
  @@ -284,7 +284,6 @@
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
       </target>
  @@ -295,7 +294,6 @@
           description="Generates a distribution (jar + docs javadocs + unit tests + checkstyle reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -308,7 +306,7 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	    <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  +        <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -327,7 +325,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.39      +0 -2      avalon-excalibur/instrument-client/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/instrument-client/build.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- build.xml	16 Apr 2003 22:40:27 -0000	1.38
  +++ build.xml	19 May 2003 16:53:02 -0000	1.39
  @@ -225,7 +225,6 @@
           description="Generates a distribution (jar + javadocs + unit tests)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -291,7 +290,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.41      +1 -3      avalon-excalibur/instrument-manager/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/instrument-manager/build.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build.xml	16 Apr 2003 22:21:38 -0000	1.40
  +++ build.xml	19 May 2003 16:53:02 -0000	1.41
  @@ -288,7 +288,6 @@
           description="Generates a distribution (jar + docs javadocs + unit tests + checkstyle reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -301,7 +300,7 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	    <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  +        <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -320,7 +319,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.42      +1 -3      avalon-excalibur/logger/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/build.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build.xml	16 Apr 2003 22:21:59 -0000	1.41
  +++ build.xml	19 May 2003 16:53:02 -0000	1.42
  @@ -449,7 +449,6 @@
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -462,7 +461,7 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	<checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  +    <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -481,7 +480,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.33      +3 -5      avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.xml	16 Apr 2003 22:22:08 -0000	1.32
  +++ build.xml	19 May 2003 16:53:02 -0000	1.33
  @@ -286,7 +286,6 @@
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -299,9 +298,9 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	<checksum fileext=".md5">
  -	  <fileset dir="${dist.base}"/>
  -	</checksum>
  +    <checksum fileext=".md5">
  +      <fileset dir="${dist.base}"/>
  +    </checksum>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -320,7 +319,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.38      +1 -3      avalon-excalibur/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/pool/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml	16 Apr 2003 22:22:33 -0000	1.37
  +++ build.xml	19 May 2003 16:53:02 -0000	1.38
  @@ -279,7 +279,6 @@
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -292,7 +291,7 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	<checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
  +    <checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -311,7 +310,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.36      +3 -5      avalon-excalibur/sourceresolve/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/sourceresolve/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- build.xml	16 Apr 2003 22:22:44 -0000	1.35
  +++ build.xml	19 May 2003 16:53:03 -0000	1.36
  @@ -270,7 +270,6 @@
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
  @@ -283,9 +282,9 @@
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
  -	<checksum fileext=".md5">
  -	  <fileset dir="${dist.base}"/>
  -	</checksum>
  +    <checksum fileext=".md5">
  +      <fileset dir="${dist.base}"/>
  +    </checksum>
       </target>
   
       <!-- Creates a mini jar-only distribution -->
  @@ -304,7 +303,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.20      +0 -1      avalon-excalibur/store/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/store/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	22 Apr 2003 16:52:22 -0000	1.19
  +++ build.xml	19 May 2003 16:53:03 -0000	1.20
  @@ -301,7 +301,6 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
   
       </target>
   
  
  
  
  1.39      +118 -119  avalon-excalibur/thread/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/thread/build.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- build.xml	18 Apr 2003 09:09:07 -0000	1.38
  +++ build.xml	19 May 2003 16:53:03 -0000	1.39
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
   <project name="Excalibur Thread" default="main" basedir=".">
  -
  +    
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
       <property file="${basedir}/ant.properties"/>
  @@ -9,7 +9,7 @@
       <property file="${basedir}/../libraries.properties"/>
       <property file="${basedir}/../default.properties"/>
       <property file="${basedir}/default.properties"/>
  -
  +    
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
  @@ -23,14 +23,14 @@
           <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
       </path>
  -
  +    
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
       </path>
  -
  +    
       <path id="test.class.path">
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
  @@ -39,19 +39,19 @@
           <path refid="project.class.path"/>
       </path>
       <property name="cp" refid="test.class.path"/>
  -
  +    
       <target name="main" depends="jar" description="Build the project">
           <echo>
  -=============================================================
  -WARNING: excalibur-thread's unit tests are not run by
  -         default, since they include performance tests
  -         which may fail in some environments. Please run
  -         these tests manually using `ant test`.
  -=============================================================
  +            =============================================================
  +            WARNING: excalibur-thread's unit tests are not run by
  +            default, since they include performance tests
  +            which may fail in some environments. Please run
  +            these tests manually using `ant test`.
  +            =============================================================
           </echo>
       </target>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  -
  +    
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  @@ -59,21 +59,21 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
       </target>
  -
  +    
       <target name="dependencies-test" depends="dist-jar, dependencies"
           description="Check unit test dependencies" unless="skip.dependencies">
           <!-- Need the jar to prevent recursive deps. -->
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
       </target>
  -
  -
  +    
  +    
       <!-- Compiles the source code -->
       <target name="compile" depends="dependencies" description="Compiles the source code">
  -
  +        
           <mkdir dir="${build.classes}"/>
  -
  +        
           <!-- Compile all classes excluding the tests. -->
           <javac srcdir="${java.dir}"
               destdir="${build.classes}"
  @@ -84,7 +84,7 @@
               <classpath refid="project.class.path" />
               <include name="**/*.java"/>
           </javac>
  -
  +        
           <!-- copy resources to same location as .class files -->
           <copy todir="${build.classes}">
               <fileset dir="${java.dir}">
  @@ -92,20 +92,20 @@
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
           <mkdir dir="${build.testsrc}"/>
  -
  +        
           <!-- Copy over all of the tests applying test filters -->
           <copy todir="${build.testsrc}">
               <fileset dir="${test.dir}"/>
           </copy>
  -
  +        
           <mkdir dir="${build.testclasses}"/>
  -
  +        
           <!-- Compile all test classes. -->
           <javac srcdir="${build.testsrc}"
               destdir="${build.testclasses}"
  @@ -116,16 +116,16 @@
               <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
  -
  +        
           <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Copies and filters the license. Used by jar and dist -->
       <target name="prepare-conf">
           <mkdir dir="${build.conf}"/>
  @@ -135,24 +135,24 @@
                   <filter token="year" value="${year}"/>
               </filterset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Creates all the .jar file -->
       <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
  -
  +        
           <mkdir dir="${build.lib}"/>
  -
  +        
           <jar jarfile="${build.lib}/${jar.name}"
               basedir="${build.classes}"
               compress="${build.compress}">
               <manifest>
  -              <attribute name="Extension-Name" value="${name}"/>
  -              <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Specification-Version" value="${version}"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  -              <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +                <attribute name="Extension-Name" value="${name}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="${version}"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
               </manifest>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
  @@ -160,10 +160,10 @@
               </zipfileset>
           </jar>
       </target>
  -
  +    
       <!-- Creates all the Javadocs -->
       <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  -
  +        
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
               sourcepath="${java.dir}"
  @@ -182,22 +182,22 @@
               </doclet>
           </javadoc>
       </target>
  -
  +    
       <target name="test" depends="compile-test" description="Perform the unit tests" unless="skip.tests">
  -
  +        
           <echo message="Performing Unit Tests" />
  -
  +        
           <mkdir dir="${build.tests}"/>
  -
  +        
           <junit fork="true"
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
               <classpath refid="test.class.path"/>
  -
  +            
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
               <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
  -
  +            
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
  @@ -205,34 +205,34 @@
                   </fileset>
               </batchtest>
           </junit>
  -
  +        
       </target>
  -
  +    
       <target name="test-reports" depends="test" description="Generate Reports for the unit tests">
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkBSF"/>
  -
  +        
           <mkdir dir="${build.reports}/junit"/>
  -
  +        
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
               </fileset>
               <report format="frames" todir="${build.reports}/junit"/>
           </junitreport>
  -
  +        
           <!-- Clean up the xml reports used by the junitreport task -->
           <!--
           <delete>
  -            <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  -            <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -
  +        
       </target>
  -
  +    
       <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"
  @@ -267,46 +267,45 @@
               <formatter type="xml" toFile="${build.dir}/checkstyle-results.xml"/>
           </checkstyle>
       </target>
  -
  +    
       <target name="checkstyle-report"
           depends="checkstyle"
           if="do.checkstyle"
           description="Generate Checkstyle Report">
  -
  +        
           <mkdir dir="${build.reports}/checkstyle"/>
           <property name="checkstyle.pathhack" location="."/>
           <style style="${tools.dir}/etc/checkstyle-frames.xsl" in="${build.dir}/checkstyle-results.xml"
               out="${build.reports}/checkstyle/delete-me.html">
               <param name="pathhack" expression="${checkstyle.pathhack}"/>
           </style>
  -
  +        
       </target>
  -
  +    
       <!-- Creates the distribution -->
       <target name="dist"
           depends="dist-jar, test-reports, checkstyle-report, docs, javadocs"
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle reports)">
  -
  -
  +        
  +        
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
           </zip>
  -
  +        
           <mkdir dir="${dist.base}"/>
  -
  +        
           <zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
  -
  -	<checksum fileext=".md5">
  -	  <fileset dir="${dist.base}"/>
  -	</checksum>
  +        
  +        <checksum fileext=".md5">
  +            <fileset dir="${dist.base}"/>
  +        </checksum>
       </target>
  -
  +    
       <!-- Creates a mini jar-only distribution -->
       <target name="dist-jar" depends="jar">
           <mkdir dir="${dist.dir}"/>
  @@ -316,67 +315,67 @@
               </fileset>
           </copy>
       </target>
  -
  +    
       <!-- Creates a minimal distribution -->
       <target name="dist.lite"
           depends="dist-jar, test, javadocs"
           description="Generates a minimal distribution (jar + javadocs)">
  -
  +        
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
       </target>
  -
  +    
       <!-- Setup the filters -->
       <target name="setup-filters">
  -      <filter token="Name" value="Avalon ${Name}"/>
  -      <filter token="name" value="${dir-name}"/>
  -      <filter token="version" value="${version}"/>
  -      <filter token="year" value="${year}"/>
  -      <filter token="status" value="${status}"/>
  -      <filter token="release" value="${release}"/>
  -      <filter token="short-version" value="${short.version}"/>
  -
  -      <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -      <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -      <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -      <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -      <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -      <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -      <filter token="year" value="${year}"/>
  -      <filter token="AVALON_BASE" value="${avalon.base}"/>
  -      <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -      <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -      <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -      <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -      <filter token="TESTLET_BASE" value="${testlet.base}"/>
  +        <filter token="Name" value="Avalon ${Name}"/>
  +        <filter token="name" value="${dir-name}"/>
  +        <filter token="version" value="${version}"/>
  +        <filter token="year" value="${year}"/>
  +        <filter token="status" value="${status}"/>
  +        <filter token="release" value="${release}"/>
  +        <filter token="short-version" value="${short.version}"/>
  +        
  +        <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  +        <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  +        <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  +        <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  +        <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  +        <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  +        
  +        <filter token="year" value="${year}"/>
  +        <filter token="AVALON_BASE" value="${avalon.base}"/>
  +        <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +        <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  +        <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  +        <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  +        <filter token="TESTLET_BASE" value="${testlet.base}"/>
       </target>
  -
  -
  +    
  +    
       <!-- Prepares the documentation directory -->
       <target name="docs" depends="setup-filters" description="Generates the Docs">
  -    <ant antfile="${basedir}/../forrestbuild.xml"/>
  -
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  -
  +        <ant antfile="${basedir}/../forrestbuild.xml"/>
  +        
  +        <copy todir="${docs.dir}">
  +            <fileset dir="${build.docs}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +        
       </target>
  -
  +    
       <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  -
  -      <mkdir dir="../site/dist/docs/${dir-name}"/>
  -      <copy todir="../site/dist/docs/${dir-name}">
  -        <fileset dir="${docs.dir}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  -
  +        
  +        <mkdir dir="../site/dist/docs/${dir-name}"/>
  +        <copy todir="../site/dist/docs/${dir-name}">
  +            <fileset dir="${docs.dir}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +        
       </target>
  -
  +    
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  @@ -388,9 +387,9 @@
               <fileset dir="." includes="**/*~" defaultexcludes="no"/>
           </delete>
       </target>
  -
  +    
       <target name="real-clean" depends="clean" description="Cleans up the project, including distributions">
           <delete dir="${dist.base}" />
       </target>
  -
  +    
   </project>
  
  
  

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