http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/filterchain.html ---------------------------------------------------------------------- diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html index ced1f30..649a3fd 100644 --- a/manual/Types/filterchain.html +++ b/manual/Types/filterchain.html @@ -56,7 +56,7 @@ FilterReaders can be easily plugged in as nested elements of <code><filterchain></code> by using <code><filterreader></code> elements. <p> Example: -<blockquote><pre> +<pre> <copy file="${src.file}" tofile="${dest.file}"> <filterchain> <filterreader classname="your.extension.of.java.io.FilterReader"> @@ -71,21 +71,21 @@ Example: </filterreader> </filterchain> </copy> -</pre></blockquote> +</pre> Ant provides some built-in filter readers. These filter readers can also be declared using a syntax similar to the above syntax. However, they can be declared using some simpler syntax also.<p> Example: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <headfilter lines="15"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> is equivalent to: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.HeadFilter"> @@ -93,7 +93,7 @@ is equivalent to: </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> The following built-in tasks support nested <code><filterchain></code> elements.<br> <a href="../Tasks/concat.html">Concat</a>,<br> @@ -188,18 +188,18 @@ distribution. This loads the basic constants defined in a Java class as Ant properties. -<blockquote><pre> +<pre> <loadproperties srcfile="foo.class" encoding="ISO-8859-1"> <filterchain> <classconstants/> </filterchain> </loadproperties> -</pre></blockquote> +</pre> This loads the constants from a Java class file as Ant properties, prepending the names with a prefix. - <blockquote><pre> + <pre> <loadproperties srcfile="build/classes/org/acme/bar.class" encoding="ISO-8859-1"> <filterchain> @@ -207,7 +207,7 @@ prepending the names with a prefix. <prefixlines prefix="ini."/> </filterchain> </loadproperties> -</pre></blockquote> +</pre> <h3 id="escapeunicode">EscapeUnicode</h3> <p> This filter converts its input by changing all non US-ASCII characters @@ -218,34 +218,34 @@ into their equivalent unicode escape backslash u plus 4 digits.</p> <h4>Example:</h4> This loads the basic constants defined in a Java class as Ant properties. -<blockquote><pre> +<pre> <loadproperties srcfile="non_ascii_property.properties"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.EscapeUnicode"/> </filterchain> </loadproperties> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadproperties srcfile="non_ascii_property.properties"> <filterchain> <escapeunicode/> </filterchain> </loadproperties> -</pre></blockquote> +</pre> <h3 id="expandproperties">ExpandProperties</h3> <p> If the data contains data that represents Ant properties (of the form ${...}), that is substituted with the property's actual value. -<p> +</p> <h4>Example:</h4> This results in the property modifiedmessage holding the value "All these moments will be lost in time, like teardrops in the rain" -<blockquote><pre> +<pre> <echo message="All these moments will be lost in time, like teardrops in the ${weather}" file="loadfile1.tmp" @@ -256,10 +256,10 @@ This results in the property modifiedmessage holding the value <filterreader classname="org.apache.tools.ant.filters.ExpandProperties"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <echo message="All these moments will be lost in time, like teardrops in the ${weather}" file="loadfile1.tmp" @@ -270,12 +270,12 @@ Convenience method: <expandproperties/> </filterchain> </loadfile> -</pre></blockquote> +</pre> <p><em>Since Ant 1.8.3</em>, a nested - <a href="propertyset.html">PropertySet</a> can be specified: + <a href="propertyset.html">PropertySet</a> can be specified:</p> -<blockquote><pre> +<pre> <property name="weather" value="rain"/> <loadfile property="modifiedmessage" srcFile="loadfile1.tmp"> <filterchain> @@ -286,7 +286,7 @@ Convenience method: </expandproperties> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="headfilter">HeadFilter</h3> @@ -316,7 +316,7 @@ This filter reads the first few lines from the data supplied to it. <h4>Example:</h4> This stores the first 15 lines of the supplied data in the property src.file.head -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.HeadFilter"> @@ -324,26 +324,26 @@ This stores the first 15 lines of the supplied data in the property src.file.hea </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <headfilter lines="15"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> This stores the first 15 lines, skipping the first 2 lines, of the supplied data in the property src.file.head. (Means: lines 3-17) -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <headfilter lines="15" skip="2"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> See the testcases for more examples (<i>src\etc\testcases\filters\head-tail.xml</i> in the source distribution). @@ -376,36 +376,36 @@ strings. This will include only those lines that contain <code>foo</code> and <code>bar</code>. -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.LineContains"> <param type="contains" value="foo"/> <param type="contains" value="bar"/> </filterreader> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <linecontains> <contains value="foo"/> <contains value="bar"/> </linecontains> -</pre></blockquote> +</pre> Negation: -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.LineContains"> <param type="negate" value="true"/> <param type="contains" value="foo"/> <param type="contains" value="bar"/> </filterreader> -</pre></blockquote> +</pre> <i>or</i> -<blockquote><pre> +<pre> <linecontains negate="true"> <contains value="foo"/> <contains value="bar"/> </linecontains> -</pre></blockquote> +</pre> <h3 id="linecontainsregexp">LineContainsRegExp</h3> @@ -447,32 +447,32 @@ the choice of regular expression implementation. <h4>Example:</h4> This will fetch all those lines that contain the pattern <code>foo</code> -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.LineContainsRegExp"> <param type="regexp" value="foo*"/> </filterreader> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <linecontainsregexp> <regexp pattern="foo*"/> </linecontainsregexp> -</pre></blockquote> +</pre> Negation: -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.LineContainsRegExp"> <param type="negate" value="true"/> <param type="regexp" value="foo*"/> </filterreader> -</pre></blockquote> +</pre> <i>or</i> -<blockquote><pre> +<pre> <linecontainsregexp negate="true"> <regexp pattern="foo*"/> </linecontainsregexp> -</pre></blockquote> +</pre> <h3 id="prefixlines">PrefixLines</h3> @@ -494,16 +494,16 @@ Attaches a prefix to every line. <h4>Example:</h4> This will attach the prefix <code>Foo</code> to all lines. -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.PrefixLines"> <param name="prefix" value="Foo"/> </filterreader> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <prefixlines prefix="Foo"/> -</pre></blockquote> +</pre> <h3 id="suffixlines">SuffixLines</h3> @@ -527,16 +527,16 @@ Attaches a suffix to every line. <h4>Example:</h4> This will attach the suffix <code>Foo</code> to all lines. -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.SuffixLines"> <param name="suffix" value="Foo"/> </filterreader> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <suffixlines suffix="Foo"/> -</pre></blockquote> +</pre> <h3 id="replacetokens">ReplaceTokens</h3> @@ -598,7 +598,7 @@ user defined values. This replaces occurrences of the string @DATE@ in the data with today's date and stores it in the property ${src.file.replaced}. -<blockquote><pre> +<pre> <tstamp/> <!-- just for explaining the use of the properties --> <property name="src.file" value="orders.csv"/> @@ -615,10 +615,10 @@ with today's date and stores it in the property ${src.file.replaced}. <!-- just for explaining the use of the properties --> <echo message="${orders.replaced}"/> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <tstamp/> <loadfile srcfile="${src.file}" property="${src.file.replaced}"> <filterchain> @@ -627,11 +627,11 @@ Convenience method: </replacetokens> </filterchain> </loadfile> -</pre></blockquote> +</pre> This replaces occurrences of the string {{DATE}} in the data with today's date and stores it in the property ${src.file.replaced}. -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.replaced}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> @@ -640,10 +640,10 @@ with today's date and stores it in the property ${src.file.replaced}. </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <tstamp/> <loadfile srcfile="${src.file}" property="${src.file.replaced}"> <filterchain> @@ -652,10 +652,10 @@ Convenience method: </replacetokens> </filterchain> </loadfile> -</pre></blockquote> +</pre> This will treat each properties file entry in sample.properties as a token/key pair : -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.replaced}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> @@ -663,10 +663,10 @@ This will treat each properties file entry in sample.properties as a token/key p </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> This reads the properties from an Ant resource referenced by its id: -<blockquote><pre> +<pre> <string id="embedded-properties"> foo=bar baz=xyzzy @@ -676,7 +676,7 @@ baz=xyzzy <replacetokens propertiesResource="${ant.refid:embedded-properties}"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="stripjavacomments">StripJavaComments</h3> @@ -686,22 +686,22 @@ take in any parameters. <p> <h4>Example:</h4> -<blockquote><pre> +<pre> <loadfile srcfile="${java.src.file}" property="${java.src.file.nocomments}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.StripJavaComments"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${java.src.file}" property="${java.src.file.nocomments}"> <filterchain> <stripjavacomments/> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="striplinebreaks">StripLineBreaks</h3> @@ -725,26 +725,26 @@ from the data supplied to it. <h4>Examples:</h4> This strips the '\r' and '\n' characters. -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.contents}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.StripLineBreaks"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.contents}"> <filterchain> <striplinebreaks/> </filterchain> </loadfile> -</pre></blockquote> +</pre> This treats the '(' and ')' characters as line break characters and strips them. -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.contents}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.StripLineBreaks"> @@ -752,7 +752,7 @@ strips them. </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="striplinecomments">StripLineComments</h3> @@ -776,7 +776,7 @@ that represent comments as specified by the user. <h4>Examples:</h4> This removes all lines that begin with #, --, REM, rem and // -<blockquote><pre> +<pre> <filterreader classname="org.apache.tools.ant.filters.StripLineComments"> <param type="comment" value="#"/> <param type="comment" value="--"/> @@ -784,10 +784,10 @@ This removes all lines that begin with #, --, REM, rem and // <param type="comment" value="rem "/> <param type="comment" value="//"/> </filterreader> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <striplinecomments> <comment value="#"/> <comment value="--"/> @@ -795,7 +795,7 @@ Convenience method: <comment value="rem "/> <comment value="//"/> </striplinecomments> -</pre></blockquote> +</pre> <h3 id="tabstospaces">TabsToSpaces</h3> @@ -817,22 +817,22 @@ This filter replaces tabs with spaces <h4>Examples:</h4> This replaces tabs in ${src.file} with spaces. -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.notab}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.TabsToSpaces"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.notab}"> <filterchain> <tabstospaces/> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="tailfilter">TailFilter</h3> @@ -931,7 +931,7 @@ This graphic shows the dependencies: <h4>Examples:</h4> This stores the last 15 lines of the supplied data in the property ${src.file.tail} -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.tail}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.TailFilter"> @@ -939,20 +939,20 @@ This stores the last 15 lines of the supplied data in the property ${src.file.ta </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.tail}"> <filterchain> <tailfilter lines="15"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> This stores the last 5 lines of the first 15 lines of the supplied data in the property ${src.file.mid} -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.mid}"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.HeadFilter"> @@ -963,28 +963,28 @@ data in the property ${src.file.mid} </filterreader> </filterchain> </loadfile> -</pre></blockquote> +</pre> Convenience method: -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="${src.file.mid}"> <filterchain> <headfilter lines="15"/> <tailfilter lines="5"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> This stores the last 10 lines, skipping the last 2 lines, of the supplied data in the property src.file.head. (Means: if supplied data contains 60 lines, lines 49-58 are extracted) -<blockquote><pre> +<pre> <loadfile srcfile="${src.file}" property="src.file.head"> <filterchain> <tailfilter lines="10" skip="2"/> </filterchain> </loadfile> -</pre></blockquote> +</pre> <h3 id="deletecharacters">DeleteCharacters</h3> @@ -1011,9 +1011,9 @@ lines 49-58 are extracted) <h4>Examples:</h4> Delete tabs and returns from the data. -<blockquote><pre> +<pre> <deletecharacters chars="\t\r"/> -</pre></blockquote> +</pre> <h3 id="concatfilter">ConcatFilter</h3> <p>This filter prepends or appends the content file to the filtered files.</p> @@ -1044,18 +1044,18 @@ Delete tabs and returns from the data. <h4>Examples:</h4> Do nothing: -<blockquote><pre> +<pre> <filterchain> <concatfilter/> </filterchain> -</pre></blockquote> +</pre> Adds a license text before each java source: -<blockquote><pre> +<pre> <filterchain> <concatfilter prepend="apache-license-java.txt"/> </filterchain> -</pre></blockquote> +</pre> <h3 id="sortfilter">SortFilter</h3> <p><em>since Ant 1.8.0</em></p> @@ -1094,14 +1094,14 @@ Adds a license text before each java source: <h4>Examples:</h4> -<blockquote><pre> +<pre> <copy todir="build"> <fileset dir="input" includes="*.txt"/> <filterchain> <sortfilter/> </filterchain> </copy> -</pre></blockquote> +</pre> <p> Sort all files <code>*.txt</code> from <i>src</i> location @@ -1110,21 +1110,21 @@ ascendant order comparing the lines via the <code>String.compareTo(Object o)</code> method. </p> -<blockquote><pre> +<pre> <copy todir="build"> <fileset dir="input" includes="*.txt"/> <filterchain> <sortfilter reverse="true"/> </filterchain> </copy> -</pre></blockquote> +</pre> <p> Sort all files <code>*.txt</code> from <i>src</i> location into reverse order and copy them into <i>build</i> location. </p> -<blockquote><pre> +<pre> <copy todir="build"> <fileset dir="input" includes="*.txt"/> <filterchain> @@ -1133,7 +1133,7 @@ order and copy them into <i>build</i> location. </filterreader> </filterchain> </copy> -</pre></blockquote> +</pre> <p> Sort all files <code>*.txt</code> from <i>src</i> location using as @@ -1157,7 +1157,7 @@ implement <code>java.util.Comparator</code> interface, for example: <p>The example above is equivalent to:</p> -<blockquote><pre> +<pre> <componentdef name="evenfirst" classname="org.apache.tools.ant.filters.EvenFirstCmp"/> <copy todir="build"> @@ -1168,7 +1168,7 @@ implement <code>java.util.Comparator</code> interface, for example: </sortfilter> </filterchain> </copy> -</pre></blockquote> +</pre> <h3 id="tokenfilter">TokenFilter</h3> This filter tokenizes the inputstream into strings and passes these @@ -1274,17 +1274,17 @@ This is the default tokenizer. <h5>Examples:</h5> Convert input current line endings to unix style line endings. -<blockquote><pre> +<pre> <tokenfilter delimoutput="\n"/> -</pre></blockquote> +</pre> Remove blank lines. -<blockquote><pre> +<pre> <tokenfilter> <ignoreblank/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="filetokenizer">FileTokenizer</h4> This tokenizer treats <b>all</b> the input as a token. So be @@ -1292,14 +1292,14 @@ careful not to use this on very large input. <h5>Examples:</h5> Replace the first occurrence of package with //package. -<blockquote><pre> +<pre> <tokenfilter> <filetokenizer/> <replaceregex pattern="([\n\r]+[ \t]*|^[ \t]*)package" flags="s" replace="\1//package"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="stringtokenizer">StringTokenizer</h4> This tokenizer is based on java.util.StringTokenizer. @@ -1353,13 +1353,13 @@ attribute is used). Surround each non space token with a "[]". -<blockquote><pre> +<pre> <tokenfilter> <stringtokenizer/> <replaceregex pattern="(.+)" replace="[\1]"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="replacestring">ReplaceString</h4> This is a simple filter to replace strings. @@ -1389,11 +1389,11 @@ This filter may be used directly within a filterchain. Replace "sun" with "moon". -<blockquote><pre> +<pre> <tokenfilter> <replacestring from="sun" to="moon"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="containsstring">ContainsString</h4> This is a simple filter to filter tokens that contains @@ -1416,12 +1416,12 @@ a specified string. Include only lines that contain "foo"; -<blockquote><pre> +<pre> <tokenfilter> <containsstring contains="foo"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="replaceregex">ReplaceRegex</h4> This string filter replaces regular expressions. @@ -1461,12 +1461,12 @@ for an explanation of regex flags.</td> Replace all occurrences of "hello" with "world", ignoring case. -<blockquote><pre> +<pre> <tokenfilter> <replaceregex pattern="hello" replace="world" flags="gi"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="containsregex">ContainsRegex</h4> This filters strings that match regular expressions. @@ -1509,23 +1509,23 @@ for an explanation of regex flags.</td> Filter lines that contain "hello" or "world", ignoring case. -<blockquote><pre> +<pre> <tokenfilter> <containsregex pattern="(hello|world)" flags="i"/> </tokenfilter> -</pre></blockquote> +</pre> This example replaces lines like "SUITE(TestSuite, bits);" with "void register_bits();" and removes other lines. -<blockquote><pre> +<pre> <tokenfilter> <containsregex pattern="^ *SUITE\(.*,\s*(.*)\s*\).*" replace="void register_\1();"/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="trim">Trim</h4> This filter trims whitespace from the start and end of @@ -1557,14 +1557,14 @@ This filter deletes specified characters from tokens. Delete tabs from lines, trim the lines and removes empty lines. -<blockquote><pre> +<pre> <tokenfilter> <deletecharacters chars="\t"/> <trim/> <ignoreblank/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="uniqfilter">UniqFilter</h4> @@ -1576,11 +1576,11 @@ Delete tabs from lines, trim the lines and removes empty lines. <h5>Example:</h5> This suppresses duplicate lines. -<blockquote><pre> +<pre> <tokenfilter> <uniqfilter/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="native2asciifilter">Native2AsciiFilter</h4> @@ -1609,11 +1609,11 @@ This suppresses duplicate lines. <h5>Example:</h5> <p>This replaces all non-ASCII characters by their Unicode-escapes.</p> -<blockquote><pre> +<pre> <tokenfilter> <native2asciifilter/> </tokenfilter> -</pre></blockquote> +</pre> <h4 id="scriptfilter">ScriptFilter</h4> <p> @@ -1694,18 +1694,17 @@ Must be a supported Apache BSF or JSR 223 language</td> <h5>Examples:</h5> Convert to uppercase: -<blockquote><pre> +<pre> <tokenfilter> <scriptfilter language="javascript"> self.setToken(self.getToken().toUpperCase()); </scriptfilter> </tokenfilter> -</pre></blockquote> +</pre> Remove lines containing the string "bad" while copying text files: - <blockquote> - <pre> +<pre> <copy todir="dist"> <fileset dir="src" includes="**/*.txt"/> <filterchain> @@ -1716,8 +1715,7 @@ copying text files: </scriptfilter> </filterchain> </copy> - </pre> - </blockquote> +</pre> <h4 id="custom">Custom tokenizers and string filters</h4> @@ -1727,7 +1725,7 @@ and org.apache.tools.ant.util.Tokenizer respectly. They are defined in the build file using <code><typedef/></code>. For example a string filter that capitalizes words may be declared as: -<blockquote><pre> +<pre> package my.customant; import org.apache.tools.ant.filters.TokenFilter; @@ -1741,10 +1739,10 @@ public class Capitalize token.substring(1); } } -</pre></blockquote> +</pre> This may be used as follows: -<blockquote><pre> +<pre> <typedef name="capitalize" classname="my.customant.Capitalize" classpath="my.customant.path"/> <copy file="input" tofile="output"> @@ -1755,6 +1753,7 @@ This may be used as follows: </tokenfilter> </filterchain> </copy> -</pre></blockquote> +</pre> -</body></html> +</body> +</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/filterset.html ---------------------------------------------------------------------- diff --git a/manual/Types/filterset.html b/manual/Types/filterset.html index a50d750..ea1b7b7 100644 --- a/manual/Types/filterset.html +++ b/manual/Types/filterset.html @@ -141,27 +141,27 @@ you should ensure that the set of files being filtered are all text files. <p>You are copying the <code>version.txt</code> file to the <code>dist</code> directory from the <code>build</code> directory but wish to replace the token <code>@DATE@</code> with today's date.</p> -<blockquote><pre> +<pre> <copy file="${build.dir}/version.txt" toFile="${dist.dir}/version.txt"> <filterset> <filter token="DATE" value="${TODAY}"/> </filterset> </copy> -</pre></blockquote> +</pre> <p>You are copying the <code>version.txt</code> file to the <code>dist</code> directory from the build directory but wish to replace the token <code>%DATE*</code> with today's date.</p> -<blockquote><pre> +<pre> <copy file="${build.dir}/version.txt" toFile="${dist.dir}/version.txt"> <filterset begintoken="%" endtoken="*"> <filter token="DATE" value="${TODAY}"/> </filterset> </copy> -</pre></blockquote> +</pre> <p>Copy all the docs but change all dates and appropriate notices as stored in a file.</p> -<blockquote><pre> +<pre> <copy toDir="${dist.dir}/docs"> <fileset dir="${build.dir}/docs"> <include name="**/*.html"> @@ -170,10 +170,10 @@ but wish to replace the token <code>%DATE*</code> with today's date.</p> <filtersfile file="${user.dir}/dist.properties"/> </filterset> </copy> -</pre></blockquote> +</pre> <p>Define a FilterSet and reference it later.</p> -<blockquote><pre> +<pre> <filterset id="myFilterSet" begintoken="%" endtoken="*"> <filter token="DATE" value="${TODAY}"/> </filterset> @@ -181,12 +181,12 @@ but wish to replace the token <code>%DATE*</code> with today's date.</p> <copy file="${build.dir}/version.txt" toFile="${dist.dir}/version.txt"> <filterset refid="myFilterSet"/> </copy> -</pre></blockquote> +</pre> <p>You are copying the <code>version.txt</code> file to the <code>dist</code> directory from the <code>build</code> directory but wish to replace the token <code>@project.date@</code> with the property of the same name.</p> -<blockquote><pre> +<pre> <copy file="${build.dir}/version.txt" toFile="${dist.dir}/version.txt"> <filterset> <propertyset> @@ -194,5 +194,6 @@ but wish to replace the token <code>@project.date@</code> with the prope </propertyset> </filterset> </copy> -</pre></blockquote> -</body></html> +</pre> +</body> +</html> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/mapper.html ---------------------------------------------------------------------- diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html index 01ccc90..4678afe 100644 --- a/manual/Types/mapper.html +++ b/manual/Types/mapper.html @@ -117,10 +117,10 @@ implicitly configured as a <a href="#composite-mapper">composite mapper</a>. <p>The target file name is identical to the source file name. Both <code>to</code> and <code>from</code> will be ignored.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <mapper type="identity"/> <identitymapper/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -153,10 +153,10 @@ implicitly configured as a <a href="#composite-mapper">composite mapper</a>. leading directory information stripped off. Both <code>to</code> and <code>from</code> will be ignored.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <mapper type="flatten"/> <flattenmapper/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -188,10 +188,10 @@ leading directory information stripped off. Both <code>to</code> and <p>The target file name will always be the same, as defined by <code>to</code> - <code>from</code> will be ignored.</p> <h5>Examples:</h5> -<blockquote><pre> +<pre> <mapper type="merge" to="archive.tar"/> <mergemapper to="archive.tar"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -228,10 +228,10 @@ the <code>to</code> pattern with the text that matches the <code>*</code> in the <code>from</code> pattern. Source file names that don't match the <code>from</code> pattern will be ignored.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <mapper type="glob" from="*.java" to="*.java.bak"/> <globmapper from="*.java" to="*.java.bak"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -254,10 +254,10 @@ that don't match the <code>from</code> pattern will be ignored.</p> <td valign="top">ignored</td> </tr> </table> -<blockquote><pre> +<pre> <mapper type="glob" from="C*ies" to="Q*y"/> <globmapper from="C*ies" to="Q*y"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -404,10 +404,10 @@ should be used.</li> </ul> <b>Examples:</b> -<blockquote><pre> +<pre> <mapper type="regexp" from="^(.*)\.java$$" to="\1.java.bak"/> <regexpmapper from="^(.*)\.java$$" to="\1.java.bak"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -430,10 +430,10 @@ should be used.</li> <td valign="top">ignored</td> </tr> </table> -<blockquote><pre> +<pre> <mapper type="regexp" from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/\2-\3"/> <regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/\2-\3"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -456,10 +456,10 @@ should be used.</li> <td valign="top"><code>Classes/dir/dir2/dir2-A.properties</code></td> </tr> </table> -<blockquote><pre> +<pre> <mapper type="regexp" from="^(.*)\.(.*)$$" to="\2.\1"/> <regexpmapper from="^(.*)\.(.*)$$" to="\2.\1"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -482,10 +482,10 @@ should be used.</li> <td valign="top"><code>properties.Classes/dir/dir2/A</code></td> </tr> </table> -<blockquote><pre> +<pre> <mapper type="regexp" from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/> <regexpmapper from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -580,10 +580,10 @@ pattern placeholder. This mapper is particularly useful in combination with <code><uptodate></code> and <code><junit></code> output.</p> <p>The to and from attributes are both required.</p> <b>Example:</b> -<blockquote><pre> +<pre> <mapper type="package" from="*Test.java" to="TEST-*Test.xml"/> <packagemapper from="*Test.java" to="TEST-*Test.xml"/> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -612,10 +612,10 @@ with <code><uptodate></code> and <code><junit></code> output.</p> </p> <p>The to and from attributes are both required.</p> <b>Example:</b> -<blockquote><pre> +<pre> <mapper type="unpackage" from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"> <unpackagemapper from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -640,12 +640,12 @@ with <code><uptodate></code> and <code><junit></code> output.</p> same as the order of the nested mappers; prior to Ant 1.8.0 the order has been undefined.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <compositemapper> <identitymapper/> <packagemapper from="*.java" to="*"/> </compositemapper> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -674,7 +674,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p> generated by the last nested mapper comprise the ultimate results of the mapping operation. The <i>to</i> and <i>from</i> attributes are ignored.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <chainedmapper> <flattenmapper/> <globmapper from="*" to="new/path/*"/> @@ -683,7 +683,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p> <globmapper from="*" to="*2"/> </mapper> </chainedmapper> -</pre></blockquote> +</pre> <table> <tr> <td valign="top"><b>Source file name</b></td> @@ -718,11 +718,11 @@ with <code><uptodate></code> and <code><junit></code> output.</p> to the source file name. </p> <b>Examples:</b> -<blockquote><pre> +<pre> <filtermapper> <replacestring from="\" to="/"/> </filtermapper> -</pre></blockquote> +</pre> <table> <tr> @@ -734,13 +734,13 @@ with <code><uptodate></code> and <code><junit></code> output.</p> <td valign="top"><code>foo/bar/A.java</code></td> </tr> </table> -<blockquote><pre> +<pre> <filtermapper> <scriptfilter language="beanshell"> self.setToken(self.getToken().toUpperCase()); </scriptfilter> </filtermapper> -</pre></blockquote> +</pre> <table> <tr> @@ -838,12 +838,12 @@ an explanation of scripts and dependencies. <p> <b>Example:</b> </p> -<blockquote><pre> +<pre> <scriptmapper language="javascript"> self.addMappedName(source.toUpperCase()); self.addMappedName(source.toLowerCase()); </scriptmapper> -</pre></blockquote> +</pre> <table> <tr> @@ -907,12 +907,12 @@ list of mapped names reset after every invocation. different from <a href="#composite-mapper">composite mapper</a> which collects the results of all matching children.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <firstmatchmapper> <globmapper from="*.txt" to="*.bak"/> <globmapper from="*A.*" to="*B.*"/> </firstmatchmapper> -</pre></blockquote> +</pre> <table> <tr> @@ -939,9 +939,9 @@ list of mapped names reset after every invocation. the source file name.</p> <b>Examples:</b> -<blockquote><pre> +<pre> <cutdirsmapper dirs="1"/> -</pre></blockquote> +</pre> <table> <tr> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/multirootfileset.html ---------------------------------------------------------------------- diff --git a/manual/Types/multirootfileset.html b/manual/Types/multirootfileset.html index cbe1fdc..fbb83a8 100644 --- a/manual/Types/multirootfileset.html +++ b/manual/Types/multirootfileset.html @@ -143,25 +143,25 @@ an <code><and></code> selector container.</p> <h4>Examples</h4> -<blockquote><pre> +<pre> <multirootfileset basedirs="${build.dir},${other.project.dir}"> <include name="apps/**/classes"/> <exclude name="apps/**/*Test*"/> </multirootfileset> -</pre></blockquote> +</pre> <p>Groups all files inside <code>classes</code> found under the <code>apps</code> subdirectory of <code>${build.dir}</code> or <code>${other.project.dir}</code>, except those that have the text <code>Test</code> in their name.</p> -<blockquote><pre> +<pre> <multirootfileset> <basedir file="${build.dir}"/> <basedir file="${other.project.dir}" <include name="apps/**/classes"/> <exclude name="apps/**/*Test*"/> </multirootfileset> -</pre></blockquote> +</pre> <p>Is equivalent to the first example but used nested <code>basedir</code> elements. The nested elements and the <code>basedirs</code> attribute can be used at the same time and http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/patternset.html ---------------------------------------------------------------------- diff --git a/manual/Types/patternset.html b/manual/Types/patternset.html index e06cfc2..3ab11e3 100644 --- a/manual/Types/patternset.html +++ b/manual/Types/patternset.html @@ -133,12 +133,12 @@ patterns to the parent patternset.</p> <p>A nested patternset can be inverted using the <code><invert></code> element. <em>Since Apache Ant 1.7.1</em></p> <h3>Examples</h3> -<blockquote><pre> +<pre> <patternset id="non.test.sources"> <include name="**/*.java"/> <exclude name="**/*Test*"/> </patternset> -</pre></blockquote> +</pre> <p>Builds a set of patterns that matches all <code>.java</code> files that do not contain the text <code>Test</code> in their name. This set can be <a href="../using.html#references">referred</a> to via @@ -153,34 +153,34 @@ attribute to hold a single pattern.</p> specify that the element should only be used if a property is set, or that it should be used only if a property is not set.</p> <p>For example</p> -<blockquote><pre> +<pre> <patternset id="sources"> <include name="std/**/*.java"/> <include name="prof/**/*.java" if="professional"/> <exclude name="**/*Test*"/> </patternset> -</pre></blockquote> +</pre> <p>will only include the files in the sub-directory <em>prof</em> if the property <em>professional</em> is set to some value.</p> <p>The two sets</p> -<blockquote><pre> +<pre> <patternset includesfile="some-file"/> -</pre></blockquote> +</pre> <p>and</p> -<blockquote><pre> +<pre> <patternset> <includesfile name="some-file"/> <patternset/> -</pre></blockquote> +</pre> <p>are identical. The include patterns will be read from the file <code>some-file</code>, one pattern per line.</p> -<blockquote><pre> +<pre> <patternset> <includesfile name="some-file"/> <includesfile name="${some-other-file}" if="some-other-file"/> <patternset/> -</pre></blockquote> +</pre> <p>will also read include patterns from the file the property <code>some-other-file</code> points to, if a property of that name has been defined.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/permissions.html ---------------------------------------------------------------------- diff --git a/manual/Types/permissions.html b/manual/Types/permissions.html index a1438e5..83698b0 100644 --- a/manual/Types/permissions.html +++ b/manual/Types/permissions.html @@ -114,7 +114,7 @@ If the actions are left empty all actions match, and are revoked. </p> <h3 id="baseset">Base set</h3> A permissions set implicitly contains the following permissions: -<blockquote><pre> +<pre> <grant class="java.net.SocketPermission" name="localhost:1024-" actions="listen"> <grant class="java.util.PropertyPermission" name="java.version" actions="read"> <grant class="java.util.PropertyPermission" name="java.vendor" actions="read"> @@ -136,25 +136,25 @@ A permissions set implicitly contains the following permissions: <grant class="java.util.PropertyPermission" name="java.vm.version" actions="read"> <grant class="java.util.PropertyPermission" name="java.vm.vendor" actions="read"> <grant class="java.util.PropertyPermission" name="java.vm.name" actions="read"> -</pre></blockquote> +</pre> These permissions can be revoked via <code><revoke></code> elements if necessary. <h3>Examples</h3> -<blockquote><pre> +<pre> <permissions> <grant class="java.security.AllPermission"/> <revoke class="java.util.PropertyPermission"/> </permissions> -</pre></blockquote> +</pre> <p> Grants all permissions to the code except for those handling Properties. </p> -<blockquote><pre> +<pre> <permissions> <grant class="java.net.SocketPermission" name="foo.bar.com" action="connect"/> <grant class="java.util.PropertyPermission" name="user.home" action="read,write"/> </permissions> -</pre></blockquote> +</pre> <p> Grants the base set of permissions with the addition of a SocketPermission to connect to foo.bar.com and the permission to read and write the user.home system property. http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/propertyset.html ---------------------------------------------------------------------- diff --git a/manual/Types/propertyset.html b/manual/Types/propertyset.html index 9227236..e98dea4 100644 --- a/manual/Types/propertyset.html +++ b/manual/Types/propertyset.html @@ -56,8 +56,7 @@ supports this.</p> <h4>propertyref</h4> -<p>Selects properties from the current project to be included in the -set.</p> +<p>Selects properties from the current project to be included in the set.</p> <table> <tr> @@ -100,7 +99,7 @@ set.</p> <p>For example:</p> -<blockquote><pre> +<pre> <propertyset id="properties-starting-with-foo"> <propertyref prefix="foo"/> </propertyset> @@ -111,7 +110,7 @@ set.</p> <propertyset refid="properties-starting-with-foo"/> <propertyset refid="properties-starting-with-bar"/> </propertyset> -</pre></blockquote> +</pre> <p>collects all properties whose name starts with either "foo" or "bar" in the set named @@ -123,12 +122,12 @@ set.</p> specified. The mapper is used to change the names of the property keys, for example: -<blockquote><pre> +<pre> <propertyset id="properties-starting-with-foo"> <propertyref prefix="foo"/> <mapper type="glob" from="foo*" to="bar*"/> </propertyset> -</pre></blockquote> +</pre> <p>collects all properties whose name starts with "foo", but changes the names to start with "bar" instead.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/regexp.html ---------------------------------------------------------------------- diff --git a/manual/Types/regexp.html b/manual/Types/regexp.html index 5e01ec3..005be81 100644 --- a/manual/Types/regexp.html +++ b/manual/Types/regexp.html @@ -42,15 +42,11 @@ Regexp represents a regular expression. </table> <h3>Examples</h3> -<blockquote><pre> - <regexp id="myregexp" pattern="alpha(.+)beta"/><br> -</pre></blockquote> +<pre><regexp id="myregexp" pattern="alpha(.+)beta"/></pre> <p> Defines a regular expression for later use with id myregexp. </p> -<blockquote><pre> - <regexp refid="myregexp"/><br> -</pre></blockquote> +<pre><regexp refid="myregexp"/></pre> <p> Use the regular expression with id myregexp. </p> @@ -67,15 +63,9 @@ See <a href="../install.html#librarydependencies">installation dependencies</a> The property <code>ant.regexp.regexpimpl</code> governs which regular expression implementation will be chosen. Possible values for this property are:</p> <ul> -<li> -org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp -</li> -<li> -org.apache.tools.ant.util.regexp.JakartaOroRegexp -</li> -<li> -org.apache.tools.ant.util.regexp.JakartaRegexpRegexp -</li> +<li>org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp</li> +<li>org.apache.tools.ant.util.regexp.JakartaOroRegexp</li> +<li>org.apache.tools.ant.util.regexp.JakartaRegexpRegexp</li> </ul> <p>It can also be another implementation of the interface <code>org.apache.tools.ant.util.regexp.Regexp</code>. If <code>ant.regexp.regexpimpl</code> is not defined, Ant uses Jdk14Regexp as this is always available.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/resources.html ---------------------------------------------------------------------- diff --git a/manual/Types/resources.html b/manual/Types/resources.html index 7c0040c..0222b6c 100644 --- a/manual/Types/resources.html +++ b/manual/Types/resources.html @@ -440,7 +440,6 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections: preserving the order of nested collections as well as duplicate resources (contrast with <a href="#union">union</a>). </p> -<blockquote> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -453,7 +452,6 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections: <td valign="top" align="center">No, default <i>false</i></td> </tr> </table> -</blockquote> <h4 id="files">files</h4> <p>A group of files. These files are matched by <b>absolute</b> patterns http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/selectors.html ---------------------------------------------------------------------- diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html index a302081..be2da68 100644 --- a/manual/Types/selectors.html +++ b/manual/Types/selectors.html @@ -151,11 +151,11 @@ <p>Here is an example of how to use the Contains Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${doc.path}" includes="**/*.html"> <contains text="script" casesensitive="no"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all the HTML files that contain the string <code>script</code>.</p> @@ -232,11 +232,11 @@ <p>Here is an example of how to use the Date Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${jar.path}" includes="**/*.jar"> <date datetime="01/01/2001 12:00 AM" when="before"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all JAR files which were last modified before midnight January 1, 2001.</p> @@ -282,11 +282,11 @@ <p>Here is an example of how to use the Depend Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${ant.1.5}/src/main" includes="**/*.java"> <depend targetdir="${ant.1.4.1}/src/main"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all the Java source files which were modified in the 1.5 release. @@ -324,11 +324,11 @@ <p>Here is an example of how to use the Depth Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${doc.path}" includes="**/*"> <depth max="1"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all files in the base directory and one directory below that.</p> @@ -410,12 +410,12 @@ <p>Here is an example of how to use the Different Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${ant.1.5}/src/main" includes="**/*.java"> <different targetdir="${ant.1.4.1}/src/main" ignoreFileTimes="true"/> </fileset> -</pre></blockquote> +</pre> <p>Compares all the Java source files between the 1.4.1 and the 1.5 release and selects those who are different, disregarding file times. @@ -470,11 +470,11 @@ <p>Here is an example of how to use the Filename Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${doc.path}" includes="**/*"> <filename name="**/*.css"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all the cascading style sheet files.</p> @@ -526,11 +526,11 @@ <p>Here is an example of how to use the Present Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${ant.1.5}/src/main" includes="**/*.java"> <present present="srconly" targetdir="${ant.1.4.1}/src/main"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all the Java source files which are new in the 1.5 release. @@ -585,11 +585,11 @@ <p>Here is an example of how to use the regular expression Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${doc.path}" includes="*.txt"> <containsregexp expression="[4-6]\.[0-9]"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all the text files that match the regular expression (have a 4,5 or 6 followed by a period and a number from 0 to 9). @@ -643,14 +643,14 @@ <p>Here is an example of how to use the Size Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${jar.path}"> <patternset> <include name="**/*.jar"/> </patternset> <size value="4" units="Ki" when="more"/> </fileset> -</pre></blockquote> +</pre> <p>Selects all JAR files that are larger than 4096 bytes.</p> @@ -681,24 +681,24 @@ <p>Here is an example of how to use the Type Selector to select only directories in <code>${src}</code></p> - <blockquote><pre> + <pre> <fileset dir="${src}"> <type type="dir"/> </fileset> -</pre></blockquote> +</pre> <p>The Type Selector is often used in conjunction with other selectors. For example, to select files that also exist in a <code>template</code> directory, but avoid selecting empty directories, use: -<blockquote><pre> +<pre> <fileset dir="${src}"> <and> <present targetdir="template"/> <type type="file"/> </and> </fileset> -</pre></blockquote> +</pre> <h4 id="modified">Modified Selector</h4> <p>The <code><modified></code> selector computes a value for a file, compares that @@ -892,18 +892,18 @@ <h5>Examples</h5> <p>Here are some examples of how to use the Modified Selector:</p> - <blockquote><pre> + <pre> <copy todir="dest"> <fileset dir="src"> <modified/> </fileset> </copy> - </pre></blockquote> + </pre> <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> + <pre> <copy todir="dest"> <fileset dir="src"> <modified update="true" @@ -916,11 +916,11 @@ </modified> </fileset> </copy> - </pre></blockquote> + </pre> <p>This is the same example rewritten as CoreSelector with setting the all the values (same as defaults are).</p> - <blockquote><pre> + <pre> <copy todir="dest"> <fileset dir="src"> <custom class="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"> @@ -934,10 +934,10 @@ </custom> </fileset> </copy> - </pre></blockquote> + </pre> <p>And this is the same rewritten as CustomSelector.</p> - <blockquote><pre> + <pre> <target name="generate-and-upload-site"> <echo> generate the site using forrest </echo> <antcall target="site"/> @@ -949,19 +949,19 @@ </fileset> </ftp> </target> - </pre></blockquote> + </pre> <p>A useful scenario for this selector inside a build environment for homepage generation (e.g. with <a href="http://xml.apache.org/forrest/";> Apache Forrest</a>). Here all <b>changed</b> files are uploaded to the server. The CacheSelector saves therefore much upload time.</p> - <blockquote><pre> + <pre> <modified cacheclassname="com.mycompany.MyCache"> <classpath> <pathelement location="lib/mycompany-antutil.jar"/> </classpath> </modified> - </pre></blockquote> + </pre> <p>Uses <tt>com.mycompany.MyCache</tt> from a jar outside of Ants own classpath as cache implementation</p> @@ -1277,14 +1277,14 @@ Select files whose filename length is even. <p>Here is an example of how to use the And Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${dist}" includes="**/*.jar"> <and> <size value="4" units="Ki" when="more"/> <date datetime="01/01/2001 12:00 AM" when="before"/> </and> </fileset> -</pre></blockquote> +</pre> <p>Selects all the JAR file larger than 4096 bytes which haven't been update since the last millennium. @@ -1315,7 +1315,7 @@ Select files whose filename length is even. <p>Here is an example of how to use the Majority Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${docs}" includes="**/*.html"> <majority> <contains text="project" casesensitive="false"/> @@ -1323,7 +1323,7 @@ Select files whose filename length is even. <contains text="IntrospectionHelper" casesensitive="true"/> </majority> </fileset> -</pre></blockquote> +</pre> <p>Selects all the HTML files which contain at least two of the three phrases "project", "taskdef", and "IntrospectionHelper" (this last phrase must @@ -1340,7 +1340,7 @@ Select files whose filename length is even. <p>Here is an example of how to use the None Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${src}" includes="**/*.java"> <none> <present targetdir="${dest}"/> @@ -1349,7 +1349,7 @@ Select files whose filename length is even. </present> </none> </fileset> -</pre></blockquote> +</pre> <p>Selects only Java files which do not have equivalent java or class files in the dest directory. @@ -1363,13 +1363,13 @@ Select files whose filename length is even. <p>Here is an example of how to use the Not Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${src}" includes="**/*.java"> <not> <contains text="test"/> </not> </fileset> -</pre></blockquote> +</pre> <p>Selects all the files in the src directory that do not contain the string "test". @@ -1385,7 +1385,7 @@ Select files whose filename length is even. <p>Here is an example of how to use the Or Selector:</p> - <blockquote><pre> + <pre> <fileset dir="${basedir}"> <or> <depth max="0"/> @@ -1394,7 +1394,7 @@ Select files whose filename length is even. <filename name="*.jpg"/> </or> </fileset> -</pre></blockquote> +</pre> <p>Selects all the files in the top directory along with all the image files below it. @@ -1442,7 +1442,7 @@ Select files whose filename length is even. <p>Here is an example of how to use the Selector Reference:</p> - <blockquote><pre> + <pre> <project default="all" basedir="./ant"> <selector id="completed"> @@ -1465,7 +1465,7 @@ Select files whose filename length is even. </target> </project> -</pre></blockquote> +</pre> <p>Zips up all the Java files which have an up-to-date equivalent class file and javadoc file associated with them. @@ -1474,7 +1474,7 @@ Select files whose filename length is even. <p>And an example of selecting files conditionally, based on whether properties are set:</p> - <blockquote><pre> + <pre> <fileset dir="${working.copy}"> <or> <selector if="include.tests"> @@ -1492,7 +1492,7 @@ Select files whose filename length is even. </selector> </or> </fileset> -</pre></blockquote> +</pre> <p>A fileset that conditionally contains Java source files and Test source and class files.</p> @@ -1550,13 +1550,13 @@ Select files whose filename length is even. use your class as a selector: </p> - <blockquote><pre> + <pre> <fileset dir="${mydir}" includes="**/*"> <custom classname="com.mydomain.MySelector"> <param name="myattribute" value="myvalue"/> </custom> </fileset> -</pre></blockquote> +</pre> <p>A number of core selectors can also be used as custom selectors by specifying their attributes using <code><param></code> elements. These @@ -1578,13 +1578,13 @@ Select files whose filename length is even. <p>Here is the example from the Depth Selector section rewritten to use the selector through <code><custom></code>.</p> - <blockquote><pre> + <pre> <fileset dir="${doc.path}" includes="**/*"> <custom classname="org.apache.tools.ant.types.selectors.DepthSelector"> <param name="max" value="1"/> </custom> </fileset> -</pre></blockquote> +</pre> <p>Selects all files in the base directory and one directory below that.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/tarfileset.html ---------------------------------------------------------------------- diff --git a/manual/Types/tarfileset.html b/manual/Types/tarfileset.html index 6a726ff..3224e7c 100644 --- a/manual/Types/tarfileset.html +++ b/manual/Types/tarfileset.html @@ -159,7 +159,7 @@ resource collection</h4> <p>The specified resource will be used as src.</p> <h4>Examples</h4> -<blockquote> + <pre> <copy todir="some-dir"> <tarfileset includes="lib/**"> @@ -168,7 +168,7 @@ resource collection</h4> </bzip2resource> </tarfileset> </copy> - </pre></blockquote> +</pre> <p>downloads the archive some-archive.tar.bz2, uncompresses and extracts it on the fly, copies the contents of the lib directory into http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/xmlcatalog.html ---------------------------------------------------------------------- diff --git a/manual/Types/xmlcatalog.html b/manual/Types/xmlcatalog.html index 5c8bc14..bd2415d 100644 --- a/manual/Types/xmlcatalog.html +++ b/manual/Types/xmlcatalog.html @@ -241,17 +241,17 @@ resolver library from xml-commons is not available in the classpath, all <p>Set up an XMLCatalog with a single dtd referenced locally in a user's home directory:</p> -<blockquote><pre> +<pre> <xmlcatalog> <dtd publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" location="/home/dion/downloads/docbook/docbookx.dtd"/> </xmlcatalog> -</pre></blockquote> +</pre> <p>Set up an XMLCatalog with a multiple dtds to be found either in the filesystem (relative to the Ant project basedir) or in the classpath: </p> -<blockquote><pre> +<pre> <xmlcatalog id="commonDTDs"> <dtd publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" @@ -260,13 +260,13 @@ filesystem (relative to the Ant project basedir) or in the classpath: publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" location="web-app_2_2.dtd"/> </xmlcatalog> -</pre></blockquote> +</pre> <p>Set up an XMLCatalog with a combination of DTDs and entities as well as a nested XMLCatalog and external catalog files in both formats:</p> -<blockquote><pre> +<pre> <xmlcatalog id="allcatalogs"> <dtd publicId="-//ArielPartners//DTD XML Article V1.0//EN" @@ -286,9 +286,9 @@ formats:</p> </catalogpath> </xmlcatalog> </xmlcatalog> -</pre></blockquote> +</pre> <p>To reference the above XMLCatalog in an <code>xslt</code> task:<p> -<blockquote><pre> +<pre> <xslt basedir="${source.doc}" destdir="${dest.xdocs}" extension=".xml" @@ -297,7 +297,7 @@ formats:</p> force="true"> <xmlcatalog refid="allcatalogs"/> </xslt> -</pre></blockquote> +</pre> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/zipfileset.html ---------------------------------------------------------------------- diff --git a/manual/Types/zipfileset.html b/manual/Types/zipfileset.html index 3e28a00..45a421d 100644 --- a/manual/Types/zipfileset.html +++ b/manual/Types/zipfileset.html @@ -130,21 +130,19 @@ single element resource collection</h4> <p>The specified resource will be used as src.</p> <h4>Examples</h4> -<blockquote> - <pre> <zip destfile="${dist}/manual.zip"> +<pre> <zip destfile="${dist}/manual.zip"> <zipfileset dir="htdocs/manual" prefix="docs/user-guide"/> <zipfileset dir="." includes="ChangeLog27.txt" fullpath="docs/ChangeLog.txt"/> <zipfileset src="examples.zip" includes="**/*.html" prefix="docs/examples"/> </zip></pre> - <p>zips all files in the <code>htdocs/manual</code> directory into +<p>zips all files in the <code>htdocs/manual</code> directory into the <code>docs/user-guide</code> directory in the archive, adds the file <code>ChangeLog27.txt</code> in the current directory as <code>docs/ChangeLog.txt</code>, and includes all the html files in <code>examples.zip</code> under <code>docs/examples</code>. The archive might end up containing the files:</p> - <code>docs/user-guide/html/index.html<br> -docs/ChangeLog.txt<br> -docs/examples/index.html<br> - </code></blockquote> +<pre>docs/user-guide/html/index.html +docs/ChangeLog.txt +docs/examples/index.html</pre> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/develop.html ---------------------------------------------------------------------- diff --git a/manual/develop.html b/manual/develop.html index 65b711d..4d1cacd 100644 --- a/manual/develop.html +++ b/manual/develop.html @@ -275,7 +275,6 @@ If your task needs to nest an arbitrary type that has been defined org.apache.tools.ant.taskdefs.condition.Condition, one may have a class: </p> - <blockquote> <pre> public class MyTask extends Task { private List conditions = new ArrayList(); @@ -287,25 +286,21 @@ public class MyTask extends Task { } } </pre> - </blockquote> <p> One may define and use this class like this: </p> - <blockquote> - <pre> +<pre> <taskdef name="mytask" classname="MyTask" classpath="classes"/> <typedef name="condition.equals" classname="org.apache.tools.ant.taskdefs.conditions.Equals"/> <mytask> <condition.equals arg1="${debug}" arg2="true"/> </mytask> - </pre> - </blockquote> +</pre> <p> A more complicated example follows: </p> - <blockquote> - <pre> +<pre> public class Sample { public static class MyFileSelector implements FileSelector { public void setAttrA(int a) {} @@ -334,14 +329,13 @@ public class Sample { public void setCount(int c) {} } } - </pre> - </blockquote> +</pre> <p> This class defines a number of static classes that implement/extend Path, MyFileSelector and MyInterface. These may be defined and used as follows: </p> - <pre> +<pre> <typedef name="myfileselector" classname="Sample$MyFileSelector" classpath="classes" loaderref="classes"/> <typedef name="buildpath" classname="Sample$BuildPath" @@ -358,7 +352,7 @@ public class Sample { </myfileselector> </fileset> </copy> - </pre> +</pre> <h3 id="taskcontainer">TaskContainer</h3> @@ -382,7 +376,7 @@ invoke <code>perform</code> on these instances instead of <p>Let's write our own task, which prints a message on the <code>System.out</code> stream. The task has one attribute, called <code>message</code>.</p> -<blockquote> + <pre> package com.mydomain; @@ -403,7 +397,7 @@ public class MyVeryOwnTask extends Task { } } </pre> -</blockquote> + <p>It's really this simple ;-)</p> <p>Adding your task to the system is rather simple too:</p> <ol> @@ -415,7 +409,7 @@ public class MyVeryOwnTask extends Task { </ol> <h3>Example</h3> -<blockquote> + <pre> <?xml version="1.0"?> @@ -427,7 +421,6 @@ public class MyVeryOwnTask extends Task { </target> </project> </pre> -</blockquote> <h3>Example 2</h3> To use a task directly from the buildfile which created it, place the @@ -435,7 +428,7 @@ To use a task directly from the buildfile which created it, place the <i>after the compilation</i>. Use the <code>classpath</code> attribute of <code><taskdef></code> to point to where the code has just been compiled. -<blockquote> + <pre> <?xml version="1.0"?> @@ -457,7 +450,6 @@ compiled. </target> </project> </pre> -</blockquote> <p>Another way to add a task (more permanently), is to add the task name and implementing class name to the <code>default.properties</code> file in the @@ -502,9 +494,9 @@ listener, of course).</p> <p>If you wish to attach a listener from the command line you may use the <code>-listener</code> option. For example:</p> -<blockquote> - <pre>ant -listener org.apache.tools.ant.XmlLogger</pre> -</blockquote> + +<pre>ant -listener org.apache.tools.ant.XmlLogger</pre> + <p>will run Ant with a listener that generates an XML representation of the build progress. This listener is included with Ant, as is the default listener, which generates the logging to standard output.</p> @@ -528,7 +520,6 @@ When starting your build provide your adapter class and the log library to the build classpath and activate your logger via <code>-listener</code> option as described above. -<blockquote> <pre> public class MyLogAdapter implements BuildListener { @@ -555,7 +546,6 @@ public class MyLogAdapter implements BuildListener { // implement all methods in that way } </pre> -</blockquote> <hr> <h2 id="integration">Source code integration</h2> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/ifunless.html ---------------------------------------------------------------------- diff --git a/manual/ifunless.html b/manual/ifunless.html index 8d0da2e..03e970c 100644 --- a/manual/ifunless.html +++ b/manual/ifunless.html @@ -28,11 +28,10 @@ <p><em>Since Ant 1.9.1</em>, it is possible to add if and unless attributes on all tasks and nested elements using special namespaces.</p> <p>In order to use this feature you need to add the following namespace declarations</p> - <blockquote><pre> + <pre> xmlns:if="ant:if" xmlns:unless="ant:unless" </pre> - </blockquote> <p>The if and unless namespaces support the following 3 conditions:</p> <ul> @@ -40,8 +39,6 @@ <li>blank</li>true if the value of the attribute is null or empty <li>set</li>true if the specified property is set </ul> - -<blockquote> <pre> <project name="tryit" xmlns:if="ant:if" @@ -58,7 +55,6 @@ <echo unless:set="onmac">not running on MacOS</echo> </project> </pre> -</blockquote> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/install.html ---------------------------------------------------------------------- diff --git a/manual/install.html b/manual/install.html index 7051546..9c0c034 100644 --- a/manual/install.html +++ b/manual/install.html @@ -418,9 +418,7 @@ the optional Ant tasks need. To do so, change to the <code>ANT_HOME</code> directory and execute the command: </p> -<blockquote> - <pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre> -</blockquote> +<pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre> <p> where option is one of the following, as described above: @@ -528,21 +526,15 @@ laptop, you have to change these settings as you roam. To set <code>ANT_OPTS</co <p> For csh/tcsh: </p> -<pre> - setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" -</pre> +<pre>setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre> <p> For bash: </p> -<pre> - export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" -</pre> +<pre>export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre> <p> For Windows, set the environment variable in the appropriate dialog box and open a new console or, by hand </p> -<pre> - set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -</pre> +<pre>set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080</pre> </blockquote> </li> @@ -757,9 +749,9 @@ reasons why the <a href="Tasks/chmod.html">chmod</a> task might fail (like when different user than the one who installed Ant initially). In this case you can set the Ant property <code>chmod.fail</code> to false when starting the build like in </p> -<blockquote> - <p><code>sh build.sh install -Dchmod.fail=false</code></p> -</blockquote> + +<pre>sh build.sh install -Dchmod.fail=false</pre> + <p> and any error to change permission will not result in a build failure. </p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/listeners.html ---------------------------------------------------------------------- diff --git a/manual/listeners.html b/manual/listeners.html index f21fe1a..222ad68 100644 --- a/manual/listeners.html +++ b/manual/listeners.html @@ -134,15 +134,13 @@ listeners and loggers.</p> <h3 id="DefaultLogger">DefaultLogger</h3> <p>Simply run Ant normally, or:</p> -<blockquote> -<p><code>ant -logger org.apache.tools.ant.DefaultLogger</code></p> -</blockquote> + +<pre>ant -logger org.apache.tools.ant.DefaultLogger</pre> <h3 id="NoBannerLogger">NoBannerLogger</h3> <p>Removes output of empty target output.</p> -<blockquote> -<p><code>ant -logger org.apache.tools.ant.NoBannerLogger</code></p> -</blockquote> + +<pre>ant -logger org.apache.tools.ant.NoBannerLogger</pre> <h3 id="MailLogger">MailLogger</h3> <p>The MailLogger captures all output logged through DefaultLogger (standard Ant @@ -280,9 +278,7 @@ control for turning off success or failure messages individually.</p> </tr> </table> -<blockquote> -<p><code>ant -logger org.apache.tools.ant.listener.MailLogger</code></p> -</blockquote> +<pre>ant -logger org.apache.tools.ant.listener.MailLogger</pre> <h3 id="AnsiColorLogger">AnsiColorLogger</h3> @@ -353,9 +349,7 @@ Background is one of the following: 46 -> Cyan 47 -> White</pre> -<blockquote> <pre>ant -logger org.apache.tools.ant.listener.AnsiColorLogger</pre> -</blockquote> <h3 id="Log4jListener">Log4jListener</h3> <p><b>Deprecated:</b> Apache Log4j (1) is not developed any more. Last @@ -374,24 +368,19 @@ INFO or ERROR depending on whether the build failed during that stage. Message events are logged according to their Ant logging level, mapping directly to a corresponding Log4j level.</p> -<blockquote> <pre>ant -listener org.apache.tools.ant.listener.Log4jListener</pre> -</blockquote> <p>To use Log4j you will need the Log4j JAR file and a 'log4j.properties' configuration file. Both should be placed somewhere in your Ant classpath. If the log4j.properties is in your project root folder you can add this with <i>-lib</i> option:</p> -<blockquote> <pre>ant -listener org.apache.tools.ant.listener.Log4jListener -lib .</pre> -</blockquote> <p>If, for example, you wanted to capture the same information output to the console by the DefaultLogger and send it to a file named 'build.log', you could use the following configuration:</p> -<blockquote> <pre>log4j.rootLogger=ERROR, LogFile log4j.logger.org.apache.tools.ant.Project=INFO log4j.logger.org.apache.tools.ant.Target=INFO @@ -403,7 +392,6 @@ log4j.appender.LogFile.layout=org.apache.log4j.PatternLayout log4j.appender.LogFile.layout.ConversionPattern=[%6r] %8c{1} : %m%n log4j.appender.LogFile.file=build.log </pre> -</blockquote> <p>For more information about configuring Log4J see <a href="http://logging.apache.org/log4j/docs/documentation.html";>its documentation page</a>.</p> @@ -421,7 +409,6 @@ For using the bridge with Ant you have to add to your classpath (e.g. via the <code>-lib</code> option). (For using the bridge Ant 1.9.10/1.10.2 or higher is required.) Translating the 1.x properties file into the 2.x xml syntax would result in -<blockquote> <pre><?xml version="1.0" encoding="UTF-8"?> <Configuration status="WARN"> <Appenders> @@ -442,7 +429,6 @@ Translating the 1.x properties file into the 2.x xml syntax would result in </Loggers> </Configuration> </pre> -</blockquote> <h3 id="XmlLogger">XmlLogger</h3> <p>Writes all build information out to an XML file named log.xml, or the value @@ -459,10 +445,8 @@ this can be a relative or absolute file path, or an http URL. If you set the property to the empty string, "", no XSLT transform is declared at all.</p> -<blockquote> <pre>ant -listener org.apache.tools.ant.XmlLogger ant -logger org.apache.tools.ant.XmlLogger -verbose -logfile build_log.xml</pre> -</blockquote> <h3 id="TimestampedLogger">TimestampedLogger</h3> <p> @@ -474,9 +458,7 @@ ant -logger org.apache.tools.ant.XmlLogger -verbose -logfile build_log.xml</pre> </pre> <p>To use this listener, use the command:</p> -<blockquote> <pre>ant -logger org.apache.tools.ant.listener.TimestampedLogger</pre> -</blockquote> <h3 id="BigProjectLogger">BigProjectLogger</h3> <p> @@ -528,9 +510,7 @@ Exiting project "junit" are in charge -or more importantly, which project is failing. </p> <p>To use this listener, use the command:</p> -<blockquote> <pre>ant -logger org.apache.tools.ant.listener.BigProjectLogger</pre> -</blockquote> <h3 id="SimpleBigProjectLogger">SimpleBigProjectLogger</h3> <p>Like <code>BigProjectLogger</code>, project-qualified target names are printed, @@ -558,9 +538,7 @@ Total time: 1 second </pre> <p><em>since Ant 1.8.1</em></p> <p>To use this listener, use the command:</p> -<blockquote> <pre>ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</pre> -</blockquote> <h3 id="ProfileLogger">ProfileLogger</h3> <p>This logger stores the time needed for executing a task, target and the whole build and prints http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/running.html ---------------------------------------------------------------------- diff --git a/manual/running.html b/manual/running.html index 56b03b2..dbd7810 100644 --- a/manual/running.html +++ b/manual/running.html @@ -191,41 +191,30 @@ JVM documentation for more details. </p> <h3>Examples</h3> -<blockquote> - <pre>ant</pre> -</blockquote> + +<pre>ant</pre> <p>runs Ant using the <code>build.xml</code> file in the current directory, on the default target.</p> -<blockquote> - <pre>ant -buildfile test.xml</pre> -</blockquote> +<pre>ant -buildfile test.xml</pre> <p>runs Ant using the <code>test.xml</code> file in the current directory, on the default target.</p> -<blockquote> - <pre>ant -buildfile test.xml dist</pre> -</blockquote> +<pre>ant -buildfile test.xml dist</pre> <p>runs Ant using the <code>test.xml</code> file in the current directory, on the target called <code>dist</code>.</p> -<blockquote> - <pre>ant -buildfile test.xml -Dbuild=build/classes dist</pre> -</blockquote> +<pre>ant -buildfile test.xml -Dbuild=build/classes dist</pre> <p>runs Ant using the <code>test.xml</code> file in the current directory, on the target called <code>dist</code>, setting the <code>build</code> property to the value <code>build/classes</code>.</p> -<blockquote> - <pre>ant -lib /home/ant/extras</pre> -</blockquote> +<pre>ant -lib /home/ant/extras</pre> <p>runs Ant picking up additional task and support jars from the /home/ant/extras location</p> -<blockquote> - <pre>ant -lib one.jar;another.jar</pre> - <pre>ant -lib one.jar -lib another.jar</pre> -</blockquote> +<pre>ant -lib one.jar;another.jar</pre> +<pre>ant -lib one.jar -lib another.jar</pre> <p>adds two jars to Ants classpath.</p> <h3 id="files">Files</h3> @@ -262,9 +251,7 @@ set):</p> <p>Some of Ant's core classes can be configured via system properties.</p> <p>Here is the result of a search through the codebase. Because system properties are available via Project instance, I searched for them with a</p> -<pre> - grep -r -n "getPropert" * > ..\grep.txt -</pre> +<pre>grep -r -n "getPropert" * > ..\grep.txt</pre> <p>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, line.separator, java.home, java.version, java.version, user.home, java.class.path</i><br> @@ -565,13 +552,9 @@ have some documentation inside.</p> <h2 id="viajava">Running Ant via Java</h2> <p>If you have installed Ant in the do-it-yourself way, Ant can be started from one of two entry points:</p> -<blockquote> - <pre>java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre> -</blockquote> -<blockquote> - <pre>java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre> -</blockquote> +<pre>java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre> +<pre>java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre> <p> The first method runs Ant's traditional entry point. The second method uses http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/stylesheets/style.css ---------------------------------------------------------------------- diff --git a/manual/stylesheets/style.css b/manual/stylesheets/style.css index a77379e..0b474ac 100644 --- a/manual/stylesheets/style.css +++ b/manual/stylesheets/style.css @@ -84,11 +84,13 @@ code { pre { background-color: #efefef; + margin-right: 4rem; + margin-left: 4rem; } /* code snippets in examples and tutorials */ .code { - background: #EFEFEF; + background: #efefef; } /* highlight console output */ http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/targets.html ---------------------------------------------------------------------- diff --git a/manual/targets.html b/manual/targets.html index 6501660..4c1c891 100644 --- a/manual/targets.html +++ b/manual/targets.html @@ -40,12 +40,10 @@ mind that it is possible that a target can get executed earlier when an earlier target depends on it:</p> -<blockquote> -<pre><target name="A"/> + <pre><target name="A"/> <target name="B" depends="A"/> <target name="C" depends="B"/> <target name="D" depends="C,B,A"/></pre> -</blockquote> <p>Suppose we want to execute target D. From its <code>depends</code> attribute, you might think that first target @@ -53,7 +51,7 @@ depends on A, so first A is executed, then B, then C, and finally D.</p> - <blockquote><pre><b>Call-Graph:</b> A --> B --> C --> D</pre></blockquote> + <pre><b>Call-Graph:</b> A --> B --> C --> D</pre> <p>In a chain of dependencies stretching back from a given target such as D above, each target gets executed only once, even when @@ -81,10 +79,8 @@ <a href="properties.html#if+unless">the properties page</a> for more details. For example:</p> -<blockquote> <pre><target name="build-module-A" if="module-A-present"/></pre> <pre><target name="build-own-fake-module-A" unless="module-A-present"/></pre> -</blockquote> <p>In the first example, if the <code>module-A-present</code> property is set (to any value, e.g. <i>false</i>), the target will @@ -96,7 +92,7 @@ clause. If you want to check multiple conditions, you can use a dependent target for computing the result for the check:</p> -<blockquote><pre> +<pre> <target name="myTarget" depends="myTarget.check" if="myTarget.run"> <echo>Files foo.txt and bar.txt are present.</echo> </target> @@ -109,9 +105,9 @@ </and> </condition> </target> -</pre></blockquote> +</pre> - <blockquote><pre><b>Call-Graph:</b> myTarget.check --> maybe(myTarget)</pre></blockquote> + <pre><b>Call-Graph:</b> myTarget.check --> maybe(myTarget)</pre> <p>If no <code>if</code> and no <code>unless</code> attribute is present, the target will always be executed.</p> @@ -136,7 +132,7 @@ depend. Make sure that target is always the first one in the depends list of the other targets. In this manual, most initialization targets have the name <code>"init"</code>.</p> - <blockquote><pre> + <pre> <project> <target name="init"> <tstamp/> @@ -145,15 +141,15 @@ ... </target> </project> - </pre></blockquote> + </pre> <p>Especially if you only have a few tasks you also could place these tasks directly under the project tag (since Ant 1.6.0):</p> - <blockquote><pre> + <pre> <project> <tstamp/> </project> - </pre></blockquote> + </pre> <p>If the depends attribute and the if/unless attribute are set, the depends attribute is executed first.</p> @@ -263,7 +259,7 @@ <p>For example your imported build file may need to compile code, it might look like:</p> -<blockquote><pre> +<pre> <target name="create-directory-layout"> ... </target> @@ -272,20 +268,20 @@ <target name="compile" depends="ready-to-compile"> ... </target> -</pre></blockquote> +</pre> - <blockquote><pre><b>Call-Graph:</b> create-directory-layout --> 'empty slot' --> compile</pre></blockquote> + <pre><b>Call-Graph:</b> create-directory-layout --> 'empty slot' --> compile</pre> <p>And you need to generate some source before compilation, then in your main build file you may use something like</p> -<blockquote><pre> +<pre> <target name="generate-sources" extensionOf="ready-to-compile"> ... </target> -</pre></blockquote> +</pre> - <blockquote><pre><b>Call-Graph:</b> create-directory-layout --> generate-sources --> compile</pre></blockquote> + <pre><b>Call-Graph:</b> create-directory-layout --> generate-sources --> compile</pre> <p>This will ensure that the <em>generate-sources</em> target is executed before the <em>compile</em> target.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/tutorial-HelloWorldWithAnt.html ---------------------------------------------------------------------- diff --git a/manual/tutorial-HelloWorldWithAnt.html b/manual/tutorial-HelloWorldWithAnt.html index 9382045..916ca7a 100644 --- a/manual/tutorial-HelloWorldWithAnt.html +++ b/manual/tutorial-HelloWorldWithAnt.html @@ -486,11 +486,11 @@ need the HTML report just for testing, e.g. if you are fixing an error or a inte </p> <h2 id="resources">Resources</h2> -<pre> - [1] <a href="http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip";>http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip</a> - [2] <a href="http://logging.apache.org/log4j/docs/manual.html";>http://logging.apache.org/log4j/docs/manual.html</a> - [3] <a href="http://www.junit.org/index.htm";>http://www.junit.org/index.htm</a> -</pre> +<ol class="refs"> + <li><a href="http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip";>http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip</a></li> + <li><a href="http://logging.apache.org/log4j/docs/manual.html";>http://logging.apache.org/log4j/docs/manual.html</a></li> + <li><a href="http://www.junit.org/index.htm";>http://www.junit.org/index.htm</a></li> +</ol> </body> </html>
