Thanks. Yeah, it has been a while. $JOB always takes priority over @HOBBIES.
:)
Attached is a new patch to fix places where > was used instead of >, for
consistency.
-- Larry
> -----Original Message-----
> From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
> Sent: Friday, November 12, 2004 2:40 AM
> To: [EMAIL PROTECTED]
> Subject: Re: [PATCH] Spelling fixes for OptionalTasks and
> OptionalTypes
>
>
> Hi Larry,
>
> long time no see.
>
> patch committed, thanks
>
> Stefan
Index: docs/manual/running.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/running.html,v
retrieving revision 1.27
diff -r1.27 running.html
220c220
< grep -r -n "getPropert" * > ..\grep.txt
---
> grep -r -n "getPropert" * > ..\grep.txt
Index: docs/manual/tutorial-tasks-filesets-properties.html
===================================================================
RCS file:
/home/cvspublic/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
retrieving revision 1.4
diff -r1.4 tutorial-tasks-filesets-properties.html
44,45c44,45
< <?xml version="1.0" encoding="ISO-8859-1"?>
< <project name="<b>FindTask</b>" basedir="." default="test">
---
> <?xml version="1.0" encoding="ISO-8859-1"?>
> <project name="<b>FindTask</b>" basedir="." default="test">
47,49c47,49
< <target name="use.init" description="Taskdef´ the <b>Find</b>-Task"
depends="jar">
< <taskdef name="<b>find</b>" classname="<b>Find</b>"
classpath="${ant.project.name}.jar"/>
< </target>
---
> <target name="use.init" description="Taskdef´ the <b>Find</b>-Task"
> depends="jar">
> <taskdef name="<b>find</b>" classname="<b>Find</b>"
> classpath="${ant.project.name}.jar"/>
> </target>
53c53
< </project>
---
> </project>
66,67c66,67
< <find property="test" value="test-value"/>
< <find print="test"/>
---
> <find property="test" value="test-value"/>
> <find print="test"/>
71,72c71,72
< <property name="test" value="test-value"/>
< <echo message="${test}"/>
---
> <property name="test" value="test-value"/>
> <echo message="${test}"/>
120c120
< an <antcall> creates a new space for property names. All properties from
the caller
---
> an <antcall> creates a new space for property names. All properties
> from the caller
161,163c161,163
< <find file="ant.jar" location="location.ant-jar">
< <fileset dir="${ant.home}" includes="**/*.jar"/>
< </find>
---
> <find file="ant.jar" location="location.ant-jar">
> <fileset dir="${ant.home}" includes="**/*.jar"/>
> </find>
318,329c318,329
< <target name="junit" description="Runs the unit tests" depends="jar">
< <delete dir="${junit.out.dir.xml}" />
< <mkdir dir="${junit.out.dir.xml}" />
< <junit printsummary="yes" haltonfailure="no">
< <classpath refid="classpath.test"/>
< <b><sysproperty key="ant.home" value="${ant.home}"/></b>
< <formatter type="xml"/>
< <batchtest fork="yes" todir="${junit.out.dir.xml}">
< <fileset dir="${src.dir}" includes="**/*Test.java"/>
< </batchtest>
< </junit>
< </target>
---
> <target name="junit" description="Runs the unit tests"
> depends="jar">
> <delete dir="${junit.out.dir.xml}"/>
> <mkdir dir="${junit.out.dir.xml}"/>
> <junit printsummary="yes" haltonfailure="no">
> <classpath refid="classpath.test"/>
> <b><sysproperty key="ant.home" value="${ant.home}"/></b>
> <formatter type="xml"/>
> <batchtest fork="yes" todir="${junit.out.dir.xml}">
> <fileset dir="${src.dir}" includes="**/*Test.java"/>
> </batchtest>
> </junit>
> </target>
336c336
< possibility of bundling files: the <path>. Fileset are easy if the files
are all under
---
> possibility of bundling files: the <path>. Fileset are easy if the
> files are all under
339c339
< <filelist> instead? <path>s combines these datatypes in that way that a
path contains
---
> <filelist> instead? <path>s combines these datatypes in that way
> that a path contains
341c341
< Ant-Contribs [4]</a> <foreach> task is modified to support paths instead
of filesets. So we want that,
---
> Ant-Contribs [4]</a> <foreach> task is modified to support paths
> instead of filesets. So we want that,
357,359c357,359
< <find file="ant.jar" location="location.ant-jar">
< <fileset dir="${ant.home}" includes="**/*.jar"/>
< </find>
---
> <find file="ant.jar" location="location.ant-jar">
> <fileset dir="${ant.home}" includes="**/*.jar"/>
> </find>
361,365c361,365
< <find file="ant.jar" location="location.ant-jar">
< <b><path></b> *3
< <fileset dir="${ant.home}" includes="**/*.jar"/>
< </path>
< </find>
---
> <find file="ant.jar" location="location.ant-jar">
> <b><path></b> *3
> <fileset dir="${ant.home}" includes="**/*.jar"/>
> </path>
> </find>
417c417
< tasks use lists. The most famous task using lists is Ant-Contribs
<foreach>. All list
---
> tasks use lists. The most famous task using lists is Ant-Contribs
> <foreach>. All list
423c423
< <find ... <b>delimiter=""</b>/> ... </find>
---
> <find ... <b>delimiter=""</b>/> ... </find>
439,441c439,441
< <target name="test.init">
< <mkdir dir="test1/dir11/dir111"/> *1
< <mkdir dir="test1/dir11/dir112"/>
---
> <target name="test.init">
> <mkdir dir="test1/dir11/dir111"/> *1
> <mkdir dir="test1/dir11/dir112"/>
443,444c443,444
< <touch file="test1/dir11/dir111/test"/>
< <touch file="test1/dir11/dir111/not"/>
---
> <touch file="test1/dir11/dir111/test"/>
> <touch file="test1/dir11/dir111/not"/>
446,467c446,467
< <touch file="test1/dir13/dir131/not2"/>
< <touch file="test1/dir13/dir132/test"/>
< <touch file="test1/dir13/dir132/not"/>
< <touch file="test1/dir13/dir132/not2"/>
< <mkdir dir="test2"/>
< <copy todir="test2"> *2
< <fileset dir="test1"/>
< </copy>
< </target>
<
< <target name="testMultipleFiles" depends="use.init,<b>test.init</b>">
*3
< <find file="test" location="location.test" <b>delimiter=";"</b>>
< <path>
< <fileset dir="test1"/>
< <fileset dir="test2"/>
< </path>
< </find>
< <delete> *4
< <fileset dir="test1"/>
< <fileset dir="test2"/>
< </delete>
< </target>
---
> <touch file="test1/dir13/dir131/not2"/>
> <touch file="test1/dir13/dir132/test"/>
> <touch file="test1/dir13/dir132/not"/>
> <touch file="test1/dir13/dir132/not2"/>
> <mkdir dir="test2"/>
> <copy todir="test2"> *2
> <fileset dir="test1"/>
> </copy>
> </target>
>
> <target name="testMultipleFiles"
> depends="use.init,<b>test.init</b>"> *3
> <find file="test" location="location.test" <b>delimiter=";"</b>>
> <path>
> <fileset dir="test1"/>
> <fileset dir="test2"/>
> </path>
> </find>
> <delete> *4
> <fileset dir="test1"/>
> <fileset dir="test2"/>
> </delete>
> </target>
566c566
< <html>
---
> <html>
568,585c568,585
< <head>
< <meta http-equiv="Content-Language" content="en-us">
< <title> <b>Taskname</b> Task</title>
< </head>
<
< <body>
<
< <h2><a name="<i>taskname</i>"><b>Taskname</b></a></h2>
< <h3>Description</h3>
< <p> <b>Describe the task.</b></p>
<
< <h3>Parameters</h3>
< <table border="1" cellpadding="2" cellspacing="0">
< <tr>
< <td valign="top"><b>Attribute</b></td>
< <td valign="top"><b>Description</b></td>
< <td align="center" valign="top"><b>Required</b></td>
< </tr>
---
> <head>
> <meta http-equiv="Content-Language" content="en-us">
> <title> <b>Taskname</b> Task</title>
> </head>
>
> <body>
>
> <h2><a name="<i>taskname</i>"><b>Taskname</b></a></h2>
> <h3>Description</h3>
> <p> <b>Describe the task.</b></p>
>
> <h3>Parameters</h3>
> <table border="1" cellpadding="2" cellspacing="0">
> <tr>
> <td valign="top"><b>Attribute</b></td>
> <td valign="top"><b>Description</b></td>
> <td align="center"
> valign="top"><b>Required</b></td>
> </tr>
588,592c588,592
< <tr>
< <td valign="top">classname</td>
< <td valign="top">the Java class to execute.</td>
< <td align="center" valign="top">Either jar or classname</td>
< </tr>
---
> <tr>
> <td valign="top">classname</td>
> <td valign="top">the Java class to execute.</td>
> <td align="center" valign="top">Either jar or classname</td>
> </tr>
594c594
< </table>
---
> </table>
596c596
< <h3>Parameters specified as nested elements</h3>
---
> <h3>Parameters specified as nested elements</h3>
599,601c599,601
< <h4><b>your nested element</b></h4>
< <p> <b>description</b> </p>
< <p><em>since Ant 1.6</em>.</p>
---
> <h4>your nested element</b></h4>
> <p> <b>description</b> </p>
> <p><em>since Ant 1.6</em>.</p>
603,604c603,604
< <h3>Examples</h3>
< <pre>
---
> <h3>Examples</h3>
> <pre>
606c606
< </pre>
---
> </pre>
609,610c609,610
< </body>
< </html>
---
> </body>
> </html>
615c615
< <html>
---
> <html>
617,678c617,678
< <head>
< <meta http-equiv="Content-Language" content="en-us">
< <title> Find Task</title>
< </head>
<
< <body>
<
< <h2><a name="find">Find</a></h2>
< <h3>Description</h3>
< <p>Searchs in a given path for a file and returns the absolute to it as
property.
< If delimiter is set this task returns all found locations.</p>
<
< <h3>Parameters</h3>
< <table border="1" cellpadding="2" cellspacing="0">
< <tr>
< <td valign="top"><b>Attribute</b></td>
< <td valign="top"><b>Description</b></td>
< <td align="center" valign="top"><b>Required</b></td>
< </tr>
< <tr>
< <td valign="top">file</td>
< <td valign="top">The name of the file to search.</td>
< <td align="center" valign="top">yes</td>
< </tr>
< <tr>
< <td valign="top">location</td>
< <td valign="top">The name of the property where to store the
location</td>
< <td align="center" valign="top">yes</td>
< </tr>
< <tr>
< <td valign="top">delimiter</td>
< <td valign="top">A delimiter to use when returning the list</td>
< <td align="center" valign="top">only if the list is required</td>
< </tr>
< </table>
<
< <h3>Parameters specified as nested elements</h3>
<
< <h4>path</h4>
< <p>The path where to search the file.</p>
<
< <h3>Examples</h3>
< <pre>
< <find file="ant.jar" location="loc">
< <path>
< <fileset dir="${ant.home}"/>
< <path>
< </find>
< </pre>
< Searches in Ants home directory for a file <i>ant.jar</i> and stores
its location in
< property <i>loc</i> (should be ANT_HOME/bin/ant.jar).
<
< <pre>
< <find file="ant.jar" location="loc" delimiter=";">
< <path>
< <fileset dir="C:/"/>
< <path>
< </find>
< <echo>ant.jar found in: ${loc}</echo>
< </pre>
< Searches in Windows C: drive for all <i>ant.jar</i> and stores their
locations in
< property <i>loc</i> delimited with <i>';'</i>. (should need a
long time :-)
---
> <head>
> <meta http-equiv="Content-Language" content="en-us">
> <title> Find Task</title>
> </head>
>
> <body>
>
> <h2><a name="find">Find</a></h2>
> <h3>Description</h3>
> <p>Searchs in a given path for a file and returns the absolute to it as
> property.
> If delimiter is set this task returns all found locations.</p>
>
> <h3>Parameters</h3>
> <table border="1" cellpadding="2" cellspacing="0">
> <tr>
> <td valign="top"><b>Attribute</b></td>
> <td valign="top"><b>Description</b></td>
> <td align="center"
> valign="top"><b>Required</b></td>
> </tr>
> <tr>
> <td valign="top">file</td>
> <td valign="top">The name of the file to search.</td>
> <td align="center" valign="top">yes</td>
> </tr>
> <tr>
> <td valign="top">location</td>
> <td valign="top">The name of the property where to store the
> location</td>
> <td align="center" valign="top">yes</td>
> </tr>
> <tr>
> <td valign="top">delimiter</td>
> <td valign="top">A delimiter to use when returning the
> list</td>
> <td align="center" valign="top">only if the list is
> required</td>
> </tr>
> </table>
>
> <h3>Parameters specified as nested elements</h3>
>
> <h4>path</h4>
> <p>The path where to search the file.</p>
>
> <h3>Examples</h3>
> <pre>
> <find file="ant.jar" location="loc">
> <path>
> <fileset dir="${ant.home}"/>
> <path>
> </find>
> </pre>
> Searches in Ants home directory for a file <i>ant.jar</i> and
> stores its location in
> property <i>loc</i> (should be ANT_HOME/bin/ant.jar).
>
> <pre>
> <find file="ant.jar" location="loc" delimiter=";">
> <path>
> <fileset dir="C:/"/>
> <path>
> </find>
> <echo>ant.jar found in: ${loc}</echo>
> </pre>
> Searches in Windows C: drive for all <i>ant.jar</i> and stores
> their locations in
> property <i>loc</i> delimited with <i>';'</i>.
> (should need a long time :-)
681,682c681,682
< </body>
< </html>
---
> </body>
> </html>
758,760c758,760
< ANTHOME> build // 1
< ANTHOME> set ANT_HOME=%CD%\dist // 2
< ANTHOME> ant test -Dtest.haltonfailure=false // 3
---
> ANTHOME> build // 1
> ANTHOME> set ANT_HOME=%CD%\dist // 2
> ANTHOME> ant test -Dtest.haltonfailure=false // 3
785c785
< <li>add a <tt><a href="CoreTasks/find.html">Find</a><br></tt>
---
> <li>add a <tt><a
> href="CoreTasks/find.html">Find</a><br></tt>
791,792c791,792
< ANTHOME> build
< ANTHOME> ant run-single-test // 1
---
> ANTHOME> build
> ANTHOME> ant run-single-test // 1
802,803c802,803
< <p>Ok: in the earlier steps we told Ant to use the Find class for the
<find> task (remember the
< <taskdef> statement in the "use.init" target). But now we want to
introduce that task as
---
> <p>Ok: in the earlier steps we told Ant to use the Find class for the
> <find> task (remember the
> <taskdef> statement in the "use.init" target). But now we want to
> introduce that task as
809,810c809,810
< ANTHOME> build // 1
< ANTHOME> ant run-single-test
---
> ANTHOME> build // 1
> ANTHOME> ant run-single-test
819c819
< ANTHOME> ant test -Dtest.haltonfailure=false
---
> ANTHOME> ant test -Dtest.haltonfailure=false
866c866
< ANTHOME> ant -f check.xml checkstyle htmlreport
---
> ANTHOME> ant -f check.xml checkstyle htmlreport
903c903
< <td>This new task looks inside a nested <path/> for occurrences of a
file and stores
---
> <td>This new task looks inside a nested <path/> for occurrences of a
> file and stores
Index: docs/manual/tutorial-writing-tasks.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/tutorial-writing-tasks.html,v
retrieving revision 1.4
diff -r1.4 tutorial-writing-tasks.html
47,48c47,48
< <?xml version="1.0" encoding="ISO-8859-1"?>
< <project name="MyTask" basedir="." default="jar">
---
> <?xml version="1.0" encoding="ISO-8859-1"?>
> <project name="MyTask" basedir="." default="jar">
50,61c50,61
< <target name="clean" description="Delete all generated files">
< <delete dir="classes"/>
< <delete file="MyTasks.jar"/>
< </target>
<
< <target name="compile" description="Compiles the Task">
< <javac srcdir="src" destdir="classes"/>
< </target>
<
< <target name="jar" description="JARs the Task">
< <jar destfile="MyTask.jar" basedir="classes"/>
< </target>
---
> <target name="clean" description="Delete all generated files">
> <delete dir="classes"/>
> <delete file="MyTasks.jar"/>
> </target>
>
> <target name="compile" description="Compiles the Task">
> <javac srcdir="src" destdir="classes"/>
> </target>
>
> <target name="jar" description="JARs the Task">
> <jar destfile="MyTask.jar" basedir="classes"/>
> </target>
63c63
< </project>
---
> </project>
67c67
< using <property>s. On second there are some handicaps: <javac> requires
that the destination
---
> using <property>s. On second there are some handicaps: <javac>
> requires that the destination
72,73c72,73
< <?xml version="1.0" encoding="ISO-8859-1"?>
< <project name="MyTask" basedir="." default="jar">
---
> <?xml version="1.0" encoding="ISO-8859-1"?>
> <project name="MyTask" basedir="." default="jar">
75,76c75,76
< <b><property name="src.dir" value="src"/></b>
< <b><property name="classes.dir" value="classes"/></b>
---
> <b><property name="src.dir" value="src"/></b>
> <b><property name="classes.dir" value="classes"/></b>
78,90c78,90
< <target name="clean" description="Delete all generated files">
< <delete dir="<b>${classes.dir}</b>" <b>failonerror="false"</b>/>
< <delete file="<b>${ant.project.name}.jar</b>"/>
< </target>
<
< <target name="compile" description="Compiles the Task">
< <b><mkdir dir="${classes.dir}"/></b>
< <javac srcdir="<b>${src.dir}</b>" destdir="${classes.dir}"/>
< </target>
<
< <target name="jar" description="JARs the Task"
<b>depends="compile"</b>>
< <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
< </target>
---
> <target name="clean" description="Delete all generated files">
> <delete dir="<b>${classes.dir}</b>" <b>failonerror="false"</b>/>
> <delete file="<b>${ant.project.name}.jar</b>"/>
> </target>
>
> <target name="compile" description="Compiles the Task">
> <b><mkdir dir="${classes.dir}"/></b>
> <javac srcdir="<b>${src.dir}</b>" destdir="${classes.dir}"/>
> </target>
>
> <target name="jar" description="JARs the Task"
> <b>depends="compile"</b>>
> <jar destfile="${ant.project.name}.jar"
> basedir="${classes.dir}"/>
> </target>
92c92
< </project>
---
> </project>
121c121
< <taskdef> [2]</a>. And for easier process we change the default clause:
---
> <taskdef> [2]</a>. And for easier process we change the default clause:
123,124c123,124
< <?xml version="1.0" encoding="ISO-8859-1"?>
< <project name="MyTask" basedir="." default="<b>use</b>">
---
> <?xml version="1.0" encoding="ISO-8859-1"?>
> <project name="MyTask" basedir="." default="<b>use</b>">
128,131c128,131
< <b><target name="use" description="Use the Task" depends="jar">
< <taskdef name="helloworld" classname="HelloWorld"
classpath="${ant.project.name}.jar"/>
< <helloworld/>
< </target></b>
---
> <b><target name="use" description="Use the Task" depends="jar">
> <taskdef name="helloworld" classname="HelloWorld"
> classpath="${ant.project.name}.jar"/>
> <helloworld/>
> </target></b>
133c133
< </project>
---
> </project>
229,230c229,230
< rewriting the <echo/> task :-). First we well do that with an attribute.
< It is very easy - for each attribute provide a <tt>public void
set<attributename>(<type>
---
> rewriting the <echo/> task :-). First we well do that with an attribute.
> It is very easy - for each attribute provide a <tt>public void
> set<attributename>(<type>
260c260
< <target name="use" description="Use the Task" depends="jar">
---
> <target name="use" description="Use the Task" depends="jar">
263,265c263,265
< classpath="${ant.project.name}.jar"/>
< <helloworld <b>message="Hello World"</b>/>
< </target>
---
> classpath="${ant.project.name}.jar"/>
> <helloworld <b>message="Hello World"</b>/>
> </target>
278c278
< Before calling the set-method all properties are resolved. So a
<tt><helloworld message="${msg}"/></tt>
---
> Before calling the set-method all properties are resolved. So a
> <tt><helloworld message="${msg}"/></tt>
284c284
< <p>Maybe you have used the <echo> task in a way like <tt><echo>Hello
World</echo></tt>.
---
> <p>Maybe you have used the <echo> task in a way like
> <tt><echo>Hello World</echo></tt>.
308c308
< as for the task (set<attributename>() methods). </li>
---
> as for the task (set<attributename>() methods). </li>
349,352c349,352
< <helloworld>
< <message msg="Nested Element 1"/>
< <message msg="Nested Element 2"/>
< </helloworld>
---
> <helloworld>
> <message msg="Nested Element 1"/>
> <message msg="Nested Element 2"/>
> </helloworld>
360,361c360,361
< <?xml version="1.0" encoding="ISO-8859-1"?>
< <project name="MyTask" basedir="." default="use">
---
> <?xml version="1.0" encoding="ISO-8859-1"?>
> <project name="MyTask" basedir="." default="use">
363,364c363,364
< <property name="src.dir" value="src"/>
< <property name="classes.dir" value="classes"/>
---
> <property name="src.dir" value="src"/>
> <property name="classes.dir" value="classes"/>
366,378c366,378
< <target name="clean" description="Delete all generated files">
< <delete dir="${classes.dir}" failonerror="false"/>
< <delete file="${ant.project.name}.jar"/>
< </target>
<
< <target name="compile" description="Compiles the Task">
< <mkdir dir="${classes.dir}"/>
< <javac srcdir="${src.dir}" destdir="${classes.dir}"/>
< </target>
<
< <target name="jar" description="JARs the Task" depends="compile">
< <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
< </target>
---
> <target name="clean" description="Delete all generated files">
> <delete dir="${classes.dir}" failonerror="false"/>
> <delete file="${ant.project.name}.jar"/>
> </target>
>
> <target name="compile" description="Compiles the Task">
> <mkdir dir="${classes.dir}"/>
> <javac srcdir="${src.dir}" destdir="${classes.dir}"/>
> </target>
>
> <target name="jar" description="JARs the Task" depends="compile">
> <jar destfile="${ant.project.name}.jar"
> basedir="${classes.dir}"/>
> </target>
383c383
< depends="jar">
---
> depends="jar">
386,387c386,387
< classpath="${ant.project.name}.jar"/>
< </target>
---
> classpath="${ant.project.name}.jar"/>
> </target>
392,394c392,394
< depends="use.init">
< <helloworld/>
< </target>
---
> depends="use.init">
> <helloworld/>
> </target>
398,400c398,400
< depends="use.init">
< <helloworld message="attribute-text"/>
< </target>
---
> depends="use.init">
> <helloworld message="attribute-text"/>
> </target>
404,406c404,406
< depends="use.init">
< <helloworld fail="true"/>
< </target>
---
> depends="use.init">
> <helloworld fail="true"/>
> </target>
410,412c410,412
< depends="use.init">
< <helloworld>nested-text</helloworld>
< </target>
---
> depends="use.init">
> <helloworld>nested-text</helloworld>
> </target>
416,421c416,421
< depends="use.init">
< <helloworld>
< <message msg="Nested Element 1"/>
< <message msg="Nested Element 2"/>
< </helloworld>
< </target>
---
> depends="use.init">
> <helloworld>
> <message msg="Nested Element 1"/>
> <message msg="Nested Element 2"/>
> </helloworld>
> </target>
427c427
< />
---
> />
429c429
< </project>
---
> </project>
508c508
< C:\tmp\anttests\MyFirstTask>ant
---
> C:\tmp\anttests\MyFirstTask>ant
540c540
< C:\tmp\anttests\MyFirstTask>ant use.fail
---
> C:\tmp\anttests\MyFirstTask>ant use.fail
555c555
< C:\tmp\anttests\MyFirstTask>
---
> C:\tmp\anttests\MyFirstTask>
583,584c583,584
< <p>For executing the test and creating a report we need the optional tasks
<junit>
< and <junitreport>. So we add to the buildfile:
---
> <p>For executing the test and creating a report we need the optional tasks
> <junit>
> and <junitreport>. So we add to the buildfile:
589,615c589,615
< <property name="ant.test.lib" value="ant-testutil.jar"/>
< <property name="report.dir" value="report"/>
< <property name="junit.out.dir.xml" value="${report.dir}/junit/xml"/>
< <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
<
< <path id="classpath.run">
< <path path="${java.class.path}"/>
< <path location="${ant.project.name}.jar"/>
< </path>
<
< <path id="classpath.test">
< <path refid="classpath.run"/>
< <path location="${ant.test.lib}"/>
< </path>
<
< <target name="clean" description="Delete all generated files">
< <delete failonerror="false" includeEmptyDirs="true">
< <fileset dir="." includes="${ant.project.name}.jar"/>
< <fileset dir="${classes.dir}"/>
< <fileset dir="${report.dir}"/>
< </delete>
< </target>
<
< <font color="#9F9F9F"><target name="compile" description="Compiles the
Task">
< <mkdir dir="${classes.dir}"/>
< <javac srcdir="${src.dir}" destdir="${classes.dir}"
</font>classpath="${ant.test.lib}"<font color="#9F9F9F">/>
< </target></font>
---
> <property name="ant.test.lib" value="ant-testutil.jar"/>
> <property name="report.dir" value="report"/>
> <property name="junit.out.dir.xml"
> value="${report.dir}/junit/xml"/>
> <property name="junit.out.dir.html"
> value="${report.dir}/junit/html"/>
>
> <path id="classpath.run">
> <path path="${java.class.path}"/>
> <path location="${ant.project.name}.jar"/>
> </path>
>
> <path id="classpath.test">
> <path refid="classpath.run"/>
> <path location="${ant.test.lib}"/>
> </path>
>
> <target name="clean" description="Delete all generated files">
> <delete failonerror="false" includeEmptyDirs="true">
> <fileset dir="." includes="${ant.project.name}.jar"/>
> <fileset dir="${classes.dir}"/>
> <fileset dir="${report.dir}"/>
> </delete>
> </target>
>
> <font color="#9F9F9F"><target name="compile" description="Compiles the
> Task">
> <mkdir dir="${classes.dir}"/>
> <javac srcdir="${src.dir}" destdir="${classes.dir}"
> </font>classpath="${ant.test.lib}"<font color="#9F9F9F">/>
> </target></font>
617,637c617,637
< <target name="junit" description="Runs the unit tests" depends="jar">
< <delete dir="${junit.out.dir.xml}" />
< <mkdir dir="${junit.out.dir.xml}" />
< <junit printsummary="yes" haltonfailure="no">
< <classpath refid="classpath.test"/>
< <formatter type="xml"/>
< <batchtest fork="yes" todir="${junit.out.dir.xml}">
< <fileset dir="${src.dir}" includes="**/*Test.java"/>
< </batchtest>
< </junit>
< </target>
<
< <target name="junitreport" description="Create a report for the rest
result">
< <mkdir dir="${junit.out.dir.html}" />
< <junitreport todir="${junit.out.dir.html}">
< <fileset dir="${junit.out.dir.xml}">
< <include name="*.xml"/>
< </fileset>
< <report format="frames" todir="${junit.out.dir.html}"/>
< </junitreport>
< </target>
---
> <target name="junit" description="Runs the unit tests"
> depends="jar">
> <delete dir="${junit.out.dir.xml}"/>
> <mkdir dir="${junit.out.dir.xml}"/>
> <junit printsummary="yes" haltonfailure="no">
> <classpath refid="classpath.test"/>
> <formatter type="xml"/>
> <batchtest fork="yes" todir="${junit.out.dir.xml}">
> <fileset dir="${src.dir}" includes="**/*Test.java"/>
> </batchtest>
> </junit>
> </target>
>
> <target name="junitreport" description="Create a report for the rest
> result">
> <mkdir dir="${junit.out.dir.html}"/>
> <junitreport todir="${junit.out.dir.html}">
> <fileset dir="${junit.out.dir.xml}">
> <include name="*.xml"/>
> </fileset>
> <report format="frames" todir="${junit.out.dir.html}"/>
> </junitreport>
> </target>
642c642
< />
---
> />
696c696
< C:\tmp\anttests\MyFirstTask>ant
---
> C:\tmp\anttests\MyFirstTask>ant
722c722
< C:\tmp\anttests\MyFirstTask>
---
> C:\tmp\anttests\MyFirstTask>
Index: docs/manual/CoreTasks/changelog.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/changelog.html,v
retrieving revision 1.15
diff -r1.15 changelog.html
216c216
< <msg><![CDATA[Use URLs directly rather than go via a FIle.
---
> <msg><![CDATA[Use URLs directly rather than go via a File.
218c218
< This allows temp[lates to be stored inside jar]]></msg>
---
> This allows templates to be stored inside jar]]></msg>
Index: docs/manual/CoreTasks/chmod.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/chmod.html,v
retrieving revision 1.16
diff -r1.16 chmod.html
150,151c150,151
< extension or directories begining with <code>private_</code>. A directory
< ending in <code>.old</code> or a file begining with private_ would remain
---
> extension or directories beginning with <code>private_</code>. A directory
> ending in <code>.old</code> or a file beginning with private_ would remain
Index: docs/manual/CoreTypes/filterchain.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTypes/filterchain.html,v
retrieving revision 1.20
diff -r1.20 filterchain.html
651c651
< <TD><PRE><filterchain>
---
> <TD><PRE><filterchain>
653c653
< </filterchain></PRE></TD>
---
> </filterchain></PRE></TD>
657c657
< <TD><PRE><filterchain>
---
> <TD><PRE><filterchain>
659c659
< </filterchain></PRE></TD>
---
> </filterchain></PRE></TD>
663c663
< <TD><PRE><filterchain>
---
> <TD><PRE><filterchain>
665c665
< </filterchain></PRE></TD>
---
> </filterchain></PRE></TD>
669,672c669,672
< <TD><PRE><filterchain>
< <headfilter lines="-1" skip="2"/>
< <tailfilter lines="-1" skip="2"/>
< </filterchain></PRE></TD>
---
> <TD><PRE><filterchain>
> <headfilter lines="-1" skip="2"/>
> <tailfilter lines="-1" skip="2"/>
> </filterchain></PRE></TD>
676c676
< <TD><PRE><filterchain>
---
> <TD><PRE><filterchain>
678c678
< </filterchain></PRE></TD>
---
> </filterchain></PRE></TD>
Index: docs/manual/CoreTypes/selectors-program.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTypes/selectors-program.html,v
retrieving revision 1.5
diff -r1.5 selectors-program.html
204c204
< [junit] expected:<<font color=blue>FTTTFTTTF...</font>> but
was:<TTTTTTTTT...>
---
> [junit] expected:<<font color=blue>FTTTFTTTF...</font>> but
> was:<TTTTTTTTT...>
206c206
< [junit] expected:<FTTTFTTTF...> but was:<TTTTTTTTT...>
---
> [junit] expected:<FTTTFTTTF...> but was:<TTTTTTTTT...>
Index: docs/manual/CoreTypes/selectors.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTypes/selectors.html,v
retrieving revision 1.25
diff -r1.25 selectors.html
616c616
< <type type="dir"/>
---
> <type type="dir"/>
625,630c625,630
< <fileset dir="${src}">
< <and>
< <present targetdir="template"/>
< <type type="file"/>
< </and>
< </fileset>
---
> <fileset dir="${src}">
> <and>
> <present targetdir="template"/>
> <type type="file"/>
> </and>
> </fileset>
819,823c819,823
< <copy todir="dest">
< <fileset dir="src">
< <modified/>
< </fileset>
< </copy
---
> <copy todir="dest">
> <fileset dir="src">
> <modified/>
> </fileset>
> </copy>
830,831c830,831
< <copy todir="dest">
< <fileset dir="src">
---
> <copy todir="dest">
> <fileset dir="src">
836,841c836,841
< comparator="equal">
< <param name="cache.cachefile"
value="cache.properties"/>
< <param name="algorithm.algorithm" value="MD5"/>
< </modified>
< </fileset>
< </copy>
---
> comparator="equal">
> <param name="cache.cachefile"
> value="cache.properties"/>
> <param name="algorithm.algorithm" value="MD5"/>
> </modified>
> </fileset>
> </copy>
847,859c847,859
< <copy todir="dest">
< <fileset dir="src">
< <custom
class="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector">
< <param name="update" value="true"/>
< <param name="seldirs" value="true"/>
< <param name="cache" value="propertyfile"/>
< <param name="algorithm" value="digest"/>
< <param name="comparator" value="equal"/>
< <param name="cache.cachefile"
value="cache.properties"/>
< <param name="algorithm.algorithm" value="MD5"/>
< </custom>
< </fileset>
< </copy>
---
> <copy todir="dest">
> <fileset dir="src">
> <custom
> class="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector">
> <param name="update" value="true"/>
> <param name="seldirs" value="true"/>
> <param name="cache" value="propertyfile"/>
> <param name="algorithm" value="digest"/>
> <param name="comparator" value="equal"/>
> <param name="cache.cachefile"
> value="cache.properties"/>
> <param name="algorithm.algorithm" value="MD5"/>
> </custom>
> </fileset>
> </copy>
864,874c864,874
< <target name="generate-and-upload-site">
< <echo> generate the site using forrest </echo>
< <antcall target="site"/>
<
< <echo> upload the changed file </echo>
< <ftp server="${ftp.server}" userid="${ftp.user}"
password="${ftp.pwd}">
< <fileset dir="htdocs/manual">
< <modified/>
< </fileset>
< </ftp>
< </target>
---
> <target name="generate-and-upload-site">
> <echo> generate the site using forrest </echo>
> <antcall target="site"/>
>
> <echo> upload the changed file </echo>
> <ftp server="${ftp.server}" userid="${ftp.user}"
> password="${ftp.pwd}">
> <fileset dir="htdocs/manual">
> <modified/>
> </fileset>
> </ftp>
> </target>
Index: docs/manual/OptionalTasks/replaceregexp.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.21
diff -r1.21 replaceregexp.html
126c126
< <html> <body>
---
> <html> <body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
