ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r953741 [3/4] - in /ant/core/branches/run-single-test-method: ./ docs/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs/manual/OptionalTasks/ docs/manual/OptionalTypes/ docs/manual/Tasks/ docs/manual/Types/ lib/ lib/optional/...
Date Fri, 11 Jun 2010 15:50:16 GMT
Modified: ant/core/branches/run-single-test-method/docs/manual/tutorial-tasks-filesets-properties.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/tutorial-tasks-filesets-properties.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/tutorial-tasks-filesets-properties.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/tutorial-tasks-filesets-properties.html Fri Jun 11 15:50:09 2010
@@ -551,7 +551,7 @@ form you do that depends on your favouri
 it has advantages if you use that: all task users know that form, this form is requested if
 you decide to contribute your task. So we will doc our task in that form.</p>
 
-<p>If you have a look at the manual page of the <a href="CoreTasks/java.html">Java task [5]</a>
+<p>If you have a look at the manual page of the <a href="Tasks/java.html">Java task [5]</a>
    you will see that it:<ul>
 <li>is plain html</li>
 <li>starts with the name</li>
@@ -715,8 +715,7 @@ information on that.</p>
 <li>Patch files generated using cvs diff -u <b><i>to do</i></b></li>
 <li>patch files include a patch to defaults.properties to register the
 tasks <b><i>to do</i></b></li>
-<li>patch files include a patch to coretasklist.html or
-optionaltasklist.html to link to the new task page <b><i>to do</i></b></li>
+<li>patch files include a patch to tasklist.html to link to the new task page <b><i>to do</i></b></li>
 <li>Message to dev contains [SUBMIT] and task name in subject <b><i>to do</i></b></li>
 <li>Message body contains a rationale for the task <b><i>to do</i></b></li>
 <li>Message attachments contain the required files -source, documentation,
@@ -783,9 +782,9 @@ necessary and saves a lot of work if you
 <li>delete the dependency to "use.init" in the find.xml </li>
 <li>in FindTest.java change the line <tt>configureProject("build.xml");</tt> to
     <tt>configureProject("src/etc/testcases/taskdefs/find.xml");</tt> </li>
-<li>move the find.html to ANTHOME/docs/manual/CoreTasks/find.html </li>
-<li>add a <tt>&lt;a href="CoreTasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</tt>
-    in the ANTHOME/docs/manual/coretasklist.html </li>
+<li>move the find.html to ANTHOME/docs/manual/Tasks/find.html </li>
+<li>add a <tt>&lt;a href="Tasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</tt>
+    in the ANTHOME/docs/manual/tasklist.html </li>
 </ul>
 
 Now our modifications are done and we will retest it:
@@ -954,7 +953,7 @@ Now the new task is uploaded into the bu
 &nbsp;&nbsp;[2] <a href="tutorial-tasks-filesets-properties.zip">tutorial-tasks-filesets-properties.zip</a><br>
 &nbsp;&nbsp;[3] <a href="properties.html#built-in-props">properties.html#built-in-props</a><br>
 &nbsp;&nbsp;[4] <a href="http://ant-contrib.sourceforge.net/">http://ant-contrib.sourceforge.net/</a><br>
-&nbsp;&nbsp;[5] <a href="CoreTasks/java.html">CoreTasks/java.html</a><br>
+&nbsp;&nbsp;[5] <a href="Tasks/java.html">Tasks/java.html</a><br>
 &nbsp;&nbsp;[6] <a href="http://ant.apache.org/ant_task_guidelines.html">http://ant.apache.org/ant_task_guidelines.html</a><br>
 &nbsp;&nbsp;[7] <a href="http://ant.apache.org/cvs.html">http://ant.apache.org/cvs.html</a><br>
 &nbsp;&nbsp;[8] <a href="http://java.sun.com/products/archive/index.html">http://java.sun.com/products/archive/index.html</a><br>

Modified: ant/core/branches/run-single-test-method/docs/manual/tutorial-writing-tasks.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/tutorial-writing-tasks.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/tutorial-writing-tasks.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/tutorial-writing-tasks.html Fri Jun 11 15:50:09 2010
@@ -127,7 +127,7 @@ its <i>depends</i>-clause the "compile" 
 <h2>Use the Task</h2>
 <p>But after creating the jar we want to use our new Task. Therefore we need a
 new target "use". Before we can use our new task we have to declare it with
-<a href="http://ant.apache.org/manual/CoreTasks/taskdef.html" target="_blank">
+<a href="http://ant.apache.org/manual/Tasks/taskdef.html" target="_blank">
 <code>&lt;taskdef&gt;</code> [2]</a>. And for easier process we change the default clause:
 <pre class="code">
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
@@ -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="CoreTasks/propertyhelper.html">Property
+<li>Any Java Object parsed from Ant 1.8's <a href="Tasks/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>
@@ -756,7 +756,7 @@ The last sources and the buildfile are a
 
 Used Links:<br>
 &nbsp;&nbsp;[1] <a href="http://ant.apache.org/manual/properties.html#built-in-props">http://ant.apache.org/manual/properties.html#built-in-props</a><br>
-&nbsp;&nbsp;[2] <a href="http://ant.apache.org/manual/CoreTasks/taskdef.html">http://ant.apache.org/manual/CoreTasks/taskdef.html</a><br>
+&nbsp;&nbsp;[2] <a href="http://ant.apache.org/manual/Tasks/taskdef.html">http://ant.apache.org/manual/Tasks/taskdef.html</a><br>
 &nbsp;&nbsp;[3] <a href="http://ant.apache.org/manual/develop.html#set-magic">http://ant.apache.org/manual/develop.html#set-magic</a><br>
 &nbsp;&nbsp;[4] <a href="http://ant.apache.org/manual/develop.html#nested-elements">http://ant.apache.org/manual/develop.html#nested-elements</a><br>
 &nbsp;&nbsp;[5] <a href="http://gump.covalent.net/jars/latest/ant/ant-testutil.jar">http://gump.covalent.net/jars/latest/ant/ant-testutil.jar</a><br>

