Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
retrieving revision 1.28.2.1
diff -u -t -r1.28.2.1 build.xml
--- ant/build.xml	2001/04/24 15:29:02	1.28.2.1
+++ ant/build.xml	2001/04/25 16:59:10
@@ -84,12 +84,9 @@
       <license name="ant-license.txt">
         For the Ant module itself:
         <file location="${license.file}"/>
-        For the Ant runtime:
+        For the Ant runtime and manual:
         <file location="Ant_License"/>
       </license>
-      <description>
-        Support for Ant build scripts.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
@@ -98,19 +95,11 @@
     <mkdir dir="test"/>
     <filter token="BUILD_NUMBER_SUBST" value="testing"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <mkdir dir="test/xtra-ant"/>
-    <unzip src="release/modules/ext/ant.jar" dest="test/xtra-ant"/>
-    <mkdir dir="test/xtra-optional"/>
-    <unzip src="release/modules/ext/ant-optional.jar" dest="test/xtra-optional"/>
     <jar jarfile="test/ant.jar" manifest="manifest-subst.mf" compress="false">
       <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
       <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
-      <!-- Wait for Ant 1.3 to be standard:
       <zipfileset src="release/modules/ext/ant.jar" excludes="META-INF/MANIFEST.MF"/>
       <zipfileset src="release/modules/ext/ant-optional.jar" excludes="META-INF/MANIFEST.MF"/>
-      -->
-      <fileset dir="test/xtra-ant" excludes="META-INF/MANIFEST.MF"/>
-      <fileset dir="test/xtra-optional" excludes="META-INF/MANIFEST.MF"/>
     </jar>
     <nbinstaller module="test/ant.jar" action="reinstall"/>
   </target>
@@ -127,6 +116,9 @@
     <delete dir="Info"/>
     <delete dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch2"/>
     <delete dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
+  </target>
+
+  <target name="real-clean" depends="clean">
     <delete dir="test"/>
   </target>
 
Index: apisupport/build.xml
===================================================================
RCS file: /cvs/apisupport/build.xml,v
retrieving revision 1.32.2.1
diff -u -t -r1.32.2.1 build.xml
--- apisupport/build.xml	2001/04/05 13:09:42	1.32.2.1
+++ apisupport/build.xml	2001/04/25 16:59:10
@@ -43,7 +43,7 @@
       <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"/>
+        <pathelement location="../ant/release/modules/ext/ant.jar"/>
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
@@ -110,11 +110,24 @@
     </makenbm>
   </target>
 
-  <target name="test" depends="compile,javahelp">
+  <target name="test-lite">
     <ant dir="lite" target="compile"/>
+    <filter token="BUILD_NUMBER_SUBST" value="testing"/>
+    <copy file="apisupport-lite.mf" tofile="apisupport-lite-subst.mf" filtering="on"/>
     <mkdir dir="test"/>
+    <jar jarfile="test/apisupport-lite.jar"
+         manifest="apisupport-lite-subst.mf"
+         compress="false">
+      <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt">
+        <include name="org/netbeans/modules/apisupport/lite/"/>
+      </fileset>
+    </jar>
+    <nbinstaller module="test/apisupport-lite.jar" action="reinstall"/>
+  </target>
+  <target name="test-main" depends="compile,javahelp">
     <filter token="BUILD_NUMBER_SUBST" value="testing"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+    <mkdir dir="test"/>
     <jar jarfile="test/apisupport.jar"
          manifest="manifest-subst.mf"
          compress="false">
@@ -125,7 +138,12 @@
       </fileset>
       <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
     </jar>
+    <nbinstaller module="test/apisupport.jar" action="reinstall"/>
+  </target>
+  <target name="test-ant" depends="compile">
+    <filter token="BUILD_NUMBER_SUBST" value="testing"/>
     <copy file="apisupport-ant.mf" tofile="apisupport-ant-subst.mf" filtering="on"/>
+    <mkdir dir="test"/>
     <jar jarfile="test/apisupport-ant.jar"
          manifest="apisupport-ant-subst.mf"
          compress="false">
@@ -133,19 +151,9 @@
         <include name="org/netbeans/modules/apisupport/ant/"/>
       </fileset>
     </jar>
