ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r939802 [2/7] - in /ant/core/branches/ANT_SITE: ./ docs/ docs/antlibs/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs/manual/OptionalTasks/ docs/webtest/gettest/ lib/ src/etc/ src/etc/poms/ src/etc/poms/ant-apache-xalan2/ s...
Date Fri, 30 Apr 2010 20:28:12 GMT
Modified: ant/core/branches/ANT_SITE/docs/faq.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/faq.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/faq.html (original)
+++ ant/core/branches/ANT_SITE/docs/faq.html Fri Apr 30 20:28:06 2010
@@ -408,9 +408,6 @@
   <chmod> or <exec> doesn't work in Ant
         1.3 on Unix
       </a></li>
-                <li><a href="#javadoc-cannot-execute">
-  JavaDoc failed: java.io.IOException: javadoc: cannot execute
-      </a></li>
                 <li><a href="#delegating-classloader">
   &lt;style&gt; or &lt;junit&gt; ignores my
       &lt;classpath&gt;
@@ -423,50 +420,23 @@
   &lt;style&gt; or &lt;junit&gt; ignores my
       &lt;classpath&gt; - Ant 1.6.x version
       </a></li>
-                <li><a href="#winxp-jdk14-ant14">
-  When running Ant 1.4 on Windows XP and JDK 1.4, I get
-      various errors when trying to <code>&lt;exec&gt;</code>, fork
-      <code>&lt;java&gt;</code> or access environment
-      variables.
-      </a></li>
-                <li><a href="#1.5-cygwin-sh">
-  The <code>ant</code> wrapper script of Ant 1.5 fails
-      for Cygwin if <code>ANT_HOME</code> is set to a Windows style
-      path.
-      </a></li>
-                <li><a href="#1.5.2-zip-broken">
-  <code>&lt;zip&gt;</code> is broken in Ant 1.5.2.
-      </a></li>
                 <li><a href="#unknownelement.taskcontainer">
   
         Why do my custom task containers see Unknown Elements in Ant 1.6
         - they worked in Ant 1.5?
       
       </a></li>
-                <li><a href="#java.exception.stacktrace">
-  
-        The program I run via &lt;java&gt; throws an exception but I
-        can't seem to get the full stack trace.
-      
-      </a></li>
-                <li><a href="#junit-no-runtime-xml">
-  
-        Using format="xml", &lt;junit&gt; fails with a
-        <code>NoClassDefFoundError</code> if forked.
-      
-      </a></li>
-                <li><a href="#xalan-jdk1.5">
-  
-        <code>&lt;junitreport&gt;</code> doesn't work with JDK 1.5 but
-        worked fine with JDK 1.4.
-      
-      </a></li>
                 <li><a href="#oom-on-mac">
   
-        Ant runs into an infinite loop/throws an OutOufMemoryError
+        Ant runs into an infinite loop/throws an OutOfMemoryError
         when I compile my project under Mac OS X.
       
       </a></li>
+                <li><a href="#extension-point-and-import">
+  <code>extension-point</code> doesn't work
+        with <code>import</code> like the documentation
+        states.
+      </a></li>
             </ul>
     
       <h3 class="section">Answers</h3>
@@ -502,11 +472,11 @@
         Ant's SVN repository - the build file
         <code>docs.xml</code> at the top level of the ant SVN
         module (trunk) is used to drive Anakia.</p>
-                        <p>This file assumes that you have the
-        <code>jakarta-site2</code> CVS module checked out as well, but
-        if you follow the instruction from Anakia's homepage, you
-        should get it to work without that.  Just make sure all
-        required jars are in the task's classpath.</p>
+                        <p>To transform the xml into html, one needs velocity 1.4.
+        The command to run is :</p>
+                        <p>
+        <code>ant -Dvelocity.dir=[installation path of velocity] -f docs.xml</code>
+        </p>
                                 <p class="faq">
       <a name="what-is-ant"></a>
       What is Apache Ant?
@@ -741,13 +711,23 @@
           27 June 2008
       </td>
       </tr>
+                  <tr>
+                      <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          1.8.0
+      </td>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          8 February 2010
+      </td>
+      </tr>
           </table>
                                 <p class="faq">
       <a name="java-version"></a>
       Which version of Java is required to run
         Ant?
     </p>
-                  <p>You will need Java installed on your system, version 1.3 or
+                  <p>You will need Java installed on your system, version 1.4 or
           later required, 1.5 or later strongly recommended. The later
           the version of Java, the more Ant tasks you get.</p>
                         <p>If only the JRE is present but not a full JDK then many
@@ -800,7 +780,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          current svn trunk
+          1.8.0 up to current svn trunk
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -1914,14 +1894,6 @@ tr -d '\r' &lt; $ANT_HOME/bin/antRun &gt
 mv /tmp/foo $ANT_HOME/bin/antRun
 </pre>
                     <p class="faq">