Modified: ant/core/branches/run-single-test-method/docs/manual/using.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/using.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/using.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/using.html Fri Jun 11 15:50:09 2010
@@ -67,7 +67,7 @@ to be unique. (For additional informatio
 </table>
 <p>Optionally, a description for the project can be provided as a
 top-level <code>&lt;description&gt;</code> element (see the <a
-href="CoreTypes/description.html">description</a> type).</p>
+href="Types/description.html">description</a> type).</p>
 
 <p>Each project defines one or more <i>targets</i>.
 A target is a set of <i>tasks</i> you want
@@ -101,9 +101,7 @@ resolved before the task is executed.</p
 <p>where <i>name</i> is the name of the task,
 <i>attributeN</i> is the attribute name, and
 <i>valueN</i> is the value for this attribute.</p>
-<p>There is a set of <a href="coretasklist.html" target="navFrame">built-in tasks</a>, along with a
-number of
-<a href="optionaltasklist.html" target="navFrame"> optional tasks</a>, but it is also very
+<p>There is a set of <a href="tasklist.html" target="navFrame">built-in tasks</a>, but it is also very
 easy to <a href="develop.html#writingowntask">write your own</a>.</p>
 <p>All tasks share a task name attribute. The value of
 this attribute will be used in the logging messages generated by
@@ -146,7 +144,7 @@ task instances at all, only proxies.
   inside a build file.</p>
 
 <p>In its most simple form properties are defined in the build file
-  (for example by the <a href="CoreTasks/property.html">property</a>
+  (for example by the <a href="Tasks/property.html">property</a>
   task) or might be set outside Ant.  A property has a name and a
   value; the name is case-sensitive. Properties may be used in the
   value of task attributes or in the nested text of tasks that support
@@ -225,7 +223,7 @@ should be stored in a directory tree whi
 <p>A project can have a set of tokens that might be automatically expanded if
 found when a file is copied, when the filtering-copy behavior is selected in the
 tasks that support this. These might be set in the buildfile
-by the <a href="CoreTasks/filter.html">filter</a> task.</p>
+by the <a href="Tasks/filter.html">filter</a> task.</p>
 <p>Since this can potentially be a very harmful behavior,
 the tokens in the files <b>must</b>
 be of the form <code>@</code><i>token</i><code>@</code>, where
@@ -277,14 +275,14 @@ supports <code>path</code> and
     &lt;classpath path=&quot;${classpath}&quot;/&gt;
 </pre>
 <p>In addition, one or more
-<a href="CoreTypes/resources.html#collection">Resource Collection</a>s
+<a href="Types/resources.html#collection">Resource Collection</a>s
 can be specified as nested elements (these must consist of
-<a href="CoreTypes/resources.html#file">file</a>-type resources only).
+<a href="Types/resources.html#file">file</a>-type resources only).
 Additionally, it should be noted that although resource collections are
 processed in the order encountered, certain resource collection types
-such as <a href="CoreTypes/fileset.html">fileset</a>,
-<a href="CoreTypes/dirset.html">dirset</a> and
-<a href="CoreTypes/resources.html#files">files</a>
+such as <a href="Types/fileset.html">fileset</a>,
+<a href="Types/dirset.html">dirset</a> and
+<a href="Types/resources.html#files">files</a>
 are undefined in terms of order.</p>
 <pre>
     &lt;classpath&gt;
@@ -502,15 +500,15 @@ replicate the same snippet of XML over a
 &lt;/project&gt;
 </pre></blockquote>
 <p>All tasks that use nested elements for 
-<a href="CoreTypes/patternset.html">PatternSet</a>s, 
-<a href="CoreTypes/fileset.html">FileSet</a>s, 
-<a href="CoreTypes/zipfileset.html">ZipFileSet</a>s or 
+<a href="Types/patternset.html">PatternSet</a>s, 
+<a href="Types/fileset.html">FileSet</a>s, 
+<a href="Types/zipfileset.html">ZipFileSet</a>s or 
 <a href="#path">path-like structures</a> accept references to these structures 
 as shown in the examples. Using <code>refid</code> on a task will ordinarily 
 have the same effect (referencing a task already declared), but the user 
 should be aware that the interpretation of this attribute is dependent on the 
 implementation of the element upon which it is specified. Some tasks (the 
-<a href="CoreTasks/property.html">property</a> task is a handy example) 
+<a href="Tasks/property.html">property</a> task is a handy example) 
 deliberately assign a different meaning to <code>refid</code>.</p>
 
 
@@ -532,7 +530,7 @@ for adding libraries: 
 For the declaration there are several ways:
 <ul>
   <li>declare a single task per using instruction using  
-      <code>&lt;<a href="CoreTasks/taskdef.html">taskdef</a> name=&quot;taskname&quot; 
+      <code>&lt;<a href="Tasks/taskdef.html">taskdef</a> name=&quot;taskname&quot; 
       classname=&quot;ImplementationClass&quot;/&gt;</code>
       <br>
       <code>&lt;taskdef name=&quot;for&quot; classname=&quot;net.sf.antcontrib.logic.For&quot; /&gt; 
@@ -544,14 +542,14 @@ For the declaration there are several wa
       <code>&lt;taskdef resource=&quot;net/sf/antcontrib/antcontrib.properties&quot; /&gt; 
       &lt;for ... /&gt;</code>
   </li>
-  <li>declare a bundle of tasks using a <a href="CoreTypes/antlib.html">xml-file</a> holding these  
+  <li>declare a bundle of tasks using a <a href="Types/antlib.html">xml-file</a> holding these  
       taskname-ImplementationClass-pairs and <code>&lt;taskdef&gt;</code>
       <br>
       <code>&lt;taskdef resource=&quot;net/sf/antcontrib/antlib.xml&quot; /&gt; 
       &lt;for ... /&gt;</code>
   </li>
   <li>declare a bundle of tasks using a xml-file named antlib.xml, XML-namespace and 
