ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r940531 [3/7] - in /ant/core/branches/run-single-test-method: ./ 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-an...
Date Mon, 03 May 2010 17:44:28 GMT
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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,17 +27,17 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -26,24 +26,24 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <description>contains the junit and junirreport tasks</description>
+  <version>1.8.1-SNAPSHOT</version>
+  <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-nodeps</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -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/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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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,7 +41,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -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/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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -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>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,7 +57,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/sound/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/sound/*</include>
           </includes>
         </configuration>
       </plugin>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,7 +57,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/ssh/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/ssh/*</include>
           </includes>
         </configuration>
       </plugin>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -80,7 +80,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/junit/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
         </configuration>
       </plugin>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,7 +57,7 @@ xsi:schemaLocation="http://maven.apache.
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/NetRexxC*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/NetRexxC*</include>
           </includes>
         </configuration>
       </plugin>

Modified: ant/core/branches/run-single-test-method/src/etc/poms/ant-nodeps/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/poms/ant-nodeps/pom.xml?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/poms/ant-nodeps/pom.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/poms/ant-nodeps/pom.xml Mon May  3 17:44:21 2010
@@ -27,42 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-nodeps</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <description>contains all the optional tasks and types which do not have particular dependencies</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <!-- the implementation jar of the xerces jar will be used by ant to parse
-      XML files, particularly the build files, if the JDK does not provide a parser
-      xercesImpl.jar is provided with ant -->
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.9.0</version>
-      <optional>true</optional>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <!-- xml-apis contains the org.w3c.dom package 
-        since ant is using DOM APIS to parse the XML build file and do other XML related activities
-        xml-apis is a compile time dependency
-        a version of xml-apis.jar is delivered with ant -->
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
-      <optional>true</optional>
-      <scope>compile</scope>
-    </dependency>
-
   </dependencies>
   <build>
     <plugins>
@@ -81,7 +59,6 @@
             <include>org/apache/tools/ant/util/regexp/Jdk14Regexp*</include>
           </includes>
           <excludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/junit/**</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/perforce/**</exclude>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -51,7 +51,7 @@
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/splash/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/splash/*</include>
           </includes>
         </configuration>
       </plugin>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <description>test utility classes</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.1-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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -27,40 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.1-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.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <!-- the implementation jar of the xerces jar will be used by ant to parse
-      XML files, particularly the build files, if the JDK does not provide a parser
-        xercesImpl.jar is provided with ant -->
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.9.0</version>
-      <optional>true</optional>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <!-- xml-apis contains the org.w3c.dom package 
-      since ant is using DOM APIS to parse the XML build file and do other XML related activities
-      xml-apis is a compile time dependency
-      a version of xml-apis.jar is delivered with ant -->
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
-      <optional>true</optional>
+      <version>1.8.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 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.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>master POM</description>
   <name>Apache Ant</name>
@@ -90,7 +90,6 @@ xsi:schemaLocation="http://maven.apache.
     <module>ant-nodeps</module>
     <module>ant-swing</module>
     <module>ant-testutil</module>
-    <module>ant-trax</module>
   </modules>
   <dependencies>
      <dependency>

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -32,10 +32,10 @@
 		<fail>
 			<condition>
 				<not>
-					<antversion exactly="1.8.0" />
+					<antversion exactly="1.8.1" />
 				</not>
 			</condition>
-			Should be exactly 1.8.0
+			Should be exactly 1.8.1
 
   		</fail>
 	</target>
@@ -63,4 +63,4 @@
 	  	  Should be exactly 1.9.0
 	  	</fail>
 	</target>
-</project>
\ No newline at end of file
+</project>

Modified: ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/exec/exec.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/exec/exec.xml?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/exec/exec.xml (original)
+++ ant/core/branches/run-single-test-method/src/etc/testcases/taskdefs/exec/exec.xml Mon May  3 17:44:21 2010
@@ -32,26 +32,6 @@
                 <isset property="sh.exe.executable"/>
             </or>
         </condition>
-        <!-- UNIX -->
-        <available file="wc" filepath="${env.PATH}" property="wc.executable"/>
-        <!-- CYGWIN -->
-        <available file="wc.exe" filepath="${env.PATH}" property="wc.exe.executable"/>
-        <condition property="wc.can.run">
-            <or>
-                <isset property="wc.executable"/>
-                <isset property="wc.exe.executable"/>
-            </or>
-        </condition>
-        <!-- UNIX -->
-        <available file="cat" filepath="${env.PATH}" property="cat.executable"/>
-        <!-- CYGWIN -->
-        <available file="cat.exe" filepath="${env.PATH}" property="cat.exe.executable"/>
-        <condition property="cat.can.run">
-            <or>
-                <isset property="cat.executable"/>
-                <isset property="cat.exe.executable"/>
-            </or>
-        </condition>
     </target>
 
     <target name="spawn" depends="init" if="test.can.run">
@@ -62,324 +42,7 @@
         </exec>
     </target>
 
-    <target name="no-redirect" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirect1" depends="init" if="test.can.run">
-        <exec executable="sh" output="redirect.out">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirect2" depends="init" if="test.can.run">
-        <exec executable="sh" output="redirect.out" error="redirect.err">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirect3" depends="init" if="test.can.run">
-        <exec executable="sh" logerror="true"
-              output="redirect.out" outputproperty="redirect.out">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirect4" depends="init" if="test.can.run">
-        <exec executable="sh"
-              error="redirect.err" errorproperty="redirect.err"
-              output="redirect.out" outputproperty="redirect.out">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirect5" depends="init" if="wc.can.run">
-        <exec executable="wc" inputstring="x y z"
-              error="redirect.err" errorproperty="redirect.err"
-              output="redirect.out" outputproperty="redirect.out">
-            <arg value="-w"/>
-        </exec>
-    </target>
-
-    <target name="redirect6" depends="init" if="wc.can.run">
-        <echo file="redirect.in">x y z</echo>
-        <exec executable="wc" input="redirect.in"
-              error="redirect.err" errorproperty="redirect.err"
-              output="redirect.out" outputproperty="redirect.out">
-            <arg value="-w"/>
-        </exec>
-    </target>
-
-    <target name="redirect7" depends="init" if="wc.can.run">
-        <exec executable="wc" inputstring="x y z"
-              error="redirect.err"
-              output="redirect.out" outputproperty="redirect.out">
-            <arg value="-w"/>
-        </exec>
-    </target>
-
-    <target name="redirector1" description="fail"
-            depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-            <redirector output="redirector.out" />
-            <redirector output="whocares" />
-        </exec>
-    </target>
-
-    <target name="redirector2" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-            <redirector output="redirector.out" />
-        </exec>
-    </target>
-
-    <target name="redirector3" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-            <redirector output="redirector.out" error="redirector.err" />
-        </exec>
-    </target>
-
-    <target name="redirector4" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-            <redirector output="redirector.out" logerror="true"
-                        outputproperty="redirector.out" />
-        </exec>
-    </target>
-
-    <target name="redirector5" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector error="redirector.err" errorproperty="redirector.err"
-              output="redirector.out" outputproperty="redirector.out" />
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirector6" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-            </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirector7" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-                <errorfilterchain>
-                    <replacestring from="err" to="ERROR!!!" />
-                </errorfilterchain>
-            </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirector8" depends="init" if="wc.can.run">
-        <echo file="redirector.in">x y z</echo>
-        <exec executable="wc">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <inputmapper type="merge" to="redirector.in" />
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-            </redirector>
-            <arg value="-w"/>
-        </exec>
-    </target>
-
-    <target name="redirector9" depends="init" if="cat.can.run">
-        <echo file="redirector.in">blah before blah</echo>
-        <exec executable="cat">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <inputfilterchain>
-                    <replacestring from="before" to="after" />
-                </inputfilterchain>
-                <inputmapper type="merge" to="redirector.in" />
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-            </redirector>
-        </exec>
-    </target>
-
-    <target name="redirector10" depends="init" if="cat.can.run">
-        <echo file="redirector.in">blah before blah</echo>
-        <exec executable="cat">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <outputfilterchain>
-                    <replacestring from="before" to="after" />
-                </outputfilterchain>
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-            </redirector>
-            <arg value="redirector.in"/>
-        </exec>
-    </target>
-
-    <target name="redirector11" depends="init" if="cat.can.run">
-        <exec executable="cat">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err"
-                        inputstring="blah before blah">
-                <inputfilterchain>
-                    <replacestring from="before" to="after" />
-                </inputfilterchain>
-                <outputmapper type="merge" to="redirector.out" />
-                <errormapper type="merge" to="redirector.err" />
-            </redirector>
-        </exec>
-    </target>
-
-    <target name="redirector12" depends="init" if="cat.can.run">
-        <echo file="redirector.in">blah before blah</echo>
-        <exec executable="cat" output="redirector.out" error="redirector.err">
-            <redirector outputproperty="redirector.out"
-                        errorproperty="redirector.err">
-                <outputfilterchain>
-                    <replacestring from="before" to="after" />
-                </outputfilterchain>
-                <outputmapper type="glob" from="nomatch" to="nomatchout" />
-                <errormapper type="glob" from="nomatch" to="nomatcherr" />
-            </redirector>
-            <arg value="redirector.in"/>
-        </exec>
-    </target>
-
-    <target name="redirector13" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector>
-                <outputfilterchain>
-                    <replacestring from="out" to="OUTPUT???" />
-                </outputfilterchain>
-                <errorfilterchain>
-                    <replacestring from="err" to="ERROR!!!" />
-                </errorfilterchain>
-            </redirector>
-            <arg value="parrot.sh" />
-            <arg value="${ant.file}" />
-        </exec>
-    </target>
-
-    <target name="redirector14" depends="init" if="cat.can.run">
-        <exec executable="cat">
-            <redirector inputstring="blah before blah">
-                <outputfilterchain>
-                    <replacestring from="before" to="after" />
-                </outputfilterchain>
-                <outputmapper type="glob" from="nomatch" to="nomatchout" />
-                <errormapper type="glob" from="nomatch" to="nomatcherr" />
-            </redirector>
-        </exec>
-    </target>
-
-    <target name="redirector15" depends="init" if="cat.can.run">
-        <exec executable="cat">
-            <redirector input="input/iso8859-1" output="redirector.out"
-                        inputencoding="ISO8859_1" outputencoding="UTF8" />
-        </exec>
-    </target>
-
-    <target name="redirector16" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector inputstring="exit"
-                        output="redirector16.out" error="redirector16.err" />
-        </exec>
-        <condition property="16pass">
-            <and>
-                <available file="redirector16.out" type="file" />
-                <available file="redirector16.err" type="file" />
-            </and>
-        </condition>
-        <fail unless="16pass">Files were not created.</fail>
-    </target>
-
-    <target name="redirector17" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <redirector inputstring="exit" createemptyfiles="false"
-                        output="redirector17.out" error="redirector17.err" />
-        </exec>
-        <condition property="17fail">
-            <or>
-                <available file="redirector17.out" type="file" />
-                <available file="redirector17.err" type="file" />
-            </or>
-        </condition>
-        <fail if="17fail">Files were created.</fail>
-    </target>
-
-    <target name="redirector18" depends="init" if="test.can.run">
-        <exec executable="sh">
-            <arg value="parrot.sh"/>
-            <arg value="${ant.file}" />
-            <redirector alwayslog="true" logerror="true"
-                        outputproperty="redirector.out" />
-        </exec>
-        <fail message="property redirector.out has unexpected content">
-            <condition>
-                <not>
-                    <equals arg1="${ant.file} out" arg2="${redirector.out}" />
-                </not>
-            </condition>
-        </fail>
-    </target>
-
-    <!-- test will succeed as the OS wont match-->
-    <target name="testExecUnknownOS">
-      <exec executable="nonexistent-program-we-expect"
-        failonerror="true"
-        os="ZX81">
-      </exec>
-    </target>
-
-    <target name="testExecOSFamily">
-      <exec executable="uptime"
-        failonerror="true"
-        osFamily="unix">
-      </exec>
-      <exec executable="cmd.exe"
-        failonerror="true"
-        osFamily="winnt">
-        <arg value="/c" />
-        <arg value="time /t" />
-      </exec>
-    </target>    
-    
-    <target name="testExecInconsistentSettings">
-      <exec executable="nonexistent-program-we-expect"
-        failonerror="true"
-        osFamily="WIN9X"
-        os="linux unix">
-      </exec>
-    </target>
-    
     <target name="cleanup">
-        <delete>
-            <fileset file="${logFile}" />
-            <fileset dir="${basedir}" includes="redirect*" />
-            <fileset dir="${basedir}" includes="redirector*" />
-        </delete>
+        <delete file="${logFile}" />
     </target>
 </project>

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntClassLoader.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntClassLoader.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntClassLoader.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntClassLoader.java Mon May  3 17:44:21 2010
@@ -22,8 +22,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -37,14 +35,11 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.Vector;
-import java.util.Locale;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.CollectionUtils;
 import org.apache.tools.ant.util.FileUtils;
@@ -213,9 +208,9 @@ public class AntClassLoader extends Clas
     private ClassLoader parent = null;
 
     /**
-     * A hashtable of zip files opened by the classloader (File to ZipFile).
+     * A hashtable of zip files opened by the classloader (File to JarFile).
      */