-      <a name="javadoc-cannot-execute"></a>
-      JavaDoc failed: java.io.IOException: javadoc: cannot execute
-    </p>
-                  <p>There is a bug in the Solaris reference implementation of
-        the JDK (see <a href="http://developer.java.sun.com/developer/bugParade/bugs/4230399.html">http://developer.java.sun.com/developer/bugParade/bugs/4230399.html</a>).
-        This also appears to be true under Linux. Moving the JDK to
-        the front of the PATH fixes the problem.</p>
-                    <p class="faq">
       <a name="delegating-classloader"></a>
       &lt;style&gt; or &lt;junit&gt; ignores my
       &lt;classpath&gt;
@@ -2104,10 +2076,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         dependencies on external libraries.  You can move the
         "offending" jar out of <code>ANT_HOME/lib</code>.  For the
         <code>&lt;junit&gt;</code> task it would be
-        <code>ant-junit.jar</code> and for <code>&lt;style&gt;</code>
-        it would be <code>ant-trax.jar</code>
-        or <code>ant-xslp.jar</code> - 
-        depending on the processor you use.</p>
+        <code>ant-junit.jar</code>.</p>
                         <p>If you do so, you will have to <code>&lt;taskdef&gt;</code>
         all optional tasks that need the external library and use
         nested <code>&lt;classpath&gt;</code> elements in the
@@ -2128,48 +2097,6 @@ mv /tmp/foo $ANT_HOME/bin/antRun
     &lt;/taskdef&gt;
 </pre>
                     <p class="faq">
-      <a name="winxp-jdk14-ant14"></a>
-      When running Ant 1.4 on Windows XP and JDK 1.4, I get
-      various errors when trying to <code>&lt;exec&gt;</code>, fork
-      <code>&lt;java&gt;</code> or access environment
-      variables.
-    </p>
-                  <p>Ant &lt; 1.5 doesn't recognize Windows XP as a flavor
-        of Windows that runs <code>CMD.EXE</code> instead of
-        <code>COMMAND.COM</code>.  JDK 1.3 will tell Ant that Windows
-        XP is Windows 2000 so the problem doesn't show up
-        there.</p>
-                        <p>Apart from upgrading to Ant 1.5 or better, setting the
-        environment variable <code>ANT_OPTS</code> to
-        <code>-Dos.name=Windows_NT</code> prior to invoking Ant has
-        been confirmed as a workaround.</p>
-                    <p class="faq">
-      <a name="1.5-cygwin-sh"></a>
-      The <code>ant</code> wrapper script of Ant 1.5 fails
-      for Cygwin if <code>ANT_HOME</code> is set to a Windows style
-      path.
-    </p>
-                  <p>This problem has been reported only hours after Ant 1.5 has
-        been released, see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10664">Bug
-        10664</a> and all its duplicates.</p>
-                        <p>A fixed version of the wrapper script can be found <a href="http://ant.apache.org/old-releases/v1.5/errata/">here</a>.
-        Simply replace your script with this version.</p>
-                    <p class="faq">
-      <a name="1.5.2-zip-broken"></a>
-      <code>&lt;zip&gt;</code> is broken in Ant 1.5.2.
-    </p>
-                  <p>Yes, it is.</p>
-                        <p>The problem reported by most people - see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17648">Bug
-        17648</a> and all its duplicates - is that Ant creates
-        archives that a partially unreadable by WinZIP.  Luckily
-        <code>jar</code> deals with the archives and so the generated
-        jars/wars/ears will most likely work for you anyway.</p>
-                        <p>There are additional problems, see bugs <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17780">Bug
-        17780</a>, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17871">Bug
-        17871</a> and <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18403">Bug
-        18403</a>.  All of them are supposed to be fixed with Ant
-        1.5.3 (and only 18403 should exist in 1.5.3beta1).</p>
-                    <p class="faq">
       <a name="unknownelement.taskcontainer"></a>
       
         Why do my custom task containers see Unknown Elements in Ant 1.6
@@ -2219,61 +2146,9 @@ mv /tmp/foo $ANT_HOME/bin/antRun
           This approach should work for ant1.5 and ant1.6.
         </p>
                     <p class="faq">
-      <a name="java.exception.stacktrace"></a>
-      
-        The program I run via &lt;java&gt; throws an exception but I
-        can't seem to get the full stack trace.
-      
-    </p>
-                  <p>This is a know bug that has been fixed after the release of
-        Ant 1.6.1.</p>
-                        <p>As a workaround, run your &lt;java&gt; task with
-        <code>fork="true"</code> and Ant will display the full
-        trace.</p>
-                    <p class="faq">
-      <a name="junit-no-runtime-xml"></a>
-      
-        Using format="xml", &lt;junit&gt; fails with a
-        <code>NoClassDefFoundError</code> if forked.
-      
-    </p>
-                  <p>The XML formatter needs the <a href="http://www.w3.org/DOM/">DOM classes</a> to work.  If you
-        are using JDK 1.4 or later they are included with your Java
-        Runtime and this problem won't occur.  If you are running JDK
-        1.3 or earlier, the DOM classes have to be on your
-        &lt;junit&gt; task's &lt;classpath&gt;.</p>
-                        <p>Prior to Ant 1.6.0 Ant would include the DOM classes from
-        the XML parser that is used by Ant itself if you set the
-        includeAntRuntime attribute to true (the default).  With Ant
-        1.6.0 this has been changed as this behavior made it
-        impossible to use a different XML parser in your tests.</p>
-                        <p>This means that you have to take care of the DOM classes
-        explicitly starting with Ant 1.6.0.  If you don't need to set
-        up a different XML parser for your tests, the easiest solution
-        is to add</p>
-                        <pre class="code">
-&lt;pathelement path=&quot;${ant.home}/lib/xml-apis.jar:${ant.home}/lib/xercesImpl.jar&quot;/&gt;
-</pre>
-                        <p>to your task's &lt;classpath&gt;.</p>
-                    <p class="faq">
-      <a name="xalan-jdk1.5"></a>
-      
-        <code>&lt;junitreport&gt;</code> doesn't work with JDK 1.5 but
-        worked fine with JDK 1.4.
-      
-    </p>
-                  <p>While JDK 1.4.x contains a version of Xalan-J 2, JDK 1.5
-        (and later?) have <a href="http://java.sun.com/j2se/1.5.0/compatibility.html#4959783">moved
-        to XSLTC</a>.  Since this task uses Xalan's redirect
-        extensions for its internal stylesheet, Ant prior to 1.6.2 didn't support
-        XSLTC.  This means that you have to install <a href="http://xml.apache.org/xalan-j/">Xalan-J 2</a> in order
-        to use this task with JDK 1.5 in older versions of Ant.</p>
-                        <p>Starting with Ant 1.6.2 <code>&lt;junitreport&gt;</code>
-        supports JDK 1.5.</p>
-                    <p class="faq">
       <a name="oom-on-mac"></a>
       
-        Ant runs into an infinite loop/throws an OutOufMemoryError
+        Ant runs into an infinite loop/throws an OutOfMemoryError
         when I compile my project under Mac OS X.
       
     </p>
@@ -2314,6 +2189,49 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         there is another symlink <code>bundle</code> that points to
         the <code>Home</code> directory and will cause infite
         recursions as well.</p>
+                    <p class="faq">
+      <a name="extension-point-and-import"></a>
+      <code>extension-point</code> doesn't work
+        with <code>import</code> like the documentation
+        states.
+    </p>
+                  <p>Yes, there is
+          a <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=48804">bug
+          in Ant 1.8.0</a>.</p>
+                        <p>When using two build files like</p>
+                        <pre class="code">
+importing.xml:
+&lt;project&gt;
+   ...
+   &lt;import file=&quot;imported.xml&quot;/&gt;
+   &lt;target name=&quot;bar&quot; extensionOf=&quot;foo&quot;/&gt;
+&lt;/project&gt;
+imported.xml:
+&lt;project&gt;
+   &lt;extension-point name=&quot;foo&quot;/&gt;
+&lt;/project&gt;
+</pre>
+                        <p>Ant 1.8.0 will fail, claiming there was no extension point
+          named "foo".</p>
+                        <p>This bug has been fixed for Ant 1.8.1.  For Ant 1.8.0 there
+          is
+          a <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=48804#c9">work-around</a>:
+          add an additional layer of importing like in</p>
+                        <pre class="code">
+importing.xml:
+&lt;project&gt;
+   &lt;target name=&quot;bar&quot; extensionOf=&quot;foo&quot;/&gt;
+&lt;/project&gt;
+imported.xml:
+&lt;project&gt;
+   &lt;extension-point name=&quot;foo&quot;/&gt;
+&lt;/project&gt;
+build.xml:
+&lt;project&gt;
+   &lt;import file=&quot;imported.xml&quot;/&gt;
+   &lt;import file=&quot;importing.xml&quot;/&gt;
+&lt;/project&gt;
+</pre>
                     </div>
   </div>
 

Modified: ant/core/branches/ANT_SITE/docs/index.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/index.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/index.html (original)
+++ ant/core/branches/ANT_SITE/docs/index.html Fri Apr 30 20:28:06 2010
@@ -201,31 +201,42 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Ant 1.8.0RC1"></a>
-      Ant 1.8.0RC1
+      <a name="Ant 1.8.0"></a>
+      Ant 1.8.0
     </h3>
-                        <h3>January 12, 2010 - Ant 1.8.0RC1 Available</h3>
+                        <h3>February 8, 2010 - Ant 1.8.0 Available</h3>
                                 <p>
-			Apache Ant 1.8.0RC1 is now available for
+			Apache Ant 1.8.0 is now available for
 			<a href="http://ant.apache.org/bindownload.cgi">download</a>
 			.
 		</p>
                                 <ul>
-			<li>a new top level element extension-point allows build files to be
+		    <li>Lexically scoped local properties, i.e. properties that are only
+		        defined inside a target, 
+                sequential block or similar environment.</li>
+            <li>&lt;import&gt; can now import from any file- or URL-providing resource - 
+                this includes &lt;javaresource&gt;.</li>    
+			<li>Various improvements to the directory scanning code that help 
+			with symbolic link cycles (as can be found on MacOS X Java
+			installations for example) and improve scanning performance. 
+			For big directory trees the improvement is 
+            <a href="http://mail-archives.apache.org/mod_mbox/ant-dev/200809.mbox/%3Cy1u4p48li29.fsf@v30161.1blu.de%3E">dramatic</a>.</li>
+            <li>The way developers can extend Ant's property expansion algorithm has been rewritten 
+            (breaking the older API) to be easier to use and be more powerful.
+            </li>
+            <li>a new top level element extension-point allows build files to be
 				extended with custom targets more easily</li>
-			<li>if and unless attributes will be evaluated according to the
-				values of the properties entered
-				if these properties evaluate to true, false, on, off</li>
+			<li>At the same time the if and unless attributes have been rewritten to do the expected 
+            thing if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" 
+            if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a property named 
+           "true" existed). This adds "testing conditions" as a new use-case to property 
+            expansion.</li>
 			<li>Ant now requires Java 1.4 or later</li>
 			<li>new task include provides an alternative to &lt;import&gt; that
 				should be preferred when you don't want to override any targets</li>
 			<li>numerous bug fixes and improvements as documented in Bugzilla
 				and in WHATSNEW</li>
 		</ul>
-                                <p>While in open source projects a final release date strongly depends
-		  on the free time of the volunteers/committers, the final release is
-      expected one to two months maximum after this RC. So Ant 1.8.0 is
-      expected between mid February and mid March 2010.</p>
                         <h3 class="section">
       <a name="Ivy 2.1.0"></a>
       Ivy 2.1.0
