Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
--- ant/build.xml	9 Oct 2001 08:56:26 -0000	1.41
+++ ant/build.xml	15 Oct 2001 19:20:18 -0000
@@ -35,7 +35,10 @@ 
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
-	<pathelement location="${binroot}/ant/release/modules/ext/ant.jar"/>
+        <fileset dir="${binroot}/ant/release/modules/ext">
+          <include name="ant.jar"/>
+          <include name="ant-1.*.jar"/>
+        </fileset>
 	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
@@ -178,6 +181,7 @@ 
         <include name="org/apache/tools/ant/types/*.java"/>
         <include name="org/apache/tools/ant/util/*.java"/>
         <include name="org/apache/tools/ant/util/regexp/RegexpMatcher.java"/>
+        <include name="org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java"/>
         <!-- Do not forget about the package list for Javadoc below... -->
       </fileset>
     </copy>
Index: ant/manifest.mf
===================================================================
RCS file: /cvs/ant/manifest.mf,v
--- ant/manifest.mf	27 Sep 2001 18:41:13 -0000	1.34
+++ ant/manifest.mf	15 Oct 2001 19:20:18 -0000
@@ -9,7 +9,7 @@ 
 OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser]
 X-Comment-2: Cf. AntActionInstance, new XXX(Action) constructors
 OpenIDE-Module-Java-Dependencies: Java > 1.3
-Class-Path: ext/ant.jar ext/ant-optional.jar docs/ant-manual.zip
+Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar docs/ant-manual.zip
 
 Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class
 OpenIDE-Module-Class: Loader
Index: ant/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs
===================================================================
RCS file: /cvs/ant/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs,v
--- ant/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs	7 Sep 2001 00:27:16 -0000	1.8
+++ ant/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs	15 Oct 2001 19:20:18 -0000
@@ -14,7 +14,7 @@ 
 <!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" "http://java.sun.com/products/javahelp/helpset_1_0.dtd">
 
 <helpset version="1.0">
-  <title>Ant 1.4 Manual</title>
+  <title>Ant 1.4.1 Manual</title>
   <maps>
      <homeID>org.apache.tools.ant.module.ant-docs</homeID>
      <mapref location="Map.jhm"/>
Index: ant/javahelp/org/apache/tools/ant/module/docs/TOC.toc
===================================================================
RCS file: /cvs/ant/javahelp/org/apache/tools/ant/module/docs/TOC.toc,v
--- ant/javahelp/org/apache/tools/ant/module/docs/TOC.toc	7 Sep 2001 00:27:16 -0000	1.12
+++ ant/javahelp/org/apache/tools/ant/module/docs/TOC.toc	15 Oct 2001 19:20:19 -0000
@@ -13,7 +13,7 @@ 
 -->
 <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
 <toc version="1.0">
-    <tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.4 Manual
+    <tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.4.1 Manual
       <tocitem target="org.apache.tools.ant.module.ant-docs.libdeps">Optional Libraries</tocitem>
       <tocitem target="org.apache.tools.ant.module.ant-docs.using">Using</tocitem>
       <tocitem>Built-in Tasks
Index: ant/src/org/apache/tools/ant/module/resources/Bundle.properties
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/resources/Bundle.properties,v
--- ant/src/org/apache/tools/ant/module/resources/Bundle.properties	9 Oct 2001 01:22:39 -0000	1.10
+++ ant/src/org/apache/tools/ant/module/resources/Bundle.properties	15 Oct 2001 19:20:57 -0000
@@ -18,10 +18,10 @@ 
 Templates/Ant/SampleProject.xml=Sample Ant Project
 Templates/Ant/CustomTask.java=Custom Task
 Templates/Ant/Shortcut.txt=Shortcut to Target
-Menu/Help/HelpShortcuts/org-apache-tools-ant-module-mainpage.xml=Ant 1.4 Manual
-Actions/Help/org-apache-tools-ant-module-mainpage.xml=Ant 1.4 Manual
+Menu/Help/HelpShortcuts/org-apache-tools-ant-module-mainpage.xml=Ant 1.4.1 Manual
+Actions/Help/org-apache-tools-ant-module-mainpage.xml=Ant 1.4.1 Manual
 # #14574:
-Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.4 API Javadoc
+Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.4.1 API Javadoc
 Services/MIMEResolver/org-apache-tools-ant-module-mime-resolver.xml=Ant <project> XML files
 Services/org-apache-tools-ant-module-AntSettings.settings=Ant Settings
 
Index: ant/src/org/apache/tools/ant/module/resources/SampleProject.xml_
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/resources/SampleProject.xml_,v
--- ant/src/org/apache/tools/ant/module/resources/SampleProject.xml_	7 Sep 2001 00:27:16 -0000	1.4
+++ ant/src/org/apache/tools/ant/module/resources/SampleProject.xml_	15 Oct 2001 19:20:58 -0000
@@ -8,7 +8,7 @@ 
 <project name="myapp" basedir="." default="all">
 
     <!-- Don't worry if you don't know the Ant syntax completely or need help on some tasks! -->
-    <!-- The standard Ant documentation is bundled. See Help | Shortcuts | Ant 1.4 Documentation. -->
+    <!-- The standard Ant documentation is bundled. See Help | Shortcuts | Ant 1.4.1 Documentation. -->
 
     <target name="init">
         <!-- You can set up any variables you want used throughout the script here. -->