-    private Hashtable zipFiles = new Hashtable();
+    private Hashtable jarFiles = new Hashtable();
 
     /** Static map of jar file/time to manifest class-path entries */
     private static Map/*<String,String>*/ pathMap = Collections.synchronizedMap(new HashMap());
@@ -488,23 +483,16 @@ public class AntClassLoader extends Clas
                 + pathComponent.lastModified() + "-" + pathComponent.length();
         String classpath = (String) pathMap.get(absPathPlusTimeAndLength);
         if (classpath == null) {
-            ZipFile jarFile = null;
-            InputStream manifestStream = null;
+            JarFile jarFile = null;
             try {
-                jarFile = new ZipFile(pathComponent);
-                manifestStream = jarFile.getInputStream(new ZipEntry("META-INF/MANIFEST.MF"));
-
-                if (manifestStream == null) {
+                jarFile = new JarFile(pathComponent);
+                Manifest manifest = jarFile.getManifest();
+                if (manifest == null) {
                     return;
                 }
-                Reader manifestReader = new InputStreamReader(manifestStream, "UTF-8");
-                org.apache.tools.ant.taskdefs.Manifest manifest
-                        = new org.apache.tools.ant.taskdefs.Manifest(manifestReader);
-                classpath = manifest.getMainSection().getAttributeValue("Class-Path");
-            } catch (org.apache.tools.ant.taskdefs.ManifestException e) {
-                // ignore
+                classpath = manifest.getMainAttributes()
+                    .getValue(Attributes.Name.CLASS_PATH);
             } finally {
-                FileUtils.close(manifestStream);
                 if (jarFile != null) {
                     jarFile.close();
                 }
@@ -783,27 +771,27 @@ public class AntClassLoader extends Clas
      */
     private InputStream getResourceStream(File file, String resourceName) {
         try {
-            ZipFile zipFile = (ZipFile) zipFiles.get(file);
-            if (zipFile == null && file.isDirectory()) {
+            JarFile jarFile = (JarFile) jarFiles.get(file);
+            if (jarFile == null && file.isDirectory()) {
                 File resource = new File(file, resourceName);
                 if (resource.exists()) {
                     return new FileInputStream(resource);
                 }
             } else {
-                if (zipFile == null) {
+                if (jarFile == null) {
                     if (file.exists()) {
-                        zipFile = new ZipFile(file);
-                        zipFiles.put(file, zipFile);
+                        jarFile = new JarFile(file);
+                        jarFiles.put(file, jarFile);
                     } else {
                         return null;
                     }
                     //to eliminate a race condition, retrieve the entry
                     //that is in the hash table under that filename
-                    zipFile = (ZipFile) zipFiles.get(file);
+                    jarFile = (JarFile) jarFiles.get(file);
                 }
-                ZipEntry entry = zipFile.getEntry(resourceName);
+                JarEntry entry = jarFile.getJarEntry(resourceName);
                 if (entry != null) {
-                    return zipFile.getInputStream(entry);
+                    return jarFile.getInputStream(entry);
                 }
             }
         } catch (Exception e) {
@@ -997,8 +985,8 @@ public class AntClassLoader extends Clas
      */
     protected URL getResourceURL(File file, String resourceName) {
         try {
-            ZipFile zipFile = (ZipFile) zipFiles.get(file);
-            if (zipFile == null && file.isDirectory()) {
+            JarFile jarFile = (JarFile) jarFiles.get(file);
+            if (jarFile == null && file.isDirectory()) {
                 File resource = new File(file, resourceName);
 
                 if (resource.exists()) {
@@ -1009,15 +997,17 @@ public class AntClassLoader extends Clas
                     }
                 }
             } else {
-                if (zipFile == null) {
+                if (jarFile == null) {
                     if (file.exists()) {
-                        zipFile = new ZipFile(file);
-                        zipFiles.put(file, zipFile);
+                        jarFile = new JarFile(file);
+                        jarFiles.put(file, jarFile);
                     } else {
                         return null;
                     }
+                    // potential race-condition
+                    jarFile = (JarFile) jarFiles.get(file);
                 }
-                ZipEntry entry = zipFile.getEntry(resourceName);
+                JarEntry entry = jarFile.getJarEntry(resourceName);
                 if (entry != null) {
                     try {
                         return new URL("jar:" + FILE_UTILS.getFileURL(file) + "!/" + entry);
@@ -1180,15 +1170,11 @@ public class AntClassLoader extends Clas
         if (container.isDirectory()) {
             return null;
         }
-        JarFile jarFile = null;
-        try {
-            jarFile = new JarFile(container);
-            return jarFile.getManifest();
-        } finally {
-            if (jarFile != null) {
-                jarFile.close();
-            }
+        JarFile jarFile = (JarFile) jarFiles.get(container);
+        if (jarFile == null) {
+            return null;
         }
+        return jarFile.getManifest();
     }
 
     /**
@@ -1207,23 +1193,12 @@ public class AntClassLoader extends Clas
         if (container.isDirectory()) {
             return null;
         }
-        JarFile jarFile = null;
-        InputStream is = null;
-        try {
-            jarFile = new JarFile(container);
-            JarEntry ent = jarFile.getJarEntry(entry);
-            if (ent != null) {
-                // must read the input in order to obtain certificates
-                is = jarFile.getInputStream(ent);
-                while (is.read() >= 0);
-            }
-            return ent == null ? null : ent.getCertificates();
-        } finally {
-            FileUtils.close(is);
-            if (jarFile != null) {
-                jarFile.close();
-            }
+        JarFile jarFile = (JarFile) jarFiles.get(container);
+        if (jarFile == null) {
+            return null;
         }
+        JarEntry ent = jarFile.getJarEntry(entry);
+        return ent == null ? null : ent.getCertificates();
     }
 
     /**
@@ -1280,7 +1255,7 @@ public class AntClassLoader extends Clas
                 sealedString = mainAttributes.getValue(Name.SEALED);
             }
         }
-        if (sealedString != null && sealedString.toLowerCase(Locale.ENGLISH).equals("true")) {
+        if (sealedString != null && sealedString.equalsIgnoreCase("true")) {
             try {
                 sealBase = new URL(FileUtils.getFileUtils().toURI(container.getAbsolutePath()));
             } catch (MalformedURLException e) {
@@ -1413,15 +1388,15 @@ public class AntClassLoader extends Clas
      * files are closed.
      */
     public synchronized void cleanup() {
-        for (Enumeration e = zipFiles.elements(); e.hasMoreElements();) {
-            ZipFile zipFile = (ZipFile) e.nextElement();
+        for (Enumeration e = jarFiles.elements(); e.hasMoreElements();) {
+            JarFile jarFile = (JarFile) e.nextElement();
             try {
-                zipFile.close();
+                jarFile.close();
             } catch (IOException ioe) {
                 // ignore
             }
         }
-        zipFiles = new Hashtable();
+        jarFiles = new Hashtable();
         if (project != null) {
             project.removeBuildListener(this);
         }

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntTypeDefinition.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntTypeDefinition.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntTypeDefinition.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/AntTypeDefinition.java Mon May  3 17:44:21 2010
@@ -146,7 +146,7 @@ public class AntTypeDefinition {
      * class and the definition class is not
      * assignable from the assignable class.
      * @param project the current project.
-     * @return the exposed class - may return null if upable to load the class
+     * @return the exposed class - may return null if unable to load the class
      */
     public Class getExposedClass(Project project) {
         if (adaptToClass != null) {

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ComponentHelper.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ComponentHelper.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ComponentHelper.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ComponentHelper.java Mon May  3 17:44:21 2010
@@ -202,7 +202,7 @@ public class ComponentHelper  {
     /**
      * @return A deep copy of the restrictredDefinition
      */
-    private Map getRestrictedDefintion() {
+    private Map getRestrictedDefinition() {
         Map result = new HashMap();
         synchronized (restrictedDefinitions) {
             for(Iterator i = restrictedDefinitions.entrySet().iterator();
@@ -241,7 +241,7 @@ public class ComponentHelper  {
         synchronized (this) {
             checkedNamespaces.addAll(inheritedCheckedNamespace);
         }
-        Map inheritedRestrictedDef = helper.getRestrictedDefintion();
+        Map inheritedRestrictedDef = helper.getRestrictedDefinition();
         synchronized (restrictedDefinitions) {
             restrictedDefinitions.putAll(inheritedRestrictedDef);
         }

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=940531&r1=940530&r2=940531&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 Mon May  3 17:44:21 2010
@@ -180,6 +180,9 @@ public final class Diagnostics {
      * @since Ant 1.8.0
      */
     private static URL getClassLocation(Class clazz) {
+        if (clazz.getProtectionDomain().getCodeSource() == null) {
+            return null;
+        }
         return clazz.getProtectionDomain().getCodeSource().getLocation();
     }
 

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DynamicElement.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DynamicElement.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DynamicElement.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/DynamicElement.java Mon May  3 17:44:21 2010
@@ -28,7 +28,7 @@ public interface DynamicElement {
     /**
      * Create an element with the given name
      *
-     * @param name the element nbame
+     * @param name the element name
      * @throws BuildException when any error occurs
      * @return the element created
      */

Propchange: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ExtensionPoint.java
            ('svn:mergeinfo' removed)

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/IntrospectionHelper.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/IntrospectionHelper.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/IntrospectionHelper.java Mon May  3 17:44:21 2010
@@ -378,7 +378,7 @@ public final class IntrospectionHelper {
     public void setAttribute(Project p, Object element, String attributeName,
             Object value) throws BuildException {
         AttributeSetter as = (AttributeSetter) attributeSetters.get(
-                attributeName.toLowerCase(Locale.US));
+                attributeName.toLowerCase(Locale.ENGLISH));
         if (as == null && value != null) {
             if (element instanceof DynamicAttributeNS) {
                 DynamicAttributeNS dc = (DynamicAttributeNS) element;
@@ -391,7 +391,7 @@ public final class IntrospectionHelper {
             }
             if (element instanceof DynamicAttribute) {
                 DynamicAttribute dc = (DynamicAttribute) element;
-                dc.setDynamicAttribute(attributeName.toLowerCase(Locale.US), value.toString());
+                dc.setDynamicAttribute(attributeName.toLowerCase(Locale.ENGLISH), value.toString());
                 return;
             }
             if (attributeName.indexOf(':') >= 0) {
@@ -529,7 +529,7 @@ public final class IntrospectionHelper {
         }
         NestedCreator nc = null;
         if (uri.equals(parentUri) || uri.length() == 0) {
-            nc = (NestedCreator) nestedCreators.get(name.toLowerCase(Locale.US));
+            nc = (NestedCreator) nestedCreators.get(name.toLowerCase(Locale.ENGLISH));
         }
         if (nc == null) {
             nc = createAddTypeCreator(project, parent, elementName);
@@ -573,7 +573,7 @@ public final class IntrospectionHelper {
         if (nestedElement == null && parent instanceof DynamicElement) {
             DynamicElement dc = (DynamicElement) parent;
             nestedElement =
-                dc.createDynamicElement(localName.toLowerCase(Locale.US));
+                dc.createDynamicElement(localName.toLowerCase(Locale.ENGLISH));
         }
         return nestedElement;
     }
@@ -740,7 +740,7 @@ public final class IntrospectionHelper {
     public boolean supportsReflectElement(
         String parentUri, String elementName) {
         String name = ProjectHelper.extractNameFromComponentName(elementName);
-        if (!nestedCreators.containsKey(name.toLowerCase(Locale.US))) {
+        if (!nestedCreators.containsKey(name.toLowerCase(Locale.ENGLISH))) {
             return false;
         }
         String uri = ProjectHelper.extractUriFromComponentName(elementName);
@@ -781,7 +781,7 @@ public final class IntrospectionHelper {
         if (elementName == null) {
             return;
         }
-        NestedCreator ns = (NestedCreator) nestedCreators.get(elementName.toLowerCase(Locale.US));
+        NestedCreator ns = (NestedCreator) nestedCreators.get(elementName.toLowerCase(Locale.ENGLISH));
         if (ns == null) {
             return;
         }
@@ -1274,7 +1274,7 @@ public final class IntrospectionHelper {
      * @return the lower-cased method name with the prefix removed.
      */
     private static String getPropertyName(String methodName, String prefix) {
-        return methodName.substring(prefix.length()).toLowerCase(Locale.US);
+        return methodName.substring(prefix.length()).toLowerCase(Locale.ENGLISH);
     }
 
     /**

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Project.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Project.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Project.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/Project.java Mon May  3 17:44:21 2010
@@ -48,6 +48,7 @@ import org.apache.tools.ant.util.Collect
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.StringUtils;
+import org.apache.tools.ant.util.VectorSet;
 
 /**
  * Central representation of an Ant project. This class defines an
@@ -425,10 +426,10 @@ public class Project implements Resource
     }
 
     /**
-         * Return a copy of the list of build listeners for the project.
-         * 
-         * @return a list of build listeners for the project
-         */
+     * Return a copy of the list of build listeners for the project.
+     * 
+     * @return a list of build listeners for the project
+     */
     public Vector getBuildListeners() {
         synchronized (listenersLock) {
             Vector r = new Vector(listeners.length);
@@ -1025,6 +1026,19 @@ public class Project implements Resource
     }
 
     /**
+     * Return the current task definition map. The returned map is a
+     * copy of the &quot;live&quot; definitions.
+     *
+     * @return a map of from task name to implementing class
+     *         (String to Class).
+     *
+     * @since Ant 1.8.1
+     */
+    public Map getCopyOfTaskDefinitions() {
+        return new HashMap(getTaskDefinitions());
+    }
+
+    /**
      * Add a new datatype definition.
      * Attempting to override an existing definition with an
      * equivalent one (i.e. with the same classname) results in
@@ -1054,6 +1068,19 @@ public class Project implements Resource
     }
 
     /**
+     * Return the current datatype definition map. The returned
+     * map is a copy pf the &quot;live&quot; definitions.
+     *
+     * @return a map of from datatype name to implementing class
+     *         (String to Class).
+     *
+     * @since Ant 1.8.1
+     */
+    public Map getCopyOfDataTypeDefinitions() {
+        return new HashMap(getDataTypeDefinitions());
+    }
+
+    /**
      * Add a <em>new</em> target to the project.
      *
      * @param target The target to be added to the project.
@@ -1124,6 +1151,16 @@ public class Project implements Resource
     }
 
     /**
+     * Return the map of targets. The returned map
+     * is a copy of the &quot;live&quot; targets.
+     * @return a map from name to target (String to Target).
+     * @since Ant 1.8.1
+     */
+    public Map getCopyOfTargets() {
+        return new HashMap(targets);
+    }
+
+    /**
      * Create a new instance of a task, adding it to a list of
      * created tasks for later invalidation. This causes all tasks
      * to be remembered until the containing project is removed
@@ -1763,7 +1800,7 @@ public class Project implements Resource
      */
     public final Vector topoSort(String[] root, Hashtable targetTable,
                                  boolean returnAll) throws BuildException {
-        Vector ret = new Vector();
+        Vector ret = new VectorSet();
         Hashtable state = new Hashtable();
         Stack visiting = new Stack();
 
@@ -1971,6 +2008,19 @@ public class Project implements Resource
     }
 
     /**
+     * Return a map of the references in the project (String to
+     * Object).  The returned hashtable is a copy of the
+     * &quot;live&quot; references.
+     *
+     * @return a map of the references in the project (String to Object).
+     *
+     * @since Ant 1.8.1
+     */
+    public Map getCopyOfReferences() {
+        return new HashMap(references);
+    }
+
+    /**
      * Look up a reference by its key (ID).
      *
      * @param key The key for the desired reference.

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ProjectHelper.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ProjectHelper.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ProjectHelper.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/ProjectHelper.java Mon May  3 17:44:21 2010
@@ -19,6 +19,8 @@ package org.apache.tools.ant;
 
 import java.io.File;
 import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
 
@@ -89,6 +91,7 @@ public class ProjectHelper {
     // that read build files using ProjectHelper ).
 
     private Vector importStack = new Vector();
+    private List extensionStack = new LinkedList();
 
     /**
      *  Import stack.
@@ -101,6 +104,18 @@ public class ProjectHelper {
         return importStack;
     }
 
+    /**
+     * Extension stack.
+     * Used to keep track of targets that extend extension points.
+     *
+     * @return a list of two element string arrays where the first
+     * element is the name of the extensionpoint and the second the
+     * name of the target
+     */
+    public List getExtensionStack() {
+        return extensionStack;
+    }
+
     private final static ThreadLocal targetPrefix = new ThreadLocal() {
             protected Object initialValue() {
                 return (String) null;
@@ -213,7 +228,7 @@ public class ProjectHelper {
      * Get the first project helper found in the classpath
      * 
      * @return an project helper, never <code>null</code>
-     * @see #getHelpers()
+     * @see org.apache.tools.ant.ProjectHelperRepository#getHelpers()
      */
     public static ProjectHelper getProjectHelper() {
         return (ProjectHelper) ProjectHelperRepository.getInstance().getHelpers().next();
@@ -261,7 +276,7 @@ public class ProjectHelper {
             // reflect these into the target
             String value = replaceProperties(project, attrs.getValue(i), project.getProperties());
             try {
-                ih.setAttribute(project, target, attrs.getName(i).toLowerCase(Locale.US), value);
+                ih.setAttribute(project, target, attrs.getName(i).toLowerCase(Locale.ENGLISH), value);
             } catch (BuildException be) {
                 // id attribute must be set externally
                 if (!attrs.getName(i).equals("id")) {

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/PropertyHelper.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/PropertyHelper.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/PropertyHelper.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/PropertyHelper.java Mon May  3 17:44:21 2010
@@ -188,14 +188,18 @@ public class PropertyHelper implements G
         public String parsePropertyName(
             String s, ParsePosition pos, ParseNextProperty notUsed) {
             int index = pos.getIndex();
-            if (s.indexOf("${", index) == index) {
-                int end = s.indexOf('}', index);
+            //directly check near, triggering characters:
+            if (s.length() - index >= 3
+                    && '$' == s.charAt(index) && '{' == s.charAt(index + 1)) {
+                int start = index + 2;
+                //defer to String.indexOf() for protracted check:
+                int end = s.indexOf('}', start);
                 if (end < 0) {
-                    throw new BuildException("Syntax error in property: " + s);
+                    throw new BuildException("Syntax error in property: "
+                            + s.substring(index));
                 }
-                int start = index + 2;
                 pos.setIndex(end + 1);
-                return s.substring(start, end);
+                return start == end ? "" :  s.substring(start, end);
             }
             return null;
         }
@@ -213,8 +217,16 @@ public class PropertyHelper implements G
             public String parsePropertyName(
                 String s, ParsePosition pos, ParseNextProperty notUsed) {
                 int index = pos.getIndex();
-                if (s.indexOf("$$", index) == index) {
-                    pos.setIndex(++index);
+                if (s.length() - index >= 2) {
+                    /* check for $$; if found, advance by one--
+                     * this expander is at the bottom of the stack
+                     * and will thus be the last consulted,
+                     * so the next thing that ParseProperties will do
+                     * is advance the parse position beyond the second $
+                     */
+                    if ('$' == s.charAt(index) && '$' == s.charAt(++index)) {
+                        pos.setIndex(index);
+                    }
                 }
                 return null;
             }

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/RuntimeConfigurable.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/RuntimeConfigurable.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/RuntimeConfigurable.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/RuntimeConfigurable.java Mon May  3 17:44:21 2010
@@ -22,10 +22,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Iterator;
 
@@ -37,10 +36,12 @@ import org.xml.sax.helpers.AttributeList
  * Wrapper class that holds the attributes of an element, its children, and
  * any text within it. It then takes care of configuring that element at
  * runtime.
- *
  */
 public class RuntimeConfigurable implements Serializable {
 
+    /** Serialization version */
+    private static final long serialVersionUID = 1L;
+
     /** Empty Hashtable. */
     private static final Hashtable EMPTY_HASHTABLE = new Hashtable(0);
 
@@ -66,22 +67,15 @@ public class RuntimeConfigurable impleme
 
     /** Attribute names and values. While the XML spec doesn't require
      *  preserving the order ( AFAIK ), some ant tests do rely on the
-     *  exact order. The following code is copied from AttributeImpl.
-     *  We could also just use SAX2 Attributes and convert to SAX1 ( DOM
-     *  attribute Nodes can also be stored in SAX2 Attributes )
+     *  exact order. 
      * The only exception to this order is the treatment of
      * refid. A number of datatypes check if refid is set
      * when other attributes are set. This check will not
      * work if the build script has the other attribute before
      * the "refid" attribute, so now (ANT 1.7) the refid
      * attribute will be processed first.
-     * (Other than treatment of refid, could just use a LinkedHashMap,
-     * but peterreilly's rev 452635 includes no regression test.)
      */
-    private List/*<String>*/ attributeNames = null;
-
-    /** Map of attribute names to values */
-    private Map/*<String,String>*/ attributeMap = null;
+    private LinkedHashMap/*<String, String>*/ attributeMap = null;
 
     /** Text appearing within the element. */
     private StringBuffer characters = null;
@@ -188,16 +182,17 @@ public class RuntimeConfigurable impleme
         if (name.equalsIgnoreCase(ProjectHelper.ANT_TYPE)) {
             this.polyType = value;
         } else {
-            if (attributeNames == null) {
-                attributeNames = new ArrayList();
-                attributeMap = new HashMap();
+            if (attributeMap == null) {
+                attributeMap = new LinkedHashMap();
             }
-            if (name.toLowerCase(Locale.US).equals("refid")) {
-                attributeNames.add(0, name);
+            if (name.equalsIgnoreCase("refid") && !attributeMap.isEmpty()) {
+                LinkedHashMap newAttributeMap = new LinkedHashMap();
+                newAttributeMap.put(name, value);
+                newAttributeMap.putAll(attributeMap);
+                attributeMap = newAttributeMap;
             } else {
-                attributeNames.add(name);
+                attributeMap.put(name, value);
             }
-            attributeMap.put(name, value);
             if (name.equals("id")) {
                 this.id = value;
             }
@@ -209,7 +204,6 @@ public class RuntimeConfigurable impleme
      * @param name the name of the attribute to be removed.
      */
     public synchronized void removeAttribute(String name) {
-        attributeNames.remove(name);
         attributeMap.remove(name);
     }
 
@@ -382,10 +376,11 @@ public class RuntimeConfigurable impleme
         IntrospectionHelper ih =
             IntrospectionHelper.getHelper(p, target.getClass());
 
-        if (attributeNames != null) {
-            for (int i = 0; i < attributeNames.size(); i++) {
-                String name = (String) attributeNames.get(i);
-                String value = (String) attributeMap.get(name);
+        if (attributeMap != null) {
+            for (Iterator iter = attributeMap.entrySet().iterator(); iter.hasNext();) {
+                Map.Entry entry = (Map.Entry) iter.next();
+                String name = (String) entry.getKey();
+                String value = (String) entry.getValue();
 
                 // reflect these into the target
                 Object attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value);
@@ -395,11 +390,11 @@ public class RuntimeConfigurable impleme
                     // id attribute must be set externally
                     if (name.equals("id")) {
                         // Do nothing
-                    } else  if (getElementTag() == null) {
+                    } else if (getElementTag() == null) {
                         throw be;
                     } else {
                         throw new BuildException(
-                            getElementTag() +  " doesn't support the \""
+                            getElementTag() + " doesn't support the \""
                             + be.getAttribute() + "\" attribute", be);
                     }
                 } catch (BuildException be) {
@@ -434,7 +429,6 @@ public class RuntimeConfigurable impleme
         maybeConfigure(p);
     }
 
-
     /**
      * Apply presets, attributes and text are set if not currently set.
      * Nested elements are prepended.

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/ClassConstants.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/ClassConstants.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/ClassConstants.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/ClassConstants.java Mon May  3 17:44:21 2010
@@ -22,7 +22,7 @@ import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import org.apache.tools.ant.BuildException;
-
+import org.apache.tools.ant.util.ResourceUtils;
 
 /**
  * Assembles the constants declared in a Java class in
@@ -104,7 +104,7 @@ public final class ClassConstants
             if (clazz == null || clazz.length() == 0) {
                 ch = -1;
             } else {
-                final byte[] bytes = clazz.getBytes("ISO-8859-1");
+                final byte[] bytes = clazz.getBytes(ResourceUtils.ISO_8859_1);
                 try {
                     final Class javaClassHelper =
                         Class.forName(JAVA_CLASS_HELPER);

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SortFilter.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SortFilter.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SortFilter.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SortFilter.java Mon May  3 17:44:21 2010
@@ -47,9 +47,9 @@ import org.apache.tools.ant.types.Parame
  * </pre>
  * 
  * <p>
- * Sort all files <code>*.txt</code> from <i>src</i> location in descendant
- * order and copy them into <i>build</i> location. The lines of each file are
- * sorted in ascendant order comparing the lines via the
+ * Sort all files <code>*.txt</code> from <i>src</i> location and copy
+ * them 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>
  * 
@@ -57,9 +57,7 @@ import org.apache.tools.ant.types.Parame
  *   &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;param name=&quot;reverse&quot; value=&quot;true&quot;/&gt;
- *           &lt;/sortfilter/&gt;
+ *           &lt;sortfilter reverse=&quot;true&quot;/&gt;
  *       &lt;/filterchain&gt;
  *   &lt;/copy&gt;
  * </pre>
@@ -75,9 +73,9 @@ import org.apache.tools.ant.types.Parame
  *   &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;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;/sortfilter/&gt;
+ *           &lt;/filterreader&gt;
  *       &lt;/filterchain&gt;
  *   &lt;/copy&gt;
  * </pre>
@@ -102,8 +100,23 @@ import org.apache.tools.ant.types.Parame
  *           }
  * </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>
+ * 
  * <p> If parameter <code>comparator</code> is present, then
- * <code>reverse</code> parameter will not taken into account.  </p>
+ * <code>reverse</code> parameter will not be taken into account.  </p>
  * 
  * @since Ant 1.8.0
  */

Modified: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SuffixLines.java
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SuffixLines.java?rev=940531&r1=940530&r2=940531&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SuffixLines.java (original)
+++ ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SuffixLines.java Mon May  3 17:44:21 2010
@@ -126,8 +126,8 @@ public final class SuffixLines
      *               May be <code>null</code>, in which case no suffix
      *               is added.
      */
-    public void setSuffix(final String append) {
-        this.suffix = append;
+    public void setSuffix(final String suffix) {
+        this.suffix = suffix;
     }
 
     /**

Propchange: ant/core/branches/run-single-test-method/src/main/org/apache/tools/ant/filters/SuffixLines.java
            ('svn:mergeinfo' removed)



Mime
View raw message