@@ -261,66 +272,40 @@
                                 <p>For more information see the <a href="antlibs/antunit/">Antlib's
         home page</a></p>
                         <h3 class="section">
-      <a name="Apache Ivy is an Ant Sub-Project Now!"></a>
-      Apache Ivy is an Ant Sub-Project Now!
-    </h3>
-                        <h3>October 11, 2007 - Apache Ivy is an Ant Sub-Project Now!</h3>
-                                <p>Apache Ivy, "A Java based tool for tracking, resolving and
-    managing project dependencies.", just finished <a href="http://incubator.apache.org/">Incubation</a> and has joined
-    the Ant project.  More information will be available from the Ant
-    site soon.</p>
-                                <p>Until we've finished the migration, you can learn more about
-    Ivy from its <a href="http://incubator.apache.org/ivy/">Incubator
-    website</a>.</p>
-                        <h3 class="section">
       <a name="Apache Ant"></a>
       Apache Ant
     </h3>
                         <p>
-Apache Ant is a Java-based build tool. In theory, it is kind of like
-Make, but without Make's wrinkles.
-</p>
-                                <p>
-Why another build tool when there is already <em>make</em>, <em>gnumake</em>,
-<em>nmake</em>, <em>jam</em>, and
-others? Because all those tools have limitations that Ant's original author
-couldn't live with when developing software across multiple platforms. Make-like
-tools are inherently shell-based -- they evaluate a set of dependencies, then
-execute commands not unlike what you would issue in a shell. This means that you
-can easily extend these tools by using or writing any program for the OS that
-you are working on. However, this also means that you limit yourself to the OS,
-or at least the OS type such as Unix, that you are working on.
-</p>
-                                <p>
-Makefiles are inherently evil as well. Anybody who has worked on them for any
-time has run into the dreaded tab problem. "Is my command not executing
-because I have a space in front of my tab!!!" said the original author of
-Ant way too many times. Tools like Jam took care of this to a great degree, but
-still have yet another format to use and remember.
-</p>
-                                <p>
-Ant is different. Instead of a model where it is extended with shell-based
-commands, Ant is extended using Java classes. Instead of writing shell commands,
-the configuration files are XML-based, calling out a target tree where various
-tasks get executed. Each task is run by an object that implements a particular
-Task interface.
-</p>
+		Ant is a Java library and command-line tool.
+		Ant's mission is to drive processes described in build files as targets
+		and extension points dependent upon each other.
+		The main known usage of Ant is the build of Java applications.
+		Ant supplies a number of built-in tasks allowing to compile, assemble,
+		test and run Java applications.
+		Ant can also be used effectively to build non Java applications, for
+		instance C or C++ applications. More generally, Ant can be used to
+		pilot any type of process which can be described in terms of targets
+		and tasks.
+    </p>
+                                <p>
+		Ant is written in Java. Users of Ant can develop their own
+		"antlibs" containing Ant tasks and types, and are offered 
+		a large number of ready-made commercial or open-source "antlibs".
+    </p>
+                                <p>
+		Ant is extremely flexible and does not impose coding conventions or
+		directory layouts to the Java projects which adopt it as a build tool.
+	</p>
                                 <p>
-Granted, this removes some of the expressive power that is inherent by being
-able to construct a shell command such as
-<code>`find . -name foo -exec rm {}`</code>, but it
-gives you the ability to be cross platform -- to work anywhere and everywhere.
-And hey, if you really need to execute a shell command, Ant has an
-<code>&lt;exec&gt;</code> task that
-allows different commands to be executed based on the OS that it is executing
-on.
+		Software development projects looking for a solution combining build tool and
+		dependency management can use Ant in combination with <a href="http://ant.apache.org/ivy/">Ivy</a>.
 </p>
                         <h3 class="section">
       <a name="Documentation"></a>
       Documentation
     </h3>
                         <p>
-You can view the documentation for the current release (Apache Ant 1.8.0RC1)
+You can view the documentation for the current release (Apache Ant 1.8.0)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>

Modified: ant/core/branches/ANT_SITE/docs/legal.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/legal.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/legal.html (original)
+++ ant/core/branches/ANT_SITE/docs/legal.html Fri Apr 30 20:28:06 2010
@@ -202,7 +202,7 @@
       <a name="Legal Stuff They Make Us Say"></a>
       Legal Stuff They Make Us Say
     </h3>
-                        <p>All material on this website is Copyright © 1999-2009,
+                        <p>All material on this website is Copyright © 1999-2010,
       The Apache Software Foundation.</p>
                                 <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web
       Development Kit, and JavaServer Pages are trademarks or

Modified: ant/core/branches/ANT_SITE/docs/mail.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/mail.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/mail.html (original)
+++ ant/core/branches/ANT_SITE/docs/mail.html Fri Apr 30 20:28:06 2010
@@ -302,8 +302,8 @@
           <li><a href="http://marc.theaimsgroup.com/">Mailing list Archives</a></li>
           <li><a href="http://news.gmane.org/gmane.comp.jakarta.ant.devel/">Ant Developer List on gmane</a></li>
           <li><a href="http://news.gmane.org/gmane.comp.jakarta.ant.user/">Ant User List on gmane</a></li>
-          <li><a href="http://www.nabble.com/Ant---Dev-f108.html">Ant Developer List on nabble</a></li>
-          <li><a href="http://www.nabble.com/Ant---Users-f107.html">Ant User List on nabble</a></li>
+          <li><a href="http://old.nabble.com/Ant---Dev-f108.html">Ant Developer List on nabble</a></li>
+          <li><a href="http://old.nabble.com/Ant---Users-f107.html">Ant User List on nabble</a></li>
           <li><a href="http://ant.markmail.org/">Mailing List Archive at MarkMail</a></li>
         </ul>
                 

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/conditions.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTasks/conditions.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTasks/conditions.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTasks/conditions.html Fri Apr 30 20:28:06 2010
@@ -138,7 +138,7 @@ the tests succeed.
 </ul>
 
 <h4>equals</h4>
-<p>Tests whether the two given Strings are identical</p>
+<p>Tests whether the two given values are equal.</p>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -147,12 +147,12 @@ the tests succeed.
   </tr>
   <tr>
     <td valign="top">arg1</td>
-    <td valign="top">First string to test.</td>
+    <td valign="top">First value to test.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
     <td valign="top">arg2</td>
-    <td valign="top">Second string to test.</td>
+    <td valign="top">Second value to test.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -167,6 +167,13 @@ the tests succeed.
         them.  Default is false.</td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">forcestring</td>
+    <td valign="top">Force string comparison of <code>arg1/arg2</code>.
+        Default is false.  <em>Since Ant 1.8.1</em>
+    </td>
+    <td valign="top" align="center">No</td>
+  </tr>
 </table>
 
 <h4>isset</h4>

Propchange: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 20:28:06 2010
@@ -1 +1,2 @@
 /ant/core/trunk/docs/manual/CoreTasks/import.html:713353
+/ant/core/trunk/docs/manual/CoreTasks/include.html:904538-939797

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/length.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTasks/length.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTasks/length.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTasks/length.html Fri Apr 30 20:28:06 2010
@@ -47,10 +47,17 @@
   <tr>
     <td valign="top">file</td>
     <td valign="top">Single file whose length to report.</td>
-    <td valign="top" align="center" rowspan="2">One of these,
+    <td valign="top" align="center" rowspan="3">One of these,
       or one or more nested filesets</td>
   </tr>
   <tr>
+    <td valign="top">resource</td>
+    <td valign="top">Single resource whose length to report (using extended
+      <a href="../properties.html#propertyHelper">properties handling</a>).
+      <em>Since Ant 1.8.1</em>
+    </td>
+  </tr>
+  <tr>
     <td valign="top">string</td>
     <td valign="top">The string whose length to report.</td>
   </tr>

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/loadproperties.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTasks/loadproperties.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTasks/loadproperties.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTasks/loadproperties.html Fri Apr 30 20:28:06 2010
@@ -72,6 +72,12 @@ filter.</p>
       to a <code>&lt;path&gt;</code> defined elsewhere..</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">prefix</td>