-      <a href="CoreTypes/antlib.html#antlibnamespace"><code>antlib:</code> protocoll handler</a> 
+      <a href="Types/antlib.html#antlibnamespace"><code>antlib:</code> protocoll handler</a> 
       <br>
       <code>&lt;project xmlns:ac=&quot;antlib:net.sf.antconrib&quot;/&gt; 
       &lt;ac:for ... /&gt;</code>

Modified: ant/core/branches/run-single-test-method/docs/srcdownload.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/srcdownload.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/srcdownload.html (original)
+++ ant/core/branches/run-single-test-method/docs/srcdownload.html Fri Jun 11 15:50:09 2010
@@ -246,7 +246,7 @@ Other mirrors: <select name="Preferred">
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.8.1 was released on 6-May-2010 and
+<div class="content">Ant 1.8.1 was released on 7-May-2010 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />

Modified: ant/core/branches/run-single-test-method/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/fetch.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/fetch.xml (original)
+++ ant/core/branches/run-single-test-method/fetch.xml Fri Jun 11 15:50:09 2010
@@ -60,6 +60,10 @@
   <!-- load in our properties table -->
   <property file="${lib.dir}/libraries.properties"/>
 
+  <!-- Temporary cache for working files -->
+  <property name="temp.dir" location="${user.home}/.ant/tempcache" />
+  <property name="keep.temp.dir" value="true" />
+
   <import file="get-m2.xml" />
 
   <target name="pick-dest">
@@ -99,9 +103,10 @@ Set -Ddest=LOCATION on the command line
     <macrodef name="f2">
       <attribute name="project" />
       <attribute name="archive" default="@{project}"/>
+      <attribute name="repository" default="${m2.repo}"/>
       <sequential>
         <fail>
-        Unknown archive @{archive} -no property @{archive}.version defined.
+        Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
           <condition>
             <not>
             <isset property="@{archive}.version"/>
@@ -112,6 +117,7 @@ Set -Ddest=LOCATION on the command line
           <dependency groupID="@{project}"
             artifactID="@{archive}"
             version="${@{archive}.version}"/>
+          <remoteRepository url="@{repository}" />
         </artifact:dependencies>
         <!-- now we are left with the problem of getting the files
              into our directory -->
@@ -123,11 +129,71 @@ Set -Ddest=LOCATION on the command line
     </macrodef>
   </target>
 
+  <target name="nonm2-macros" depends="pick-dest">
+    <macrodef name="get-ftp-file">
+      <attribute name="host" />
+      <attribute name="port" default="21"/>
+      <attribute name="remotedir" />
+      <attribute name="filename" />
+      <attribute name="localdir" default="${dest.dir}" />
+      <attribute name="user" default="anonymous"/>
+      <attribute name="pw" default="anonymous"/>
+      <sequential>
+        <ftp server="@{host}" port="@{port}" userid="@{user}" password="@{pw}" passive="true"
+            remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
+            skipFailedTransfers="true">
+          <fileset dir="@{localdir}">
+            <include name="@{filename}" />
+          </fileset>
+        </ftp>
+      </sequential>
+    </macrodef>
+
+  </target>
+
 
 
   <!-- any init stuff -->
   <target name="init" depends="macros" />
 
+  <target name="init-no-m2" depends="nonm2-macros" />
+
+  <target name="init-cache">
+    <available property="temp.cache.already.exists" file="${temp.dir}" type="dir" />
+    <condition property="user.wants.temp.cache">
+      <and>
+        <isset property="keep.temp.dir" />
+        <not>
+          <or>
+            <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false" />
+          </or>
+        </not>
+      </and>
+    </condition>
+    <condition property="delete.temp.cache">
+      <and>
+        <not>
+          <isset property="temp.cache.already.exists" />
+        </not>
+        <not>
+          <isset property="user.wants.temp.cache" />
+        </not>
+      </and>
+    </condition>
+  </target>
+
+  <target name="-setup-temp-cache" depends="init-cache" unless="temp.cache.already.exists"
+          description="Setup temporary cache for downloaded files">
+    <mkdir dir="${temp.dir}" />
+  </target>
+
+  <target name="-cleanup-temp-cache" depends="init-cache" if="delete.temp.cache"
+          description="Gets rid of the temporary cache directory">
+    <delete dir="${temp.dir}" />
+  </target>
+
 
   <target name="diag" depends="init">
     <echoproperties />
@@ -153,11 +219,6 @@ Set -Ddest=LOCATION on the command line
     <f2 project="xml-resolver" />
   </target>
 
-  <!--
-   This is not used as
-   we like to get the more recent artifacts than are in the repo at the time of writing (2006-12-21)
-   -->
-
   <target name="networking"
     description="load networking libraries (commons-net; jsch)"
     depends="init">
@@ -242,8 +303,29 @@ Set -Ddest=LOCATION on the command line
     <f2 project="javax.servlet" archive="servlet-api"/>
   </target>
 
+  <target name="jai" depends="init"
+          description="load java advanced imaging">
+    <f2 project="javax.media" archive="jai-core" repository="http://repository.jboss.org/maven2"/>
+    <f2 project="com.sun.media" archive="jai-codec" repository="http://repository.jboss.org/maven2"/>
+  </target>
+
+  <target name="netrexx" depends="init-no-m2,-setup-temp-cache,networking,-fetch-netrexx,-cleanup-temp-cache"
+          description="load NetRexx compiler" />
+
+  <target name="-fetch-netrexx" depends="-setup-temp-cache"
+          description="FTPs NetRexx compiler from IBM site">
+    <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
+            filename="NetRexx.zip" localdir="${temp.dir}" />
+    <copy todir="${dest.dir}" flatten="true">
+      <zipfileset src="${temp.dir}/NetRexx.zip">
+        <include name="NetRexx\lib\NetRexxC.jar" />
+        <include name="NetRexx\browse\license.txt" />
+      </zipfileset>
+    </copy>
+  </target>
+
   <target name="all"
     description="load all the libraries (except jython)"
