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 build.xml project.properties
Date Sun, 31 Mar 2002 07:03:35 GMT
jefft       02/03/30 23:03:34

  Modified:    baxter   build.xml project.properties
               bzip2    build.xml project.properties
               cache    build.xml project.properties
               cli      build.xml project.properties
               collections build.xml project.properties
               command  build.xml project.properties
               concurrent build.xml project.properties
               event    build.xml project.properties
               extension build.xml project.properties
               i18n     build.xml project.properties
               instrument build.xml project.properties
               instrument-client build.xml project.properties
               instrument-manager build.xml project.properties
               io       build.xml project.properties
               naming   build.xml project.properties
               tar      build.xml project.properties
               template-product build.xml project.properties
               zip      build.xml project.properties
  Log:
  Add a manifest to jars, where Extension-Name: and Implementation-Version: are
  tokens replaced by values set in project.properties. The Extension-Name value
  is always of the form 'excalibur-projectname' (lowercase).
  
  Revision  Changes    Path
  1.6       +22 -6     jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.5
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.6
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -86,16 +88,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -222,12 +238,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/baxter/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	24 Mar 2002 07:41:29 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=baxter
  -Name=Baxter
  +name=excalibur-baxter
  +Name=Excalibur Baxter
   version=1.0a
   year=2000-2002
  
  
  
  1.6       +22 -6     jakarta-avalon-excalibur/bzip2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.5
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.6
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/bzip2/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	24 Mar 2002 07:02:31 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=bzip2
  -Name=BZip2
  +name=excalibur-bzip2
  +Name=Excalibur BZip2
   version=1.0a
   year=2000-2002
  
  
  
  1.15      +22 -6     jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.14
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.15
  @@ -27,6 +27,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -34,6 +35,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -41,7 +43,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -90,16 +92,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -226,12 +242,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/cache/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.properties	28 Mar 2002 08:25:11 -0000	1.4
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.5
  @@ -1,4 +1,4 @@
  -name=cache
  -Name=Cache
  +name=excalibur-cache
  +Name=Excalibur Cache
   version=1.0a
   year=2001-2002
  
  
  
  1.26      +22 -6     jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.25
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.26
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/cli/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	15 Mar 2002 03:53:24 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=cli
  -Name=CLI
  +name=excalibur-cli
  +Name=Excalibur CLI
   version=1.0
   year=2000-2002
  
  
  
  1.4       +22 -6     jakarta-avalon-excalibur/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.3
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.4
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/collections/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	29 Mar 2002 07:19:38 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=collections
  -Name=Collections
  +name=excalibur-collections
  +Name=Excalibur Collections
   version=1.0
   year=2000-2002
  
  
  
  1.4       +22 -6     jakarta-avalon-excalibur/command/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/command/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.3
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.4
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -89,16 +91,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -225,12 +241,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/command/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/command/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	30 Mar 2002 22:10:39 -0000	1.2
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.3
  @@ -1,4 +1,4 @@
  -name=command
  -Name=Command
  +name=excalibur-command
  +Name=Excalibur Command
   version=1.0a
   year=2002
  
  
  
  1.4       +22 -6     jakarta-avalon-excalibur/concurrent/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.3
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.4
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/concurrent/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	29 Mar 2002 09:41:42 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=concurrent
  -Name=Concurrent
  +name=excalibur-concurrent
  +Name=Excalibur Concurrent
   version=1.0
   year=2000-2002
  
  
  
  1.6       +22 -6     jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.5
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.6
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -87,16 +89,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -223,12 +239,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/event/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	30 Mar 2002 21:59:00 -0000	1.2
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.3
  @@ -1,4 +1,4 @@
  -name=event
  -Name=Event
  +name=excalibur-event
  +Name=Excalibur Event
   version=1.0a
   year=2002
  
  
  
  1.30      +22 -6     jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.29
  +++ build.xml	31 Mar 2002 07:03:33 -0000	1.30
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/extension/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	24 Mar 2002 07:42:47 -0000	1.2
  +++ project.properties	31 Mar 2002 07:03:33 -0000	1.3
  @@ -1,4 +1,4 @@
  -name=extension
  -Name=Extension
  +name=excalibur-extension
  +Name=Excalibur Extension
   version=1.0a
   year=2000-2002
  
  
  
  1.28      +24 -8     jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.27
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.28
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -206,12 +222,12 @@
       </target>
   
       <target name="checkstyle-report"
  -        if="do.checkstyle"
           depends="checkstyle"
  +        if="do.checkstyle"
           description="Generate Checkstyle Report">
   
  -        <property name="checkstyle.pathhack" location="."/>
           <mkdir dir="${build.reports}/checkstyle"/>
  +        <property name="checkstyle.pathhack" location="."/>
           <style style="../tools/etc/checkstyle-frames.xsl" in="build/checkstyle-results.xml"
               out="${build.reports}/checkstyle/delete-me.html">
               <param name="pathhack" expression="${checkstyle.pathhack}"/>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/i18n/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	15 Mar 2002 04:06:25 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=i18n
  -Name=I18N
  +name=excalibur-i18n
  +Name=Excalibur I18N
   version=1.0
   year=2000-2002
  
  
  
  1.6       +65 -26    jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	31 Mar 2002 03:29:22 -0000	1.5
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.6
  @@ -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"/>
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="${basedir}/build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="${basedir}/src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -49,12 +51,13 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -        
  +
       <target name="main" depends="jar" 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. -->
  @@ -84,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -122,15 +139,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 +160,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,11 +181,11 @@
               <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"
  @@ -204,10 +221,10 @@
           </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"/>
           <property name="checkstyle.pathhack" location="."/>
  @@ -217,14 +234,15 @@
       </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -232,6 +250,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       +2 -2      jakarta-avalon-excalibur/instrument/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	26 Mar 2002 11:17:21 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=instrument
  -Name=Instrument
  +name=excalibur-instrument
  +Name=Excalibur Instrument
   version=0.1
   year=2002
  
  
  
  1.8       +66 -26    jakarta-avalon-excalibur/instrument-client/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.7
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.8
  @@ -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"/>
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="${basedir}/build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.genjava" value="${build.dir}/genjava"/>
       <property name="build.tests" value="${build.dir}/tests"/>
  @@ -31,6 +32,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="${basedir}/src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -38,7 +40,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -56,7 +58,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -    
  +
       <taskdef name="altrmiproxies"
           classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
           <classpath refid="project.class.path" />
  @@ -67,6 +69,7 @@
   
       <!-- Compiles the source code -->
       <target name="compile" description="Compiles the source code">
  +
           <mkdir dir="${build.classes}"/>
   
           <!-- Compile all classes including the tests. -->
  @@ -95,6 +98,20 @@
           </copy>
   
       </target>
  +
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +    </target>
  +
  + 
       
       <!-- Generates the altrmi proxies used by the client. -->
       <target name="altrmiproxies" depends="compile">
  @@ -117,15 +134,16 @@
       </target>
   
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile, altrmiproxies" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf, altrmiproxies" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -154,15 +172,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 -->
  @@ -175,13 +193,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"/>
  @@ -196,11 +214,11 @@
               <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"
  @@ -236,10 +254,10 @@
           </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"/>
           <property name="checkstyle.pathhack" location="."/>
  @@ -249,14 +267,15 @@
       </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  +        <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
   
  @@ -264,6 +283,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       +2 -2      jakarta-avalon-excalibur/instrument-client/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	26 Mar 2002 11:32:23 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=instrument-client
  -Name=Instrument Client
  +name=excalibur-instrument-client
  +Name=Excalibur Instrument Client
   version=0.1
   year=2002
  
  
  
  1.9       +65 -26    jakarta-avalon-excalibur/instrument-manager/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.8
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.9
  @@ -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"/>
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="${basedir}/build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="${basedir}/src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
       <property name="dist-interfaces.name" value="excalibur-${name}-interfaces-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
  @@ -58,12 +60,13 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -        
  +
       <target name="main" depends="jar" 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. -->
  @@ -93,16 +96,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -141,15 +158,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 -->
  @@ -162,13 +179,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"/>
  @@ -183,11 +200,11 @@
               <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"
  @@ -223,10 +240,10 @@
           </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"/>
           <property name="checkstyle.pathhack" location="."/>
  @@ -236,15 +253,16 @@
       </target>
   
       <!-- Creates the distribution -->
  -    <target name="dist" 
  -            depends="jar, test-reports, checkstyle-report, javadocs" 
  -            description="Generates the jar files">
  +    <target name="dist"
  +        depends="prepare-conf, jar, test-reports, checkstyle-report, javadocs" 
  +        description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  +        <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="${build.lib}/${dist-interfaces.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}"/>
   
  @@ -252,6 +270,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       +2 -2      jakarta-avalon-excalibur/instrument-manager/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	26 Mar 2002 11:56:15 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=instrument-manager
  -Name=Instrument Manager
  +name=excalibur-instrument-manager
  +Name=Excalibur Instrument Manager
   version=0.1
   year=2002
  
  
  
  1.30      +22 -6     jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.29
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.30
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +3 -3      jakarta-avalon-excalibur/io/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	15 Mar 2002 03:43:15 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=io
  -Name=IO
  -version=1.0
  +name=excalibur-io
  +Name=Excalibur IO
  +version=1.1
   year=2000-2002
  
  
  
  1.30      +22 -6     jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.29
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.30
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -92,16 +94,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -228,12 +244,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/naming/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	15 Mar 2002 04:15:12 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=naming
  -Name=Naming
  +name=excalibur-naming
  +Name=Excalibur Naming
   version=1.0
   year=2000-2002
  
  
  
  1.9       +22 -6     jakarta-avalon-excalibur/tar/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.8
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.9
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/tar/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	24 Mar 2002 07:42:47 -0000	1.2
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.3
  @@ -1,4 +1,4 @@
  -name=tar
  -Name=Tar
  +name=excalibur-tar
  +Name=Excalibur TAR
   version=1.0a
   year=2000-2002
  
  
  
  1.7       +22 -6     jakarta-avalon-excalibur/template-product/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.6
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.7
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/template-product/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	22 Mar 2002 12:26:57 -0000	1.1
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.2
  @@ -1,4 +1,4 @@
  -name=my-component
  -Name=MyComponent
  +name=excalibur-my-component
  +Name=Excalibur MyComponent
   version=1.0
   year=2000-2002
  
  
  
  1.9       +22 -6     jakarta-avalon-excalibur/zip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	31 Mar 2002 03:29:23 -0000	1.8
  +++ build.xml	31 Mar 2002 07:03:34 -0000	1.9
  @@ -23,6 +23,7 @@
       <!-- location of intermediate products -->
       <property name="build.dir" value="build"/>
       <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.conf" value="${build.dir}/conf"/>
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.tests" value="${build.dir}/tests"/>
       <property name="build.reports" value="${build.dir}/reports"/>
  @@ -30,6 +31,7 @@
       <!-- Set the properties for source directories -->
       <property name="src.dir" value="src"/>
       <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="test.dir" value="${src.dir}/test"/>
   
       <!-- Set the properties for distribution directories -->
  @@ -37,7 +39,7 @@
       <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
   
       <!-- property to specify name of zip/jar files -->
  -    <property name="dist.name" value="excalibur-${name}-${version}"/>
  +    <property name="dist.name" value="${name}-${version}"/>
   
       <!-- property indicating directory where all distribution archives are placed -->
       <property name="dist.base" value="distributions"/>
  @@ -85,16 +87,30 @@
   
       </target>
   
  +    <!-- Copies and filters the manifest and license. Used by jar and dist -->
  +    <target name="prepare-conf">
  +        <mkdir dir="${build.conf}"/>
  +        <copy todir="${build.conf}" flatten="true">
  +            <fileset dir="../" includes="LICENSE.txt"/>
  +            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
  +            <filterset>
  +                <filtersfile file="project.properties"/>
  +            </filterset>
  +        </copy>
  +
  +    </target>
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile" description="Generates the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar files">
   
           <mkdir dir="${build.lib}"/>
   
           <jar jarfile="${build.lib}/${dist.name}.jar"
               basedir="${build.classes}"
  -            compress="${build.compress}">
  +            compress="${build.compress}"
  +            manifest="${build.conf}/MANIFEST.MF">
               <exclude name="**/test/**"/>
  -            <zipfileset dir=".." prefix="META-INF/">
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  @@ -221,12 +237,12 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="jar, test-reports, checkstyle-report, javadocs"
  +        depends="prepare-conf, jar, test-reports, 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="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/zip/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	24 Mar 2002 07:42:47 -0000	1.2
  +++ project.properties	31 Mar 2002 07:03:34 -0000	1.3
  @@ -1,4 +1,4 @@
  -name=zip
  -Name=Zip
  +name=excalibur-zip
  +Name=Excalibur Zip
   version=1.0a
   year=2000-2002
  
  
  

--
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