Index: ant/www/plans/features.xml
===================================================================
RCS file: /cvs/ant/www/plans/features.xml,v
--- ant/www/plans/features.xml	27 Sep 2001 18:56:18 -0000	1.10
+++ ant/www/plans/features.xml	15 Oct 2001 19:20:58 -0000
@@ -275,15 +275,15 @@ 
     </roles>
   </requirement>
 
-  <requirement name="Upgrade to Ant 1.4" target="3.3" priority="medium" user-impact="high" duration="1" percentage-complete="100">
+  <requirement name="Upgrade to Ant 1.4.1" target="3.3" priority="medium" user-impact="high" duration="1" percentage-complete="100">
     <short-description>
-      Upgrade the bundled Ant library to 1.4.
+      Upgrade the bundled Ant library to 1.4.1.
     </short-description>
     <long-description>
       <body>
         <p>
           Previously Ant 1.3 was used in the Ant module. For NetBeans 3.3,
-          Ant 1.4 should be used.
+          Ant 1.4.1 should be used.
         </p>
       </body>
     </long-description>
Index: apisupport/build.xml
===================================================================
RCS file: /cvs/apisupport/build.xml,v
--- apisupport/build.xml	9 Oct 2001 08:56:27 -0000	1.49
+++ apisupport/build.xml	15 Oct 2001 19:20:59 -0000
@@ -46,8 +46,10 @@ 
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
         <pathelement location="../ant/netbeans/modules/ant.jar"/>
-        <!-- Currently automatically in classpath, but a future Ant may change that: -->
-        <pathelement location="${binroot}/ant/release/modules/ext/ant.jar"/>
+        <fileset dir="${binroot}/ant/release/modules/ext">
+          <include name="ant.jar"/>
+          <include name="ant-1.*.jar"/>
+        </fileset>
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
Index: core/test/build.xml
===================================================================
RCS file: /cvs/core/test/build.xml,v
--- core/test/build.xml	11 Oct 2001 16:06:29 -0000	1.11
+++ core/test/build.xml	15 Oct 2001 19:20:59 -0000
@@ -264,8 +264,9 @@ 
         <property name="xtest.ide.path" refid="xtest.ide.path">
             <classpath id="xtest.ide.path">
                 <!-- XXX this is bad, it assumes the Ant module is installed! -->
-                <pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />
-                <pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />
+                <fileset dir="${netbeans.test.home}/modules/ext">
+                    <include name="ant*.jar"/>
+                </fileset>
             </classpath>
         </property>
 
Index: java/test/build.xml
===================================================================
RCS file: /cvs/java/test/build.xml,v
--- java/test/build.xml	11 Oct 2001 16:08:32 -0000	1.10
+++ java/test/build.xml	15 Oct 2001 19:20:59 -0000
@@ -251,8 +251,10 @@ 
         <property name="test.target" value="ide_test_helper"/>
         <property name="xtest.ide.path" refid="xtest.ide.path">
             <classpath id="xtest.ide.path">
-                <pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />
-                <pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />
+                <!-- XXX this is bad, it assumes the Ant module is installed! -->
+                <fileset dir="${netbeans.test.home}/modules/ext">
+                    <include name="ant*.jar"/>
+                </fileset>
             </classpath>
         </property>
 
Index: openide/test/build.xml
===================================================================
RCS file: /cvs/openide/test/build.xml,v
--- openide/test/build.xml	11 Oct 2001 16:07:15 -0000	1.12
+++ openide/test/build.xml	15 Oct 2001 19:20:59 -0000
@@ -261,8 +261,10 @@ 
         <property name="test.target" value="ide_test_helper"/>
         <property name="xtest.ide.path" refid="xtest.ide.path">
             <classpath id="xtest.ide.path">
-                <pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />
-                <pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />
+                <!-- XXX this is bad, it assumes the Ant module is installed! -->
+                <fileset dir="${netbeans.test.home}/modules/ext">
+                    <include name="ant*.jar"/>
+                </fileset>
             </classpath>
         </property>
 
Index: openidex/test/build.xml
===================================================================
RCS file: /cvs/openidex/test/build.xml,v
--- openidex/test/build.xml	11 Oct 2001 16:07:54 -0000	1.9
+++ openidex/test/build.xml	15 Oct 2001 19:20:59 -0000
@@ -265,8 +265,10 @@ 
         <property name="test.target" value="ide_test_helper"/>
         <property name="xtest.ide.path" refid="xtest.ide.path">
             <classpath id="xtest.ide.path">
-                <pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />
-                <pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />
+                <!-- XXX this is bad, it assumes the Ant module is installed! -->
+                <fileset dir="${netbeans.test.home}/modules/ext">
+                    <include name="ant*.jar"/>
+                </fileset>
             </classpath>
         </property>
 
Index: xtest/xtest.xml
===================================================================
RCS file: /cvs/xtest/xtest.xml,v
--- xtest/xtest.xml	9 Oct 2001 13:30:42 -0000	1.6
+++ xtest/xtest.xml	15 Oct 2001 19:20:59 -0000
@@ -34,7 +34,11 @@ 
           <include name="openide*.jar" />
         </fileset>
 	<pathelement location="../core/netbeans/lib/core.jar"/>
-        <pathelement location="../../nbextra/ant/release/modules/ext/ant.jar"/>
+        <!-- XXX stop using this! Not to mention it should use ${binroot}. -->
+        <fileset dir="../../nbextra/ant/release/modules/ext">
+          <include name="ant.jar"/>
+          <include name="ant-1.*.jar"/>
+        </fileset>
         <!-- use junit with already compiled extensions -->
 	<pathelement location="src"/>
 	<pathelement location="lib/junit.jar"/>