-    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc" />
+    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx" />
 
 </project>

Modified: ant/core/branches/run-single-test-method/lib/libraries.properties
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/lib/libraries.properties?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/lib/libraries.properties (original)
+++ ant/core/branches/run-single-test-method/lib/libraries.properties Fri Jun 11 15:50:09 2010
@@ -26,6 +26,8 @@ m2.antlib.url=${m2.url}/org/apache/maven
 #this is the sha1 checksum of the artifact
 m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
 
+# Repository to use by default for fetching dependencies.
+m2.repo=http://repo1.maven.org/maven2/
 
 #versions of different libraries. Please keep in alphabetical order, except
 #when a specific dependency forces them to be out-of-order
@@ -37,6 +39,8 @@ bsh-core.version=${bsh.version}
 commons-net.version=1.4.1
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
+jai-core.version=1.1.3
+jai-codec.version=1.1.3
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
 jdepend.version=2.9.1

Propchange: ant/core/branches/run-single-test-method/lib/optional/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jun 11 15:50:09 2010
@@ -1,23 +1,38 @@
-jdepend*.jar
-s*.jar
 NetRexxC.jar
-activation.jar
-antlr*.jar
+activation-*.jar
+antlr-*.jar
+asm-*.jar
+asm-commons-*.jar
+asm-tree-*.jar
 bcel*.jar
-bsf.jar
-bsh*.jar
-commons-logging*.jar
-commons-net*.jar
-jai_codec.jar
-jai_core.jar
+bsf-*.jar
+bsh-*.jar
+commons-logging-*.jar
+commons-net-*.jar
+jai-codec-*.jar
+jai-core-*.jar
 jakarta-oro-*.jar
 jakarta-regexp-*.jar
-js.jar
-jsch*.jar
+jasper-compiler-*.jar
+jasper-runtime-*.jar
+jdepend-*.jar
+jruby-*.jar
+js-*.jar
+jsch-*.jar
+jython-*.jar
+license.txt
 log4j-*.jar
-mail.jar
+mail-*.jar
+maven-artifact-ant-*-dep.jar
 mlibwrapper_jai.jar
+oro-*.jar
+regexp-*.jar
 resolver.jar
+serializer-*.jar
+servlet-api-*.jar
 starteam-sdk.jar
 weblogic*.jar
-xalan*.jar
+which-*.jar
+xalan-*.jar
+xml-apis-*.jar
+xml-resolver-*.jar