-    <copy file="apisupport-lite.mf" tofile="apisupport-lite-subst.mf" filtering="on"/>
-    <jar jarfile="test/apisupport-lite.jar"
-         manifest="apisupport-lite-subst.mf"
-         compress="false">
-      <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt">
-        <include name="org/netbeans/modules/apisupport/lite/"/>
-      </fileset>
-    </jar>
-    <!-- Will not work the first time, must be manually primed. Bummer. -->
-    <nbinstaller module="test/apisupport-lite.jar" action="reinstall"/>
-    <nbinstaller module="test/apisupport.jar" action="reinstall"/>
     <nbinstaller module="test/apisupport-ant.jar" action="reinstall"/>
   </target>
+  <target name="test-everything" depends="test-lite,test-main,test-ant"/>
 
   <target name="clean">
     <delete>
@@ -160,6 +168,9 @@
     <delete file="apisupport.nbm"/>
     <delete dir="netbeans"/>
     <delete dir="Info"/>
+  </target>
+
+  <target name="real-clean" depends="clean">
     <delete dir="test"/>
   </target>
 
Index: autoupdate/build.xml
===================================================================
RCS file: /cvs/autoupdate/build.xml,v
retrieving revision 1.18
diff -u -t -r1.18 build.xml
--- autoupdate/build.xml	2001/02/23 16:01:56	1.18
+++ autoupdate/build.xml	2001/04/25 16:59:10
@@ -17,6 +17,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
@@ -29,6 +30,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../core/netbeans/lib/core.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.32.2.1
diff -u -t -r1.32.2.1 build.xml
--- core/build.xml	2001/04/12 17:31:07	1.32.2.1
+++ core/build.xml	2001/04/25 16:59:10
@@ -60,7 +60,7 @@
 
   <target name="netbeans" depends="jars,release">
     <mkdir dir="netbeans/lib/patches"/>
-    <!-- <mkdir dir="netbeans/modules/patches"/> -->
+    <mkdir dir="netbeans/modules"/>
   </target>
 
   <target name="clean">
Index: debuggercore/build.xml
===================================================================
RCS file: /cvs/debuggercore/build.xml,v
retrieving revision 1.19
diff -u -t -r1.19 build.xml
--- debuggercore/build.xml	2001/03/10 00:43:23	1.19
+++ debuggercore/build.xml	2001/04/25 16:59:10
@@ -26,6 +26,8 @@
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
         <pathelement location="../openide/openide-13javac-workaround.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
Index: debuggerjpda/build.xml
===================================================================
RCS file: /cvs/debuggerjpda/build.xml,v
retrieving revision 1.15
diff -u -t -r1.15 build.xml
--- debuggerjpda/build.xml	2001/02/13 13:37:58	1.15
+++ debuggerjpda/build.xml	2001/04/25 16:59:10
@@ -25,7 +25,11 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <target name="check">
-    <available property="jpda" classname="com.sun.jdi.ObjectReference"/>
+    <available property="jpda" classname="com.sun.jdi.ObjectReference">
+      <classpath>
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
+      </classpath>
+    </available>
   </target>
   <target name="no-such-luck" depends="check" unless="jpda">
     <echo message="Sorry, JPDA module will not be built unless you are running JDK 1.3"/>
@@ -39,6 +43,8 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
       </classpath>
     </javac>
   </target>
Index: debuggertools/build.xml
===================================================================
RCS file: /cvs/debuggertools/build.xml,v
retrieving revision 1.13
diff -u -t -r1.13 build.xml
--- debuggertools/build.xml	2001/02/13 13:37:58	1.13
+++ debuggertools/build.xml	2001/04/25 16:59:10
@@ -28,6 +28,8 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
       </classpath>
     </javac>
   </target>
Index: form/build.xml
===================================================================
RCS file: /cvs/form/build.xml,v
retrieving revision 1.19.2.2
diff -u -t -r1.19.2.2 build.xml
--- form/build.xml	2001/04/04 08:50:52	1.19.2.2
+++ form/build.xml	2001/04/25 16:59:10
@@ -20,6 +20,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="tojar" classname="org.netbeans.nbbuild.ToJar" classpath="../nbbuild/nbantext.jar"/>
@@ -36,6 +37,7 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../java/netbeans/modules/java.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
   </target>
Index: i18n/build.xml
===================================================================
RCS file: /cvs/i18n/build.xml,v
retrieving revision 1.26
diff -u -t -r1.26 build.xml
--- i18n/build.xml	2001/02/27 08:16:59	1.26
+++ i18n/build.xml	2001/04/25 16:59:10
@@ -17,7 +17,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
-  <property name="binroot" value=".."/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
@@ -33,6 +33,7 @@
         <pathelement location="../core/netbeans/lib/core.jar"/>
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -45,6 +46,7 @@
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <pathelement location="../form/netbeans/modules/form.jar"/>
         <pathelement location="../java/netbeans/modules/java.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
 
