bodewig 2004/11/16 00:13:39
Modified: docs/manual Tag: ANT_16_BRANCH running.html
tutorial-writing-tasks.html
docs/manual/CoreTasks Tag: ANT_16_BRANCH changelog.html
chmod.html
docs/manual/CoreTypes Tag: ANT_16_BRANCH filterchain.html
selectors-program.html selectors.html
docs/manual/OptionalTasks Tag: ANT_16_BRANCH
replaceregexp.html
Log:
merge
Revision Changes Path
No revision
No revision
1.21.2.7 +1 -1 ant/docs/manual/running.html
Index: running.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/running.html,v
retrieving revision 1.21.2.6
retrieving revision 1.21.2.7
diff -u -r1.21.2.6 -r1.21.2.7
--- running.html 9 Feb 2004 22:12:06 -0000 1.21.2.6
+++ running.html 16 Nov 2004 08:13:28 -0000 1.21.2.7
@@ -216,7 +216,7 @@
<p>So here the result of a search through the codebase. Because system
properties are
available via Project instance, I searched for them with a
<pre>
- grep -r -n "getPropert" * > ..\grep.txt
+ grep -r -n "getPropert" * > ..\grep.txt
</pre>
command. After that I filtered out the often-used but not-so-important
values (most of them
read-only values): <i>path.separator, ant.home, basedir, user.dir, os.name,
ant.file,
1.2.2.4 +151 -151 ant/docs/manual/tutorial-writing-tasks.html
Index: tutorial-writing-tasks.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/tutorial-writing-tasks.html,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- tutorial-writing-tasks.html 9 Feb 2004 22:12:06 -0000 1.2.2.3
+++ tutorial-writing-tasks.html 16 Nov 2004 08:13:28 -0000 1.2.2.4
@@ -45,52 +45,52 @@
</ul>
So the buildfile contains three targets.
<pre class="code">
-<?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">
- <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>
-</project>
+</project>
</pre>
This buildfile uses often the same value (src, classes, MyTask.jar), so we
should rewrite that
-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
directory exists; a call of "clean" with a non existing classes directory
will fail; "jar" requires
the execution of some steps bofore. So the refactored code is:
<pre class="code">
-<?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">
- <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>
- <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>
-</project>
+</project>
</pre>
<i>ant.project.name</i> is one of the
<a href="http://ant.apache.org/manual/using.html#built-in-props";
target="_blank">
@@ -119,19 +119,19 @@
<p>But after creating the jar we want to use our new Task. Therefore we need
a
new target "use". Before we can use our new task we have to declare it with
<a href="http://ant.apache.org/manual/CoreTasks/taskdef.html";
target="_blank">
-<taskdef> [2]</a>. And for easier process we change the default clause:
+<taskdef> [2]</a>. And for easier process we change the default clause:
<pre class="code">
-<?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>">
...
- <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>
-</project>
+</project>
</pre>
Important is the <i>classpath</i>-attribute. Ant searches in its /lib
directory for
@@ -227,8 +227,8 @@
<a name="attributes">
<h2>Attributes</h2>
<p>Now we want to specify the text of our message (it seems that we are
-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>
newValue)</tt> method and Ant will do the rest via reflection.</p>
<pre class="code">
import org.apache.tools.ant.Task;
@@ -258,12 +258,12 @@
<p>After that we have to modify our buildfile:
<pre class="code">
- <target name="use" description="Use the Task" depends="jar">
+ <target name="use" description="Use the Task" depends="jar">
<taskdef name="helloworld"
classname="HelloWorld"
- classpath="${ant.project.name}.jar"/>
- <helloworld <b>message="Hello World"</b>/>
- </target>
+ classpath="${ant.project.name}.jar"/>
+ <helloworld <b>message="Hello World"</b>/>
+ </target>
</pre>
That's all.</p>
@@ -276,13 +276,13 @@
<a href="http://ant.apache.org/manual/develop.html#set-magic";>Manual
'Writing Your Own Task' [3]</a>)</li>
</ul>
-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>
would not set the message string to "${msg}" if there is a property "msg"
with a set value.
<a name="NestedText"></a>
<h2>Nested Text</h2>
-<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>.
For that you have to provide a <tt>public void addText(String text)</tt>
method.
<pre class="code">
...
@@ -306,7 +306,7 @@
We use the first way of the three described ways. There are several steps
for that:<ol>
<li>We create a class for collecting all the infos the nested element should
contain.
This class is created by the same rules for attributes and nested elements
- as for the task (set<attributename>() methods). </li>
+ as for the task (set<attributename>() methods). </li>
<li>The task holds multiple instances of this class in a list.</li>
<li>A factory method instantiates an object, saves the reference in the list
and returns it to Ant Core.</li>
@@ -347,10 +347,10 @@
<tt>public <i>classname</i> create<i>XML-name</i>()</tt>. Therefore we write
in
the buildfile
<pre class="code">
- <helloworld>
- <message msg="Nested Element 1"/>
- <message msg="Nested Element 2"/>
- </helloworld>
+ <helloworld>
+ <message msg="Nested Element 1"/>
+ <message msg="Nested Element 2"/>
+ </helloworld>
</pre>
@@ -358,76 +358,76 @@
<h2>Our task in a little more complex version</h2>
<p>For recapitulation now a little refactored buildfile:
<pre class="code">
-<?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">
- <property name="src.dir" value="src"/>
- <property name="classes.dir" value="classes"/>
+ <property name="src.dir" value="src"/>
+ <property name="classes.dir" value="classes"/>
- <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>
<target name="use.init"
description="Taskdef the HelloWorld-Task"
- depends="jar">
+ depends="jar">
<taskdef name="helloworld"
classname="HelloWorld"
- classpath="${ant.project.name}.jar"/>
- </target>
+ classpath="${ant.project.name}.jar"/>
+ </target>
<target name="use.without"
description="Use without any"
- depends="use.init">
- <helloworld/>
- </target>
+ depends="use.init">
+ <helloworld/>
+ </target>
<target name="use.message"
description="Use with attribute 'message'"
- depends="use.init">
- <helloworld message="attribute-text"/>
- </target>
+ depends="use.init">
+ <helloworld message="attribute-text"/>
+ </target>
<target name="use.fail"
description="Use with attribute 'fail'"
- depends="use.init">
- <helloworld fail="true"/>
- </target>
+ depends="use.init">
+ <helloworld fail="true"/>
+ </target>
<target name="use.nestedText"
description="Use with nested text"
- depends="use.init">
- <helloworld>nested-text</helloworld>
- </target>
+ depends="use.init">
+ <helloworld>nested-text</helloworld>
+ </target>
<target name="use.nestedElement"
description="Use with nested 'message'"
- 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>
<target name="use"
description="Try all (w/out use.fail)"
depends="use.without,use.message,use.nestedText,use.nestedElement"
- />
+ />
-</project>
+</project>
</pre>
And the code of the task:
@@ -506,7 +506,7 @@
And it works:
<pre class="output">
-C:\tmp\anttests\MyFirstTask>ant
+C:\tmp\anttests\MyFirstTask>ant
Buildfile: build.xml
compile:
@@ -538,7 +538,7 @@
BUILD SUCCESSFUL
Total time: 3 seconds
-C:\tmp\anttests\MyFirstTask>ant use.fail
+C:\tmp\anttests\MyFirstTask>ant use.fail
Buildfile: build.xml
compile:
@@ -553,7 +553,7 @@
C:\tmp\anttests\MyFirstTask\build.xml:36: Fail requested.
Total time: 1 second
-C:\tmp\anttests\MyFirstTask>
+C:\tmp\anttests\MyFirstTask>
</pre>
Next step: test ...
@@ -581,66 +581,66 @@
<a href="http://gump.covalent.net/jars/latest/ant/ant-testutil.jar";>
http://gump.covalent.net/jars/latest/ant/ant-testutil.jar [5]</a>.</p>
-<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:
<pre class="code">
...
<font color="#9F9F9F"><project name="MyTask" basedir="."
</font>default="test"<font color="#9F9F9F">></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>
+ <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>
...
- <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>
<target name="test"
depends="junit,junitreport"
description="Runs unit tests and creates a report"
- />
+ />
...
</pre></p>
@@ -694,7 +694,7 @@
<p>When starting <tt>ant</tt> we'll get a short message to STDOUT and
a nice HTML-report.
<pre class="output">
-C:\tmp\anttests\MyFirstTask>ant
+C:\tmp\anttests\MyFirstTask>ant
Buildfile: build.xml
compile:
@@ -720,7 +720,7 @@
BUILD SUCCESSFUL
Total time: 7 seconds
-C:\tmp\anttests\MyFirstTask>
+C:\tmp\anttests\MyFirstTask>
</pre></p>
No revision
No revision
1.13.2.4 +2 -2 ant/docs/manual/CoreTasks/changelog.html
Index: changelog.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/changelog.html,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- changelog.html 9 Feb 2004 22:12:06 -0000 1.13.2.3
+++ changelog.html 16 Nov 2004 08:13:33 -0000 1.13.2.4
@@ -214,9 +214,9 @@
<revision>1.3</revision>
<prevrevision>1.2</prevrevision>
</file>
- <msg><![CDATA[Use URLs directly rather than go via a FIle.
+ <msg><![CDATA[Use URLs directly rather than go via a File.
-This allows temp[lates to be stored inside jar]]></msg>
+This allows templates to be stored inside jar]]></msg>
</entry>
</changelog>
</pre>
1.15.2.3 +2 -2 ant/docs/manual/CoreTasks/chmod.html
Index: chmod.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/chmod.html,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- chmod.html 9 Feb 2004 22:12:06 -0000 1.15.2.2
+++ chmod.html 16 Nov 2004 08:13:33 -0000 1.15.2.3
@@ -148,8 +148,8 @@
</blockquote>
<p>keeps non-owners from touching cgi scripts, files with a <code>.old</code>
-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
unaffected.</p>
<hr>
No revision
No revision
1.13.2.8 +12 -12 ant/docs/manual/CoreTypes/filterchain.html
Index: filterchain.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -u -r1.13.2.7 -r1.13.2.8
--- filterchain.html 15 Oct 2004 17:09:18 -0000 1.13.2.7
+++ filterchain.html 16 Nov 2004 08:13:34 -0000 1.13.2.8
@@ -649,34 +649,34 @@
<TABLE>
<TR>
<TD bgcolor="#C0C0C0"> </TD>
- <TD><PRE><filterchain>
+ <TD><PRE><filterchain>
<headfilter lines="2"/>
-</filterchain></PRE></TD>
+</filterchain></PRE></TD>
</TR>
<TR>
<TD bgcolor="#FF00FF"> </TD>
- <TD><PRE><filterchain>
+ <TD><PRE><filterchain>
<tailfilter lines="-1" skip="2"/>
-</filterchain></PRE></TD>
+</filterchain></PRE></TD>
</TR>
<TR>
<TD bgcolor="#008000"> </TD>
- <TD><PRE><filterchain>
+ <TD><PRE><filterchain>
<headfilter lines="-1" skip="2"/>
-</filterchain></PRE></TD>
+</filterchain></PRE></TD>
</TR>
<TR>
<TD bgcolor="#0000FF"> </TD>
- <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>
</TR>
<TR>
<TD bgcolor="#00FF00"> </TD>
- <TD><PRE><filterchain>
+ <TD><PRE><filterchain>
<tailfilter lines="2"/>
-</filterchain></PRE></TD>
+</filterchain></PRE></TD>
</TR>
</TABLE>
</TD>
1.5.2.3 +2 -2 ant/docs/manual/CoreTypes/selectors-program.html
Index: selectors-program.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/selectors-program.html,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- selectors-program.html 9 Feb 2004 22:12:10 -0000 1.5.2.2
+++ selectors-program.html 16 Nov 2004 08:13:34 -0000 1.5.2.3
@@ -202,9 +202,9 @@
As an example of an error JUnit could log<pre>
[junit] FAILED
[junit] Error for files: <font
color=blue>.;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz</font>
- [junit] expected:<<font color=blue>FTTTFTTTF...</font>> but
was:<TTTTTTTTT...>
+ [junit] expected:<<font color=blue>FTTTFTTTF...</font>> but
was:<TTTTTTTTT...>
[junit] junit.framework.ComparisonFailure: Error for files:
.;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz
- [junit] expected:<FTTTFTTTF...> but was:<TTTTTTTTT...>
+ [junit] expected:<FTTTFTTTF...> but was:<TTTTTTTTT...>
[junit] at junit.framework.Assert.assertEquals(Assert.java:81)
[junit] at
org.apache.tools.ant.types.selectors.BaseSelectorTest.performTest(BaseSelectorTest.java:194)
</pre></p>
1.15.2.8 +44 -44 ant/docs/manual/CoreTypes/selectors.html
Index: selectors.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/selectors.html,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -r1.15.2.7 -r1.15.2.8
--- selectors.html 17 Jul 2004 16:11:58 -0000 1.15.2.7
+++ selectors.html 16 Nov 2004 08:13:34 -0000 1.15.2.8
@@ -613,7 +613,7 @@
<blockquote><pre>
<fileset dir="${src}">
- <type type="dir"/>
+ <type type="dir"/>
</fileset>
</pre></blockquote>
@@ -622,12 +622,12 @@
directory, but avoid selecting empty directories, use:
<blockquote><pre>
-<fileset dir="${src}">
- <and>
- <present targetdir="template"/>
- <type type="file"/>
- </and>
-</fileset>
+<fileset dir="${src}">
+ <and>
+ <present targetdir="template"/>
+ <type type="file"/>
+ </and>
+</fileset>
</pre></blockquote>
@@ -766,62 +766,62 @@
<p>Here are some examples of how to use the Modified Selector:</p>
<blockquote><pre>
- <copy todir="dest">
- <fileset dir="src">
- <modified/>
- </fileset>
- </copy
+ <copy todir="dest">
+ <fileset dir="src">
+ <modified/>
+ </fileset>
+ </copy>
</pre></blockquote>
<p>This will copy all files from <i>src</i> to <i>dest</i> which content
has changed.
Using an updating PropertyfileCache with cache.properties and
MD5-DigestAlgorithm.</p>
<blockquote><pre>
- <copy todir="dest">
- <fileset dir="src">
+ <copy todir="dest">
+ <fileset dir="src">
<modified update="true"
seldirs="true"
cache="propertyfile"
algorithm="digest"
- 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>
</pre></blockquote>
<p>This is the same example rewritten as CoreSelector with setting the all
the values
(same as defaults are).</p>
<blockquote><pre>
- <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>
</pre></blockquote>
<p>And this is the same rewritten as CustomSelector.</p>
<blockquote><pre>
- <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>
</pre></blockquote>
<p>A useful scenario for this selector inside a build environment
for homepage generation (e.g. with <a
href="http://xml.apache.org/forrest/";>
No revision
No revision
1.16.2.6 +1 -1 ant/docs/manual/OptionalTasks/replaceregexp.html
Index: replaceregexp.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- replaceregexp.html 12 Nov 2004 10:38:05 -0000 1.16.2.5
+++ replaceregexp.html 16 Nov 2004 08:13:39 -0000 1.16.2.6
@@ -124,7 +124,7 @@
<blockquote>
<pre>
-<html> <body>
+<html> <body>
<<TAB>><h1> T E S T </h1> <<TAB>>
<<TAB>> </body></html>
</pre></blockquote>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