Modified: ant/core/branches/run-single-test-method/src/etc/poms/README.txt
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/README.txt?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/README.txt (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/README.txt Fri Jun 11 15:50:09 2010
@@ -8,10 +8,9 @@ Libs not available in the maven reposito
 groupId          artifactId       version   comment
 com.bea          weblogic         8.1.3.0   download it
 com.bea          weblogicclasses  5.1       a newer version can do.
-jai              jai-core         1.1.2_01  download jai from sun
-jai              jai-codec        1.1.2.1   download jai from sun
-javax.media      jmf              2.1.1e    dowmload jmf from sun
-com.ibm.netrexx  netrexx          2.0.5     I used the file NetRexxC.jar from the netrexx distribution
+jai              jai-core         1.1.2_01  fetch.xml
+jai              jai-codec        1.1.2.1   fetch.xml
+com.ibm.netrexx  netrexx          2.0.5     fetch.xml
 com.starteam     starteam-sdk     5.2       the original file is called starteam-sdk.jar
 stylebook        stylebook        1.0-b2    the original file is called stylebook-1.0-b2.jar
 

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-antlr/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-antlr/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-antlr/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-antlr/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>antlr specific task.
     The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bcel/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bcel/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bcel/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bcel/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,17 +27,17 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -56,8 +56,8 @@
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant/tfilters/util/JavaClassHelper*</include>
-            <include>org/apache/tools/ant/tutil/depend/bcel/*</include>
+            <include>org/apache/tools/ant/filters/util/JavaClassHelper*</include>
+            <include>org/apache/tools/ant/util/depend/bcel/*</include>
           </includes>
         </configuration>
       </plugin>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bsf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bsf/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bsf/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-bsf/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,17 +27,17 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-log4j/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-log4j/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-log4j/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-log4j/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,17 +26,17 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-oro/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-oro/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-oro/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-oro/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,17 +27,17 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-regexp/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-regexp/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-regexp/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-regexp/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,17 +26,17 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-resolver/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-resolver/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-resolver/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-resolver/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,17 +26,17 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-xalan2/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-xalan2/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-xalan2/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-apache-xalan2/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,24 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-nodeps</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-logging/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-logging/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-logging/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-logging/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-net/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-net/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-net/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-commons-net/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-jai/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-jai/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-jai/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-jai/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>image task and corresponding types.
   jai (Java Advanced Imaging) is not available in public Maven repositories, therefore the dependencies are included with a scope provided
     the download URL is http://java.sun.com/products/java-media/jai/
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.media</groupId>
       <artifactId>jai-core</artifactId>
-      <version>1.1.2_01</version>
+      <version>1.1.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jai</groupId>
       <artifactId>jai-codec</artifactId>
-      <version>1.1.2.1</version>
+      <version>1.1.3</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-javamail/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-javamail/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-javamail/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-javamail/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,12 +26,12 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>implementation of the mail task based on javamail.
     Required to send emails to SMTP servers using user/password combinations
   or to send mail over SSL</description>
@@ -39,7 +39,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-jdepend/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-jdepend/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-jdepend/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-jdepend/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
     jdepend parser available on the maven repository</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-jmf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-jmf/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-jmf/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-jmf/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,27 +26,21 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>contains the sound task and a soundplayer listener
     download the dependency from http://java.sun.com/products/java-media/jmf/</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.media</groupId>
-      <artifactId>jmf</artifactId>
-      <version>2.1.1e</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-jsch/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-jsch/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-jsch/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-jsch/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>contains the sshexec and scp tasks
   jsch 0.1.29 might not be available from maven</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-junit/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-junit/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-junit/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-junit/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-launcher/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-launcher/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-launcher/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-launcher/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-netrexx/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-netrexx/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-netrexx/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-netrexx/pom.xml Fri Jun 11 15:50:09 2010
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>NetRexxC task
     dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-swing/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-swing/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-swing/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-swing/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>a listener and a splash task based on Swing</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-testutil/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-testutil/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-testutil/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-testutil/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <description>test utility classes</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
      <dependency>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant/pom.xml Fri Jun 11 15:50:09 2010
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <name>org.apache.tools.ant</name>
   <description>Apache Ant</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.8.1-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -93,27 +93,36 @@
           <source>1.4</source>
           <target>1.4</target>
           <excludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/**</exclude>
             <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/util/depend/**</exclude>
-            <exclude>org/apache/tools/ant/util/optional/**</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/perforce/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
+            <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
+            <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
+            <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
+            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+            <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
           </excludes>
           <testExcludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/**</exclude>
             <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/depend/**</exclude>
-            <exclude>org/apache/tools/ant/util/optional/**</exclude>
             <exclude>org/apache/tools/ant/util/Script*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/pom.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/pom.xml Fri Jun 11 15:50:09 2010
@@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-parent</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>master POM</description>
   <name>Apache Ant</name>
@@ -87,7 +87,6 @@ xsi:schemaLocation="http://maven.apache.
     <module>ant-junit</module>
     <module>ant-launcher</module>
     <module>ant-netrexx</module>
-    <module>ant-nodeps</module>
     <module>ant-swing</module>
     <module>ant-testutil</module>
   </modules>

Modified: ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/concat.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/concat.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/concat.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/concat.xml Fri Jun 11 15:50:09 2010
@@ -110,7 +110,16 @@
     <touch file="${tmp.file.2}"/>
     <!-- concat.xml is now older than tmp.file.2
          so the following should not do anything -->
-    <concat destfile="${tmp.file.2}" force="false">
+    <concat destfile="${tmp.file.2}" overwrite="false">
+      <path path="concat.xml"/>
+    </concat>
+  </target>
+
+  <target name="testoverwrite">
+    <touch file="${tmp.file.2}"/>
+    <!-- concat.xml is now older than tmp.file.2
+         so the following should still overwrite it -->
+    <concat destfile="${tmp.file.2}" overwrite="true">
       <path path="concat.xml"/>
     </concat>
   </target>

Modified: ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/conditions/antversion.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/conditions/antversion.xml?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/conditions/antversion.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/conditions/antversion.xml Fri Jun 11 15:50:09 2010
@@ -32,10 +32,10 @@
 		<fail>
 			<condition>
 				<not>
-					<antversion exactly="1.8.1" />
+					<antversion exactly="1.8.2" />
 				</not>
 			</condition>
-			Should be exactly 1.8.1
+			Should be exactly 1.8.2
 
   		</fail>
 	</target>

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DemuxInputStream.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DemuxInputStream.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DemuxInputStream.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DemuxInputStream.java Fri Jun 11 15:50:09 2010
@@ -30,6 +30,7 @@ import java.io.InputStream;
  */
 public class DemuxInputStream extends InputStream {
 
+    private static final int MASK_8BIT = 0xFF;
     /**
      * The project to from which to get input.
      */
@@ -54,7 +55,7 @@ public class DemuxInputStream extends In
         if (project.demuxInput(buffer, 0, 1) == -1) {
             return -1;
         }
-        return buffer[0];
+        return buffer[0] & MASK_8BIT;
     }
 
 

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Diagnostics.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Diagnostics.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Diagnostics.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Diagnostics.java Fri Jun 11 15:50:09 2010
@@ -72,7 +72,6 @@ public final class Diagnostics {
     private static final int SECONDS_PER_MILLISECOND = 1000;
     private static final int SECONDS_PER_MINUTE = 60;
     private static final int MINUTES_PER_HOUR = 60;
-    private static final String TEST_CLASS = "org.apache.tools.ant.taskdefs.optional.EchoProperties";
 
     /**
      * The error text when a security manager blocks access to a property.
@@ -87,42 +86,19 @@ public final class Diagnostics {
     }
 
     /**
-     * Check if optional tasks are available. Not that it does not check
-     * for implementation version. Use <tt>validateVersion()</tt> for this.
-     * @return <tt>true</tt> if optional tasks are available.
+     * Doesn't do anything.
+     * @deprecated Obsolete since Ant 1.8.2
+     * @return <tt>true</tt>
      */
     public static boolean isOptionalAvailable() {
-        try {
-            Class.forName(TEST_CLASS);
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
         return true;
     }
 
     /**
-     * Check if core and optional implementation version do match.
-     * @throws BuildException if the implementation version of optional tasks
-     * does not match the core implementation version.
+     * Doesn't do anything.
+     * @deprecated Obsolete since Ant 1.8.2
      */
     public static void validateVersion() throws BuildException {
-        try {
-            Class optional = Class.forName(TEST_CLASS);
-            String coreVersion = getImplementationVersion(Main.class);
-            String optionalVersion = getImplementationVersion(optional);
-
-            if (coreVersion != null && !coreVersion.equals(optionalVersion)) {
-                throw new BuildException("Invalid implementation version "
-                        + "between Ant core and Ant optional tasks.\n"
-                        + " core    : " + coreVersion + " in "
-                        + getClassLocation(Main.class)
-                        + "\n" + " optional: " + optionalVersion + " in "
-                        + getClassLocation(optional));
-            }
-        } catch (ClassNotFoundException e) {
-            // ignore
-            ignoreThrowable(e);
-        }
     }
 
     /**
@@ -332,16 +308,6 @@ public final class Diagnostics {
         out.println("core tasks     : " + getImplementationVersion(Main.class)
                     + " in " + getClassLocation(Main.class));
 
-        Class optional = null;
-        try {
-            optional = Class.forName(TEST_CLASS);
-            out.println("optional tasks : " + getImplementationVersion(optional)
-                        + " in " + getClassLocation(optional));
-        } catch (ClassNotFoundException e) {
-            ignoreThrowable(e);
-            out.println("optional tasks : not available");
-        }
-
         header(out, "ANT PROPERTIES");
         doReportAntProperties(out);
 

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DirectoryScanner.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DirectoryScanner.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DirectoryScanner.java Fri Jun 11 15:50:09 2010
@@ -1255,7 +1255,8 @@ public class DirectoryScanner
                 } else {
                     everythingIncluded = false;
                     dirsNotIncluded.addElement(name);
-                    if (fast && couldHoldIncluded(newPath)) {
+                    if (fast && couldHoldIncluded(newPath)
+                        && !contentsExcluded(newPath)) {
                         scandir(file, newPath, fast, children,
                                 directoryNamesFollowed);
                     }
@@ -1458,7 +1459,7 @@ public class DirectoryScanner
      * @param path the path to check.
      * @return whether all the specified directory's contents are excluded.
      */
-    private boolean contentsExcluded(TokenizedPath path) {
+    /* package */ boolean contentsExcluded(TokenizedPath path) {
         for (int i = 0; i < excludePatterns.length; i++) {
             if (excludePatterns[i].endsWith(SelectorUtils.DEEP_TREE_MATCH)
                 && excludePatterns[i].withoutLastToken()
@@ -1783,7 +1784,7 @@ public class DirectoryScanner
      *
      * @since Ant 1.6.3
      */
-    private synchronized void ensureNonPatternSetsReady() {
+    /* package */ synchronized void ensureNonPatternSetsReady() {
         if (!areNonPatternSetsReady) {
             includePatterns = fillNonPatternSet(includeNonPatterns, includes);
             excludePatterns = fillNonPatternSet(excludeNonPatterns, excludes);

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Main.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Main.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Main.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Main.java Fri Jun 11 15:50:09 2010
@@ -193,7 +193,6 @@ public class Main implements AntMain {
                          ClassLoader coreLoader) {
 
         try {
-            Diagnostics.validateVersion();
             processArgs(args);
         } catch (Throwable exc) {
             handleLogfile();

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Checksum.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Checksum.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Checksum.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Checksum.java Fri Jun 11 15:50:09 2010
@@ -457,15 +457,7 @@ public class Checksum extends MatchingTa
         File directory;
         if (todir != null) {
             // A separate directory was explicitly declared
-            String path = (String) relativeFilePaths.get(file);
-            if (path == null) {
-                //bug 37386. this should not occur, but it has, once.
-                throw new BuildException(
-                    "Internal error: "
-                    + "relativeFilePaths could not match file"
-                    + file + "\n"
-                    + "please file a bug report on this");
-            }
+            String path = getRelativeFilePath(file);
             directory = new File(todir, path).getParentFile();
             // Create the directory, as it might not exist.
             directory.mkdirs();
@@ -559,8 +551,8 @@ public class Checksum extends MatchingTa
                             File f2 = (File) o2;
                             return f1 == null ? (f2 == null ? 0 : -1)
                                 : (f2 == null ? 1
-                                   : f1.getName().compareTo(f2.getName())
-                                   );
+                                   : getRelativeFilePath(f1)
+                                   .compareTo(getRelativeFilePath(f2)));
                         }
                     });
                 // Loop over the checksums and generate a total hash.
@@ -573,7 +565,7 @@ public class Checksum extends MatchingTa
                     messageDigest.update(digest);
 
                     // Add the file path
-                    String fileName = (String) relativeFilePaths.get(src);
+                    String fileName = getRelativeFilePath(src);
                     messageDigest.update(fileName.getBytes());
                 }
                 String totalChecksum = createDigestString(messageDigest.digest());
@@ -655,6 +647,21 @@ public class Checksum extends MatchingTa
     }
 
     /**
+     * @since Ant 1.8.2
+     */
+    private String getRelativeFilePath(File f) {
+        String path = (String) relativeFilePaths.get(f);
+        if (path == null) {
+            //bug 37386. this should not occur, but it has, once.
+            throw new BuildException("Internal error: "
+                                     + "relativeFilePaths could not match file "
+                                     + f + "\n"
+                                     + "please file a bug report on this");
+        }
+        return path;
+    }
+
+    /**
      * Helper class for the format attribute.
      *
      * @since 1.7

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Concat.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Concat.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Concat.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Concat.java Fri Jun 11 15:50:09 2010
@@ -471,6 +471,8 @@ public class Concat extends Task impleme
     private Vector filterChains;
     /** ignore dates on input files */
     private boolean forceOverwrite = true;
+    /** overwrite read-only files */
+    private boolean force = false;
     /** String to place at the start of the concatented stream */
     private TextElement footer;
     /** String to place at the end of the concatented stream */
@@ -526,6 +528,7 @@ public class Concat extends Task impleme
         eolString = StringUtils.LINE_SEP;
         rc = null;
         ignoreEmpty = true;
+        force = false;
     }
 
     // Attribute setters.
@@ -581,12 +584,36 @@ public class Concat extends Task impleme
 
     /**
      * Force overwrite existing destination file
-     * @param force if true always overwrite, otherwise only overwrite
-     *              if the output file is older any of the input files.
+     * @param forceOverwrite if true always overwrite, otherwise only
+     *              overwrite if the output file is older any of the
+     *              input files.
      * @since Ant 1.6
+     * @deprecated use #setOverwrite instead
      */
-    public void setForce(boolean force) {
-        this.forceOverwrite = force;
+    public void setForce(boolean forceOverwrite) {
+        this.forceOverwrite = forceOverwrite;
+    }
+
+    /**
+     * Force overwrite existing destination file
+     * @param forceOverwrite if true always overwrite, otherwise only
+     *              overwrite if the output file is older any of the
+     *              input files.
+     * @since Ant 1.8.2
+     */
+    public void setOverwrite(boolean forceOverwrite) {
+        setForce(forceOverwrite);
+    }
+
+    /**
+     * Whether read-only destinations will be overwritten.
+     *
+     * <p>Defaults to false</p>
+     *
+     * @since Ant 1.8.2
+     */
+    public void setForceReadOnly(boolean f) {
+        force = f;
     }
 
     /**
@@ -761,9 +788,11 @@ public class Concat extends Task impleme
         }
         try {
             //most of these are defaulted because the concat-as-a-resource code hijacks a lot:
-            ResourceUtils.copyResource(new ConcatResource(c), dest == null ? new LogOutputResource(
-                    this, Project.MSG_WARN) : dest, null, null, true, false, append, null, null,
-                    getProject());
+            ResourceUtils.copyResource(new ConcatResource(c), dest == null
+                                       ? new LogOutputResource(this, Project.MSG_WARN)
+                                       : dest,
+                                       null, null, true, false, append, null,
+                                       null, getProject(), force);
         } catch (IOException e) {
             throw new BuildException("error concatenating content to " + dest, e);
         }

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Copy.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Copy.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Copy.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Copy.java Fri Jun 11 15:50:09 2010
@@ -100,6 +100,7 @@ public class Copy extends Task {
     private String inputEncoding = null;
     private String outputEncoding = null;
     private long granularity = 0;
+    private boolean force = false;
 
     /**
      * Copy task constructor.
@@ -229,6 +230,26 @@ public class Copy extends Task {
     }
 
     /**
+     * Whether read-only destinations will be overwritten.
+     *
+     * <p>Defaults to false</p>
+     *
+     * @since Ant 1.8.2
+     */
+    public void setForce(boolean f) {
+        force = f;
+    }
+
+    /**
+     * Whether read-only destinations will be overwritten.
+     *
+     * @since Ant 1.8.2
+     */
+    public boolean getForce() {
+        return force;
+    }
+
+    /**
      * Set whether files copied from directory trees will be "flattened"
      * into a single directory.  If there are multiple files with
      * the same name in the source directory tree, only the first
@@ -838,10 +859,13 @@ public class Copy extends Task {
                             executionFilters
                                 .addFilterSet((FilterSet) filterEnum.nextElement());
                         }
-                        fileUtils.copyFile(fromFile, toFile, executionFilters,
+                        fileUtils.copyFile(new File(fromFile), new File(toFile),
+                                           executionFilters,
                                            filterChains, forceOverwrite,
-                                           preserveLastModified, inputEncoding,
-                                           outputEncoding, getProject());
+                                           preserveLastModified,
+                                           /* append: */ false, inputEncoding,
+                                           outputEncoding, getProject(),
+                                           getForce());
                     } catch (IOException ioe) {
                         String msg = "Failed to copy " + fromFile + " to " + toFile
                             + " due to " + getDueTo(ioe);
@@ -928,9 +952,11 @@ public class Copy extends Task {
                                                    filterChains,
                                                    forceOverwrite,
                                                    preserveLastModified,
+                                                   /* append: */ false,
                                                    inputEncoding,
                                                    outputEncoding,
-                                                   getProject());
+                                                   getProject(),
+                                                   getForce());
                     } catch (IOException ioe) {
                         String msg = "Failed to copy " + fromResource
                             + " to " + toFile

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Echo.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Echo.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Echo.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Echo.java Fri Jun 11 15:50:09 2010
@@ -47,6 +47,7 @@ public class Echo extends Task {
     protected boolean append = false;
     /** encoding; set to null or empty means 'default' */
     private String encoding = "";
+    private boolean force = false;
 
     // by default, messages are always displayed
     protected int logLevel = Project.MSG_WARN;
@@ -63,9 +64,12 @@ public class Echo extends Task {
         final String msg = "".equals(message) ? StringUtils.LINE_SEP : message;
         try {
             ResourceUtils
-                    .copyResource(new StringResource(msg), output == null ? new LogOutputResource(
-                            this, logLevel) : output, null, null, false, false, append, null, ""
-                            .equals(encoding) ? null : encoding, getProject());
+                    .copyResource(new StringResource(msg), output == null
+                                  ? new LogOutputResource(this, logLevel)
+                                  : output,
+                                  null, null, false, false, append, null,
+                                  "".equals(encoding) ? null : encoding,
+                                  getProject(), force);
         } catch (IOException ioe) {
             throw new BuildException(ioe, getLocation());
         }
@@ -148,6 +152,17 @@ public class Echo extends Task {
     }
 
     /**
+     * Whether read-only destinations will be overwritten.
+     *
+     * <p>Defaults to false</p>
+     *
+     * @since Ant 1.8.2
+     */
+    public void setForce(boolean f) {
+        force = f;
+    }
+
+    /**
      * The enumerated values for the level attribute.
      */
     public static class EchoLevel extends LogLevel {

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Execute.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Execute.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Execute.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Execute.java Fri Jun 11 15:50:09 2010
@@ -28,6 +28,7 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -37,6 +38,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -156,6 +158,19 @@ public class Execute {
             return procEnvironment;
         }
         procEnvironment = new Vector();
+        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5)) {
+            try {
+                Map/*<String,String>*/ env = (Map) System.class.getMethod("getenv", new Class[0]).invoke(null, new Object[0]);
+                Iterator it = env.entrySet().iterator();
+                while (it.hasNext()) {
+                    Map.Entry entry = (Map.Entry) it.next();
+                    procEnvironment.add(entry.getKey() + "=" + entry.getValue());
+                }
+                return procEnvironment;
+            } catch (Exception x) {
+                x.printStackTrace();
+            }
+        }
         try {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             Execute exe = new Execute(new PumpStreamHandler(out));

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Javac.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Javac.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Javac.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Javac.java Fri Jun 11 15:50:09 2010
@@ -807,7 +807,7 @@ public class Javac extends MatchingTask 
     }
 
     /**
-     * The property to set on compliation success.
+     * The property to set on compilation success.
      * This property will not be set if the compilation
      * fails, or if there are no files to compile.
      * @param updatedProperty the property name to use.
@@ -818,7 +818,7 @@ public class Javac extends MatchingTask 
     }
 
     /**
-     * The property to set on compliation failure.
+     * The property to set on compilation failure.
      * This property will be set if the compilation
      * fails.
      * @param errorProperty the property name to use.

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Move.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Move.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Move.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/Move.java Fri Jun 11 15:50:09 2010
@@ -233,9 +233,10 @@ public class Move extends Copy {
                                     getFilterChains(),
                                     forceOverwrite,
                                     getPreserveLastModified(),
+                                    /* append: */ false,
                                     getEncoding(),
                                     getOutputEncoding(),
-                                    getProject());
+                                    getProject(), getForce());
         } catch (IOException ioe) {
             String msg = "Failed to copy " + fromFile
                     + " to " + toFile + " due to " + ioe.getMessage();
@@ -329,6 +330,18 @@ public class Move extends Copy {
                 || getFilterChains().size() > 0) {
             return false;
         }
+
+        // identical logic lives in ResourceUtils.copyResource():
+        if (destFile.isFile() && !destFile.canWrite()) {
+            if (!getForce()) {
+                throw new IOException("can't replace read-only destination "
+                                      + "file " + destFile);
+            } else if (!getFileUtils().tryHardToDelete(destFile)) {
+                throw new IOException("failed to delete read-only "
+                                      + "destination file " + destFile);
+            }
+        }
+
         // identical logic lives in FileUtils.rename():
         File parent = destFile.getParentFile();
         if (parent != null && !parent.exists()) {

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java Fri Jun 11 15:50:09 2010
@@ -108,6 +108,10 @@ public class XSLTProcess extends Matchin
     /** for resolving entities such as dtds */
     private XMLCatalog xmlCatalog = new XMLCatalog();
 
+    /** Name of the TRAX Liaison class */
+    private static final String TRAX_LIAISON_CLASS =
+                        "org.apache.tools.ant.taskdefs.optional.TraXLiaison";
+
     /** Utilities used for file operations */
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
@@ -670,13 +674,15 @@ public class XSLTProcess extends Matchin
      * @exception Exception if the processor cannot be loaded.
      */
     private void resolveProcessor(String proc) throws Exception {
+        String classname;
         if (proc.equals(PROCESSOR_TRAX)) {
-            liaison = new org.apache.tools.ant.taskdefs.optional.TraXLiaison();
+            classname = TRAX_LIAISON_CLASS;
         } else {
             //anything else is a classname
-            Class clazz = loadClass(proc);
-            liaison = (XSLTLiaison) clazz.newInstance();
+            classname = proc;
         }
+        Class clazz = loadClass(classname);
+        liaison = (XSLTLiaison) clazz.newInstance();
     }
 
     /**
@@ -910,7 +916,8 @@ public class XSLTProcess extends Matchin
             } else {
                 try {
                     resolveProcessor(PROCESSOR_TRAX);
-                } catch (Exception e1) { // should not happen
+                } catch (Throwable e1) {
+                    e1.printStackTrace();
                     handleError(e1);
                 }
             }

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java Fri Jun 11 15:50:09 2010
@@ -45,7 +45,15 @@ import org.apache.tools.ant.taskdefs.con
  * @since Ant 1.3
  */
 public abstract class DefaultCompilerAdapter implements CompilerAdapter {
-    private static final int COMMAND_LINE_LIMIT = 4096;  // 4K
+    private static final int COMMAND_LINE_LIMIT;
+    static {
+        if (Os.isFamily("os/2")) {
+            // OS/2 CMD.EXE has a much smaller limit around 1K
+            COMMAND_LINE_LIMIT = 1000;
+        } else {
+            COMMAND_LINE_LIMIT = 4096;  // 4K
+        }
+    }
     // CheckStyle:VisibilityModifier OFF - bc
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java Fri Jun 11 15:50:09 2010
@@ -69,7 +69,7 @@ public class EmailTask extends Task {
     private String encoding = AUTO;
     /** host running SMTP  */
     private String host = "localhost";
-    private int port = SMTP_PORT;
+    private Integer port = null;
     /** subject field  */
     private String subject = null;
     /** any text  */
@@ -161,7 +161,7 @@ public class EmailTask extends Task {
      * @param port The port to use.
      */
     public void setMailport(int port) {
-        this.port = port;
+        this.port = new Integer(port);
     }
 
     /**
@@ -549,7 +549,13 @@ public class EmailTask extends Task {
 
             // pass the params to the mailer
             mailer.setHost(host);
-            mailer.setPort(port);
+            if (port != null) {
+                mailer.setPort(port.intValue());
+                mailer.setPortExplicitlySpecified(true);
+            } else {
+                mailer.setPort(SMTP_PORT);
+                mailer.setPortExplicitlySpecified(false);
+            }
             mailer.setUser(user);
             mailer.setPassword(password);
             mailer.setSSL(ssl);

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java Fri Jun 11 15:50:09 2010
@@ -50,6 +50,7 @@ public abstract class Mailer {
     // CheckStyle:VisibilityModifier ON
     private boolean ignoreInvalidRecipients = false;
     private boolean starttls = false;
+    private boolean portExplicitlySpecified = false;
 
     /**
      * Set the mail server.
@@ -70,6 +71,22 @@ public abstract class Mailer {
     }
 
     /**
+     * Whether the port has been explicitly specified by the user. 
+     * @since Ant 1.8.2
+     */
+    public void setPortExplicitlySpecified(boolean explicit) {
+        portExplicitlySpecified = explicit;
+    }
+
+    /**
+     * Whether the port has been explicitly specified by the user. 
+     * @since Ant 1.8.2
+     */
+    protected boolean isPortExplicitlySpecified() {
+        return portExplicitlySpecified;
+    }
+
+    /**
      * Set the user for smtp auth.
      *
      * @param user the username.



Mime
View raw message