+    <td valign="top">Prefix to apply to loaded properties;
+      a "." is appended to the prefix if not specified. <em>Since Ant 1.8.1</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
@@ -124,4 +130,3 @@ on the fly and load the contents as Ant 
 
 </body>
 </html>
-

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/uptodate.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTasks/uptodate.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTasks/uptodate.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTasks/uptodate.html Fri Apr 30 20:28:06 2010
@@ -78,8 +78,9 @@ target execution depending on the relati
 
 <h3>Parameters specified as nested elements</h3>
 <h4><a name="srcfiles">srcfiles</a></h4>
-<p>The nested <code>&lt;srcfiles&gt;</code> element allows you to specify a
-set of files to check against the target file(s).</p>
+<p>The nested <code>&lt;srcfiles&gt;</code> element is a
+<a href="../CoreTypes/fileset.html">fileset</a> and allows you to
+specify a set of files to check against the target file(s).</p>
 
 <p><strong>Note:</strong> You can specify either the <code>srcfile</code>
 attribute or nested <code>&lt;srcfiles&gt;</code> elements, but not both.

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTasks/war.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTasks/war.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTasks/war.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTasks/war.html Fri Apr 30 20:28:06 2010
@@ -45,7 +45,7 @@ attributes of zipfilesets in a Zip or Ja
     be made optional. However, as most real web applications do need a web.xml file,
     it is not optional by default. The task will fail if the file is not
     included, unless the <code>needxmlfile</code> attribute
-    is set to <code>true</code>. The task
+    is set to <code>false</code>. The task
     will warn if more than one web.xml file is added to the JAR  
     through the filesets.
 </p>
@@ -84,7 +84,7 @@ to a value other than its default, <code
   <tr>
     <td valign="top">needxmlfile</td>
     <td valign="top">Flag to indicate whether or not the web.xml file is needed.
-        I=it should be set to false when generating
+        It should be set to false when generating
         servlet 2.5+ WAR files without a web.xml file.
         <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No -default "true"</td>

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTypes/filterchain.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTypes/filterchain.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTypes/filterchain.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTypes/filterchain.html Fri Apr 30 20:28:06 2010
@@ -1545,4 +1545,118 @@ This may be used as follows:
   &lt;/copy&gt;
 </pre></blockquote>
 
+
+<h3><a name="sortfilter">SortFilter</a></h3>
+  <p><em>since Ant 1.8.0</em></p>
+
+<p>The sort filter reads all lines and sorts them.  The sort order can
+  be reversed and it is possible to specify a custom implementation of
+  the <code>java.util.Comparator</code> interface to get even more
+  control.</p>
+
+<table cellSpacing=0 cellPadding=2 border=1>
+  <tr>
+    <td vAlign=top><b>Parameter Name</b></td>
+    <td vAlign=top><b>Parameter Value</b></td>
+    <td vAlign=top align="center"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td vAlign=top>reverse</td>
+    <td vAlign=top align="center">whether to reverse the sort order,
+      defaults to false.  <b>Note:</b> this parameter is ignored if
+      the comparator parameter is present as well.</td>
+    <td vAlign=top align="center">No</td>
+  </tr>
+  <tr>
+    <td vAlign=top>comparator</td>
+    <td vAlign=top align="center">Class name of a class that
+      implements <code>java.util.Comparator</code> for Strings.  This
+      class will be used to determine the sort order of lines.</td>
+    <td vAlign=top align="center">No</td>
+  </tr>
+</table>
+
+<p>This filter is also available using the
+  name <code>sortfilter</code>.  The <code>reverse</code> parameter
+  becomes an attribute, <code>comparator</code> can be specified by
+  using a nested element.</p>
+
+<h4>Examples:</h4>
+
+<blockquote><pre>
+  &lt;copy todir=&quot;build&quot;&gt;
+      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+      &lt;filterchain&gt;
+          &lt;sortfilter/&gt;
+      &lt;/filterchain&gt;
+  &lt;/copy&gt;
+</pre></blockquote>
+
+<p>
+Sort all files <code>*.txt</code> from <i>src</i> location
+into <i>build</i> location. The lines of each file are sorted in
+ascendant order comparing the lines via the
+<code>String.compareTo(Object o)</code> method.
+</p>
+
+<blockquote><pre>
+  &lt;copy todir=&quot;build&quot;&gt;
+      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+      &lt;filterchain&gt;
+          &lt;sortfilter reverse=&quot;true&quot;/&gt;
+      &lt;/filterchain&gt;
+  &lt;/copy&gt;
+</pre></blockquote>
+
+<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>
+  &lt;copy todir=&quot;build&quot;&gt;
+      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+      &lt;filterchain&gt;
+          &lt;filterreader classname=&quot;org.apache.tools.ant.filters.SortFilter&quot;&gt;
+            &lt;param name=&quot;comparator&quot; value=&quot;org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
+          &lt;/filterreader&gt;
+      &lt;/filterchain&gt;
+  &lt;/copy&gt;
+</pre></blockquote>
+
+<p>
+Sort all files <code>*.txt</code> from <i>src</i> location using as
+sorting criterium <code>EvenFirstCmp</code> class, that sorts the file
+lines putting even lines first then odd lines for example. The modified files
+are copied into <i>build</i> location. The <code>EventFirstCmp</code>,
+has to an instanciable class via <code>Class.newInstance()</code>,
+therefore in case of inner class has to be <em>static</em>. It also has to
+implement <code>java.util.Comparator</code> interface, for example:
+</p>
+
+<pre>
+        package org.apache.tools.ant.filters;
+        ...(omitted)
+          public final class EvenFirstCmp implements &lt;b&gt;Comparator&lt;/b&gt; {
+            public int compare(Object o1, Object o2) {
+            ...(omitted)
+            }
+          }
+</pre>
+
+<p>The example above is equivalent to:</p>
+
+<blockquote><pre>
+  &lt;componentdef name="evenfirst"
+                classname="org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
+  &lt;copy todir=&quot;build&quot;&gt;
+      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+      &lt;filterchain&gt;
+          &lt;sortfilter&gt;
+              &lt;evenfirst/&gt;
+          &lt;/sortfilter&gt;
+      &lt;/filterchain&gt;
+  &lt;/copy&gt;
+</pre></blockquote>
+
 </body></html>

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTypes/resources.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTypes/resources.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTypes/resources.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTypes/resources.html Fri Apr 30 20:28:06 2010
@@ -1081,9 +1081,32 @@ larger collection. <strong>Since Ant 1.7
   use <em>mappedresources</em> with tasks that only allow file-system
   based resources.</p>
 
-<p><em>mappedresources</em> doesn't support any attributes.</p>
-
 <blockquote>
+  <h4>Parameters specified as attributes</h4>
+
+  <table border="1" cellpadding="2" cellspacing="0">
+    <tr>
+      <td valign="top"><b>Attribute</b></td>
+      <td valign="top"><b>Description</b></td>
+      <td align="center" valign="top"><b>Required</b></td>
+    </tr>
+    <tr>
+      <td valign="top">cache</td>
+      <td valign="top">Whether to cache results; enabling
+        may improve performance.  <em>Since Ant 1.8.1</em></td>
+      <td valign="top" align="center">No, default <i>false</i></td>
+    </tr>
+    <tr>
+      <td valign="top">enablemultiplemappings</td>
+      <td valign="top">
+        If true the the collection will use all the mappings for a
+        given source path. If false the it will only process the first
+        resource.
+        <em>since Ant 1.8.1</em>.</td>
+      <td align="center">No - defaults to false.</td>
+    </tr>
+  </table>
+
   <h4>Parameters specified as nested elements</h4>
   <p>A single resource collection is required.</p>
   <p>A single <a href="mapper.html">mapper</a> can be used to map

Modified: ant/core/branches/ANT_SITE/docs/manual/CoreTypes/selectors.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/CoreTypes/selectors.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/CoreTypes/selectors.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/CoreTypes/selectors.html Fri Apr 30 20:28:06 2010
@@ -334,7 +334,11 @@
     another location. The rules for determining difference between
     the two files are as follows:
     <ol>