Index: java/build.xml
===================================================================
RCS file: /cvs/java/build.xml,v
retrieving revision 1.22
diff -u -t -r1.22 build.xml
--- java/build.xml	2001/03/08 14:16:19	1.22
+++ java/build.xml	2001/04/25 16:59:10
@@ -17,7 +17,7 @@
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
 
-  <property name="binroot" value=".."/>
+  <property name="binroot" location=".."/>
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
@@ -32,6 +32,9 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>
         <pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
       </classpath>
     </javac>
   </target>
@@ -84,5 +87,3 @@
   </target>
 
 </project>
-
-
Index: javadoc/build.xml
===================================================================
RCS file: /cvs/javadoc/build.xml,v
retrieving revision 1.14
diff -u -t -r1.14 build.xml
--- javadoc/build.xml	2001/02/13 13:38:05	1.14
+++ javadoc/build.xml	2001/04/25 16:59:10
@@ -17,6 +17,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
@@ -29,6 +30,9 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="../java/netbeans/modules/java.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
       </classpath>
     </javac>
   </target>
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.100.2.4
diff -u -t -r1.100.2.4 build.xml
--- nbbuild/build.xml	2001/04/02 14:04:55	1.100.2.4
+++ nbbuild/build.xml	2001/04/25 16:59:10
@@ -39,6 +39,8 @@
       <classpath>
         <!-- Needed for CheckLinks: -->
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
+        <!-- For running inside the IDE, to pick up ant.jar: -->
+        <pathelement path="${netbeans.library.path}"/>
       </classpath>
     </javac>
     <jar jarfile="nbantext.jar" basedir="antsrc">
Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.57.2.1
diff -u -t -r1.57.2.1 build.xml
--- openide/build.xml	2001/03/31 16:22:44	1.57.2.1
+++ openide/build.xml	2001/04/25 16:59:10
@@ -87,6 +87,7 @@
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
 <!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
     <postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"
Index: projects/build.xml
===================================================================
RCS file: /cvs/projects/build.xml,v
retrieving revision 1.16
diff -u -t -r1.16 build.xml
--- projects/build.xml	2001/03/08 13:04:11	1.16
+++ projects/build.xml	2001/04/25 16:59:10
@@ -17,6 +17,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
@@ -29,7 +30,8 @@
           <include name="openide*.jar" />
         </fileset>
         <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
-        <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/>
+        <!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
   </target>
Index: utilities/build.xml
===================================================================
RCS file: /cvs/utilities/build.xml,v
retrieving revision 1.18
diff -u -t -r1.18 build.xml
--- utilities/build.xml	2001/03/09 12:18:11	1.18
+++ utilities/build.xml	2001/04/25 16:59:10
@@ -17,7 +17,7 @@
   <property name="homepage.base" value="netbeans.org"/>
   <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
   <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
-  <property name="binroot" value=".."/>
+  <property name="binroot" location=".."/>
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
   <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
@@ -31,6 +31,7 @@
         </fileset>
         <pathelement location="../openidex/netbeans/modules/openidex.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
   </target>
Index: vcsgeneric/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/build.xml,v
retrieving revision 1.22.2.6
diff -u -t -r1.22.2.6 build.xml
--- vcsgeneric/build.xml	2001/04/20 16:48:05	1.22.2.6
+++ vcsgeneric/build.xml	2001/04/25 16:59:10
@@ -37,6 +37,7 @@
         </fileset>
         <pathelement location="${nbroot}/openidex/netbeans/modules/openidex.jar"/>
         <pathelement location="${nbroot}/vcscore/netbeans/modules/vcscore.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src/org/netbeans/modules/vcs/advanced/config"
Index: web/build.xml
===================================================================
RCS file: /cvs/web/build.xml,v
retrieving revision 1.32.2.1
diff -u -t -r1.32.2.1 build.xml
--- web/build.xml	2001/04/17 12:50:02	1.32.2.1
+++ web/build.xml	2001/04/25 16:59:10
@@ -37,6 +37,9 @@
         </fileset>
         <pathelement location="../openidex/netbeans/modules/openidex.jar"/>
         <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
+        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
+        <!-- Hopefully set up by nbbuild/build.xml: -->
+        <pathelement location="${jdkhome}/lib/tools.jar"/>
       </classpath>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">