-    <li> If there is no 'other' file, it's different.
+    <li>If a file is only present in the resource collection you apply
+      the selector to but not in targetdir (or after applying the
+      mapper) the file is selected.
+    <li>If a file is only present in targetdir (or after applying the
+      mapper) it is ignored.
     <li> Files with different lengths are different.
     <li> If <tt>ignoreFileTimes</tt> is turned off, then differing file
     timestamps will cause files to be regarded as different.

Modified: ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/junit.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/junit.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/junit.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/junit.html Fri Apr 30 20:28:06 2010
@@ -183,10 +183,7 @@ elements</a>).</p>
     <td valign="top">includeantruntime</td>
     <td valign="top">Implicitly add the Ant classes required to run
       the tests and JUnit to the classpath in forked mode.
-      <b>Note:</b> Please read the <a
-      href="../../faq.html#junit-no-runtime-xml">Ant FAQ</a> if you
-      want to set this to <code>false</code> and use the XML formatter
-      at the same time.</td>
+    </td>
     <td align="center" valign="top">No; default is <code>true</code>.</td>
   </tr>
   <tr>
@@ -379,12 +376,6 @@ failing methods. The name and the locati
 <code>ant.junit.failureCollector</code>. The value has to point to the directory and 
 the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir</i>/FailedTests.</p>
 
-<p><b>Note:</b> Please read the <a
-href="../../faq.html#junit-no-runtime-xml">Ant FAQ</a> if you want to
-set the fork attribute to <code>true</code>, the includeAntRuntime
-attribute to <code>false</code> and use the XML formatter at the same
-time.</p>
-
 <table border="1" cellpadding="2" cellspacing="0">
 <tr>
   <td width="12%" valign="top"><b>Attribute</b></td>

Modified: ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/netrexxc.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/netrexxc.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/netrexxc.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/netrexxc.html Fri Apr 30 20:28:06 2010
@@ -98,7 +98,7 @@ or from the command line as<br>
   <tr>
     <td valign="top">console</td>
     <td valign="top">Whether or not messages should be displayed on the
-      'console'</td>
+      'console'. Note that this task will rely on the default value for filtering compile messages.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -109,7 +109,8 @@ or from the command line as<br>
   <tr>
     <td valign="top">decimal</td>
     <td valign="top">Whether decimal arithmetic should be used for the
-      NetRexx code</td>
+      NetRexx code. Setting this to off will report decimal arithmetic
+      as an error, for performance critical applications.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -177,7 +178,7 @@ or from the command line as<br>
     <td valign="top">keep</td>
     <td valign="top">Sets whether the generated java source file should be kept
       after compilation. The generated files will have an extension of
-      .java.keep, <b>not</b> .java</td>
+      .java.keep, <b>not</b> .java. Use removeKeepExtension to change that.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -187,6 +188,13 @@ or from the command line as<br>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
+    <td valign="top">removeKeepExtension</td>
+    <td valign="top">Tells wether the trailing .keep in nocompile-mode should
+      be removed so that the resulting java source really ends on .java. This
+      facilitates the use of the javadoc tool lateron.</td>
+    <td valign="top" align="center">No</td>
+  </tr>
+  <tr>
     <td valign="top">replace</td>
     <td valign="top">Whether the generated .java file should be replaced
       when compiling</td>
@@ -283,33 +291,33 @@ or from the command line as<br>
     <td valign="top">suppressMethodArgumentNotUsed</td>
     <td valign="top">Tells whether we should filter out the
       &amp;Method argument not used&amp; messages in strictargs mode.</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">suppressPrivatePropertyNotUsed</td>
     <td valign="top">Tells whether we should filter out the
       &amp;Private Property defined, but not used&amp; messages in strictargs mode.</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">suppressVariableNotUsed</td>
     <td valign="top">Tells whether we should filter out the
       &amp;Variable set but not used&amp; messages in strictargs mode.
       Please be careful with this one, as you can hide errors behind it!</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">suppressExceptionNotSignalled</td>
     <td valign="top">Tells whether we should filter out the
       &amp;Exception is declared, but not signaled within the method&amp;
       messages in strictsignal mode.</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">suppressDeprecation</td>
     <td valign="top">Tells whether we should filter out any deprecation-messages
       of the compiler out.</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top" align="center">No</td>
   </tr>
 </table>
 <h3>Examples</h3>

Modified: ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/perforce.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/perforce.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/perforce.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/perforce.html Fri Apr 30 20:28:06 2010
@@ -868,7 +868,7 @@ Both fromfile and tofile can be supplied
     <td valign="top" align="center">-t</td>
   </tr>
   <tr>
-    <td valign="top">nocopytargetfiles</td>
+    <td valign="top">nocopynewtargetfiles</td>
     <td valign="top">Prevents the physical delivery on disk of new target files (*)</td>
     <td valign="center">No</td>
     <td valign="top" align="center">-v</td>

Modified: ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/symlink.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/symlink.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/symlink.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/symlink.html Fri Apr 30 20:28:06 2010
@@ -48,7 +48,13 @@ set of links to record, or a set of prop
   </tr>
   <tr>
     <td valign="top">link</td>
-    <td valign="top">The name of the link to be created or deleted.</td>
+    <td valign="top">The name of the link to be created or deleted.<br/>
+      <b>Note</b> this attribute is resolved against the current
+      working directory rather than the project's basedir for
+      historical reasons.  It is recommended you always use an
+      absolute path or a path like <code>${basedir}/some-path</code>
+      as its value.
+    </td>
     <td valign="center" align="center" >required for 
     action="single" or "delete". Ignored in other actions.</td>
   </tr>

Modified: ant/core/branches/ANT_SITE/docs/manual/coretasklist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/coretasklist.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/coretasklist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/coretasklist.html Fri Apr 30 20:28:06 2010
@@ -41,6 +41,7 @@
 <li><a href="CoreTasks/antversion.html">AntVersion</a></li>
 <li><a href="CoreTasks/apply.html">Apply/<i>ExecOn</i></a></li>
 <li><a href="CoreTasks/apt.html">Apt</a></li>
+<li><a href="CoreTasks/augment.html">Augment</a></li>
 <li><a href="CoreTasks/available.html">Available</a></li>
 <li><a href="CoreTasks/basename.html">Basename</a></li>
 <li><a href="CoreTasks/buildnumber.html">BuildNumber</a></li>

Modified: ant/core/branches/ANT_SITE/docs/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/cover.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/cover.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/cover.html Fri Apr 30 20:28:06 2010
@@ -25,8 +25,8 @@
 <body bgcolor="#FFFFFF">
 <div align="center"> 
   <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1>
-  <h1>Apache Ant 1.8.0RC1 Manual</h1>
-  <p align="left">This is the manual for version 1.8.0RC1 of 
+  <h1>Apache Ant 1.8.0 Manual</h1>
+  <p align="left">This is the manual for version 1.8.0 of 
   <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 
     If your version 
     of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 

Modified: ant/core/branches/ANT_SITE/docs/manual/credits.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/credits.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/credits.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/credits.html Fri Apr 30 20:28:06 2010
@@ -18,6 +18,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
 <title>Apache Ant User Manual - Credits</title>
 </head>
 
@@ -61,7 +62,7 @@
 </ul>
 
 <center>
-<p>Version: 1.8.0RC1</p>
+<p>Version: 1.8.0</p>
 </center>
 
 

Modified: ant/core/branches/ANT_SITE/docs/manual/develop.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/develop.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/develop.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/develop.html Fri Apr 30 20:28:06 2010
@@ -106,7 +106,9 @@ good convention, though.</p>
   <li>All child elements of the XML element corresponding to this task
     are created via this task's <code>createXXX()</code> methods or
     instantiated and added to this task via its <code>addXXX()</code>
-    methods, at run time.</li>
+    methods, at run time.  Child elements corresponding
+    to <code>addConfiguredXXX()</code> are created at this point but
+    the actual <code>addCondifgired</code> method is not called.</li>
 
   <li>All attributes of this task get set via their corresponding
     <code>setXXX</code> methods, at runtime.</li>
@@ -118,6 +120,10 @@ good convention, though.</p>
   <li>All attributes of all child elements get set via their corresponding
     <code>setXXX</code> methods, at runtime.</li>
 
+  <li>If child elements of the XML element corresponding to this task
+    have been created for <code>addConfiguredXXX()</code> methods,
+    those methods get invoked now.</li>
+
   <li><a name="execute"><code>execute()</code></a> is called at runtime.
     If <code>target1</code> and <code>target2</code> both depend
     on <code>target3</code>, then running
@@ -129,7 +135,7 @@ good convention, though.</p>
 
 <p>Ant will always expand properties before it passes the value of an
 attribute to the corresponding setter method. <b>Since Ant 1.8</b>, it is
-possible to <a href="using.html#propertyhelper">extend Ant's property handling</a>
+possible to <a href="CoreTasks/propertyhelper.html">extend Ant's property handling</a>
 such that a non-string Object may be the result of the evaluation of a string
 containing a single property reference. These will be assigned directly via
 setter methods of matching type. Since it requires some beyond-the-basics

Modified: ant/core/branches/ANT_SITE/docs/manual/install.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/install.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/install.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/install.html Fri Apr 30 20:28:06 2010
@@ -183,25 +183,6 @@ Windows NT-platforms, OS/2 Warp, Novell 
 The platforms used most for development are, in no particular order,
 Linux, MacOS X, Windows XP and Unix; these are therefore that platforms
 that tend to work best. As of Ant1.7, Windows 9x is no longer supported.
-<p>
-To build and use Ant, you must have a JAXP-compliant XML parser installed and
-available on your classpath, such as Xerces.</p>
-<p>
-The binary distribution of Ant includes the latest version of the
-<a href="http://xml.apache.org/xerces2-j/index.html" target="_top">Apache Xerces2</a> XML parser.
-Please see
-<a href="http://java.sun.com/xml/" target="_top">http://java.sun.com/xml/</a>
-for more information about JAXP.
-If you wish to use a different JAXP-compliant parser, you should remove
-<code>xercesImpl.jar</code> and <code>xml-apis.jar</code>
-from Ant's <code>lib</code> directory.
-<p>
-You can then either put the JARs of your preferred parser into Ant's
-<code>lib</code> directory or put the jars on the system classpath.
-Some parts of Ant will fail if you use an old parser, especially one
-that is not namespace-aware. In particular, avoid the Crimson parser.</p>
-
-<p>Tip: "ant -diagnostics" will list the XML parser used and its location.</p>
 
 <p>
 For the current version of Ant, you will also need a JDK installed on
@@ -639,6 +620,11 @@ still need to
 make the JARs available as described under
 <a href="#installing">Installing Ant</a>.</p>
 
+<p>As of version 1.7.0 Ant has a hard dependency on JUnit and you must
+  install it manually into <code>lib/optional</code> (download it from
+  <a href="http://junit.org/" target="_top">JUnit.org</a>) if you are
+  using a source distribution of Ant.</p>
+
 <p>Your are now ready to build Ant:</p>
 <blockquote>
   <p><code>build -Ddist.dir=&lt;<i>directory_to_contain_Ant_distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
@@ -720,23 +706,13 @@ Installing Ant / Optional Tasks</a> sect
     <td><b>Available At</b></td>
   </tr>
   <tr>
-    <td>An XSL transformer like Xalan</td>
-    <td>style task</td>
-    <td>
-    <b>If you use JDK 1.4+, an XSL transformer is already included, so you need not do anything special.</b><br>
-    <ul><li>XALAN : <a href="http://xml.apache.org/xalan-j/index.html"
-    target="_top">http://xml.apache.org/xalan-j/index.html</a></li>
-    </ul>
-    </td>
-  </tr>
-  <tr>
     <td>jakarta-regexp-1.3.jar</td>
-    <td>regexp type with mappers</td>
+    <td>regexp type with mappers (if you do not wish to use java.util.regex)</td>
     <td><a href="http://jakarta.apache.org/regexp/" target="_top">http://jakarta.apache.org/regexp/</a></td>
   </tr>
   <tr>
     <td>jakarta-oro-2.0.8.jar</td>
-    <td>regexp type with mappers and the perforce tasks<br>
+    <td>regexp type with mappers (if you do not wish to use java.util.regex) and the Perforce tasks<br>
     To use the FTP task,
 you need jakarta-oro 2.0.8 or later, and <a href="#commons-net">commons-net</a></td>
     <td><a href="http://jakarta.apache.org/oro/" target="_top">http://jakarta.apache.org/oro/</a></td>
@@ -752,11 +728,6 @@ you need jakarta-oro 2.0.8 or later, and
     <td><a href="http://xml.apache.org/xalan-j/" target="_top">http://xml.apache.org/xalan-j/</a></td>
   </tr>
   <tr>
-    <td>stylebook.jar</td>
-    <td>stylebook task</td>
-    <td>SVN repository of <a href="http://xml.apache.org/svn.html" target="_top">http://xml.apache.org/svn.html</a></td>
-  </tr>
-  <tr>
     <td>antlr.jar</td>
     <td>antlr task</td>
     <td><a href="http://www.antlr.org/" target="_top">http://www.antlr.org/</a></td>
@@ -920,8 +891,8 @@ Already included Java 1.4+</td>
   <tr>
     <td>JAI - Java Advanced Imaging</td>
     <td>image task</td>
-    <td><a href="http://java.sun.com/products/java-media/jai/"
-        target="_top">http://java.sun.com/products/java-media/jai/</a></td>
+    <td><a href="https://jai.dev.java.net/"
+        target="_top">https://jai.dev.java.net/</a></td>
   </tr>
   <tr>
     <td>Starteam SDK</td>

Modified: ant/core/branches/ANT_SITE/docs/manual/optionaltasklist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/optionaltasklist.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/optionaltasklist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/optionaltasklist.html Fri Apr 30 20:28:06 2010
@@ -81,7 +81,6 @@
 <li><a href="OptionalTasks/sshexec.html">Sshexec</a></li>
 <li><a href="OptionalTasks/sshsession.html">Sshsession</a></li>
 <li><a href="OptionalTasks/starteam.html">Starteam Tasks</a></li>
-<li><a href="OptionalTasks/stylebook.html"><i>Stylebook</i></a></li>
 <li><a href="OptionalTasks/symlink.html">Symlink</a></li>
 <li><a href="OptionalTasks/telnet.html">Telnet</a></li>
 <li><a href="OptionalTasks/translate.html">Translate</a></li>

Modified: ant/core/branches/ANT_SITE/docs/manual/platform.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/platform.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/platform.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/platform.html Fri Apr 30 20:28:06 2010
@@ -172,15 +172,13 @@ it is treated like any other Unix. 
 <p>To give the same level of sophisticated control as Ant's startup scripts on other platforms, it was decided to make the main ant startup on NetWare be via a Perl Script, "runant.pl".  This is found in the bin directory (for instance - bootstrap\bin or dist\bin).</p>
 
 <p>One important item of note is that you need to set up the following to run ant:</p>
-<ul><li><code>CLASSPATH</code> - put ant.jar, xercesImpl.jar, xml-apis.jar and any other needed jars on the system classpath.</li>
+<ul><li><code>CLASSPATH</code> - put ant.jar and any other needed jars on the system classpath.</li>
    <li><code>ANT_OPTS</code> - On NetWare, <code>ANT_OPTS</code> needs to include a parameter of the form, <nobr>"-envCWD=<code>ANT_HOME</code>"</nobr>, with <code>ANT_HOME</code> being the fully expanded location of Ant, <b>not</b> an environment variable.  This is due to the fact that the NetWare System Console has no notion of a current working directory.</li>
 </ul>
 <p>It is suggested that you create up an ant.ncf that sets up these parameters, and calls <code>perl ANT_HOME/dist/bin/runant.pl</code></p>
 <p>The following is an example of such an NCF file(assuming ant is installed in <nobr>'sys:/apache-ant/'):</nobr></p>
 <code>
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=SYS:/apache-ant/bootstrap/lib/ant.jar<br>
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/xercesImpl.jar <br>
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/xml-apis.jar <br>
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/optional/junit.jar <br>
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/bootstrap/lib/optional.jar <br>
 <br>

Modified: ant/core/branches/ANT_SITE/docs/manual/properties.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/properties.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/properties.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/properties.html Fri Apr 30 20:28:06 2010
@@ -318,7 +318,7 @@ public void setAttr(Resource r) { ... }
 </pre>
 
   <p>then the syntax can be used to pass in resource subclasses
-    preciously defined as references like</p>
+    previously defined as references like</p>
 <pre>
   &lt;url url="http://ant.apache.org/" id="anturl"/&gt;
   &lt;my:task attr="${ant.refid:anturl}"/&gt;
@@ -327,7 +327,7 @@ public void setAttr(Resource r) { ... }
   <h2><a name="if+unless">If/Unless Attributes</a></h2>
   <p>
       The <code>&lt;target></code> element and various tasks (such as
-      <code>&lt;exit></code>) and task elements (such as <code>&lt;test></code>
+      <code>&lt;fail></code>) and task elements (such as <code>&lt;test></code>
       in <code>&lt;junit></code>) support <code>if</code> and <code>unless</code>
       attributes which can be used to control whether the item is run or otherwise
       takes effect.

Modified: ant/core/branches/ANT_SITE/docs/manual/targets.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/targets.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/targets.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/targets.html Fri Apr 30 20:28:06 2010
@@ -245,7 +245,7 @@
 
   <p>The main purpose of an extension-point is to act as an extension
     point for build files designed to
-    be <a href="CoreTasks\import.html">imported</a>.  In the imported
+    be <a href="CoreTasks/import.html">imported</a>.  In the imported
     file an extension-point defines a state that must be reached and
     targets from other build files can join the depends list of said
     extension-point in order to contribute to that state.</p>

Modified: ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html Fri Apr 30 20:28:06 2010
@@ -315,12 +315,6 @@ documentation.</p>
      The Javadoc2 task is deprecated; use the Javadoc task instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="OptionalTasks/stylebook.html">Stylebook</a></td>
-    <td><p>Executes the Apache Stylebook documentation generator.
-     Unlike the command-line version of this tool, all three arguments
-     are required to run the Stylebook task.</p></td>
-  </tr>
 </table>
 
 <p></p>

Modified: ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html Fri Apr 30 20:28:06 2010
@@ -284,7 +284,7 @@ arguments of the set-method:<ul>
 <li>some more classes (e.g. <i>java.io.File</i>; see
     <a href="develop.html#set-magic">Manual
     'Writing Your Own Task' [3]</a>)</li>
-<li>Any Java Object parsed from Ant 1.8's <a href="using.html#propertyhelper">Property
+<li>Any Java Object parsed from Ant 1.8's <a href="CoreTasks/propertyhelper.html">Property
 Helper</a></li>
 </ul>
 Before calling the set-method all properties are resolved. So a <tt>&lt;helloworld message="${msg}"/&gt;</tt>

Modified: ant/core/branches/ANT_SITE/docs/nightlies.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/nightlies.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/nightlies.html (original)
+++ ant/core/branches/ANT_SITE/docs/nightlies.html Fri Apr 30 20:28:06 2010
@@ -266,56 +266,56 @@ installation of the <a href="http://huds
       <td class="description">current development (Windows platform)</td>
       <td class="command">clean test</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt133&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt133&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt133&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt133&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Core Trunk (Linux)</td>
       <td class="description">current development (Linux platform)</td>
       <td class="command">clean test</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt134&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt134&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt134&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt134&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Core Trunk (MacOS)</td>
       <td class="description">current development (MacOS platform)</td>
       <td class="command">clean test</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt135&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt135&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt135&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt135&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">JavaDoc</td>
       <td class="description">JavaDocs for classes and testclasses</td>
       <td class="command">javadocs javadocs.test</td>
               <td class="when">Daily at 08:00 GMT <br /> (if there are pending changes)</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt131&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt131&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt131&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt131&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Checkstyle</td>
       <td class="description">check the conformance against coding styleguide</td>
       <td class="command">-f check.xml checkstyle htmlreport</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt132&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt132&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt132&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt132&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Findbugs</td>
       <td class="description">runs Findbugs against Ant Codebase</td>
       <td class="command">-f check.xml findbugs</td>
               <td class="when">Daily at 08:00 <br /> (if there are pending changes)</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt136&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt136&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt136&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt136&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Distribution</td>
       <td class="description">a 'distribution' nearly as done while releasing</td>
       <td class="command">allclean main_distribution</td>
               <td class="when">Daily at 08:00 GMT <br /> (if there are pending changes)</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt130&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt130&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt130&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt130&buildId=lastSuccessful">last success</a></td>
     </tr>
                 <tr><td colspan="6" class="title"><b>Apache Ivy</b></td></tr>
                         <tr>
@@ -323,32 +323,32 @@ installation of the <a href="http://huds
       <td class="description">current development</td>
       <td class="command">clean-all test</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt125&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt125&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt125&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt125&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Core 2.0.x</td>
       <td class="description">maintenance of 2.x releases</td>
       <td class="command">clean-all test</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt126&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt126&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt126&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt126&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Core Trunk - Checkstyle</td>
       <td class="description">check of code styleguide</td>
       <td class="command">clean checkstyle</td>
               <td class="when">Daily at 00:00 GMT + 12:00 GMT <br /> (if there are pending changes)</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt127&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt127&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt127&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt127&buildId=lastSuccessful">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Core Trunk - Distribution</td>
       <td class="description">a 'distribution' nearly as done while releasing.</td>
       <td class="command">-f build-release.xml snapshot-maven2</td>
               <td class="when">Daily at 09:00 GMT <br /> (if there are pending changes)</td>
-            <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt128&buildId=lastFinished">last build</a></td>
-      <td class="link"><a href="http://teamcity.jetbrains.com/guestAuth/viewLog.html?&buildTypeId=bt128&buildId=lastSuccessful">last success</a></td>
+            <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt128&buildId=lastFinished">last build</a></td>
+      <td class="link"><a href="http://teamcity.jetbrains.com/viewLog.html?&buildTypeId=bt128&buildId=lastSuccessful">last success</a></td>
     </tr>
                 </table>
                 

Modified: ant/core/branches/ANT_SITE/docs/projects.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/projects.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/projects.html (original)
+++ ant/core/branches/ANT_SITE/docs/projects.html Fri Apr 30 20:28:06 2010
@@ -835,6 +835,66 @@
       </tr>
           </table>
                                                           <h4 class="subsection">
+        <a name="Flaka"></a>
+        Flaka
+      </h4>
+                        <p>The goal of Flaka is to simplify writing build scripts using
+        <ul> 
+          <li><strong>Regular control structures</strong> (<code>when</code>, <code>for</code>, <code>switch</code>, ..)</li>
+          <li><strong>Exception handling</strong></li>
+          <li>An <em>Expression Language</em> which in turn provdes:
+          <ul> 
+            <li><strong>access to underlying data objects</strong></li> 
+            <li><strong>untyped variables in addition to Ant properties</strong></li> 
+            <li><strong>powerfull expressions like <code> cond ? then : else</code></strong></li> 
+          </ul> 
+          </li>
+        </ul>
+        Checkout the <a href="http://workbench.haefelinger.it/flaka/download/manual/latest">manual's overview chapter</a> about the feature Flaka provides. Have especially a look at the section describing the expression language.
+        </p>
+                                      <table class="externals" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.7 and higher 
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://workbench.haefelinger.it/flaka/">http://workbench.haefelinger.it/flaka/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Contact:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="mailto:wh@haefelinger.it">Contact Project Lead</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          License:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v.20</a>
+      </td>
+      </tr>
+          </table>
+                                                          <h4 class="subsection">
         <a name="Invicta"></a>
         Invicta
       </h4>

Modified: ant/core/branches/ANT_SITE/docs/srcdownload.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/srcdownload.html?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/srcdownload.html (original)
+++ ant/core/branches/ANT_SITE/docs/srcdownload.html Fri Apr 30 20:28:06 2010
@@ -242,11 +242,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.8.0RC1 is the best available version, see the
+                        <p>Currently, Apache Ant 1.8.0 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.8.0RC1 was released on 12-Jan-2010 and
+<div class="content">Ant 1.8.0 was released on 8-Feb-2010 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -257,22 +257,22 @@ may not be available on all mirrors for 
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0RC1-src.zip">apache-ant-1.8.0RC1-src.zip</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.zip.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.zip.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.0-src.zip">apache-ant-1.8.0-src.zip</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0RC1-src.tar.gz">apache-ant-1.8.0RC1-src.tar.gz</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.gz.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.gz.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.gz">apache-ant-1.8.0-src.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0RC1-src.tar.bz2">apache-ant-1.8.0RC1-src.tar.bz2</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.bz2.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.bz2.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0RC1-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.bz2">apache-ant-1.8.0-src.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -297,17 +297,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.8.0RC1-src.tar.gz.asc<br />
+% pgpv apache-ant-1.8.0-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.8.0RC1-src.tar.gz.asc<br />
+% pgp apache-ant-1.8.0-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.8.0RC1-src.tar.gz.asc
+% gpg --verify apache-ant-1.8.0-src.tar.gz.asc
 </code></p>
                                 <p>Alternatively, you can verify the checksums on the files.  Unix
 programs called <code>md5</code>/<code>sha1</code> or

Modified: ant/core/branches/ANT_SITE/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/fetch.xml?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/fetch.xml (original)
+++ ant/core/branches/ANT_SITE/fetch.xml Fri Apr 30 20:28:06 2010
@@ -158,13 +158,6 @@ Set -Ddest=LOCATION on the command line
    we like to get the more recent artifacts than are in the repo at the time of writing (2006-12-21)
    -->
 
-  <target name="xerces"
-      description="load an updated version of Xerces"
-      depends="init">
-    <f2 project="xerces" archive="xercesImpl"/>
-    <f2 project="xerces" archive="xml-apis" />
-  </target>
-
   <target name="networking"
     description="load networking libraries (commons-net; jsch)"
     depends="init">

Modified: ant/core/branches/ANT_SITE/lib/README
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/lib/README?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/lib/README (original)
+++ ant/core/branches/ANT_SITE/lib/README Fri Apr 30 20:28:06 2010
@@ -1,17 +1,3 @@
 Please refer to the Ant manual under Installing Ant / Library
 Dependencies for a list of the jar requirements for various optional
 tasks and features.
-
-This directory contains xercesImpl.jar from the 2.9.0 release of
-Apache Xerces.  For more information or newer releases see
-<http://xerces.apache.org/xerces2-j/>.  Xerces is provided under the
-same license as Apache Ant itself, see the file LICENSE.  For
-additional Xerces specific notes see the file NOTICE.
-
-It also contains xml-apis.jar, an Apache-controlled collection of
-standard classes from the 1.3.04 release of the Apache XML-Commons
-release.  For more information or newer releases see
-<http://xml.apache.org/commons/>.  See the "W3C® SOFTWARE NOTICE AND
-LICENSE" and SAX2 notice in the file LICENSE for the terms of
-distribution.
-

Modified: ant/core/branches/ANT_SITE/lib/libraries.properties
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/lib/libraries.properties?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/lib/libraries.properties (original)
+++ ant/core/branches/ANT_SITE/lib/libraries.properties Fri Apr 30 20:28:06 2010
@@ -53,12 +53,6 @@ oro.version=2.0.8
 regexp.version=1.3
 servlet-api.version=2.3
 which.version=1.0
-xerces.version=2.9.0
-xercesImpl.version=${xerces.version}
-#should be in sync w/ xerces, but not in the maven repository
-#xmlParserAPIs.version=${xerces.version}
-#xmlParserAPIs.version=2.6.1
-xml-apis.version=2.0.2
 xalan.version=2.7.1
 xml-resolver.version=1.2
 mail.version=1.4

Modified: ant/core/branches/ANT_SITE/src/etc/ant-bin.wxs
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/ant-bin.wxs?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/ant-bin.wxs (original)
+++ ant/core/branches/ANT_SITE/src/etc/ant-bin.wxs Fri Apr 30 20:28:06 2010
@@ -51,16 +51,11 @@
           <File DiskId="1" Id="file16" Name="ANT-NE_1.JAR" LongName="ant-netrexx.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-netrexx.jar" />
           <File DiskId="1" Id="file17" Name="ANT-NO_1.JAR" LongName="ant-nodeps.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-nodeps.jar" />
           <File DiskId="1" Id="file18" Name="ANT-ST_2.JAR" LongName="ant-starteam.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-starteam.jar" />
-          <File DiskId="1" Id="file19" Name="ANT-ST_1.JAR" LongName="ant-stylebook.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-stylebook.jar" />
-          <File DiskId="1" Id="file20" Name="ANT-SW_1.JAR" LongName="ant-swing.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-swing.jar" />
-          <File DiskId="1" Id="file21" Name="ant-trax.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-trax.jar" />
-          <File DiskId="1" Id="file22" Name="ANT-WE_1.JAR" LongName="ant-weblogic.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-weblogic.jar" />
-          <File DiskId="1" Id="file23" Name="ANT-XA_1.JAR" LongName="ant-xalan1.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-xalan1.jar" />
-          <File DiskId="1" Id="file24" Name="ant.jar" Vital="yes" src="$(var.dist.dir)/lib\ant.jar" />
-          <File DiskId="1" Id="file25" Name="LIBRAR_1.PRO" LongName="libraries.properties" Vital="yes" src="$(var.dist.dir)/lib\libraries.properties" />
-          <File DiskId="1" Id="file26" Name="README" Vital="yes" src="$(var.dist.dir)/lib\README" />
-          <File DiskId="1" Id="file27" Name="XERCES_1.JAR" LongName="xercesImpl.jar" Vital="yes" src="$(var.dist.dir)/lib\xercesImpl.jar" />
-          <File DiskId="1" Id="file28" Name="xml-apis.jar" Vital="yes" src="$(var.dist.dir)/lib\xml-apis.jar" />
+          <File DiskId="1" Id="file19" Name="ANT-SW_1.JAR" LongName="ant-swing.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-swing.jar" />
+          <File DiskId="1" Id="file20" Name="ANT-WE_1.JAR" LongName="ant-weblogic.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-weblogic.jar" />
+          <File DiskId="1" Id="file21" Name="ant.jar" Vital="yes" src="$(var.dist.dir)/lib\ant.jar" />
+          <File DiskId="1" Id="file22" Name="LIBRAR_1.PRO" LongName="libraries.properties" Vital="yes" src="$(var.dist.dir)/lib\libraries.properties" />
+          <File DiskId="1" Id="file23" Name="README" Vital="yes" src="$(var.dist.dir)/lib\README" />
         </Component>
       </Directory>
       <Directory Id="directory1" Name="bin">
@@ -397,7 +392,6 @@
               <File DiskId="1" Id="file572" Name="SPLASH_1.HTM" LongName="splash.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\splash.html" />
               <File DiskId="1" Id="file573" Name="SSHEXE_1.HTM" LongName="sshexec.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\sshexec.html" />
               <File DiskId="1" Id="file574" Name="STARTE_1.HTM" LongName="starteam.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\starteam.html" />
-              <File DiskId="1" Id="file575" Name="STYLEB_1.HTM" LongName="stylebook.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\stylebook.html" />
               <File DiskId="1" Id="file576" Name="SYMLIN_1.HTM" LongName="symlink.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\symlink.html" />
               <File DiskId="1" Id="file577" Name="TELNET_1.HTM" LongName="telnet.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\telnet.html" />
               <File DiskId="1" Id="file578" Name="TRANSL_1.HTM" LongName="translate.html" Vital="yes" src="$(var.dist.dir)/docs\manual\OptionalTasks\translate.html" />
@@ -458,4 +452,4 @@
       </Directory>
     </DirectoryRef>
   </Fragment>
-</Wix>
\ No newline at end of file
+</Wix>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml Fri Apr 30 20:28:06 2010
@@ -32,7 +32,7 @@ xsi:schemaLocation="http://maven.apache.
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
   <version>1.8.0-SNAPSHOT</version>
-  <description>contains the junit and junirreport tasks</description>
+  <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
@@ -86,7 +86,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/Xalan2TraceSupport*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</include>
           </includes>
         </configuration>
       </plugin>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml Fri Apr 30 20:28:06 2010
@@ -64,7 +64,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/email/MimeMailer*</include>
+            <include>org/apache/tools/ant/taskdefs/email/MimeMailer*</include>
           </includes>
         </configuration>
       </plugin>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml?rev=939802&r1=939801&r2=939802&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml Fri Apr 30 20:28:06 2010
@@ -58,7 +58,7 @@
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/jdepend/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include>
           </includes>
         </configuration>
       </plugin>



Mime
View raw message