? patch40598.diff
? ant/external/ant-api-1.6.0.zip
? ant/external/ant-docs-1.6.0.zip
? ant/external/ant-libs-1.6.0.zip
? libs/j2eeeditor/j2eeeditor.nbm
? nbbuild/build.log
? nbbuild/moduleCluster.properties
? nbbuild/tests
? xml/css/css.nbm
Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
retrieving revision 1.88
diff -u -r1.88 build.xml
--- ant/build.xml	4 Mar 2004 04:54:57 -0000	1.88
+++ ant/build.xml	8 Mar 2004 10:59:15 -0000
@@ -15,41 +15,36 @@
 -->
 
 <project name="ant" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
-
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="external" target="unscramble"/>
     <ant dir="../libs/external" target="unscramble"/>
+    <patternset id="ant.files">
+      <include name="${nb.modules.dir}/ant.jar"/>
+      <include name="ant/nblib/bridge.jar"/>
+      <include name="ant/lib/**"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
+      <fileset dir="../libs/external">
+        <include name="xerces*.jar"/>
+      </fileset>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
+    </path>
+    <path id="cp+ant">
+      <path refid="cp"/>
+      <pathelement location="src"/>
+      <pathelement location="external/lib/ant.jar"/>
+    </path>
   </target>
-  
-  <path id="cp">
-    <pathelement location="../openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-    <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-    <pathelement location="../java/api/netbeans/modules/autoload/java-api.jar"/>
-    <fileset dir="../libs/external">
-      <include name="xerces*.jar"/>
-    </fileset>
-    <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-  </path>
-
-  <path id="cp+ant">
-    <path refid="cp"/>
-    <pathelement location="src"/>
-    <pathelement location="external/lib/ant.jar"/>
-  </path>
 
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
@@ -61,18 +56,17 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/ant.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ant.jar"
          manifest="manifest-subst.mf"
          basedir="src"
 	 excludesfile="../nbbuild/standard-jar-excludes.txt"
 	 compress="false">
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/ant/nblib"/>
-    <jar jarfile="netbeans/ant/nblib/bridge.jar" compress="false">
+    </jar>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/nblib"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/ant/nblib/bridge.jar" compress="false">
       <fileset dir="src-bridge">
         <excludesfile name="../nbbuild/standard-jar-excludes.txt"/>
       </fileset>
@@ -80,20 +74,24 @@
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/ant/lib"/>
-    <copy todir="netbeans/ant/lib">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/lib"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/ant/lib">
       <fileset dir="external/lib"/>
     </copy>
   </target>
 
   <target name="netbeans" depends="jars,release" description="Build module.">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/ant.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="ant.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build module NBM file.">
     <makenbm file="ant.nbm"
-             topdir="."
-             module="netbeans/modules/ant.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/ant.jar"
 	     homepage="http://ant.${homepage.base}/"
 	     distribution="http://${dist.base}/ant.nbm">
       <license name="ant-license.txt">
@@ -110,7 +108,7 @@
     <nbinstaller module="netbeans/modules/ant.jar" action="reinstall"/>
   </target>
 
-  <target name="clean" description="Clean out build products.">
+  <target name="clean" depends="init" description="Clean out build products.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -118,11 +116,12 @@
       <fileset dir="src-bridge">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="ant.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="ant.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
     <delete dir="javadoc"/>
     <!-- See target 'release-helper': -->
     <delete dir="release-work"/>
@@ -229,7 +228,7 @@
 </echo>
   </target>
 
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="AntModuleAPI"/>
Index: applet/build.xml
===================================================================
RCS file: /cvs/applet/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- applet/build.xml	9 Oct 2003 00:35:36 -0000	1.34
+++ applet/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,74 +13,77 @@
 -->
 
 <project name="applet" default="netbeans" basedir=".">
-  
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
+  <import file="../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="applet.files">
+      <include name="${nb.modules.dir}/applet.jar"/>
+    </patternset>
 
-  <target name="compile">
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-	<pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-	<!--<pathelement location="../html/netbeans/modules/html.jar"/> -->
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
+
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/applet.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-      <!-- Not using locale kits yet... -->
-      <!-- <localekit dir="src" includesfile="../nbbuild/standard-localekit-includes.txt"/> -->
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/applet.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false">
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/applet.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="applet.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="applet.nbm"
-             topdir="."
-             module="netbeans/modules/applet.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/applet.jar"
 	     homepage="http://applet.${homepage.base}/"
 	     distribution="http://${dist.base}/applet.nbm">
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
-  <target name="clean">
+
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="applet.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="applet.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
-    <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build applet module API documentation.">
+  <target name="javadoc" depends="init" description="Build applet module API documentation.">
     <tstamp/>
     <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
     <property name="openide-docs-location" value="http://www.netbeans.org/download/apis/"/>
@@ -101,14 +104,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <!-- this classpath probably should be the same as for compilation -->
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-      </classpath>
+      <classpath refID="cp"/> 
       <link href="${jdk-docs-location}"
             offline="true"
             packagelistLoc="../openide/api/doc"
Index: autoupdate/build.xml
===================================================================
RCS file: /cvs/autoupdate/build.xml,v
retrieving revision 1.45
diff -u -r1.45 build.xml
--- autoupdate/build.xml	24 Nov 2003 13:00:07 -0000	1.45
+++ autoupdate/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,29 +13,28 @@
 -->
 
 <project name="autoupdate" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  
-  <path id="cp">
-    <pathelement location="../openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    <pathelement location="libsrc"/>
-    <pathelement location="../core/netbeans/lib/core.jar"/>
-    <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
-    <!-- commenting out for now, readd if required: -jglick
-    <pathelement location="src" />
-    -->
-  </path>
+  <target name="init" depends="default.init">
+    <patternset id="autoupdate.files">
+      <include name="${nb.modules.dir}/autoupdate.jar"/>
+      <include name="${nb.lib.dir}/updater.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="libsrc"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
+      <!-- commenting out for now, readd if required: -jglick
+      <pathelement location="src" />
+      -->
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"/>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath refid="cp" />
@@ -43,34 +42,33 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/autoupdate.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/lib"/>
-    <locjar jarfile="netbeans/lib/updater.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/autoupdate.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/updater.jar"
          basedir="libsrc"
 	 excludesfile="../nbbuild/standard-jar-excludes.txt"
-	 compress="false">
-      <locale name="ja"/>
-    </locjar>
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/autoupdate.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="autoupdate.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="autoupdate.nbm"
-             topdir="."
-             module="netbeans/modules/autoupdate.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/autoupdate.jar"
 	     homepage="http://${homepage.base}/"
 	     distribution="http://${dist.base}/autoupdate.nbm"
 		 excludes="netbeans/lib,netbeans/lib/*"> 
@@ -79,7 +77,7 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -87,15 +85,17 @@
       <fileset dir="libsrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="autoupdate.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="autoupdate.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build autoupdate module API documentation.">
+  <target name="javadoc" depends="init" description="Build autoupdate module API documentation.">
         <ant dir="../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="AutoUpdateAPI"/>
Index: autoupdate/updatecenters/build.xml
===================================================================
RCS file: /cvs/autoupdate/updatecenters/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- autoupdate/updatecenters/build.xml	6 Feb 2004 14:42:54 -0000	1.3
+++ autoupdate/updatecenters/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,34 +13,33 @@
 -->
 
 <project name="autoupdate/updatecenters" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nbroot" value="../.."/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-  
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="autoupdate/updatecenters.files">
+      <include name="${nb.modules.dir}/eager/autoupdate-updatecenters.jar"/>
+    </patternset>
 
-  <target name="jars">
-    <mkdir dir="netbeans/modules/eager"/>
+    <path id="cp">
+    </path>
+  </target>
+
+  <target name="jars" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/eager"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/eager/autoupdate-updatecenters.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-        <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/eager/autoupdate-updatecenters.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="autoupdate-updatecenters.nbm"
-             topdir="."
-             module="netbeans/modules/eager/autoupdate-updatecenters.jar"
-             homepage="http://${homepage.base}"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/eager/autoupdate-updatecenters.jar"
+             homepage="http://{homepage.base}"
 	     distribution="http://${dist.base}/autoupdate-updatescenters.nbm">
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
@@ -48,14 +47,21 @@
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- XXX is this the right outputfiledir? -->
-    <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/eager/autoupdate-updatecenters.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="autoupdate/updatecenters.files"/>
+      </fileset>
+    </genlist>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
+    <delete>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="autoupdate/updatecenters.files"/>
+      </fileset>
+    </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="autoupdate-updatecenters.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="Info"/>
   </target>
 
Index: beans/build.xml
===================================================================
RCS file: /cvs/beans/build.xml,v
retrieving revision 1.28
diff -u -r1.28 build.xml
--- beans/build.xml	2 Apr 2003 09:45:20 -0000	1.28
+++ beans/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,71 +13,92 @@
 -->
 
 <project name="beans" default="netbeans" basedir=".">
-  
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
+  <import file="../nbbuild/default.xml"/> 
+
+  <target name="init" depends="default.init">
+    <patternset id="beans.files">
+      <include name="${nb.modules.dir}/beans.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+      <pathelement location="{jdkhome}/lib/tools.jar"/>
+    </path>
+  </target>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
+  <target name="setup-jdkhome-1">
+    <!-- Note: user-configured -Djavahome=... will always override this: -->
+    <property name="javahome" location="${java.home}"/>
+    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
+  </target>
+  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
+    <property name="jdkhome" value="${javahome}"/>
+    <property name="jdkhome-valid" value="true"/>
+  </target>
+  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
+    <property name="jdkhome" location="${javahome}/.."/>
+    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
+  </target>
+  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
+    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-	<pathelement location="../java/netbeans/modules/java.jar"/>
-	<pathelement location="{java.home}/lib/tools.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
+
   <target name="jars" depends="compile">
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/beans.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-      <!-- Not yet: -->
-      <!-- <localekit dir="src" includesfile="../nbbuild/standard-localekit-includes.txt"/> -->
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/beans.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
   
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/beans.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="beans.files"/>
+      </fileset>
+    </genlist>
   </target>
  
   <target name="nbm" depends="netbeans">
     <makenbm file="beans.nbm"
-             topdir="."
-             module="netbeans/modules/beans.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/beans.jar"
 	     homepage="http://beans.${homepage.base}/"
 	     distribution="http://${dist.base}/beans.nbm">
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
-  <target name="clean">
+
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="beans.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="beans.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build beans module API documentation.">
+  <target name="javadoc" depends="init" description="Build beans module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build beans module API documentation..."/>
@@ -96,15 +117,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <!-- this classpath probably should be the same as for compilation -->
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-	<pathelement location="../java/netbeans/modules/java.jar"/>
-	<pathelement location="{java.home}/lib/tools.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: classfile/build.xml
===================================================================
RCS file: /cvs/classfile/build.xml,v
retrieving revision 1.14
diff -u -r1.14 build.xml
--- classfile/build.xml	14 Feb 2003 08:48:23 -0000	1.14
+++ classfile/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,25 +13,28 @@
 -->
 
 <project name="classfile" default="netbeans" basedir=".">
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
+  <import file="../nbbuild/default.xml"/> 
 
-  <target name="compile">
+  <target name="init" depends="default.init">
+    <patternset id="classfile.files">
+      <include name="${nb.modules/autoload.dir}/classfile.jar"/>
+    </patternset>
+    <path id="cp">
+      <!-- Empty -->
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload" />
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}" />
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <jar jarfile="netbeans/modules/autoload/classfile.jar" 
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/classfile.jar" 
      manifest="manifest-subst.mf" 
      basedir="src" 
      excludesfile="../nbbuild/standard-jar-excludes.txt" 
@@ -39,13 +42,17 @@
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/classfile.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="classfile.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="classfile.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/classfile.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/classfile.jar"
 	     homepage="http://classfile.${homepage.base}/"
 	     distribution="http://${dist.base}/classfile.nbm">
       <license file="${license.file}"/>
@@ -53,10 +60,13 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="classfile.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: clazz/build.xml
===================================================================
RCS file: /cvs/clazz/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- clazz/build.xml	2 Apr 2003 09:45:21 -0000	1.33
+++ clazz/build.xml	8 Mar 2004 10:59:16 -0000
@@ -13,50 +13,52 @@
 -->
 
 <project name="clazz" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
+  
+  <target name="init" depends="default.init">
+    <patternset id="clazz.files">
+      <include name="${nb.modules.dir}/clazz.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${classfile.dir}/${nb.modules/autoload.dir}/classfile.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-	<pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
+
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/clazz.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/clazz.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/clazz.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="clazz.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="clazz.nbm"
-             topdir="."
-             module="netbeans/modules/clazz.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/clazz.jar"
 	     homepage="http://clazz.${homepage.base}/"
 	     distribution="http://${dist.base}/clazz.nbm">
       <license file="${license.file}"/>
@@ -64,11 +66,14 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="clazz.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="clazz.nbm"/>
@@ -95,7 +100,7 @@
     <nbinstaller action="reinstall" module="reload/clazz.jar"/>
   </target>
 
-  <target name="javadoc" description="Build clazz module API documentation.">
+  <target name="javadoc" depends="init" description="Build clazz module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build clazz module API documentation..."/>
@@ -114,13 +119,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-	<pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/> 
     </javadoc>    
   </target>
 
Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.75
diff -u -r1.75 build.xml
--- core/build.xml	14 Jan 2004 16:49:27 -0000	1.75
+++ core/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,78 +13,118 @@
 -->
 
 <project name="core" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
+  <target name="init" depends="default.init">
+    <patternset id="core.files">
+      <include name="${nb.lib.dir}/core.jar"/>
+      <include name="${nb.lib.dir}/ide.ks"/>
+      <include name="${nb.lib.dir}/ext/boot.jar"/>
+      <include name="${nb.bin.dir}/.runide_defaults.sh"/>
+      <include name="${nb.bin.dir}/ide.cfg"/>
+      <include name="${nb.bin.dir}/ide.policy"/>
+      <include name="${nb.bin.dir}/macosx_launcher.dmg"/>
+      <include name="${nb.bin.dir}/runide.exe"/>
+      <include name="${nb.bin.dir}/runide.sh"/>
+      <include name="${nb.bin.dir}/runide_exe_defaults"/>
+      <include name="${nb.bin.dir}/runideopenvms.com"/>
+      <include name="${nb.bin.dir}/runideos2.cmd"/>
+      <include name="${nb.bin.dir}/runidew.exe"/>
+      <include name="${nb.system.dir}/ModuleAutoDeps/org-netbeans-core.xml"/>
+      <include name="CREDITS.html"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/explorer.dir}/${nb.lib.dir}/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- XXX remove soon -->
+      <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+    </path>
+  </target>
 
-  <target name="compile" depends="boot">
+  <target name="compile" depends="init,boot">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-      <classpath>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/explorer/netbeans/lib/openide-explorer.jar" /> <!-- XXX 3.6 property sheet settings - see c.PsSettingsImpl -->
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/> <!-- XXX remove soon -->
-        <pathelement location="netbeans/lib/ext/boot.jar"/>
-      </classpath>
+      <classpath refid="cp"/>
     </javac>
   </target>
 
   <!-- XXX move to bootstrap/build.xml -->  
-  <target name="boot">
+  <target name="boot" depends="init">
     <javac srcdir="bootstrap/src" destdir="bootstrap/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"/>
-    <mkdir dir="netbeans/lib/ext" />
-    <jar jarfile="netbeans/lib/ext/boot.jar"
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext" />
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/ext/boot.jar"
             basedir="bootstrap/src"
             excludesfile="../nbbuild/standard-jar-excludes.txt"
 	    compress="false">
     </jar>
   </target>
 
-  <target name="jars" depends="compile">
-    <mkdir dir="netbeans/lib"/>
+  <target name="jars" depends="init,compile">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/core.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/core.jar"
             basedir="src"
             manifest="manifest-subst.mf"
             excludesfile="../nbbuild/standard-jar-excludes.txt"
             excludes="org/netbeans/*class"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+	    compress="false"/>
   </target>
 
-  <target name="release">
-    <copy todir="netbeans" includeEmptyDirs="false">
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
       <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
         <!-- These do not currently work anyway: -->
         <exclude name="bin/unsupported/nbscript*"/>
       </fileset>
+      <mapper type="glob" from="bin/*" to="${nb.bin.dir}/*" />
     </copy>
-    <fixcrlf srcdir="netbeans/bin" eol="crlf">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
+      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
+        <!-- These do not currently work anyway: -->
+        <exclude name="bin/unsupported/nbscript*"/>
+      </fileset>
+      <mapper type="glob" from="docs/*" to="${nb.docs.dir}/*" />  
+    </copy>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
+      <fileset dir="release" includes="*" excludesfile="../nbbuild/standard-jar-excludes.txt">
+        <!-- These do not currently work anyway: -->
+        <exclude name="bin/unsupported/nbscript*"/>
+      </fileset>
+      <mapper type="identity"/>          
+    </copy>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
+      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
+        <!-- These do not currently work anyway: -->
+        <exclude name="bin/unsupported/nbscript*"/>
+      </fileset>
+      <mapper type="glob" from="system/*" to="${nb.system.dir}/*" />          
+    </copy>
+    
+    <fixcrlf srcdir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" eol="crlf">
       <include name="**/*.bat"/>
       <include name="**/*.cmd"/>
     </fixcrlf>
-    <fixcrlf srcdir="netbeans/bin" eol="lf">
+    <fixcrlf srcdir="${netbeans.dest.dir}/${cluster.dir}/${nb.bin.dir}" eol="lf">
       <include name="**/*.sh"/>
       <include name="**/ide.cfg"/>
     </fixcrlf>
   </target>
 
-  <target name="netbeans" depends="jars,release" description="Build everything.">
-    <mkdir dir="netbeans/lib/patches"/>
-    <mkdir dir="netbeans/modules"/>
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+  <target name="netbeans" depends="init,jars,release" description="Build everything.">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib/patches.dir}"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/core.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="core.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build an NBM.">
     <makenbm file="core.nbm"
-             topdir="."
-             module="netbeans/lib/core.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.lib.dir}/core.jar"
 	     homepage="http://core.${homepage.base}/"
 	     distribution="http://${dist.base}/core.nbm">
       <license file="${license.file}"/>
@@ -92,7 +132,7 @@
     </makenbm>
   </target>
 
-  <target name="lib-modules" description="Create a standalone Modules API and implementation.">
+  <target name="lib-modules" description="Create a standalone Modules API and implementation." depends="init">
     <mkdir dir="modules-lib/src"/>
     <copy todir="modules-lib/src">
       <fileset dir="../openide/src">
@@ -119,7 +159,7 @@
     <javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <exclude name="org/netbeans/core/modules/ManifestSection.java"/>
       <classpath>
-        <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
+        <pathelement location="openide/netbeans/lib/openide-util.jar"/>
       </classpath>
     </javac>
     <ant dir="../openide" target="jars"/>
@@ -143,7 +183,7 @@
     </jar>
   </target>
 
-  <target name="clean" description="Clean all build products.">
+  <target name="clean" depends="init" description="Clean all build products.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -154,8 +194,10 @@
       <fileset dir=".">
         <include name="*-subst.mf"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="core.files"/>
+      </fileset>
     </delete>
-    <delete dir="netbeans"/>
     <delete dir="modules-lib"/>
     <delete dir="Info"/>
     <delete file="core.nbm"/>
Index: core/compiler/build.xml
===================================================================
RCS file: /cvs/core/compiler/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- core/compiler/build.xml	5 Jun 2003 19:28:53 -0000	1.17
+++ core/compiler/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,51 +13,52 @@
 -->
 
 <project name="core/compiler" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="core/compiler.files">
+        <include name="${nb.modules/autoload.dir}/core-compiler.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+        <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="../netbeans/lib/core.jar"/>
-                <pathelement location="../output/netbeans/modules/autoload/core-output.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/core-compiler.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-compiler.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-compiler.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/compiler.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-compiler.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/core-compiler.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/core-compiler.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-compiler.nbm">
             <license file="${license.file}"/>
@@ -65,13 +66,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="core/compiler.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete file="core-compiler.nbm"/>
         <delete file="manifest-subst.mf"/>
Index: core/deprecated/build.xml
===================================================================
RCS file: /cvs/core/deprecated/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- core/deprecated/build.xml	2 Apr 2003 09:45:23 -0000	1.9
+++ core/deprecated/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,54 +13,52 @@
 -->
 
 <project name="core/deprecated" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
+   
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="core/deprecated.files">
+        <include name="${nb.modules/autoload.dir}/core-deprecated.jar"/>
+      </patternset>
+      <path id="cp">
+         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+         <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/>
+         <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+         <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      </path>
+    </target>
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-  
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nb_all}/openide/netbeans/lib">
-                    <include name="openide*.jar" />
-                </fileset>
-                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nb_all}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/>
-                <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="${nb_all}/core/netbeans/lib/core.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/core-deprecated.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-deprecated.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-deprecated.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/deprecated.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-deprecated.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/core-deprecated.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/core-deprecated.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-deprecated.nbm">
             <license file="${license.file}"/>
@@ -68,15 +66,17 @@
         </makenbm>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="core/deprecated.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="core-deprecated.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
     </target>
   
Index: core/execution/build.xml
===================================================================
RCS file: /cvs/core/execution/build.xml,v
retrieving revision 1.11
diff -u -r1.11 build.xml
--- core/execution/build.xml	2 Apr 2003 09:45:23 -0000	1.11
+++ core/execution/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,51 +13,53 @@
 -->
 
 <project name="core/execution" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
+  
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="core/execution.files">
+        <include name="${nb.modules/autoload.dir}/core-execution.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../netbeans/lib/core.jar"/>
-                <pathelement location="../netbeans/lib/ext/boot.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/core-execution.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-execution.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-execution.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/execution.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-execution.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/core-execution.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/core-execution.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-execution.nbm">
             <license file="${license.file}"/>
@@ -65,13 +67,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="core/execution.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="core-execution.nbm"/>
         <delete dir="Info"/>
         <delete file="manifest-subst.mf"/>
Index: core/ide/build.xml
===================================================================
RCS file: /cvs/core/ide/build.xml,v
retrieving revision 1.16
diff -u -r1.16 build.xml
--- core/ide/build.xml	22 Jul 2003 21:21:34 -0000	1.16
+++ core/ide/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,62 +13,76 @@
 -->
 
 <project name="core/ide" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
+  
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="core/ide.files">
+        <include name="${nb.modules.dir}/core-ide.jar"/>
+        <include name="${nb.bin.dir}/icons/*"/>
+        <include name="${nb.bin.dir}/docs/NetBeansWeb.html"/>
+        <include name="CHANGES.html"/>
+        <include name="README.html"/>
+        <include name="netbeans-whatisnew.css"/>
+        <include name="netbeans.css"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <fileset dir="../../openide/netbeans/lib">
-                    <include name="openide*.jar" />
-                </fileset>
-                <pathelement location="../netbeans/lib/core.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/core-ide.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-ide.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
-    <target name="release">
+    <target name="release" depends="init">
         <!-- Note: this will indeed modify working sources if there is a change. -->
         <!-- That is as desired: want an up-to-date copy of this file. -->
         <!-- Note also that if www or testwww are not checked out, nothing happens; use CVS copy. -->
         <copy file="../../testwww/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
         <copy file="../../www/www/netbeans.css" tofile="release/netbeans.css" failonerror="false"/>
         <!-- Now the regular parts: -->
-        <copy todir="netbeans" includeEmptyDirs="false">
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
+            <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
+            <mapper type="glob" from="bin/*" to="${nb.bin.dir}/*" />
+        </copy>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
             <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
+            <mapper type="glob" from="docs/*" to="${nb.docs.dir}/*" />  
+        </copy>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
+            <fileset dir="release" includes="*" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
+            <mapper type="identity"/>          
         </copy>
     </target>
 
     <target name="netbeans" depends="jars,release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-ide.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/ide.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-ide.nbm"
-                 topdir="."
-                 module="netbeans/modules/core-ide.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules.dir}/core-ide.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-ide.nbm">
             <license file="${license.file}"/>
@@ -76,13 +90,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="core/ide.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="core-ide.nbm"/>
         <delete dir="Info"/>
         <delete file="manifest-subst.mf"/>
Index: core/javahelp/build.xml
===================================================================
RCS file: /cvs/core/javahelp/build.xml,v
retrieving revision 1.23
diff -u -r1.23 build.xml
--- core/javahelp/build.xml	20 Jun 2003 20:07:02 -0000	1.23
+++ core/javahelp/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,27 +13,22 @@
 -->
 
 <project name="core/javahelp" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
+  
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-    <property name="nbroot" location="../.."/>
-
-    <target name="init">
-        <ant dir="../external" target="unscramble"/>
-        <path id="cp">
-            <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-            <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-            <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            <fileset dir="../external">
-                <include name="jh*.jar"/>
-            </fileset>
-        </path>
+    <target name="init" depends="default.init">
+      <patternset id="core/javahelp.files">
+        <include name="${nb.modules/autoload.dir}/javahelp-api.jar"/>
+        <include name="${nb.modules/autoload.dir}/ext/jh*.jar"/>
+      </patternset>
+      <path id="cp">
+         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+         <fileset dir="../external">
+           <include name="jh*.jar"/>
+         </fileset>
+      </path>
     </target>
 
     <target name="compile" depends="init">
@@ -43,21 +38,19 @@
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/javahelp-api.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+             compress="false"/>
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy todir="netbeans/modules/autoload/ext">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
             <fileset dir="../external">
                 <include name="jh*.jar"/>
             </fileset>
@@ -65,13 +58,17 @@
     </target>
 
     <target name="netbeans" depends="jars,release" description="Build everything.">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/javahelp-api.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/javahelp.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans" description="Build NBM.">
         <makenbm file="javahelp-api.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/javahelp-api.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/javahelp-api.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/javahelp-api.nbm">
             <license name="javahelp-api-license.txt">
@@ -97,13 +94,15 @@
         <nbinstaller module="reload/javahelp-api.jar" action="reinstall"/>
     </target>
 
-    <target name="clean" description="Clean build products.">
+    <target name="clean" depends="init" description="Clean build products.">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="core/javahelp.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="javahelp-api.nbm"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
Index: core/naming/build.xml
===================================================================
RCS file: /cvs/core/naming/build.xml,v
retrieving revision 1.18
diff -u -r1.18 build.xml
--- core/naming/build.xml	13 Nov 2003 09:58:21 -0000	1.18
+++ core/naming/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,17 +13,7 @@
 -->
 
 <project name="core/naming" default="netbeans" basedir=".">
-
-    <property name="nb_all" value="../.."/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+    <import file="../../nbbuild/default.xml"/> 
 
     <target name="compile">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Index: core/output/build.xml
===================================================================
RCS file: /cvs/core/output/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- core/output/build.xml	24 Sep 2003 18:32:29 -0000	1.6
+++ core/output/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,50 +13,52 @@
 -->
 
 <project name="core/output" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
+
+    <target name="init" depends="default.init">
+      <patternset id="core/output.files">
+        <include name="${nb.modules/autoload.dir}/core-output.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- remove when parseException not needed -->
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+        <pathelement location="${core/term.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
+      </path>
+    </target>
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
     
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/> <!-- remove when parseException not needed -->
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="../netbeans/lib/core.jar"/>
-                <pathelement location="../term/netbeans/modules/autoload/terminalemulator.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/core-output.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-output.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
-    <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars">
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-output.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="core/output.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-output.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/core-output.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/core-output.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-output.nbm">
             <license file="${license.file}"/>
@@ -64,13 +66,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="core/output.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="core-output.nbm"/>
         <delete dir="Info"/>
         <delete file="manifest-subst.mf"/>
Index: core/settings/build.xml
===================================================================
RCS file: /cvs/core/settings/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- core/settings/build.xml	20 Jun 2003 20:07:03 -0000	1.21
+++ core/settings/build.xml	8 Mar 2004 10:59:44 -0000
@@ -13,50 +13,48 @@
 -->
 
 <project name="core/settings" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nb_all" value="../../"/>
-    <property name="license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="core/settings.files">
+        <include name="${nb.modules/autoload.dir}/core-settings.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/core-settings.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/core-settings.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars" description="Build everything.">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/core-settings.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="core/settings.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans" description="Build NBM.">
         <makenbm file="core-settings.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/core-settings.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/core-settings.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-settings.nbm">
                  <license file="${license.file}"/>
@@ -64,11 +62,14 @@
         </makenbm>
     </target>
 
-    <target name="clean" description="Clean build products.">
+    <target name="clean" depends="init" description="Clean build products.">
       <delete>
         <fileset dir="src">
           <include name="**/*.class"/>
         </fileset>
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="core/settings.files"/>
+        </fileset>
       </delete>
       <delete file="manifest-subst.mf"/>
       <delete file="core-settings.nbm"/>
@@ -81,7 +82,7 @@
         <delete dir="reload"/>
     </target>
 
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <!-- Do this before so <checklinks> will find it and not report it as an error: -->
         <mkdir dir="javadoc/SettingsAPI/org/netbeans/spi/settings/doc-files"/>
         <copy file="src/org/netbeans/modules/settings/resources/properties-1_0.dtd"
Index: core/term/build.xml
===================================================================
RCS file: /cvs/core/term/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- core/term/build.xml	20 Jun 2003 20:07:04 -0000	1.6
+++ core/term/build.xml	8 Mar 2004 10:59:51 -0000
@@ -13,31 +13,28 @@
 -->
 
 <project name="core/term" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-    <path id="cp">
-        <!-- empty -->
-    </path>
-    
-    <target name="compile">
+    <target name="init" depends="default.init">
+      <patternset id="core/term.files">
+        <include name="${nb.modules/autoload.dir}/terminalemulator.jar"/>
+      </patternset>
+      <path id="cp">
+          <!-- empty -->
+      </path>
+    </target>
+  
+    <target name="compile" depends="init">
         <javac srcdir="../libsrc" destdir="../libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
     
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/terminalemulator.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"
                 manifest="manifest-subst.mf"
                 basedir="../libsrc"
                 excludesfile="../../nbbuild/standard-jar-excludes.txt"
@@ -46,18 +43,21 @@
             <exclude name="**/*.html"/>
             <exclude name="**/*.txt"/>
             <exclude name="**/build.xml"/>
-            <locale name="ja"/>
-        </locjar>
+        </jar>
     </target>
 
-    <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars">
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/terminalemulator.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="core/term.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="terminalemulator.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/terminalemulator.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/terminalemulator.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/terminalemulator.nbm">
             <license file="${license.file}"/>
@@ -78,10 +78,13 @@
         </ant>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="../libsrc">
                 <include name="**/*.class"/>
+            </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="core/term.files"/>
             </fileset>
         </delete>
         <delete dir="netbeans"/>
Index: core/test/build-unit.xml
===================================================================
RCS file: /cvs/core/test/build-unit.xml,v
retrieving revision 1.11
diff -u -r1.11 build-unit.xml
--- core/test/build-unit.xml	4 Dec 2003 19:16:25 -0000	1.11
+++ core/test/build-unit.xml	8 Mar 2004 10:59:51 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="Unit tests" basedir="." default="all">
+    <import file="../../nbbuild/default-properties.xml"/>
 
     <!-- =================== -->
     <!-- Setting classpathes -->
@@ -126,9 +127,6 @@
 
     <!-- this "switch" will decide how to create classpath -->
     <target name="which-classpath">
-        <condition property="jarcode.classpath">
-            <equals arg1="${xtest.source.location}" arg2="jar"/>
-        </condition>
         <condition property="srccode.classpath">
             <equals arg1="${xtest.source.location}" arg2="src"/>
         </condition>
@@ -142,29 +140,8 @@
     <!-- ========================= -->
     
     <target name="prepare-compile-classpath"
-         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
+         depends="srccompile-classpath,idecompile-classpath"/>
     
-    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
-        <echo message="Using jars classpath for compilation."/>
-    	<!-- this classpath will be used for compiling tests against jars -->
-	<path id="compiletest.classpath">        
-	    	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
-	    	<pathelement location="../netbeans/lib/core.jar"/>
-                <pathelement location="../term/netbeans/modules/autoload/terminalemulator.jar"/>
-	    	<fileset dir="../../openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-             	</fileset>
-                <!-- XXX -->
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-
-             	<pathelement path="${junit.path}"/>
-	    	<pathelement path="${xerces.path}"/>
-	</path>
-    </target>
-        
     <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
         <echo message="Using srcs classpath for compilation."/>
     	<!-- this classpath will be used for compiling tests against sources -->
@@ -175,14 +152,12 @@
                 <!-- XXX -->
                 <pathelement location="../bootstrap/src/"/>
                 
-	        <fileset dir="../../openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
                 <!-- XXX -->
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
 
 	        <pathelement path="${junit.path}"/>
 		<pathelement path="${xerces.path}"/>
@@ -194,17 +169,15 @@
     	<!-- this classpath will be used for compiling tests against installed IDE -->
     	<path id="compiletest.classpath">        
     		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
-	        <pathelement location="${netbeans.home}/lib/core.jar"/>
-		<pathelement location="${netbeans.home}/lib/ext/boot.jar"/>
-	        <fileset dir="${netbeans.home}/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-                <!-- XXX -->
-                <fileset dir="${netbeans.home}/modules/autoload">
-                    <include name="openide-*.jar"/>
-                    <include name="core-*.jar"/>
-                    <include name="terminalemulator.jar"/>
-                </fileset>
+	        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+		<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <!-- XXX -->
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+		<pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
                 
 	        <pathelement path="${junit.path}"/>
 		<pathelement path="${xerces.path}"/>
@@ -216,70 +189,43 @@
     <!-- ================================== -->
     
     <target name="prepare-codetest-classpath" 
-            depends="jartest-classpath,srctest-classpath,idetest-classpath"/>
+            depends="srctest-classpath,idetest-classpath"/>
     
-    <target name="jartest-classpath" depends="which-classpath" if="jarcode.classpath">
-        <echo message="Using jars classpath."/>
-        <!-- this classpath will be used for executing tests against jars -->
-	<path id="codetest.classpath">
-        	<fileset dir="../netbeans/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-        	</fileset>
-        	<pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <!-- XXX -->
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="../output/netbeans/modules/autoload/core-output.jar"/>
-                <pathelement location="../execution/netbeans/modules/autoload/core-execution.jar"/>
-                <pathelement location="../compiler/netbeans/modules/autoload/core-compiler.jar"/>
-                <pathelement location="../windows/netbeans/modules/core-windows.jar"/>
-    	</path>
-    </target>
-        
     <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
         <echo message="Using srcs classpath."/>
         <!-- this classpath will be used for executing tests against sources -->
     	<path id="codetest.classpath">
         <!-- Working sources should take precedence over core.jar: -->
            <pathelement location="../src"/>
-        	<fileset dir="../netbeans/lib">
-              	    <!-- But loading core.jar means its manifest is available to module system: -->
-           	    <include name="core.jar"/>
-           	    <include name="ext/*.jar"/>
-        	</fileset>
-           <pathelement location="../../openide/netbeans/lib/openide.jar"/>
+	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+
             <!-- XXX -->
-            <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            <pathelement location="../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-            <pathelement location="../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-            <pathelement location="../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-            <pathelement location="../output/src"/>
-            <pathelement location="../execution/src"/>
-            <pathelement location="../compiler/src"/>
-            <pathelement location="../windows/src"/>
-    	</path>
+           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+           <pathelement location="../output/src"/>
+           <pathelement location="../execution/src"/>
+           <pathelement location="../compiler/src"/>
+           <pathelement location="../windows/src"/>
+   	</path>
     </target>
     
     <target name="idetest-classpath" depends="which-classpath" if="idecode.classpath">
         <echo message="Using IDE classpath."/>
         <!-- this classpath will be used for executing tests against installed IDE -->
     	<path id="codetest.classpath">
-        	<fileset dir="${netbeans.home}/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-        	</fileset>
-        	<pathelement location="${netbeans.home}/lib/openide.jar"/>
-                <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>        
-                <!-- XXX -->
-                <fileset dir="${netbeans.home}/modules/autoload">
-                    <include name="openide-*.jar"/>
-                    <include name="core-*.jar"/>
-                    <include name="terminalemulator.jar"/>
-                </fileset>
-                
+	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+           <!-- XXX -->
+           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+           <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
     	</path>
     </target>
     
Index: core/test/unit/src/org/netbeans/core/modules/build.xml
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/build.xml,v
retrieving revision 1.19
diff -u -r1.19 build.xml
--- core/test/unit/src/org/netbeans/core/modules/build.xml	2 Apr 2003 09:45:28 -0000	1.19
+++ core/test/unit/src/org/netbeans/core/modules/build.xml	8 Mar 2004 10:59:51 -0000
@@ -12,6 +12,7 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 <project name="modules test setup" basedir="." default="build">
+    <import file="../../../../../../../../nbbuild/default-properties.xml"/>
 
     <property name="xtest.source.location" value="src"/>
 
@@ -32,30 +33,24 @@
     
     <target name="jartest-classpath" if="jarcode.classpath">
 	<path id="openide">
-	    <pathelement location="../../../../../../../../openide/openide-13javac-workaround.jar"/>
-            <fileset dir="../../../../../../../../openide/netbeans/lib">
-	            <include name="openide*.jar"/>
-            </fileset>
-	    <pathelement location="../../../../../../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
+	    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+	    <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
         </path>
     </target>
         
     <target name="srctest-classpath" if="srccode.classpath">
 	<path id="openide">
-	    <pathelement location="../../../../../../../../openide/openide-13javac-workaround.jar"/>
-            <fileset dir="../../../../../../../../openide/netbeans/lib">
-	            <include name="openide*.jar"/>
-            </fileset>
-            <pathelement location="../../../../../../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
+	    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+	    <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
         </path>
     </target>
     
     <target name="idetest-classpath" if="idecode.classpath">
     	<path id="openide">
 	    <pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
-            <fileset dir="${netbeans.home}/lib">
-	            <include name="openide*.jar"/>
-            </fileset>
+            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
         </path>
     </target>
     
Index: core/ui/build.xml
===================================================================
RCS file: /cvs/core/ui/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- core/ui/build.xml	11 Dec 2002 17:06:55 -0000	1.12
+++ core/ui/build.xml	8 Mar 2004 10:59:52 -0000
@@ -13,49 +13,48 @@
 -->
 
 <project name="core/ui" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="core/ui.files">
+        <include name="${nb.modules.dir}/core-ui.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar" />
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../src/" />
-                <fileset dir="../../openide/netbeans/lib">
-                    <include name="openide*.jar" />
-                </fileset>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/core-ui.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-ui.jar"
                 basedir="src"
                 manifest="manifest-subst.mf"
                 excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+	        compress="false"/>
     </target>
 
-    <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars">
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-ui.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="core/ui.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-ui.nbm"
-                 topdir="."
-                 module="netbeans/modules/core-ui.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules.dir}/core-ui.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-ui.nbm">
             <license file="${license.file}"/>
@@ -63,13 +62,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="core/ui.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="core-ui.nbm"/>
         <delete dir="Info"/>
         <delete file="manifest-subst.mf"/>
Index: core/windows/build.xml
===================================================================
RCS file: /cvs/core/windows/build.xml,v
retrieving revision 1.13
diff -u -r1.13 build.xml
--- core/windows/build.xml	27 Aug 2003 20:37:20 -0000	1.13
+++ core/windows/build.xml	8 Mar 2004 10:59:52 -0000
@@ -13,49 +13,49 @@
 -->
 
 <project name="core/windows" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
+    <target name="init" depends="default.init">
+      <patternset id="core/windows.files">
+        <include name="${nb.modules.dir}/core-windows.jar"/>
+      </patternset>
+      <path id="cp">
+         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+         <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../netbeans/lib/core.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/core-windows.jar"
-                basedir="src"
-                manifest="manifest-subst.mf"
-                excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/core-windows.jar"
+             basedir="src"
+             manifest="manifest-subst.mf"
+             excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
-    <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars">
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/core-windows.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="core/windows.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="core-windows.nbm"
-                 topdir="."
-                 module="netbeans/modules/core-windows.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules.dir}/core-windows.jar"
                  homepage="http://core.${homepage.base}/"
                  distribution="http://${dist.base}/core-windows.nbm">
             <license file="${license.file}"/>
@@ -63,13 +63,15 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="core/windows.files"/>
+            </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete file="core-windows.nbm"/>
         <delete dir="Info"/>
         <delete file="manifest-subst.mf"/>
Index: core/windows/test/build-unit.xml
===================================================================
RCS file: /cvs/core/windows/test/build-unit.xml,v
retrieving revision 1.3
diff -u -r1.3 build-unit.xml
--- core/windows/test/build-unit.xml	12 Nov 2003 07:52:29 -0000	1.3
+++ core/windows/test/build-unit.xml	8 Mar 2004 10:59:52 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="Unit tests" basedir="." default="all">
+    <import file="../../../nbbuild/default-properties.xml"/>
 
     <!-- =================== -->
     <!-- Setting classpathes -->
@@ -127,9 +128,6 @@
 
     <!-- this "switch" will decide how to create classpath -->
     <target name="which-classpath">
-        <condition property="jarcode.classpath">
-            <equals arg1="${xtest.source.location}" arg2="jar"/>
-        </condition>
         <condition property="srccode.classpath">
             <equals arg1="${xtest.source.location}" arg2="src"/>
         </condition>
@@ -143,48 +141,25 @@
     <!-- ========================= -->
     
     <target name="prepare-compile-classpath"
-         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
+         depends="srccompile-classpath,idecompile-classpath"/>
     
-    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
-        <echo message="Using jars classpath for compilation."/>
-    	<!-- this classpath will be used for compiling tests against jars -->
-	<path id="compiletest.classpath">        
-	    	<pathelement location="../../../openide/openide-13javac-workaround.jar"/>
-	    	<pathelement location="../../netbeans/lib/core.jar"/>
-                <pathelement location="../../term/netbeans/modules/autoload/terminalemulator.jar"/>
-	    	<fileset dir="../../../openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-             	</fileset>
-                <!-- XXX -->
-                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-
-             	<pathelement path="${junit.path}"/>
-	    	<pathelement path="${xerces.path}"/>
-	</path>
-    </target>
-        
     <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
         <echo message="Using srcs classpath for compilation."/>
     	<!-- this classpath will be used for compiling tests against sources -->
     	<path id="compiletest.classpath">        
-	        <pathelement location="../../../openide/openide-13javac-workaround.jar"/>
+	        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
 	        <pathelement location="../../src"/>
                 <pathelement location="../src"/>
                 <pathelement location="../../libsrc"/>
                 <!-- XXX -->
                 <pathelement location="../../bootstrap/src/"/>
                 
-	        <fileset dir="../../../openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
                 <!-- XXX -->
-                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
 
 	        <pathelement path="${junit.path}"/>
 		<pathelement path="${xerces.path}"/>
@@ -196,18 +171,15 @@
     	<!-- this classpath will be used for compiling tests against installed IDE -->
     	<path id="compiletest.classpath">        
     		<pathelement location="${xtest.home}/lib/openide-13javac-workaround.jar"/>
-	        <pathelement location="${netbeans.home}/lib/core.jar"/>
-                <pathelement location="${netbeans.home}/modules/core-windows.jar"/>
-		<pathelement location="${netbeans.home}/lib/ext/boot.jar"/>
-	        <fileset dir="${netbeans.home}/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-                <!-- XXX -->
-                <fileset dir="${netbeans.home}/modules/autoload">
-                    <include name="openide-*.jar"/>
-                    <include name="core-*.jar"/>
-                    <include name="terminalemulator.jar"/>
-                </fileset>
+	        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+		<pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <!-- XXX -->
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+                <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+                <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+                <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+		<pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
                 
 	        <pathelement path="${junit.path}"/>
 		<pathelement path="${xerces.path}"/>
@@ -225,20 +197,16 @@
         <echo message="Using jars classpath."/>
         <!-- this classpath will be used for executing tests against jars -->
 	<path id="codetest.classpath">
-        	<fileset dir="../../netbeans/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-        	</fileset>
-        	<pathelement location="../../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../netbeans/modules/core-windows.jar"/>
-                <!-- XXX -->
-                <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="../../output/netbeans/modules/autoload/core-output.jar"/>
-                <pathelement location="../../execution/netbeans/modules/autoload/core-execution.jar"/>
-                <pathelement location="../../compiler/netbeans/modules/autoload/core-compiler.jar"/>
+	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+
+            <!-- XXX -->
+           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+           <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
     	</path>
     </target>
         
@@ -248,20 +216,18 @@
     	<path id="codetest.classpath">
         <!-- Working sources should take precedence over core.jar: -->
            <pathelement location="../../src"/>
-        	<fileset dir="../../netbeans/lib">
-              	    <!-- But loading core.jar means its manifest is available to module system: -->
-           	    <include name="core.jar"/>
-           	    <include name="ext/*.jar"/>
-        	</fileset>
-           <pathelement location="../../../openide/netbeans/lib/openide.jar"/>
+	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+
             <!-- XXX -->
-            <pathelement location="../../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            <pathelement location="../../../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-            <pathelement location="../../../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-            <pathelement location="../../../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-            <pathelement location="../../output/src"/>
-            <pathelement location="../../execution/src"/>
-            <pathelement location="../../compiler/src"/>
+           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+           <pathelement location="../../output/src"/>
+           <pathelement location="../../execution/src"/>
+           <pathelement location="../../compiler/src"/>
     	</path>
     </target>
     
@@ -269,19 +235,16 @@
         <echo message="Using IDE classpath."/>
         <!-- this classpath will be used for executing tests against installed IDE -->
     	<path id="codetest.classpath">
-        	<fileset dir="${netbeans.home}/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-        	</fileset>
-        	<pathelement location="${netbeans.home}/lib/openide.jar"/>
-                <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>        
-                <!-- XXX -->
-                <fileset dir="${netbeans.home}/modules/autoload">
-                    <include name="openide-*.jar"/>
-                    <include name="core-*.jar"/>
-                    <include name="terminalemulator.jar"/>
-                </fileset>
-                
+	   <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+           <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+           <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+
+            <!-- XXX -->
+           <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+           <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+           <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+           <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+           <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
     	</path>
     </target>
     
Index: db/build.xml
===================================================================
RCS file: /cvs/db/build.xml,v
retrieving revision 1.43
diff -u -r1.43 build.xml
--- db/build.xml	16 Feb 2004 20:27:57 -0000	1.43
+++ db/build.xml	8 Mar 2004 11:00:04 -0000
@@ -14,65 +14,58 @@
 
 
 <project name="db" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="db.files">
+      <include name="${nb.modules.dir}/db.jar"/>
+      <include name="${nb.modules.dir}/ext/ddl.jar"/>
+      <include name="${nb.modules/docs.dir}/db.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${openidex.dir}/${nb.modules.dir}/openidex.jar"/>
+    </path>
     <tstamp/>
     <property name="buildnumber" value="${DSTAMP}-${TSTAMP}"/>
     <echo message="buildnumber = ${buildnumber}"/>
   </target>
 
-  <target name="precompile">
+  <target name="precompile" depends="init">
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-      </classpath>
+      <classpath refId="cp"/>
     </javac>
   </target>
 
-  <target name="compile" depends="precompile">
+  <target name="compile" depends="init,precompile">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
+        <path refID="cp"/>
         <pathelement path="libsrc"/>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="../openidex/netbeans/modules/openidex.jar"/>
       </classpath>
     </javac>
   </target>
 
   <target name="jars" depends="init,compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/db.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/db.jar"
          manifest="manifest-subst.mf"
          basedir="src"
          excludesfile="../nbbuild/standard-jar-excludes.txt"
-         compress="false">
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/modules/ext"/>
-    <locjar jarfile="netbeans/modules/ext/ddl.jar"
+         compress="false"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/ddl.jar"
          basedir="libsrc"
          excludesfile="../nbbuild/standard-jar-excludes.txt"
-         compress="false">
-      <locale name="ja"/>
-    </locjar>
+         compress="false"/>
   </target>
 
-  <target name="javahelp">
+  <target name="javahelp" depends="init"> 
     <mkdir dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/db/docs/"
                db="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2">
@@ -88,23 +81,25 @@
     </jhindexer>
     <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
     <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
-    <mkdir dir="netbeans/modules/docs"/>
-    <locjar jarfile="netbeans/modules/docs/db.jar"
-            compress="true">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/db.jar"
+         compress="true">
       <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars,javahelp">
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/db.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="db.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="db.nbm"
-             topdir="."
-             module="netbeans/modules/db.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/db.jar"
     	     homepage="http://db.${homepage.base}/"
              distribution="http://${dist.base}/db.nbm">
       <license file="${license.file}"/>
@@ -112,22 +107,21 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
-    </delete>
-    <delete>
       <fileset dir="libsrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="db.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="db.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
     <delete dir="javahelp/org/netbeans/modules/db/docs/JavaHelpSearch"/>
     <delete dir="javahelp/org/netbeans/modules/usersguide"/>
   </target>
Index: debuggercore/build.xml
===================================================================
RCS file: /cvs/debuggercore/build.xml,v
retrieving revision 1.41
diff -u -r1.41 build.xml
--- debuggercore/build.xml	15 Apr 2003 21:48:07 -0000	1.41
+++ debuggercore/build.xml	8 Mar 2004 11:00:04 -0000
@@ -13,70 +13,56 @@
 -->
 
 <project name="debuggercore" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="setup-jdkhome-1">
-    <!-- Note: user-configured -Djavahome=... will always override this: -->
-    <property name="javahome" location="${java.home}"/>
-    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
-  </target>
-  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
-    <property name="jdkhome" value="${javahome}"/>
-    <property name="jdkhome-valid" value="true"/>
-  </target>
-  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
-    <property name="jdkhome" location="${javahome}/.."/>
-    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="debuggercore.files">
+      <include name="${nb.modules/autoload.dir}/debuggerCore.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${jdkhome}/lib/tools.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+    </path>
   </target>
-  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
-    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
-  </target>
-  
-  <target name="compile" depends="setup-jdkhome">
+
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${jdkhome}/lib/tools.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
+
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/autoload/debuggerCore.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
    
   <target name="netbeans" depends="jars" description="Build everything.">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/debuggerCore.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="debuggercore.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build NBM.">
     <makenbm file="debuggercore.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/debuggerCore.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/debuggerCore.jar"
 	     homepage="http://debuggercore.${homepage.base}/"
 	     distribution="http://${dist.base}/debuggercore.nbm">
       <license file="${license.file}"/>
@@ -84,20 +70,22 @@
     </makenbm>
   </target>
   
-  <target name="clean" description="Clean everything.">
+  <target name="clean" depends="init" description="Clean everything.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="debuggercore.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="debuggercore.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" depends="setup-jdkhome" description="Build debuggercore module API documentation.">
+  <target name="javadoc" depends="init" description="Build debuggercore module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build debuggercore module API documentation..."/>
@@ -116,15 +104,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <!-- this classpath probably should be the same as for compilation -->
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${jdkhome}/lib/tools.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: debuggercore/oldapi/build.xml
===================================================================
RCS file: /cvs/debuggercore/oldapi/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- debuggercore/oldapi/build.xml	20 Jun 2003 20:07:04 -0000	1.6
+++ debuggercore/oldapi/build.xml	8 Mar 2004 11:00:04 -0000
@@ -13,56 +13,53 @@
 -->
 
 <project name="debuggercore/oldapi" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="debuggercore/oldapi.files">
+        <include name="${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_all}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="${nb_all}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
         <!-- ServiceTypeEditor: -->
-        <pathelement location="${nb_all}/core/netbeans/lib/core.jar"/>
-    </path>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/openide-debugger.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-debugger.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="debuggercore/oldapi.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="openide-debugger.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/openide-debugger.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/openide-debugger.jar"
                  homepage="http://debuggercore.${homepage.base}/"
                  distribution="http://${dist.base}/openide-debugger.nbm">
             <license file="${license.file}"/>
@@ -70,7 +67,7 @@
         </makenbm>
     </target>
   
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="DebuggerAPI"/>
@@ -83,15 +80,17 @@
         </ant>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="debuggercore/oldapi.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="openide-debugger.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
     </target>
Index: debuggerjpda/build.xml
===================================================================
RCS file: /cvs/debuggerjpda/build.xml,v
retrieving revision 1.35
diff -u -r1.35 build.xml
--- debuggerjpda/build.xml	6 Jan 2004 09:59:35 -0000	1.35
+++ debuggerjpda/build.xml	8 Mar 2004 11:00:05 -0000
@@ -13,44 +13,24 @@
 -->
 
 <project name="debuggerjpda" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="setup-jdkhome-1">
-    <!-- Note: user-configured -Djavahome=... will always override this: -->
-    <property name="javahome" location="${java.home}"/>
-    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
-  </target>
-  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
-    <property name="jdkhome" value="${javahome}"/>
-    <property name="jdkhome-valid" value="true"/>
-  </target>
-  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
-    <property name="jdkhome" location="${javahome}/.."/>
-    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
-  </target>
-  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
-    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
-  </target>
+  <target name="init" depends="default.init">
+    <patternset id="debuggerjpda.files">
+      <include name="${nb.modules.dir}/jpdaDebugger.jar"/>
+    </patternset>
 
-  <target name="init" depends="setup-jdkhome">
     <path id="cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
       <pathelement location="${jdkhome}/lib/tools.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-      <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-      <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-      <pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-      <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
     </path>
   </target>
 
@@ -61,27 +41,29 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/jpdaDebugger.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jpdaDebugger.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jpdaDebugger.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="debuggerjpda.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="debuggerjpda.nbm"
-             topdir="."
-             module="netbeans/modules/jpdaDebugger.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/jpdaDebugger.jar"
 	     homepage="http://debuggerjpda.${homepage.base}/"
 	     distribution="http://${dist.base}/debuggerjpda.nbm">
       <license file="${license.file}"/>
@@ -89,10 +71,13 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="debuggerjpda.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: diff/build.xml
===================================================================
RCS file: /cvs/diff/build.xml,v
retrieving revision 1.28
diff -u -r1.28 build.xml
--- diff/build.xml	30 Dec 2003 22:55:33 -0000	1.28
+++ diff/build.xml	8 Mar 2004 11:00:05 -0000
@@ -15,27 +15,21 @@
 <!-- Special targets: diff-apis -->
 
 <project name="diff" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbroot" value=".."/>
-  <property name="nbext" value="${nbroot}/nbbuild"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
-
-  <path id="cp">
-    <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
-    <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-  </path>
+  <target name="init" depends="default.init">
+    <patternset id="diff.files">
+      <include name="${nb.modules.dir}/diff.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" 
         deprecation="${build.compiler.deprecation}" 
         debug="${build.compiler.debug}"
@@ -45,26 +39,28 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/diff.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/diff.jar"
          manifest="manifest-subst.mf"
          basedir="src"
-         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-         compress="false">
-      <locale name="ja"/>
-    </locjar>
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/diff.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="diff.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="diff.nbm"
-             topdir="."
-	     module="netbeans/modules/diff.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+	     module="${nb.modules.dir}/diff.jar"
 	     homepage="http://diff.${homepage.base}/"
 	     distribution="http://${dist.base}/diff.nbm">
       <license file="${license.file}"/>
@@ -72,7 +68,7 @@
     </makenbm>
   </target>
 
-  <target name="javadoc">
+  <target name="javadoc" depends="init">
     <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
       <property name="javadoc.base" location="."/>
       <property name="javadoc.name" value="DiffAPI"/>
@@ -85,18 +81,19 @@
     </ant>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete dir="javadoc"/>
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="diff.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="diff.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
   </target>
 
 </project>
Index: editor/build.xml
===================================================================
RCS file: /cvs/editor/build.xml,v
retrieving revision 1.41
diff -u -r1.41 build.xml
--- editor/build.xml	21 Nov 2003 14:47:40 -0000	1.41
+++ editor/build.xml	8 Mar 2004 11:00:06 -0000
@@ -13,72 +13,76 @@
 -->
 
 <project name="editor" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
+  
+  <target name="init" depends="default.init">
+    <patternset id="editor.files">
+      <include name="${nb.modules.dir}/editor.jar"/>
+      <include name="${nb.modules.dir}/ext/nb-editor.jar"/>
+      <include name="${nb.system.dir}/ParserDB/jdk14.jcb"/>
+      <include name="${nb.system.dir}/ParserDB/jdk14.jcs"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <!-- XXX illegal dependency on core! -->
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      <pathelement location="libsrc"/>
+    </path>
+    <path id="libcp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <!-- We need Openide-util library. Namely RequestProcessor. -->
-      <classpath>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      </classpath>
+      <classpath refID="libcp"/>
     </javac>
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-       <!-- XXX illegal dependency on core! -->
-       <pathelement location="../core/netbeans/lib/core.jar"/>
-       <pathelement location="libsrc"/>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-    <locjar jarfile="netbeans/modules/editor.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/modules/ext"/>
-    <locjar jarfile="netbeans/modules/ext/nb-editor.jar"
-            basedir="libsrc"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/editor.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/nb-editor.jar"
+         basedir="libsrc"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
-  <target name="release">
-    <copy todir="netbeans" includeEmptyDirs="false">
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
       <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
     </copy>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/editor.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="editor.files"/>
+      </fileset>
+    </genlist>
   </target>
 
 
   <target name="nbm" depends="netbeans">
     <makenbm file="editor.nbm"
-             topdir="."
-             module="netbeans/modules/editor.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/editor.jar"
 	     homepage="http://editor.${homepage.base}/"
 	     distribution="http://${dist.base}/editor.nbm">
       <license file="${license.file}"/>
@@ -86,7 +90,7 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -96,23 +100,17 @@
       <fileset dir="libsrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="editor.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="editor.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <path id="cp">
-    <pathelement location="src" />
-    <pathelement location="libsrc"/>
-    <pathelement location="../openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-  </path>
-
-  <target name="javadoc" description="Build editor module API documentation.">
+  <target name="javadoc" depends="init" description="Build editor module API documentation.">
      <selector id="editor_javadoc_files" >
        <or>
          <filename name="src/**/*.java" />
Index: extbrowser/build.xml
===================================================================
RCS file: /cvs/extbrowser/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- extbrowser/build.xml	16 Oct 2003 12:01:47 -0000	1.32
+++ extbrowser/build.xml	8 Mar 2004 11:00:19 -0000
@@ -13,57 +13,58 @@
 -->
 
 <project name="extbrowser" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="extbrowser.files">
+      <include name="${nb.modules.dir}/extbrowser.jar"/>
+      <include name="${nb.modules.dir}/bin/extbrowser.dll"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <include name="org/netbeans/modules/extbrowser/"/>
-      <classpath>
-        <!--<pathelement location="patches"/>-->
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/extbrowser.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/extbrowser.jar"
          manifest="manifest-subst.mf"
          basedir="src"
 	 excludesfile="../nbbuild/standard-jar-excludes.txt"
-	 compress="false">
-      <locale name="ja"/>
-    </locjar>
+	 compress="false"/>
   </target>
 
-  <target name="release">
-    <copy todir="netbeans">
-      <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt">
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}">
+      <fileset dir="release/modules" excludesfile="../nbbuild/standard-jar-excludes.txt">
         <exclude name="**/sources/*"/>
       </fileset>
     </copy>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/extbrowser.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="extbrowser.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="extbrowser.nbm"
-             topdir="."
-             module="netbeans/modules/extbrowser.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/extbrowser.jar"
 	     homepage="http://extbrowser.${homepage.base}/"
 	     distribution="http://${dist.base}/extbrowser.nbm">
       <license file="${license.file}"/>
@@ -71,11 +72,14 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="org/netbeans/modules/extbrowser/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="extbrowser.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="extbrowser.nbm"/>
@@ -89,7 +93,7 @@
     <nbinstaller action="reinstall" module="netbeans/modules/extbrowser.jar"/>
   </target>
 
-  <target name="javadoc" description="Build extbrowser module API documentation.">
+  <target name="javadoc" depends="init" description="Build extbrowser module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build extbrowser module API documentation..."/>
@@ -108,13 +112,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <pathelement location="../httpserver/netbeans/modules/httpserver.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: form/build.xml
===================================================================
RCS file: /cvs/form/build.xml,v
retrieving revision 1.50
diff -u -r1.50 build.xml
--- form/build.xml	1 Mar 2004 09:13:01 -0000	1.50
+++ form/build.xml	8 Mar 2004 11:00:20 -0000
@@ -13,32 +13,36 @@
 -->
 
 <project name="form" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="form.files">
+      <include name="${nb.modules.dir}/form.jar"/>
+      <include name="${nb.modules.dir}/ext/AbsoluteLayout.jar"/>
+      <include name="${nb.sources.dir}/readme.txt"/>
+      <include name="${nb.sources.dir}/org/netbeans/lib/awtextra/AbsoluteConstraints.java"/>
+      <include name="${nb.sources.dir}/org/netbeans/lib/awtextra/AbsoluteLayout.java"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+      <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
+      <pathelement location="tmp"/>
+    </path>
+  </target>
 
-  <target name="compile" depends="hack13">
+  <target name="compile" depends="hack13,init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../java/api/netbeans/modules/autoload/java-api.jar"/>
-        <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-        <pathelement location="tmp"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
@@ -61,32 +65,37 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/form.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/form.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
-  <target name="release">
-    <copy todir="netbeans">
-      <fileset dir="release"/>
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}">
+      <fileset dir="release/modules"/>
+    </copy>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.sources.dir}">
+      <fileset dir="release/sources"/>
     </copy>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/form.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="form.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="form.nbm"
-             topdir="."
-             module="netbeans/modules/form.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/form.jar"
 	     homepage="http://form.${homepage.base}/"
 	     distribution="http://${dist.base}/form.nbm">
       <license file="${license.file}"/>
@@ -94,22 +103,24 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="form.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="form.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="tmp" />
   </target>
 
-  <target name="javadoc" depends="compile" description="Build form module API documentation.">
+  <target name="javadoc" depends="init,compile" description="Build form module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build form module API documentation..."/>
@@ -128,16 +139,8 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <pathelement location="../java/netbeans/modules/java.jar"/>
-        <pathelement location="tmp"/>
-      </classpath>
-    </javadoc>
+      <classpath refID="cp"/>
+   </javadoc>
   </target>
 
 </project>
Index: html/build.xml
===================================================================
RCS file: /cvs/html/build.xml,v
retrieving revision 1.29
diff -u -r1.29 build.xml
--- html/build.xml	9 Oct 2003 00:35:41 -0000	1.29
+++ html/build.xml	8 Mar 2004 11:00:21 -0000
@@ -13,47 +13,49 @@
 -->
 
 <project name="html" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
+  
+  <target name="init" depends="default.init">
+    <patternset id="html.files">
+      <include name="${nb.modules.dir}/html.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/html.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/html.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/html.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="html.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="html.nbm"
-             topdir="."
-             module="netbeans/modules/html.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/html.jar"
 	     homepage="http://html.${homepage.base}/"
 	     distribution="http://${dist.base}/html.nbm">
       <license file="${license.file}"/>
@@ -61,15 +63,17 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="html.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="html.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
@@ -79,7 +83,7 @@
     <nbinstaller action="reinstall" module="netbeans/modules/html.jar"/>
   </target>
   
-  <target name="javadoc" description="Build html module API documentation.">
+  <target name="javadoc" depends="init" description="Build html module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build html module API documentation..."/>
@@ -98,13 +102,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <!-- this classpath probably should be the same as for compilation -->
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: httpserver/build.xml
===================================================================
RCS file: /cvs/httpserver/build.xml,v
retrieving revision 1.37
diff -u -r1.37 build.xml
--- httpserver/build.xml	2 Apr 2003 09:45:33 -0000	1.37
+++ httpserver/build.xml	8 Mar 2004 11:00:21 -0000
@@ -13,22 +13,20 @@
 -->
 
 <project name="httpserver" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="httpserver.files">
+      <include name="${nb.modules.dir}/httpserver.jar"/>
+      <include name="${nb.modules.dir}/ext/webserver*.jar"/>
+    </patternset>
 
-  <target name="init">
     <ant dir="external" target="unscramble"/>
-    <path id="httpserver-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
       <fileset dir="external">
         <include name="webserver*.jar"/>
         <include name="servlet-2.2.jar"/>
@@ -38,34 +36,39 @@
 
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath refid="httpserver-cp"/>
+      <classpath refid="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/httpserver.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/httpserver.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/httpserver.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="httpserver.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="release" depends="init">
+<!-- Doesn't make sense to me to create directory and then copy the files from it.
+    It can be probably used for developers to add files to build, but then they should add
+    those file to httpserver.files patternset, so I'm commenting this out for now
     <mkdir dir="release"/>
     <copy todir="netbeans" includeEmptyDirs="false">
       <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
-    </copy>
-    <mkdir dir="netbeans/modules/ext"/>
-    <copy todir="netbeans/modules/ext">
+    </copy>-->
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
       <fileset dir="external">
         <include name="webserver*.jar"/>
       </fileset>
@@ -74,8 +77,8 @@
 
   <target name="nbm" depends="netbeans">
     <makenbm file="httpserver.nbm"
-             topdir="."
-             module="netbeans/modules/httpserver.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/httpserver.jar"
 	     homepage="http://httpserver.${homepage.base}/"
 	     distribution="http://${dist.base}/httpserver.nbm">
       <license name="httpserver-module-license.txt">
@@ -88,11 +91,14 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="httpserver.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="httpserver.nbm"/>
@@ -106,7 +112,7 @@
     <nbinstaller action="reinstall" module="netbeans/modules/httpserver.jar"/>
   </target>
 
-  <target name="javadoc" description="Build httpserver module API documentation.">
+  <target name="javadoc" depends="init" description="Build httpserver module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build httpserver module API documentation..."/>
@@ -125,7 +131,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath refid="httpserver-cp"/>
+      <classpath refid="cp"/>
     </javadoc>    
   </target>
 
Index: httpserver/servletapi/build.xml
===================================================================
RCS file: /cvs/httpserver/servletapi/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- httpserver/servletapi/build.xml	11 Dec 2002 17:07:03 -0000	1.6
+++ httpserver/servletapi/build.xml	8 Mar 2004 11:00:21 -0000
@@ -13,51 +13,51 @@
 -->
 
 <project name="servletapi" basedir="." default="netbeans">
+  <import file="../../nbbuild/default.xml"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="httpserver/servletapi.files">
+      <include name="${nb.modules/autoload.dir}/servletapi.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
+    </patternset>
     <ant dir="../external" target="unscramble"/>
+    <path id="cp">
+    </path>
   </target>
 
-  <target name="jars">
-    <mkdir dir="netbeans/modules/autoload"/>
+  <target name="jars" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/servletapi.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-            compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/servletapi/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
     <copy file="../external/servlet-2.2.jar"
-          tofile="netbeans/modules/autoload/ext/servlet-2.2.jar"/>
+          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
   </target>
 
   <target name="netbeans" depends="jars,release" description="Builds the module">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="httpserver/servletapi.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
     <makenbm file="servletapi.nbm"
-             topdir="."
-           module="netbeans/modules/autoload/servletapi.jar"
-           homepage="http://httpserver.${homepage.base}/"
-           distribution="http://${dist.base}/servletapi.nbm">
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/servletapi.jar"
+             homepage="http://httpserver.${homepage.base}/"
+             distribution="http://${dist.base}/servletapi.nbm">
       <license name="servletapi-license.txt">
         <text>For the integration module:</text>
         <file location="${license.file}"/>
@@ -68,10 +68,13 @@
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean all build products.">
+  <target name="clean" depends="init" description="Clean all build products.">
         <delete>
             <fileset dir="../src">
                 <include name="org/netbeans/modules/servletapi/**/*.class"/>
+            </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="httpserver/servletapi.files"/>
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
Index: i18n/build.xml
===================================================================
RCS file: /cvs/i18n/build.xml,v
retrieving revision 1.51
diff -u -r1.51 build.xml
--- i18n/build.xml	25 Feb 2004 11:46:18 -0000	1.51
+++ i18n/build.xml	8 Mar 2004 11:00:21 -0000
@@ -13,12 +13,8 @@
 -->
 
 <project name="i18n" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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="build.compiler.debug" value="on"/>
   <property name="javadoc.private" value="false"/>
   <property name="docs.location.jdk"
             value="http://java.sun.com/j2se/1.4.2/docs/api"/>
@@ -27,28 +23,30 @@
   <property name="docs.location.openide-deprecated"
             value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="i18n.files">
+      <include name="${nb.modules.dir}/i18n.jar"/>
+    </patternset>
+    <patternset id="i18n-form.files">
+      <include name="${nb.modules/eager.dir}/i18n.jar"/>
+    </patternset>
     <path id="i18n-noform-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-      <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-      <pathelement location="../core/netbeans/lib/core.jar"/>
-      <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-      <pathelement location="../properties/netbeans/modules/properties.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
+      <pathelement location="{properties.dir}/${nb.modules.dir}/properties.jar"/>
     </path>
     <path id="i18n-form-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      <pathelement location="../properties/netbeans/modules/properties.jar"/>
-      <pathelement location="../form/netbeans/modules/form.jar"/>
-      <pathelement location="../java/netbeans/modules/java.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${properties.dir}/${nb.modules.dir}/properties.jar"/>
+      <pathelement location="${form.dir}/${nb.modules.dir}/form.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
       <pathelement location="src" /> <!-- makes AspectJ compiler (ajc) happy -->
     </path>
     <path id="i18n-cp">
@@ -69,40 +67,53 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/eager"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/i18n.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/i18n.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false">
       <exclude name="org/netbeans/modules/i18n/form/"/>
       <exclude name="META-INF/netbeans/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
     <copy file="manifest-form.mf" tofile="manifest-form-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/eager/i18n-form.jar"
-            manifest="manifest-form-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/i18n-form.jar"
+         manifest="manifest-form-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false">
       <include name="org/netbeans/modules/i18n/form/"/>
       <include name="META-INF/netbeans/"/>
-      <locale name="ja"/>
-    </locjar>
-
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/i18n.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="i18n.files"/>
+       </fileset>
+    </genlist>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/i18n-form.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="i18n-form.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <!-- XXX i18n-form.jar should have its own NBM -->
     <makenbm file="i18n.nbm"
-             topdir="."
-             module="netbeans/modules/i18n.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/i18n.jar"
+	     homepage="http://i18n.${homepage.base}/"
+	     distribution="http://${dist.base}/i18n.nbm">
+      <license file="${license.file}"/>
+      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
+    </makenbm>
+    <makenbm file="i18n-form.nbm"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/eager.dir}/i18n-form.jar"
 	     homepage="http://i18n.${homepage.base}/"
 	     distribution="http://${dist.base}/i18n.nbm">
       <license file="${license.file}"/>
@@ -110,18 +121,22 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="i18n.files"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="i18n-form.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="manifest-form-subst.mf"/>
     <delete file="i18n.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
-    <delete dir="Info"/>
   </target>
 
   <target name="javadoc" depends="init" description="Build i18n module API documentation.">
Index: ide/test/build-qa-functional.xml
===================================================================
RCS file: /cvs/ide/test/build-qa-functional.xml,v
retrieving revision 1.2
diff -u -r1.2 build-qa-functional.xml
--- ide/test/build-qa-functional.xml	12 Nov 2003 09:56:32 -0000	1.2
+++ ide/test/build-qa-functional.xml	8 Mar 2004 11:00:22 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="QA functional tests compilers and executors" basedir="." default="all">
+    <import file="../../nbbuild/default-properties.xml"/>
 
     <!-- =================== -->
     <!-- Setting classpathes -->
@@ -167,7 +168,7 @@
 	         If you need e.g. your tested module, write this:
 	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
  	      -->
- 	    <pathelement location="${netbeans.home}/lib/openide.jar"/>
+ 	    <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
    	</path>
     </target>
     
Index: image/build.xml
===================================================================
RCS file: /cvs/image/build.xml,v
retrieving revision 1.30
diff -u -r1.30 build.xml
--- image/build.xml	7 Mar 2004 21:52:44 -0000	1.30
+++ image/build.xml	8 Mar 2004 11:00:22 -0000
@@ -13,47 +13,48 @@
 -->
 
 <project name="image" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="image.files">
+      <include name="${nb.modules.dir}/image.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/image.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/image.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/image.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="image.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="image.nbm"
-             topdir="."
-             module="netbeans/modules/image.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/image.jar"
 	     homepage="http://image.${homepage.base}/"
 	     distribution="http://${dist.base}/image.nbm">
       <license file="${license.file}"/>
@@ -73,15 +74,17 @@
     <nbinstaller module="test/image.jar" action="reinstall"/>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="image.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="image.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="Info"/>
   </target>
 
@@ -89,7 +92,7 @@
     <delete dir="test"/>
   </target>
 
-  <target name="javadoc" description="Build image module API documentation.">
+  <target name="javadoc" depends="init" description="Build image module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build image module API documentation..."/>
@@ -108,12 +111,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: j2eeserver/build.xml
===================================================================
RCS file: /cvs/j2eeserver/build.xml,v
retrieving revision 1.49
diff -u -r1.49 build.xml
--- j2eeserver/build.xml	7 Mar 2004 21:53:04 -0000	1.49
+++ j2eeserver/build.xml	8 Mar 2004 11:00:39 -0000
@@ -13,47 +13,42 @@
 -->
 
 <project basedir="." default="netbeans" name="j2eeserver">
-
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="nbroot" value=".."/>
-  <property name="f4jroot" value="../../f4j_all"/>
-  <property name="nbext" value="${nbroot}/nbbuild"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nbext}/standard-nbm-license.txt"/>
-  
-  <path id="cp">
-    <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-    <pathelement location="${nbroot}/debuggercore/api/netbeans/modules/autoload/debugger-api.jar"/>
-    <pathelement location="${nbroot}/core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-    <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-    <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    <pathelement location="${nbroot}/libs/external/j2eeeditor-1.0.jar"/>
-    <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/> <!-- XXX -->
-    <pathelement location="${nbroot}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/> <!-- XXX -->
-    <pathelement location="${nbroot}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
-    <pathelement location="${nbroot}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/> <!-- XXX -->
-    <pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-    <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/> 
-    <pathelement location="${nbroot}/core/settings/netbeans/modules/autoload/core-settings.jar"/>
-    <pathelement location="${nbroot}/xml/api/netbeans/modules/autoload/xml-api.jar" />
-    <fileset dir="external">
-        <include name="*.jar"/>
-    </fileset>
-    <!-- PENDING required by debugger type, perhaps could be
-    removed -->
-    <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/> 
-  </path>
+  <import file="../nbbuild/default.xml"/> 
+ 
+  <target name="init" depends="default.init">
+    <patternset id="j2eeserver.files">
+      <include name="${nb.modules/autoload.dir}/j2eeserver.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${debuggercore/api.dir}/${nb.modules/autoload.dir}/debugger-api.jar"/>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${nb_all}/libs/external/j2eeeditor-1.0.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/> <!-- XXX -->
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/> <!-- XXX -->
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/> <!-- XXX -->
+      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/> <!-- XXX -->
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+      <pathelement location="${core/settings.dir}/${nb.modules/autoload.dir}/core-settings.jar"/>
+      <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar" />
+      <fileset dir="external">
+          <include name="*.jar"/>
+      </fileset>
+      <!-- PENDING required by debugger type, perhaps could be
+      removed -->
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/> 
+    </path>
+  </target>
   
-  <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar" name="locjar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <target name="s2binit">
+  <target name="s2binit" depends="init">
 	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
 	  <classpath>
-		<pathelement path="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-		<pathelement path="${nbroot}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
-		<pathelement path="${nbroot}/schema2beans/anttask/s2banttask.jar"/>
+		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
+		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
 	  </classpath>
 	</taskdef>
   </target>
@@ -61,36 +56,33 @@
   <!-- These are the primary targets. -->
 
   <target depends="jars" name="netbeans">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
-  </target>
-
-  <target name="external">
-      <ant dir="external" target="unscramble"/>
-      <copy todir="netbeans/modules/autoload/ext">
-          <fileset dir="external/">
-		  	<include name="*.jar"/>
-          </fileset>
-      </copy>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeserver.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="j2eeserver.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="j2eeserver.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/j2eeserver.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/j2eeserver.jar"
              homepage="http://j2eeserver.${homepage.base}/"
              distribution="${dist.base}/j2eeserver.nbm">
       <license file="${license.file}" />
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
-      <exclude name="**/nondist/**" />
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="j2eeserver.files"/>
+      </fileset>
     </delete>
     <delete dir="src/org/netbeans/modules/j2ee/deployment/impl/gen"/>
     <delete dir="netbeans"/>
@@ -100,33 +92,26 @@
     <delete dir="javadoc"/>
   </target>
 
-  <!-- These are the secondary targets. -->
-
-  <target name="release">
-  </target>
 
-  <target depends="compile,release" name="jars">
-    <mkdir dir="netbeans/modules/autoload"/>
+  <target depends="compile" name="jars">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf"
           filtering="on"/>
-
-    <locjar compress="false" jarfile="netbeans/modules/autoload/j2eeserver.jar" manifest="manifest-subst.mf">
-      <locale name="ja"/>
-      <fileset dir="src" excludesfile="${nbext}/standard-jar-excludes.txt">
-          <include name="org/**"/>
-      </fileset>
-    </locjar>
+    <jar compress="false" 
+         jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeserver.jar" 
+         manifest="manifest-subst.mf"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         basedir="src"/>
   </target>
 
-  <target name="compile" depends="external,privatedtds">
+  <target name="compile" depends="init,privatedtds">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <patternset>
           <include name="org/"/>
           <exclude name="**/tests/**"/>
           <exclude name="**/J2eeNoProjectEnvironment.java"/>
       </patternset>
-
       <classpath refid="cp"/>
     </javac>
   </target>
@@ -175,23 +160,21 @@
         </uptodate> 
   </target>
 
-  <target name="ddgen" depends="ddinit" if="dd.generation">
+  <target name="ddgen" depends="init,ddinit" if="dd.generation">
      <echo message="Generated schema2beans from ${dtdfile}"/>
      <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="yes">
        <classpath>
-          <pathelement path="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-          <pathelement path="${nbroot}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
-          <fileset dir = "${nbroot}/openide">
-                <include name="netbeans/lib/openide*.jar"/>
-                <include name="loaders/netbeans/lib/openide-loaders.jar"/>
-          </fileset>
-        </classpath>
-        <arg line= "-f ${dtdfile}" />
-        <arg line= "-p ${dtdpackage}" />
-        <arg line= "-r src" />
-	    <arg line="-javaBeans"/>
-	    <arg line="-commonInterface"/>
-	    <arg line="-extendBaseBean"/>
+          <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+          <pathelement location="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+       </classpath>
+       <arg line= "-f ${dtdfile}" />
+       <arg line= "-p ${dtdpackage}" />
+       <arg line= "-r src" />
+       <arg line="-javaBeans"/>
+       <arg line="-commonInterface"/>
+       <arg line="-extendBaseBean"/>
      </java>
   </target> 
 
Index: j2eeserver/j2eeapis/build.xml
===================================================================
RCS file: /cvs/j2eeserver/j2eeapis/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- j2eeserver/j2eeapis/build.xml	27 Nov 2003 06:34:33 -0000	1.2
+++ j2eeserver/j2eeapis/build.xml	8 Mar 2004 11:00:39 -0000
@@ -13,38 +13,35 @@
 -->
 
 <project name="j2eeapis" basedir="." default="netbeans">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="../external" target="unscramble"/>
+    <patternset id="j2eeserver/j2eeapis.files">
+      <include name="${nb.modules/autoload.dir}/j2eeapis.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/ejb20.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/javax77.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jmxri.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jsr88javax.jar"/>
+    </patternset>
   </target>
 
-  <target name="jars">
-    <mkdir dir="netbeans/modules/autoload"/>
+  <target name="jars" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/j2eeapis.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-            compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeapis.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/j2eeapis/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
-    <copy todir="netbeans/modules/autoload/ext/">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
       <fileset dir="../external"> 
         <include name="*.jar"/>
       </fileset>
@@ -52,13 +49,17 @@
   </target>
 
   <target name="netbeans" depends="jars,release" description="Builds the module">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeapis.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="j2eeserver/j2eeapis.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
     <makenbm file="j2eeapis.nbm"
-             topdir="."
-           module="netbeans/modules/autoload/j2eeapis.jar"
+           productdir="${netbeans.dest.dir}/${cluster.dir}"
+           module="${nb.modules/autoload.dir}/j2eeapis.jar"
            homepage="http://web.${homepage.base}/"
            distribution="http://${dist.base}/j2eeapis.nbm">
       <license file="${license.file}"/>
@@ -78,11 +79,14 @@
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean all build products.">
-        <delete file="manifest-subst.mf"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
-        <delete file="j2eeapis.nbm"/>
+  <target name="clean" depends="init" description="Clean all build products.">
+    <delete file="manifest-subst.mf"/>
+    <delete file="j2eeapis.nbm"/>
+    <delete>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="j2eeserver/j2eeapis.files"/>
+      </fileset>
+    </delete>
   </target>
 
   <target name="javadoc">
Index: jarpackager/build.xml
===================================================================
RCS file: /cvs/jarpackager/build.xml,v
retrieving revision 1.37
diff -u -r1.37 build.xml
--- jarpackager/build.xml	9 Feb 2004 17:02:00 -0000	1.37
+++ jarpackager/build.xml	8 Mar 2004 11:00:40 -0000
@@ -13,26 +13,20 @@
 -->
 
 <project name="jarpackager" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="jarpackager.files">
+      <include name="${nb.modules.dir}/j2eeapis.jar"/>
+    </patternset>
     <path id="jarpackager-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar" />
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-<!--        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> --><!-- XXX -->
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar" />
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
     </path>
   </target>
 
@@ -43,20 +37,22 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/jarpackager.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jarpackager.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jarpackager.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="jarpackager.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="deploy" depends="netbeans">
@@ -65,8 +61,8 @@
 
   <target name="nbm" depends="netbeans">
     <makenbm file="jarpackager.nbm"
-             topdir="."
-             module="netbeans/modules/jarpackager.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/jarpackager.jar"
 	     homepage="http://jarpackager.${homepage.base}/"
 	     distribution="http://${dist.base}/jarpackager.nbm">
       <license file="${license.file}"/>
@@ -74,18 +70,19 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="jarpackager.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="jarpackager.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
-    <delete dir="Info"/>
   </target>
 
   <target name="javadoc" description="Build jarpackager module API documentation." depends="init">
Index: java/build.xml
===================================================================
RCS file: /cvs/java/build.xml,v
retrieving revision 1.61
diff -u -r1.61 build.xml
--- java/build.xml	24 Feb 2004 20:33:57 -0000	1.61
+++ java/build.xml	8 Mar 2004 11:00:40 -0000
@@ -13,64 +13,56 @@
 -->
 
 <project name="java" default="netbeans" basedir=".">
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <target name="init">
+  <import file="../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="java.files">
+      <include name="${nb.modules.dir}/java.jar"/>
+      <include name="${nb.modules.dir}/ext/javac.jar"/>
+      <include name="${nb.modules.dir}/ext/java-gj.jar"/>
+      <include name="${nb.modules.dir}/ext/javamake*.jar"/>
+    </patternset>
     <ant dir="external" target="unscramble"/>
-    <path id="java-cp">
+    <path id="cp">
       <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
       <fileset dir="external">
         <include name="javamake*.jar"/>
       </fileset>
-      <pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
+      <pathelement location="${classfile.dir}/${nb.modules/autoload.dir}/classfile.jar"/>
       <!-- Java API -->
-      <pathelement location="api/netbeans/modules/autoload/java-api.jar"/>
-      <pathelement location="srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-      <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-      <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-      <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
+      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
     </path>
     <condition property="s1s">
 	<equals arg1="${nbm_alias}" arg2="f4j_ide"/>
     </condition>
   </target>
 
-  <target name="compile-module" depends="init">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-      <classpath refid="java-cp"/>
+      <classpath refid="cp"/>
     </javac>
   </target>
-  
-  <target name="compile" depends="compile-module">
-  </target>
-  
+ 
   <target name="jars" depends="compile">
-      <mkdir dir="netbeans/modules"/>
+      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
       <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
       <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-      <locjar jarfile="netbeans/modules/java.jar"
-              manifest="manifest-subst.mf"
-          compress="false">
-          <fileset dir="src"
-          excludesfile="../nbbuild/standard-jar-excludes.txt"
-      />
-      <locale name="ja"/>
-      </locjar>
+      <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/java.jar"
+           manifest="manifest-subst.mf"
+           compress="false">
+         <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
+      </jar>
   </target>
   
   <target name="release" depends="init">
-    <mkdir dir="netbeans/modules/ext"/>
-    <copy todir="netbeans/modules/ext">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
       <fileset dir="external">
         <include name="javac.jar"/>
         <include name="java-gj.jar"/>
@@ -80,13 +72,17 @@
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/java.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="java.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build NBM.">
     <makenbm file="java.nbm"
-             topdir="."
-             module="netbeans/modules/java.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/java.jar"
 	     homepage="http://java.${homepage.base}/"
 	     distribution="http://${dist.base}/java.nbm">
       <license name="java-license.txt">
@@ -109,11 +105,14 @@
     <delete dir="javadoc"/>
   </target>
 
-  <target name="clean" description="Clean build products.">
+  <target name="clean" depends="init" description="Clean build products.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="java.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="java.nbm"/>
@@ -130,7 +129,7 @@
     </copy>
   </target>
 
-  <target name="java-module-apis" description="Build java module API documentation.">
+  <target name="java-module-apis" depends="init" description="Build java module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build java module API documentation..."/>
@@ -151,7 +150,7 @@
         <pathelement location="src"/>
         <pathelement location="api/src"/>
       </sourcepath>
-      <classpath refid="java-cp"/>
+      <classpath refid="cp"/>
     </javadoc>
     <zip zipfile="JavaAPIs.zip" basedir="JavaAPIs"/>
   </target>
Index: java/api/build.xml
===================================================================
RCS file: /cvs/java/api/build.xml,v
retrieving revision 1.18
diff -u -r1.18 build.xml
--- java/api/build.xml	15 May 2003 06:34:12 -0000	1.18
+++ java/api/build.xml	8 Mar 2004 11:00:40 -0000
@@ -13,59 +13,55 @@
 -->
 
 <project name="java" default="netbeans" basedir=".">
-
-  <property name="nb_all" value="../.."/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
+  <import file="../../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="java/api.files">
+      <include name="${nb.modules/autoload.dir}/java-api.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+    </path>
+  </target>
   
   <!-- External documentation referenced from the API -->
   <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.4/docs/api"/>
   <property name="openide-docs-location" value="http://www.netbeans.org/download/apis"/>
   <property name="openide.package-list.loc" location="doc/external/openide"/>
-  
-  <path id="cp">
-    <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-    <fileset dir="${nb_all}/openide/netbeans/lib">
-        <include name="openide*.jar" />
-    </fileset>
-    <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-    <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-  </path>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath refid="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/java-api.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/java-api.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/java-api.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="java/api.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="java-api.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/java-api.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/java-api.jar"
 	     homepage="http://java.${homepage.base}/"
 	     distribution="http://${dist.base}/java-api.nbm">
       <license file="${license.file}"/>
@@ -73,7 +69,7 @@
     </makenbm>
   </target>
   
-  <target name="javadoc">
+  <target name="javadoc" depends="init">
     <property name="_cp" refid="cp"/>
     <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
 	<property name="javadoc.base" location="."/>
@@ -89,10 +85,13 @@
     </ant>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="java/api.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: java/srcmodel/build.xml
===================================================================
RCS file: /cvs/java/srcmodel/build.xml,v
retrieving revision 1.10
diff -u -r1.10 build.xml
--- java/srcmodel/build.xml	20 Jun 2003 20:07:04 -0000	1.10
+++ java/srcmodel/build.xml	8 Mar 2004 11:00:41 -0000
@@ -13,51 +13,48 @@
 -->
 
 <project name="java/srcmodel" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-    
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="java/srcmodel.files">
+        <include name="${nb.modules/autoload.dir}/java-src-model.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/java-src-model.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/java-src-model.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/java-src-model.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="java/srcmodel.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="java-src-model.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/java-src-model.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/java-src-model.jar"
                  homepage="http://java.${homepage.base}/"
                  distribution="http://${dist.base}/java-src-model.nbm">
             <license file="${license.file}"/>
@@ -65,7 +62,7 @@
         </makenbm>
     </target>
   
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="JavaHierarchyAPI"/>
@@ -78,15 +75,17 @@
         </ant>
     </target>
     
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="java/srcmodel.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="java-src-model.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
     </target>
Index: javacvs/compat/build.xml
===================================================================
RCS file: /cvs/javacvs/compat/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- javacvs/compat/build.xml	12 Dec 2003 15:32:25 -0000	1.1
+++ javacvs/compat/build.xml	8 Mar 2004 11:00:56 -0000
@@ -13,49 +13,50 @@
 -->
 
 <project name="javacvs_compat" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="javacvs/compat.files">
+      <include name="${nb.modules.dir}/javacvscompat.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/javacvscompat.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/javacvscompat.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/javacvscompat.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="javacvs/compat.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="javacvscompat.nbm"
-             topdir="."
-             module="netbeans/modules/javacvscompat.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/javacvscompat.jar"
 	     homepage="http://javacvs.${homepage.base}/"
 	     distribution="http://${dist.base}/javacvscompat.nbm">
       <license file="${license.file}"/>
@@ -63,19 +64,20 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="javacvs/compat.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="javacvscompat.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build javacvs compat module API documentation.">
+  <target name="javadoc" depends="init" description="Build javacvs compat module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build javacvs compat module API documentation..."/>
@@ -94,14 +96,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: javacvs/libmodule/build.xml
===================================================================
RCS file: /cvs/javacvs/libmodule/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- javacvs/libmodule/build.xml	16 Jun 2003 08:36:40 -0000	1.1
+++ javacvs/libmodule/build.xml	8 Mar 2004 11:00:56 -0000
@@ -12,50 +12,61 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 <project basedir="." default="netbeans" name="javacvs/libmodule">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../../nbbuild/standard-nbm-license.txt"/>
-
-  <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar" name="makenbm"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="javacvs/libmodule.files">
+      <include name="${nb.modules/autoload.dir}/cvslib.jar"/>
+    </patternset>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init"> 
     <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="../libsrc" srcdir="../libsrc"/>
   </target>
 
   <target depends="compile" name="jars">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" filtering="on" tofile="manifest-subst.mf"/>
     <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar" name="locjar"/>
-    <locjar basedir="../libsrc" compress="false" excludesfile="../../nbbuild/standard-jar-excludes.txt" jarfile="netbeans/modules/autoload/cvslib.jar" manifest="manifest-subst.mf">
-    </locjar>
+    <jar basedir="../libsrc" 
+         compress="false" 
+         excludesfile="../../nbbuild/standard-jar-excludes.txt" 
+         jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/cvslib.jar" 
+         manifest="manifest-subst.mf"/>
   </target>
 
   <target depends="jars" name="netbeans">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/cvslib.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="javacvs/libmodule.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target depends="netbeans" name="nbm">
-    <makenbm distribution="http://${dist.base}/cvslib.nbm" file="cvslib.nbm" homepage="http://javacvs.${homepage.base}/" module="netbeans/modules/autoload/cvslib.jar" topdir=".">
+    <makenbm distribution="http://${dist.base}/cvslib.nbm" 
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             file="cvslib.nbm" 
+             homepage="http://javacvs.${homepage.base}/" 
+             module="${nb.modules/autoload.dir}/cvslib.jar">
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="../libsrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="javacvs/libmodule.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="cvslib.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
-    <delete dir="Info"/>
   </target>
 
   <target name="javadoc" description="Build cvs library module API documentation.">
Index: javadoc/build.xml
===================================================================
RCS file: /cvs/javadoc/build.xml,v
retrieving revision 1.40
diff -u -r1.40 build.xml
--- javadoc/build.xml	29 Oct 2003 12:47:56 -0000	1.40
+++ javadoc/build.xml	8 Mar 2004 11:00:58 -0000
@@ -13,46 +13,39 @@
 -->
 
 <project name="javadoc" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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="nb_all" location=".."/>
-  <property name="build.compiler.debug" value="on"/>
-  
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="javadoc.files">
+      <include name="${nb.modules.dir}/javadoc.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" destdir="src" srcdir="src" source="1.4">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-        <pathelement location="../java/netbeans/modules/java.jar"/>
-        <!--pathelement location="../openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/-->        
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/javadoc.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/javadoc.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
     <!-- I call this target from IDE directly, while debugging module. -->
@@ -65,13 +58,17 @@
   
   
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/javadoc.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="javadoc.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="javadoc.nbm"
-             topdir="."
-             module="netbeans/modules/javadoc.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/javadoc.jar"
 	     homepage="http://javadoc.${homepage.base}/"
 	     distribution="http://${dist.base}/javadoc.nbm">
       <license file="${license.file}"/>
@@ -79,20 +76,22 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="javadoc.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="javadoc.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build javadoc module API documentation.">
+  <target name="javadoc" depends="init" description="Build javadoc module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build javadoc module API documentation..."/>
@@ -111,13 +110,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <pathelement location="../java/netbeans/modules/java.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: junit/build.xml
===================================================================
RCS file: /cvs/junit/build.xml,v
retrieving revision 1.36
diff -u -r1.36 build.xml
--- junit/build.xml	16 Feb 2004 20:27:56 -0000	1.36
+++ junit/build.xml	8 Mar 2004 11:01:13 -0000
@@ -13,22 +13,33 @@
 -->
 
 <project name="junit" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  
-  <property name="build.compiler.deprecation" value="off"/>
-  <property name="build.compiler.debug" value="off"/>  
-
-  <property name="module.license.file" location="../nbbuild/standard-nbm-license.txt"/>
+  <property name="module.license.file" location="${nb_all}/nbbuild/standard-nbm-license.txt"/>
 
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="external" target="unscramble"/>
+    <patternset id="junit.files">
+      <include name="${nb.modules.dir}/junit.jar"/>
+      <include name="${nb.modules.dir}/ext/juni-testrunnert.jar"/>
+      <include name="${nb.modules/docs.dir}/junit-module-help.jar"/>
+      <include name="${nb.docs.dir}/junit-3.8.1-api.zip"/>
+      <include name="${nb.modules.dir}/ext/junit*.jar"/>
+      <include name="${nb.system.dir}/ParserDB/JUnit-*.jc?"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      <fileset dir="external">
+        <include name="junit*.jar"/>
+      </fileset>
+    </path>
   </target>
   
 
@@ -38,44 +49,29 @@
            debug="${build.compiler.debug}"
            source="1.4">
       <exclude name="org/netbeans/junit/**"/>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-        <fileset dir="external">
-          <include name="junit*.jar"/>
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
-    <mkdir dir="netbeans/modules/ext"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/junit.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="../nbbuild/standard-jar-excludes.txt"
-            compress="false"
-	    includes="org/netbeans/modules/junit/**"
-            excludes="org/netbeans/modules/junit/testrunner/**">
-    </locjar>
-    <locjar jarfile="netbeans/modules/ext/junit-testrunner.jar"
-            basedir="src"
-            excludesfile="../nbbuild/standard-jar-excludes.txt"
-            compress="false"
-	    includes="org/netbeans/modules/junit/testrunner/**">            
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/junit.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="../nbbuild/standard-jar-excludes.txt"
+         compress="false"
+	 includes="org/netbeans/modules/junit/**"
+         excludes="org/netbeans/modules/junit/testrunner/**"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/junit-testrunner.jar"
+         basedir="src"
+         excludesfile="../nbbuild/standard-jar-excludes.txt"
+         compress="false"
+	 includes="org/netbeans/modules/junit/testrunner/**"/>
   </target>
 
-  <target name="javahelp">
+  <target name="javahelp" depends="init">
     <!-- XXX consider running jhindexer too -->
     <mkdir dir="javahelp/org/netbeans/modules/junit/docs/JavaHelpSearch"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/junit/docs/"
@@ -90,25 +86,25 @@
     </jhindexer>
     <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
     <copy file="../usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
-    <mkdir dir="netbeans/modules/docs"/>    
-    <locjar jarfile="netbeans/modules/docs/junit-module-help.jar" compress="true">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>    
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/junit-module-help.jar" compress="true">
     	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
-    </locjar>
+    </jar>
     
   </target>
   
-  <target name="parserdb">
-  	<mkdir dir="netbeans/system/ParserDB"/>
-  	<copy toDir="netbeans/system/ParserDB">
-  		<fileset dir="parserdb"/>
-  	</copy>
+  <target name="parserdb" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/ParserDB"/>
+    <copy toDir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/ParserDB">
+      <fileset dir="parserdb"/>
+    </copy>
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/docs"/>
-    <copy file="external/junit-3.8.1-api.zip" todir="netbeans/docs"/>
-    <mkdir dir="netbeans/modules/ext"/>
-    <copy todir="netbeans/modules/ext">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
+    <copy file="external/junit-3.8.1-api.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
       <fileset dir="external">
         <include name="junit*.jar"/>
       </fileset>
@@ -116,14 +112,17 @@
   </target>
 
   <target name="netbeans" depends="jars,javahelp,parserdb,release">
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/junit.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="junit.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="junit.nbm"
-             topdir="."
-             module="netbeans/modules/junit.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/junit.jar"
 	     homepage="http://junit.${homepage.base}/"
 	     distribution="http://${dist.base}/junit.nbm">
       <license name="junit-license.txt">
@@ -136,10 +135,13 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="junit.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: libs/j2eeeditor/build.xml
===================================================================
RCS file: /cvs/libs/j2eeeditor/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- libs/j2eeeditor/build.xml	18 Apr 2003 14:59:26 -0000	1.2
+++ libs/j2eeeditor/build.xml	8 Mar 2004 11:01:14 -0000
@@ -13,43 +13,36 @@
 -->
 
 <project name="libs/j2eeeditor" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="libs_root" location=".."/>
 
-    <property name="nbroot" location="${libs_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
     <property name="j2eeeditor-license.file" location="${libs_root}/external/j2eeeditor-license.html"/>
-    <property name="homepage.base" value="libs.netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
 
-    <target name="init">
+    <target name="init" depends="default.init">
         <property file="${libs_root}/public.properties"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <ant dir="../external" target="unscramble"/>
+        <patternset id="libs/j2eeeditor.files">
+          <include name="${nb.modules/autoload.dir}/j2eeeditor.jar"/>
+          <include name="${nb.modules/autoload.dir}/ext/j2eeeditor*.jar"/>
+        </patternset>
     </target>
 
     <target name="jars" depends="init">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/j2eeeditor.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/j2eeeditor.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy todir="netbeans/modules/autoload/ext">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
             <fileset dir="../external">
                 <include name="j2eeeditor*.jar"/>
             </fileset>
@@ -57,14 +50,17 @@
     </target>
 
     <target name="netbeans" depends="jars, release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/j2eeeditor.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="libs/j2eeeditor.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="${libs_root}/j2eeeditor.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/j2eeeditor.jar"
+        <makenbm file="j2eeeditor.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/j2eeeditor.jar"
                  homepage="http://${homepage.base}/#j2eeeditor"
                  distribution="http://${dist.base}/j2eeeditor.nbm">
             <license name="j2eeeditor-license.html">
@@ -77,11 +73,14 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete file="manifest-subst.mf"/>
         <delete file="${libs_root}/j2eeeditor.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="libs/j2eeeditor.files"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="all" depends="clean, nbm"/>
Index: libs/jaxp/build.xml
===================================================================
RCS file: /cvs/libs/jaxp/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- libs/jaxp/build.xml	11 Dec 2002 17:07:10 -0000	1.12
+++ libs/jaxp/build.xml	8 Mar 2004 11:01:14 -0000
@@ -13,53 +13,43 @@
 -->
 
 <project name="libs/jaxp" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="libs_root" location=".."/>
 
-    <property name="nbroot" location="${libs_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="libs.netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-
-
-    <target name="init">
+    <target name="init" depends="default.init">
         <property file="${libs_root}/public.properties"/>
         <filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
         <filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+        <patternset id="libs/jaxp.files">
+          <include name="${nb.modules/autoload.dir}/jaxp.jar"/>
+        </patternset>
     </target>
 
     <target name="jars" depends="init">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/jaxp.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
-    </target>
-
-    <target name="release">
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jaxp.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
-    <target name="netbeans" depends="jars, release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jaxp.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="libs/jaxp.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="${libs_root}/jaxp.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/jaxp.jar"
+        <makenbm file="jaxp.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/jaxp.jar"
                  homepage="http://${homepage.base}/#jaxp"
                  distribution="http://${dist.base}/jaxp.nbm">
             <license file="${license.file}"/>
@@ -67,11 +57,14 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete file="manifest-subst.mf"/>
-        <delete file="${libs_root}/jaxp.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="jaxp.nbm"/>
+        <delete>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="libs/jaxp.files"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="all" depends="clean, nbm"/>
Index: libs/regexp/build.xml
===================================================================
RCS file: /cvs/libs/regexp/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- libs/regexp/build.xml	6 Jun 2003 15:29:06 -0000	1.1
+++ libs/regexp/build.xml	8 Mar 2004 11:01:14 -0000
@@ -13,45 +13,35 @@
 -->
 
 <project name="libs/regexp" default="netbeans" basedir=".">
-
     <property name="libs_root" location=".."/>
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nbroot" location="${libs_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="libs.netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-
-
-    <target name="init">
-        <property file="${libs_root}/public.properties"/>
-        <filter token="REGEXP_SPEC_VERS_SUBST" value="${libs.regexp.specification.version}"/>
-        <filter token="REGEXP_IMPL_VERS_SUBST" value="${libs.regexp.implementation.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <ant dir="${libs_root}/external" target="unscramble"/>
+    <target name="init" depends="default.init">
+      <patternset id="libs/regexp.files">
+        <include name="${nb.modules/autoload.dir}/ext/regexp*.jar"/>
+        <include name="${nb.modules/autoload.dir}/nb-regexp-wrapper.jar"/>
+      </patternset>
+      <property file="${libs_root}/public.properties"/>
+      <filter token="REGEXP_SPEC_VERS_SUBST" value="${libs.regexp.specification.version}"/>
+      <filter token="REGEXP_IMPL_VERS_SUBST" value="${libs.regexp.implementation.version}"/>
+      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+      <ant dir="${libs_root}/external" target="unscramble"/>
     </target>
 
     <target name="jars" depends="init">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/nb-regexp-wrapper.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-regexp-wrapper.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+          <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>   
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy todir="netbeans/modules/autoload/ext">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
             <fileset dir="${libs_root}/external">
                 <include name="regexp*.jar"/>
             </fileset>
@@ -59,7 +49,11 @@
     </target>
 
     <target name="netbeans" depends="jars, release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-regexp-wrapper.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="libs/regexp.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
@@ -84,6 +78,9 @@
         <delete file="${libs_root}/regexp.nbm"/>
         <delete dir="netbeans"/>
         <delete dir="Info"/>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="openide/compiler.files"/>
+            </fileset>
     </target>
 
     <target name="all" depends="clean, nbm"/>
Index: libs/xalan/build.xml
===================================================================
RCS file: /cvs/libs/xalan/build.xml,v
retrieving revision 1.15
diff -u -r1.15 build.xml
--- libs/xalan/build.xml	7 Jan 2004 00:38:58 -0000	1.15
+++ libs/xalan/build.xml	8 Mar 2004 11:01:14 -0000
@@ -13,45 +13,38 @@
 -->
 
 <project name="libs/xalan" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="libs_root" location=".."/>
-
-    <property name="nbroot" location="${libs_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
+    <property name="apache-license.file" location="${nb_all}/nbbuild/external/apache-license.txt"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="apache-license.file" location="${nbroot}/nbbuild/external/apache-license.txt"/>
-    <property name="homepage.base" value="libs.netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
+    <property name="libs_root" location=".."/>
 
-    <target name="init">
+    <target name="init" depends="default.init">
         <property file="${libs_root}/public.properties"/>
         <filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
         <filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <ant dir="../external" target="unscramble"/>
+        <patternset id="libs/xalan.files">
+          <include name="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"/>
+          <include name="${nb.modules/autoload.dir}/ext/xalan*.jar"/>
+        </patternset>
     </target>
 
     <target name="jars" depends="init">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/nb-xalan-wrapper.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy todir="netbeans/modules/autoload/ext">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
             <fileset dir="../external">
                 <include name="xalan*.jar"/>
             </fileset>
@@ -59,14 +52,17 @@
     </target>
 
     <target name="netbeans" depends="jars, release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="libs/xalan.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="${libs_root}/xalan.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/nb-xalan-wrapper.jar"
+        <makenbm file="xalan.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/nb-xalan-wrapper.jar"
                  homepage="http://${homepage.base}/#xalan"
                  distribution="http://${dist.base}/xalan.nbm">
             <license name="xalan-license.txt">
@@ -79,11 +75,14 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete file="manifest-subst.mf"/>
-        <delete file="${libs_root}/xalan.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xalan.nbm"/>
+        <delete>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="libs/xalan.files"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="all" depends="clean, nbm"/>
Index: libs/xerces/build.xml
===================================================================
RCS file: /cvs/libs/xerces/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- libs/xerces/build.xml	28 Jul 2003 17:10:53 -0000	1.12
+++ libs/xerces/build.xml	8 Mar 2004 11:01:14 -0000
@@ -13,47 +13,40 @@
 -->
 
 <project name="libs/xerces" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="libs_root" location=".."/>
 
-    <property name="nbroot" location="${libs_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
     <property file="${libs_root}/public.properties"/>
+    <property name="apache-license.file" location="${nb_all}/nbbuild/external/apache-license.txt"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="apache-license.file" location="${nbroot}/nbbuild/external/apache-license.txt"/>
-    <property name="homepage.base" value="libs.netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-
-    <target name="init">
+    <target name="init" depends="default.init">
         <property file="${libs_root}/public.properties"/>
         <filter token="XERCES_SPEC_VERS_SUBST" value="${libs.xerces.specification.version}"/>
         <filter token="XERCES_IMPL_VERS_SUBST" value="${libs.xerces.implementation.version}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <ant dir="../external" target="unscramble"/>
+        <patternset id="libs/xerces.files">
+          <include name="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"/>
+          <include name="${nb.modules/autoload.dir}/ext/${libs.xerces.jar}"/>
+          <include name="${nb.modules/autoload.dir}/ext/xml-commons-dom-ranges-*.jar"/>
+        </patternset>
     </target>
 
     <target name="jars" depends="init">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/nb-xerces-wrapper.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy todir="netbeans/modules/autoload/ext">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
             <fileset dir="../external">
                 <include name="${libs.xerces.jar}"/>
                 <include name="xml-commons-dom-ranges-*.jar"/>
@@ -62,14 +55,17 @@
     </target>
 
     <target name="netbeans" depends="jars, release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="libs/xerces.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="${libs_root}/xerces.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/nb-xerces-wrapper.jar"
+        <makenbm file="xerces.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/nb-xerces-wrapper.jar"
                  homepage="http://${homepage.base}/#xerces"
                  distribution="http://${dist.base}/xerces.nbm">
             <license name="xerces-license.txt">
@@ -84,11 +80,14 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete file="manifest-subst.mf"/>
-        <delete file="${libs_root}/xerces.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xerces.nbm"/>
+        <delete>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="libs/xerces.files"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="all" depends="clean, nbm"/>
Index: monitor/build.xml
===================================================================
RCS file: /cvs/monitor/build.xml,v
retrieving revision 1.49
diff -u -r1.49 build.xml
--- monitor/build.xml	4 Mar 2004 17:03:43 -0000	1.49
+++ monitor/build.xml	8 Mar 2004 11:01:15 -0000
@@ -14,51 +14,40 @@
 
 
 <project name="monitor" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="storepass" value="?"/>
-
-  <property name="servlet22" 
-     location="${nb_root}/httpserver/external/servlet-2.2.jar"/>
-  <property name="servlet23" 
-     location="${nb_root}/web/external/servlet-2.3.jar"/>
-
-  <target name="setup-jdkhome-1">
-    <!-- Note: user-configured -Djavahome=... will always override this: -->
-    <property name="javahome" location="${java.home}"/>
-    <available property="javahome-valid" file="${javahome}/lib/tools.jar"/>
-  </target>
-  <target name="setup-jdkhome-2" depends="setup-jdkhome-1" if="javahome-valid">
-    <property name="jdkhome" value="${javahome}"/>
-    <property name="jdkhome-valid" value="true"/>
-  </target>
-  <target name="setup-jdkhome-3" depends="setup-jdkhome-1" unless="javahome-valid">
-    <property name="jdkhome" location="${javahome}/.."/>
-    <available property="jdkhome-valid" file="${jdkhome}/lib/tools.jar"/>
-  </target>
-  <target name="setup-jdkhome" depends="setup-jdkhome-2,setup-jdkhome-3" unless="jdkhome-valid">
-    <fail message="No tools.jar found in ${javahome}! Set -Djavahome=... as needed."/>
+  <target name="init" depends="default.init">
+    <patternset id="monitor.files">
+      <include name="${nb.modules.dir}/module.jar"/>
+      <include name="${nb.modules.dir}/ext/httpmonitor.jar"/>
+    </patternset>
+    <path id="core-cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
+      <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
+    </path>
+    <path id="server-cp">
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
+      <pathelement location="${web/servletapi23.dir}/${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
+    </path>
   </target>
 
   <!-- These are the primary targets. -->
 
   <target name="netbeans" depends="jars,javahelp,copy-to-tomcat5">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/monitor.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="monitor.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="monitor.nbm"
-             topdir="."
-	     module="netbeans/modules/monitor.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+	     module="${nb.modules.dir}/monitor.jar"
 	     homepage="http://monitor.${homepage.base}/"
 	     distribution="http://${dist.base}/monitor.nbm">
       <license file="${license.file}" />
@@ -66,11 +55,14 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="monitor.files"/>
+      </fileset>
     </delete>
     <delete dir="netbeans"/>
     <delete dir="Info"/>
@@ -80,7 +72,7 @@
   </target>
 
   <!-- These are the secondary targets. -->
- <target name="javahelp">
+ <target name="javahelp" depends="init">
     <mkdir dir="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/web/monitor/docs/"
                db="javahelp/org/netbeans/modules/web/monitor/docs/JavaHelpSearch2">
@@ -94,12 +86,11 @@
       <exclude name="ja/"/>
       <exclude name="credits.html"/>
     </jhindexer>
-    <mkdir dir="netbeans/modules/docs"/>
-    <locjar jarfile="netbeans/modules/docs/monitor.jar"
-            compress="true">
-      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
-      <locale name="ja"/>
-    </locjar>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/monitor.jar"
+         compress="true">
+      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+    </jar>
   </target>
 
   <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
@@ -130,31 +121,26 @@
     The need for this target will be removed when we move the the
     projects based deployment of the monitor. 
     --> 
-    <copy file="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" tofile="${nb_root}/tomcatint/tomcat5/bundled/netbeans/jakarta-tomcat-5.0.19/common/lib/schema2beans.jar"/>
-    <copy file="netbeans/modules/ext/httpmonitor.jar"                      tofile="${nb_root}/tomcatint/tomcat5/bundled/netbeans/jakarta-tomcat-5.0.19/common/lib/httpmonitor.jar"/>
+    <copy file="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" 
+          tofile="${tomcatint/tomcat5/bundled.dir}/jakarta-tomcat-5.0.19/common/lib/schema2beans.jar"/>
+    <copy file="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/httpmonitor.jar"
+          tofile="${tomcatint/tomcat5/bundled.dir}/jakarta-tomcat-5.0.19/common/lib/httpmonitor.jar"/>
   </target>
 
   <target name="bundled-tomcat5-check">
     <available property="tomcat5-bundled" 
-    file="${nb_root}/tomcatint/tomcat5/bundled/netbeans/modules/eager/tomcat5-bundled.jar"/>
+    file="${tomcatint/tomcat5/bundled.dir}/${nb.modules/eager.dir}/tomcat5-bundled.jar"/>
   </target>
 
   <target name="compile"
-	  depends="setup-jdkhome, compile-core, compile-server"/>
+	  depends=" compile-core, compile-server"/>
 
-  <target name="compile-core">
+  <target name="compile-core" depends="init">
     <javac srcdir="src" destdir="src"
        deprecation="${build.compiler.deprecation}" 
        debug="${build.compiler.debug}"
        includes="**/MonitorModule.java,**/monitor/data/*,**/monitor/client/**">
-
-       <classpath>
-         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-         <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-         <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-         <pathelement location="${servlet22}"/>
-       </classpath>
+       <classpath refID="core-cp"/>
      </javac>
   </target>
 
@@ -164,43 +150,21 @@
        debug="${build.compiler.debug}"
        includes="**/monitor/server/**"
        excludes="**/SCCS/**, **/CVS/**">
-
-       <classpath>
-         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-         <pathelement location="${servlet23}"/>	
-       </classpath>
+       <classpath refID="server-cp"/>
      </javac>
   </target>
 
-<!--
-  <target name="compile-catalina" if="tomcat4-bundled" depends="bundled-tomcat4-check">
-    <javac srcdir="src" destdir="src"
-         deprecation="${build.compiler.deprecation}" 
-	 debug="${build.compiler.debug}"
-	 includes="**/monitor/catalina/**">
-       <classpath>
-          <pathelement location="${servlet23}"/>
-          <pathelement location="${nb_root}/tomcatint/bundledtomcat/netbeans/tomcat406/server/lib/catalina.jar"/> 
-       </classpath>
-     </javac>
-  </target>
--->  
-
-  <target name="jars" depends="compile,module-jars">
-  </target>
-
-  <target name="module-jars">
-    <mkdir dir="netbeans/modules"/>
+  <target name="jars" depends="compile">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf"
           filtering="on"/>
 
-    <locjar jarfile="netbeans/modules/monitor.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/monitor.jar"
          manifest="manifest-subst.mf"
          compress="false">
-      <locale name="ja"/>
       <fileset dir="src">
-        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
+        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
           <include name="org/netbeans/modules/web/monitor/client/"/>
           <include name="org/netbeans/modules/web/monitor/data/"/>
           <include name="org/netbeans/modules/web/monitor/resources/"/>
@@ -209,45 +173,22 @@
           <include name="org/netbeans/modules/web/monitor/Bundle_*.properties"/>
         </patternset>
       </fileset>
-    </locjar>
+    </jar>
  
  <!-- NOTE: this is not an IDE module. It is deployed on the execution 
       server. It will not be deployed correctly if we build a separate 
       version for another language --> 
-    <mkdir dir="netbeans/modules/ext"/>
-    <jar jarfile="netbeans/modules/ext/httpmonitor.jar"
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/httpmonitor.jar"
          compress="false">
 	<fileset dir="src">
-        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
+        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
 	  <include name="org/netbeans/modules/web/monitor/server/"/>
           <include name="org/netbeans/modules/web/monitor/data/"/>
         </patternset>
       </fileset>
     </jar>
   </target>
-
-<!--
-  <target name="catalina-jar" if="tomcat5-bundled" depends="bundled-tomcat5-check">
- - NOTE: this is not an IDE module. It is deployed on the execution 
-      server. It will not be deployed correctly if we build a separate 
-      version for another language. 
-      This jar file will no longer be required when we switch to J2EE
-      1.4. 
-   -
-  <jar jarfile="netbeans/modules/ext/monitor-valve.jar"
-         compress="false">
-      <fileset dir="src">
-        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
-          <include name="org/netbeans/modules/web/monitor/catalina/MonitorValve**"/> 
-
-          <include name="org/netbeans/modules/web/monitor/catalina/DispatchListener**"/>	
-        </patternset>
-      </fileset>
-
-    </jar>
-  </target>
--->
-
 </project>
 
 
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.411
diff -u -r1.411 build.xml
--- nbbuild/build.xml	5 Mar 2004 08:18:45 -0000	1.411
+++ nbbuild/build.xml	8 Mar 2004 11:01:16 -0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
+<?xml version="1.0" encoding="UTF-8"?> 
+<!-- -*- sgml-indent-step: 2 -*- -->
 <!--
                 Sun Public License Notice
 
@@ -22,6 +23,7 @@
 -->
 
 <project name="nbbuild" default="all" basedir=".">
+  <import file="default-properties.xml"/>
 
   <!-- First things first: read the user's and/or -->
   <!-- the site's build properties files.         -->
@@ -494,7 +496,7 @@
     <echo message="Building module metrics..."/>
     <ant dir="../metrics" target="netbeans"/>
   </target>
-  <target name="all-monitor" depends="all-openide,all-web/core,all-schema2beans/rt,all-html,all-httpserver,all-tomcatint/tomcat5/bundled">
+  <target name="all-monitor" depends="all-openide,all-web/core,all-schema2beans/rt,all-html,all-httpserver,all-tomcatint/tomcat5/bundled,all-httpserver/servletapi,all-web/servletapi23">
     <echo message="Building module monitor..."/>
     <ant dir="../monitor" target="netbeans"/>
   </target>
@@ -659,7 +661,7 @@
     <echo message="Building module utilities..."/>
     <ant dir="../utilities" target="netbeans"/>
   </target>
-  <target name="all-utilities/group" depends="all-openide,all-openidex,all-core/settings">
+  <target name="all-utilities/group" depends="all-openide,all-openidex">
     <echo message="Building module utilities/group..."/>
     <ant dir="../utilities/group" target="netbeans"/>
   </target>
@@ -1027,31 +1029,42 @@
     <echo message="Java: ${java.vendor} ${java.version} in ${java.home}; for NetBeans: ${jdkhome}"/>
     <echo message="Classpath: ${java.class.path}"/>
   </target>
-
-  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
-  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
-
-  <target name="build-nozip" depends="delete-and-merge" description="Build the IDE but do not create a final ZIP file.">
+  
+  <target name="create-module-xmls-for-one-cluster" >
     <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="nbantext.jar"/>
-    <mkdir dir="${netbeans.dest}/system/Modules"/>
-    <mkdir dir="${netbeans.dest}/modules/autoload"/>
-    <mkdir dir="${netbeans.dest}/modules/eager"/>
-    <createmodulexml xmldir="${netbeans.dest}/system/Modules">
-      <enabled dir="${netbeans.dest}/modules">
+    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
+    <loadproperties srcFile="cluster.properties" />
+    <loadproperties srcFile="directories.properties" />
+    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
+    
+    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.system.dir}/Modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/eager"/>
+    <createmodulexml xmldir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.system.dir}/Modules">
+      <enabled dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}">
         <include name="*.jar"/>
         <!-- Just to test that we can in fact preconfigure some disabled modules: -->
         <exclude name="icebrowser.jar"/>
       </enabled>
-      <disabled dir="${netbeans.dest}/modules">
+      <disabled dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}">
         <include name="icebrowser.jar"/>
       </disabled>
-      <autoload dir="${netbeans.dest}/modules/autoload">
+      <autoload dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/autoload">
         <include name="*.jar"/>
       </autoload>
-      <eager dir="${netbeans.dest}/modules/eager">
+      <eager dir="${netbeans.dest.dir}/${one.cluster.dir}/${nb.modules.dir}/eager">
         <include name="*.jar"/>
       </eager>
     </createmodulexml>
+  </target>
+
+  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
+  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
+
+  <target name="build-nozip" depends="merge" description="Build the IDE but do not create a final ZIP file.">
+    <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>
+    <loadproperties srcFile="cluster.properties" />
+    <repeat target="create-module-xmls-for-one-cluster" name="one.cluster.name" values="${clusters.list}" /> 
     <echo file="${netbeans.dest}/build_info">NetBeans dev build
 ------------------
 Number:   ${buildnumber}
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java,v
retrieving revision 1.21
diff -u -r1.21 MakeListOfNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java	14 Mar 2003 09:53:05 -0000	1.21
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java	8 Mar 2004 11:01:16 -0000
@@ -21,6 +21,7 @@
 import java.lang.reflect.Method;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
+import java.util.jar.JarFile;
 
 /**
  * Create an update tracking file automatically.
@@ -29,97 +30,95 @@
  * @author  Michal Zlamal
  */
 public class MakeListOfNBM extends Task {
-    String targetName = null;
     File outputFile = null;
-    
-    /** Sets target which contains the <makenbm> tasks */
-    public void setTargetname(String s) {
-        targetName = s;
-    }
+    String moduleName = null;
+    boolean pok = true;
+    FileSet fs = null;
     
     /** Sets the directory used to create the NBM list file */
     public void setOutputfiledir(File s) {
         outputFile = s;
     }
 
+    public FileSet createFileSet() {
+        return (fs = new FileSet());
+    }
+    
+    /** Sets the module file */
+    public void setModule(String s) {
+        moduleName = s;
+    }
+
+    public void setTargetName(String t) {
+        pok = false;
+    }
 
     public void execute () throws BuildException {
-        if ( targetName == null ) new BuildException( "You have to specify target used to make NBMs" );
-        if ( outputFile == null ) new BuildException( "You have to specify output directoty" );
+        if (!pok) throw new BuildException("Use the fileset to specify the content of the NBM");
+        if ( outputFile == null ) throw new BuildException( "You have to specify output directoty" );
+        if ( moduleName == null ) throw new BuildException( "You have to specify the main module's file" );
+        if ( fs == null ) throw new BuildException( "You have to specify the fileset of files of this module" );
+
         log ("Generating information for Auto Update...");
         
 /*        if (!outputFile.exists()) {
             outputFile.mkdirs();
         }
 */        
-        Task nbms[] = ((Target) this.getProject().getTargets().get(targetName)).getTasks();
         UpdateTracking track = new UpdateTracking( outputFile.getAbsolutePath() );
-        for( int i=0; i < nbms.length; i++) {
-            if (nbms[i].getClass().getName().endsWith("MakeNBM")) {
-                
-                nbms[i].maybeConfigure();
-                
-                FileSet fs;
-                try {
-                    Method m = nbms[i].getClass().getDeclaredMethod("getFileSet",null);
-                    m.setAccessible(true);
-                    fs = (FileSet)m.invoke(nbms[i],null);
-                } catch (Exception ex) {
-                    throw new BuildException( "Can't get fileset of NBM", ex, location );
-                }
-                Attributes attr;
-                try {
-                    Method m = nbms[i].getClass().getDeclaredMethod("getAttributes",null);
-                    m.setAccessible(true);
-                    attr = (Attributes)m.invoke(nbms[i],null);
-                } catch (Exception ex) {
-                    throw new BuildException( "Can't get manifest attributes", ex, location );
-                }
-                
-		String codename = attr.getValue ("OpenIDE-Module");
-		if (codename == null)
-                    throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
-                
-		String versionSpecNum = attr.getValue ("OpenIDE-Module-Specification-Version");
-		if (versionSpecNum == null) {
-                    log ("manifest does not contain OpenIDE-Module-Specification-Version");
-                    return;
-                }
-                
-                UpdateTracking.Version version = track.addNewModuleVersion( codename, versionSpecNum );
-                
-                DirectoryScanner ds = fs.getDirectoryScanner( this.getProject() );
-                ds.scan();
- 
-//                log ("Module: " + codenamebase);
-//                log ("Specification Version: " + versionSpecNum);
-                
-                String include[] = ds.getIncludedFiles();
-                for( int j=0; j < include.length; j++ ){
-                    if (include[j].equals("Info" + File.separatorChar + "info.xml") || 
-			include[j].startsWith("main" + File.separatorChar) || 
-			include[j].startsWith("netbeans" + File.separatorChar + "update_tracking" + File.separatorChar)) 
-			    continue;
-
-                    try {
-                        File inFile = new File( ds.getBasedir(), include[j] );
-                        FileInputStream inFileStream = new FileInputStream( inFile );
-                        byte array[] = new byte[ (int) inFile.length() ];
-                        CRC32 crc = new CRC32();
-                        inFileStream.read( array );
-			inFileStream.close();
-                        crc.update( array );
-                        String abs = inFile.getAbsolutePath();
-                        String prefix = ds.getBasedir().getAbsolutePath() + File.separatorChar + "netbeans" + File.separatorChar;
-                        if (! abs.startsWith(prefix)) throw new IllegalStateException(abs);
-                        version.addFileWithCrc(abs.substring(prefix.length()), Long.toString( crc.getValue() ) );
-//                        log( "File : " + inFile.getAbsolutePath().substring((ds.getBasedir().getAbsolutePath() + "/netbeans/").length() ) + " has CRC " + crc.getValue() );
-                    } catch (IOException ex) {
-                        log ( ex.toString() );
-                    }
-                }
-		track.write();		    
+        Attributes attr;
+        JarFile jar = null;
+        File module = new File( outputFile, moduleName );
+        try {
+            jar = new JarFile(module);
+            attr = jar.getManifest().getMainAttributes();
+        } catch (IOException ex) {
+            throw new BuildException( "Can't get manifest attributes", ex, location );
+        } finally {
+            try {
+                if (jar != null) jar.close();
+            } catch( IOException ex1 ) {}
+        }
+      
+        String codename = attr.getValue("OpenIDE-Module");
+        if (codename == null)
+            throw new BuildException("invalid manifest, does not contain OpenIDE-Module", location);
+        
+        String versionSpecNum = attr.getValue("OpenIDE-Module-Specification-Version");
+        if (versionSpecNum == null) {
+            log("manifest does not contain OpenIDE-Module-Specification-Version");
+            return;
+        }
+        
+        UpdateTracking.Version version = track.addNewModuleVersion( codename, versionSpecNum );
+        
+        DirectoryScanner ds = fs.getDirectoryScanner( this.getProject() );
+        String excludes[]={"Info/info.xml", "main/**"};
+        ds.setExcludes( excludes );
+        ds.scan();
+        
+        //                log ("Module: " + codenamebase);
+        //                log ("Specification Version: " + versionSpecNum);
+        
+        String include[] = ds.getIncludedFiles();
+        for( int j=0; j < include.length; j++ ){
+            if (include[j].equals("Info/info.xml") || include[j].startsWith("main/")) continue;
+            try {
+                File inFile = new File( ds.getBasedir(), include[j] );
+                FileInputStream inFileStream = new FileInputStream( inFile );
+                byte array[] = new byte[ (int) inFile.length() ];
+                CRC32 crc = new CRC32();
+                inFileStream.read( array );
+                inFileStream.close();
+                crc.update( array );
+                String abs = inFile.getAbsolutePath();
+                String prefix = ds.getBasedir().getAbsolutePath() + File.separatorChar;
+                if (! abs.startsWith(prefix)) throw new IllegalStateException(abs);
+                version.addFileWithCrc(abs.substring(prefix.length()), Long.toString( crc.getValue() ) );
+            } catch (IOException ex) {
+                log( ex.toString() );
             }
         }
+        track.write();		    
     }
 }
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java,v
retrieving revision 1.48
diff -u -r1.48 MakeNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	5 Jan 2004 14:01:10 -0000	1.48
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	8 Mar 2004 11:01:17 -0000
@@ -1,11 +1,11 @@
 /*
  *                 Sun Public License Notice
- * 
+ *
  * The contents of this file are subject to the Sun Public License
  * Version 1.0 (the "License"). You may not use this file except in
  * compliance with the License. A copy of the License is available at
  * http://www.sun.com/
- * 
+ *
  * The Original Code is NetBeans. The Initial Developer of the Original
  * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
  * Microsystems, Inc. All Rights Reserved.
@@ -22,18 +22,20 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Jar;
 import org.apache.tools.ant.taskdefs.Zip;
 import org.apache.tools.ant.taskdefs.SignJar;
 import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.ZipFileSet;
+
 
 /** Makes a <code>.nbm</code> (<b>N</b>et<b>B</b>eans <b>M</b>odule) file.
  *
  * @author Jesse Glick
  */
-public class MakeNBM extends MatchingTask {
-
+public class MakeNBM extends Task {
+    
     /** The same syntax may be used for either <samp>&lt;license&gt;</samp> or
      * <samp>&lt;description&gt;</samp> subelements.
      * <p>By setting the property <code>makenbm.nocdata</code> to <code>true</code>,
@@ -215,68 +217,66 @@
         }
         return s2.toString();
     }
-
+    
     /** <samp>&lt;signature&gt;</samp> subelement for signing the NBM. */
     public /*static*/ class Signature {
-	public File keystore;
-	public String storepass, alias;
+        public File keystore;
+        public String storepass, alias;
         /** Path to the keystore (private key). */
-	public void setKeystore (File f) {
-	    keystore = f;
-	}
+        public void setKeystore(File f) {
+            keystore = f;
+        }
         /** Password for the keystore.
          * If a question mark (<samp>?</samp>), the NBM will not be signed
          * and a warning will be printed.
          */
-	public void setStorepass (String s) {
-	    storepass = s;
-	}
+        public void setStorepass(String s) {
+            storepass = s;
+        }
         /** Alias for the private key. */
-	public void setAlias (String s) {
-	    alias = s;
-	}
+        public void setAlias(String s) {
+            alias = s;
+        }
     }
-
+    
+    private File productDir = null;
     private File file = null;
-    private File topdir = null;
     private File manifest = null;
     /** see #13850 for explanation */
-    private File module = null;
+    private String moduleName = null;
     private String homepage = null;
     private String distribution = null;
     private String needsrestart = null;
     private Blurb license = null;
     private Blurb description = null;
-    private Blurb notification = null;    
+    private Blurb notification = null;
     private Signature signature = null;
     private long mostRecentInput = 0L;
     private boolean isStandardInclude = true;
     private Vector externalPackages = null;
-
+    
     /** Include netbeans directory - default is true */
     public void setIsStandardInclude(boolean isStandardInclude) {
-	this.isStandardInclude = isStandardInclude;
+        this.isStandardInclude = isStandardInclude;
     }
-
-    /** Name of resulting NBM file. */
-    public void setFile (File file) {
-	this.file = file;
+    
+    /** Directory of the product's files */
+    public void setProductDir( File dir ) {
+        productDir = dir;
     }
-    /** Top directory.
-     * Expected to contain a subdirectory <samp>netbeans/</samp> with the
-     * desired contents of the NBM.
-     * Will create <samp>Info/info.xml</samp> with metadata.
-     */
-    public void setTopdir (File topdir) {
-	this.topdir = topdir;
+    
+    /** Name of resulting NBM file. */
+    public void setFile(File file) {
+        this.file = file;
     }
+    
     /** Module manifest needed for versioning.
      * @deprecated Use {@link #setModule} instead.
      */
-    public void setManifest (File manifest) {
-	this.manifest = manifest;
-	long lmod = manifest.lastModified ();
-	if (lmod > mostRecentInput) mostRecentInput = lmod;
+    public void setManifest(File manifest) {
+        this.manifest = manifest;
+        long lmod = manifest.lastModified();
+        if (lmod > mostRecentInput) mostRecentInput = lmod;
         log(getLocation() + "The 'manifest' attr on <makenbm> is deprecated, please use 'module' instead", Project.MSG_WARN);
     }
     /** Module JAR needed for generating the info file.
@@ -290,8 +290,8 @@
      * of what the resulting variant NBMs (or variant information within
      * the NBM) should look like.
      */
-    public void setModule(File module) {
-        this.module = module;
+    public void setModule(String module) {
+        this.moduleName = module;
         // mostRecentInput updated below...
     }
     /** URL to a home page describing the module. */
@@ -342,11 +342,13 @@
     }
 
     public void execute () throws BuildException {
+        if (productDir == null)
+            throw new BuildException("must set directory of compiled product", location);
 	if (file == null)
 	    throw new BuildException ("must set file for makenbm", location);
-        if (manifest == null && module == null)
+        if (manifest == null && moduleName == null)
             throw new BuildException ("must set module for makenbm", location);
-        if (manifest != null && module != null)
+        if (manifest != null && moduleName != null)
             throw new BuildException("cannot set both manifest and module for makenbm", location);
 
     File file;
@@ -361,13 +363,9 @@
         overrideURLIfNeeded() ;
 	overrideLicenseIfNeeded() ;
 
-	// Will create a file Info/info.xml to be stored alongside netbeans/ contents.
-	File infodir = new File (topdir, "Info"); //NOI18N
-	infodir.mkdirs ();
-	File infofile = new File (infodir, "info.xml"); //NOI18N
-	if (infofile.exists ()) {
-            infofile.delete();
-        }
+        File module = new File( productDir, moduleName );
+        // Will create a file Info/info.xml to be stored in tmp
+        File infofile = null;
         Attributes attr = null;
         if (module != null) {
             // The normal case; read attributes from its manifest and maybe bundle.
@@ -423,142 +421,136 @@
             } catch (IOException ioe) {
                 throw new BuildException("exception while reading " + module, ioe, location);
             }
-        } // else we will read attr later if info file is out of date
-	boolean skipInfo = false;
-	if (infofile.exists ()) {
-	    // Check for up-to-date w.r.t. manifest and maybe license file.
-	    long iMod = infofile.lastModified ();
-	    if (mostRecentInput < iMod)
-		skipInfo = true;
-	}
-	if (! skipInfo) {
-	    log ("Creating NBM info file " + infofile);
-            if (manifest != null) {
-                // Read module manifest for main attributes.
-                try {
-                    InputStream manifestStream = new FileInputStream (manifest);
-                    try {
-                        attr = new Manifest (manifestStream).getMainAttributes ();
-                    } finally {
-                        manifestStream.close ();
-                    }
-                } catch (IOException e) {
-                    throw new BuildException ("exception when reading manifest " + manifest, e, location);
+        }
+        try {
+	    infofile = File.createTempFile("info",".xml");
+            OutputStream infoStream = new FileOutputStream (infofile);
+            try {
+                PrintWriter ps = new PrintWriter(new OutputStreamWriter(infoStream, "UTF-8")); //NOI18N
+                // Begin writing XML.
+                ps.println ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //NOI18N
+                ps.println("<!DOCTYPE module PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">"); //NOI18N
+                String codenamebase = attr.getValue ("OpenIDE-Module"); //NOI18N
+                if (codenamebase == null)
+                    throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
+                // Strip major release number if any.
+                int idx = codenamebase.lastIndexOf ('/'); //NOI18N
+                if (idx != -1) codenamebase = codenamebase.substring (0, idx);
+                ps.println ("<module codenamebase=\"" + xmlEscape(codenamebase) + "\""); //NOI18N
+                if (homepage != null)
+                    ps.println ("        homepage=\"" + xmlEscape(homepage) + "\""); //NOI18N
+                if (distribution != null) {
+                    ps.println ("        distribution=\"" + xmlEscape(distribution) + "\""); //NOI18N
+                } else {
+                    throw new BuildException ("NBM distribution URL is not set", location);
                 }
-            } // else we read attr before
-	    try {
-		OutputStream infoStream = new FileOutputStream (infofile);
-		try {
-                    PrintWriter ps = new PrintWriter(new OutputStreamWriter(infoStream, "UTF-8")); //NOI18N
-		    // Begin writing XML.
-                    ps.println ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //NOI18N
-                    ps.println("<!DOCTYPE module PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">"); //NOI18N
-		    String codenamebase = attr.getValue ("OpenIDE-Module"); //NOI18N
-		    if (codenamebase == null)
-			throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
-		    // Strip major release number if any.
-		    int idx = codenamebase.lastIndexOf ('/'); //NOI18N
-		    if (idx != -1) codenamebase = codenamebase.substring (0, idx);
-		    ps.println ("<module codenamebase=\"" + xmlEscape(codenamebase) + "\""); //NOI18N
-		    if (homepage != null)
-                        ps.println ("        homepage=\"" + xmlEscape(homepage) + "\""); //NOI18N
-		    if (distribution != null) {
-                        ps.println ("        distribution=\"" + xmlEscape(distribution) + "\""); //NOI18N
-                    } else {
-                        throw new BuildException ("NBM distribution URL is not set", location);
-                    }
-		    // Here we only write a name for the license.
-		    if (license != null) {
-			String name = license.getName ();
-			if (name == null)
-			    throw new BuildException ("Every license must have a name or file attribute", location);
-                        ps.println ("        license=\"" + xmlEscape(name) + "\""); //NOI18N
-		    }
-		    ps.println ("        downloadsize=\"0\""); //NOI18N
-                    if (needsrestart != null)
-                        ps.println ("        needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N
-		    ps.println (">"); //NOI18N
-		    if (description != null) {
-			ps.print ("  <description>"); //NOI18N
-			ps.print (description.getText ());
-			ps.println ("</description>"); //NOI18N
-                    }
-                    if (notification != null) {
-                        ps.print("  <module_notification>"); //NOI18N
-                        ps.print(notification.getText());
-                        ps.println("</module_notification>"); //NOI18N
-		    }
-		    if (externalPackages != null) {
-			Enumeration exp = externalPackages.elements();
-			while (exp.hasMoreElements()) {
-			    ExternalPackage externalPackage = (ExternalPackage) exp.nextElement();
-			    if (externalPackage.name == null || 
-				externalPackage.targetName == null ||
-				externalPackage.startUrl == null)
-				throw new BuildException("Must define name, targetname, starturl for external package");
-			    ps.print("  <external_package "); //NOI18N
-			    ps.print("name=\""+xmlEscape(externalPackage.name)+"\" "); //NOI18N
-			    ps.print("target_name=\""+xmlEscape(externalPackage.targetName)+"\" "); //NOI18N
-			    ps.print("start_url=\""+xmlEscape(externalPackage.startUrl)+"\""); //NOI18N
-			    if (externalPackage.description != null)
-				ps.print(" description=\""+xmlEscape(externalPackage.description)+"\""); //NOI18N
-			    ps.println("/>"); //NOI18N
-			}
-		    }
-		    // Write manifest attributes.
-		    ps.print ("  <manifest "); //NOI18N
-		    boolean firstline = true;
-                    List attrNames = new ArrayList(attr.size()); // List<String>
-                    Iterator it = attr.keySet().iterator();
-                    while (it.hasNext()) {
-                        attrNames.add(((Attributes.Name)it.next()).toString());
+                // Here we only write a name for the license.
+                if (license != null) {
+                    String name = license.getName ();
+                    if (name == null)
+                        throw new BuildException ("Every license must have a name or file attribute", location);
+                    ps.println ("        license=\"" + xmlEscape(name) + "\""); //NOI18N
+                }
+                ps.println ("        downloadsize=\"0\""); //NOI18N
+                if (needsrestart != null)
+                    ps.println ("        needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N
+                ps.println (">"); //NOI18N
+                if (description != null) {
+                    ps.print ("  <description>"); //NOI18N
+                    ps.print (description.getText ());
+                    ps.println ("</description>"); //NOI18N
+                }
+                if (notification != null) {
+                    ps.print("  <module_notification>"); //NOI18N
+                    ps.print(notification.getText());
+                    ps.println("</module_notification>"); //NOI18N
+                }
+                if (externalPackages != null) {
+                    Enumeration exp = externalPackages.elements();
+                    while (exp.hasMoreElements()) {
+                        ExternalPackage externalPackage = (ExternalPackage) exp.nextElement();
+                        if (externalPackage.name == null || 
+                            externalPackage.targetName == null ||
+                            externalPackage.startUrl == null)
+                            throw new BuildException("Must define name, targetname, starturl for external package");
+                        ps.print("  <external_package "); //NOI18N
+                        ps.print("name=\""+xmlEscape(externalPackage.name)+"\" "); //NOI18N
+                        ps.print("target_name=\""+xmlEscape(externalPackage.targetName)+"\" "); //NOI18N
+                        ps.print("start_url=\""+xmlEscape(externalPackage.startUrl)+"\""); //NOI18N
+                        if (externalPackage.description != null)
+                            ps.print(" description=\""+xmlEscape(externalPackage.description)+"\""); //NOI18N
+                        ps.println("/>"); //NOI18N
                     }
-                    Collections.sort(attrNames);
-                    it = attrNames.iterator();
-                    while (it.hasNext()) {
-                        String name = (String)it.next();
-                        // Ignore irrelevant attributes (cf. www/www/dtds/autoupdate-catalog-2_0.dtd
-                        //  and www/www/dtds/autoupdate-info-2_0.dtd):
-                        if (! name.startsWith("OpenIDE-Module")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Localizing-Bundle")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Install")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Layer")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Description")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Package-Dependency-Message")) continue; //NOI18N
-                        if (name.equals("OpenIDE-Module-Public-Packages")) continue; //NOI18N
-			if (firstline)
-			    firstline = false;
-			else
-			    ps.print ("            ");
-                        ps.println(name + "=\"" + xmlEscape(attr.getValue(name)) + "\""); //NOI18N
-		    }
-		    ps.println ("  />"); //NOI18N
-		    // Maybe write out license text.
-		    if (license != null) {
-                        ps.print ("  <license name=\"" + xmlEscape(license.getName ()) + "\">"); //NOI18N
-			ps.print (license.getText ());
-			ps.println ("</license>"); //NOI18N
-		    }
-		    ps.println ("</module>"); //NOI18N
-                    ps.flush();
-		} finally {
-		    infoStream.close ();
-		}
-	    } catch (IOException e) {
-		throw new BuildException ("exception when creating Info/info.xml", e, location);
-	    }
-	}
+                }
+                // Write manifest attributes.
+                ps.print ("  <manifest "); //NOI18N
+                boolean firstline = true;
+                List attrNames = new ArrayList(attr.size()); // List<String>
+                Iterator it = attr.keySet().iterator();
+                while (it.hasNext()) {
+                    attrNames.add(((Attributes.Name)it.next()).toString());
+                }
+                Collections.sort(attrNames);
+                it = attrNames.iterator();
+                while (it.hasNext()) {
+                    String name = (String)it.next();
+                    // Ignore irrelevant attributes (cf. www/www/dtds/autoupdate-catalog-2_0.dtd
+                    //  and www/www/dtds/autoupdate-info-2_0.dtd):
+                    if (! name.startsWith("OpenIDE-Module")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Localizing-Bundle")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Install")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Layer")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Description")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Package-Dependency-Message")) continue; //NOI18N
+                    if (name.equals("OpenIDE-Module-Public-Packages")) continue; //NOI18N
+                    if (firstline)
+                        firstline = false;
+                    else
+                        ps.print ("            ");
+                    ps.println(name + "=\"" + xmlEscape(attr.getValue(name)) + "\""); //NOI18N
+                }
+                ps.println ("  />"); //NOI18N
+                // Maybe write out license text.
+                if (license != null) {
+                    ps.print ("  <license name=\"" + xmlEscape(license.getName ()) + "\">"); //NOI18N
+                    ps.print (license.getText ());
+                    ps.println ("</license>"); //NOI18N
+                }
+                ps.println ("</module>"); //NOI18N
+                ps.flush();
+            } finally {
+                infoStream.close ();
+            }
+        } catch (IOException e) {
+            throw new BuildException ("exception when creating Info/info.xml", e, location);
+        }
+        infofile.deleteOnExit();
+        ZipFileSet infoXML = new ZipFileSet();
+        infoXML.setDir( new File("/") );
+        infoXML.setIncludes( infofile.getAbsolutePath().substring(1) );
+        infoXML.setFullpath("Info/info.xml");
+
+        String codename = attr.getValue("OpenIDE-Module");
+        if (codename == null)
+ 	    new BuildException( "Can't get codenamebase" );
+ 	
+ 	UpdateTracking tracking = new UpdateTracking(productDir.getAbsolutePath());
+ 	String files[] = tracking.getListOfNBM( codename );
+ 	ZipFileSet fs = new ZipFileSet();
+ 	fs.setDir( productDir );
+ 	for (int i=0; i < files.length; i++)
+ 	    fs.createInclude().setName( files[i] );
+ 	fs.setPrefix("netbeans/");
+
 	// JAR it all up together.
 	long jarModified = file.lastModified (); // may be 0
 	//log ("Ensuring existence of NBM file " + file);
 	Jar jar = (Jar) project.createTask ("jar"); //NOI18N
     
 	jar.setJarfile (file);
-	//jar.setBasedir (topdir.getAbsolutePath ());
+        jar.addZipfileset(fs);
+        jar.addFileset (infoXML);
         jar.setCompress(true);
-	//jar.createInclude ().setName ("netbeans/"); //NOI18N
-	//jar.createInclude ().setName ("Info/info.xml"); //NOI18N
-        jar.addFileset (getFileSet());
 	jar.setLocation (location);
 	jar.init ();
 	jar.execute ();
@@ -634,40 +626,6 @@
 	}
     }
    
-    // Reflection access from MakeListOfNBM:
-    
-    FileSet getFileSet() {
-        FileSet fs = fileset;		//makes in apperance to excludes and includes files defined in XML
-        fs.setDir (topdir);
-
-	if (isStandardInclude) {
-	    fs.createInclude ().setName ("netbeans/"); //NOI18N
-	    fs.createExclude ().setName ("netbeans/update_tracking/*.xml"); //NOI18N
-        }
-
-	fs.createInclude ().setName ("Info/info.xml"); //NOI18N
-        return fs;
-    }
-
-    Attributes getAttributes() throws IOException {
-        if (manifest != null) {
-            InputStream is = new FileInputStream(manifest);
-            try {
-                return new Manifest(is).getMainAttributes();
-            } finally {
-                is.close();
-            }
-        } else if (module != null) {
-            JarFile jar = new JarFile(module);
-            try {
-                return jar.getManifest().getMainAttributes();
-            } finally {
-                jar.close();
-            }
-        } else {
-            throw new IOException(location + "must give either 'manifest' or 'module' on <makenbm>");
-        }
-    }
 
   /** This returns true if the license should be overridden. */
   protected boolean overrideLicense() {
Index: nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java,v
retrieving revision 1.21
diff -u -r1.21 NbMerge.java
--- nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java	11 Dec 2002 17:07:18 -0000	1.21
+++ nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java	8 Mar 2004 11:01:17 -0000
@@ -322,50 +322,6 @@
             suppressedlocales.add (s.locale);
         }        
 
-        mergemodules = new Vector ();
-        mergemodules.addAll(builtmodules);
-        if (mergedependentmodules) {
-            for ( int i = 0; i < builttargets.size(); i++) {
-                String target = (String) builttargets.elementAt(i);
-                if (target.startsWith(targetprefix)) {
-                    String module = target.substring(targetprefix.length());
-                    if ( mergemodules.indexOf(module) < 0 ) {
-                        mergemodules.addElement(module);
-                    }
-                }
-            }
-        }
-
-        // merge the data
-        for (int j = 0; j < topdirs.size (); j++) {
-            File topdir = (File) topdirs.get (j);
-            for (int i = 0; i < mergemodules.size (); i++) {
-                String module = (String) mergemodules.elementAt (i);
-                File netbeans = new File (new File (topdir, module), "netbeans");
-                if (! netbeans.exists ()) {
-                    log ("Build product dir " + netbeans + " does not exist, skipping...", Project.MSG_WARN);
-                    continue;
-                }
-                Copy copy = (Copy) project.createTask ("copy");
-                FileSet fs = new FileSet ();
-                fs.setDir (netbeans);
-                it = suppressedlocales.iterator ();
-                while (it.hasNext ()) {
-                    String locale = (String) it.next ();
-                    fs.createExclude ().setName ("**/*_" + locale);
-                    fs.createExclude ().setName ("**/*_" + locale + ".*");
-                    fs.createExclude ().setName ("**/*_" + locale + "/");
-                }
-                copy.addFileset (fs);
-                copy.setTodir (dest);
-                copy.setIncludeEmptyDirs (true);
-                copy.init ();
-                copy.setLocation (location);
-                copy.execute ();
-            }
-        }
-        log("mergedmodules=" + mergemodules);
-        it = suppressedlocales.iterator ();
         UpdateTracking tr = new UpdateTracking( dest.getAbsolutePath() );
         log ( dest.getAbsolutePath() );
         while (it.hasNext ()) {
Index: nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java,v
retrieving revision 1.18
diff -u -r1.18 UpdateTracking.java
--- nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java	5 Feb 2004 20:09:05 -0000	1.18
+++ nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java	8 Mar 2004 11:01:17 -0000
@@ -72,6 +72,29 @@
         return version;
     }
     
+    public String[] getListOfNBM( String codeName ) {
+        module = new Module();
+        module.setCodename( codeName );
+        File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
+        trackingFile = new File(directory, getTrackingFileName());
+
+        if (!trackingFile.exists() || !trackingFile.isFile())
+            return null;
+        
+        read();
+        
+        if ( module.getVersions().size() != 1 ) 
+            return null;
+        
+        List files = ((Version) module.getVersions().get(0)).getFiles();
+        String [] listFiles = new String[ files.size() ];
+        for (int i=0; i < files.size(); i++) {
+            listFiles[i] = (((ModuleFile) files.get(i)).getName());
+        }
+        
+        return listFiles;
+    }
+
     public void removeLocalized( String locale ) {
         File updateDirectory = new File( nbPath, TRACKING_DIRECTORY );
         File[] trackingFiles = updateDirectory.listFiles( new FileFilter() { // Get only *.xml files
@@ -112,13 +135,11 @@
         }
         
         //document.getDocumentElement().normalize();
-        String trackingFileName = module.getCodenamebase();
-        trackingFileName = trackingFileName.replace('.', '-') + ".xml";
         File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
         if (!directory.exists()) {
             directory.mkdirs();
         }
-        trackingFile = new File(directory, trackingFileName);
+        trackingFile = new File(directory, getTrackingFileName());
         try {
 	    OutputStream os = new FileOutputStream(trackingFile);
             XMLUtil.write(document, os);
@@ -128,6 +149,12 @@
             trackingFile.delete();
             throw new BuildException("Could not write update tracking file", e);
         }        
+    }
+
+    private String getTrackingFileName() {
+        String trackingFileName = module.getCodenamebase();
+        trackingFileName = trackingFileName.replace('.', '-') + ".xml";
+        return trackingFileName;
     }
 
     /** Scan through org.w3c.dom.Document document. */
Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.164
diff -u -r1.164 build.xml
--- openide/build.xml	3 Dec 2003 16:32:08 -0000	1.164
+++ openide/build.xml	8 Mar 2004 11:01:29 -0000
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1' ?><!-- -*- sgml-indent-step: 2 -*- -->
+<?xml version="1.0" encoding="iso-8859-1"?><!-- -*- sgml-indent-step: 2 -*- -->
 <!--
                 Sun Public License Notice
 
@@ -17,13 +17,13 @@
 <!-- Not clear how to solve this. Try rerunning build if it happens. -->
 
 <project name="openide" default="netbeans" basedir=".">
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
+  <import file="../nbbuild/default.xml"/>
 
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="openide.files">
+      <include name="${nb.lib.dir}/openide.jar"/>
+      <include name="${nb.system.dir}/ModuleAutoDeps/org-openide.xml"/>
+    </patternset>
     <ant dir="../core/external" target="unscramble"/>
     <path id="openide-cp">
       <!-- nothing -->
@@ -134,10 +134,9 @@
   </target>
   
   <target name="old-jars" depends="compile,13javac-workaround,vers-prep,loaders_32143-compat" description="Create JAR files.">
-    <mkdir dir="netbeans/lib"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <jar jarfile="netbeans/lib/openide.jar" manifest="manifest-subst.mf" compress="false" duplicate="preserve" >
-      
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide.jar" manifest="manifest-subst.mf" compress="false" duplicate="preserve" >
       <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
       <fileset dir="windows/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
       <fileset dir="explorer/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
@@ -147,7 +146,6 @@
            <!-- But include patch files -->
            <include name="**/$$*$$Patch$$.class" />
       </fileset>
-      
     </jar>
   </target>
 
@@ -162,21 +160,24 @@
      <ant antfile="build.xml" target="openide-compat" dir="text" />
   </target>
   
-  <target name="release">
-    <copy todir="netbeans" includeEmptyDirs="false">
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
       <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
     </copy>
   </target>
 
-  <target name="netbeans" depends="jars-from-libs,release,libs,loaders_32143-compat" description="Build everything needed for inclusion in the IDE.">
-<!--    <genlist targetname="nbm" outputfiledir="netbeans"/> -->
+  <target name="netbeans" depends="init,jars-from-libs,release,libs,loaders_32143-compat" description="Build everything needed for inclusion in the IDE.">
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/openide.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="openide.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
     <makenbm file="openide.nbm"
-             topdir="."
-             module="netbeans/lib/openide.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.lib.dir}/openide.jar"
 	     homepage="http://openide.${homepage.base}/"
 	     distribution="http://${dist.base}/openide.nbm">
       <license file="${license.file}"/>
@@ -373,10 +374,11 @@
       <property name="javadoc.files" value="${selector}" />
     </ant>
   </target>
+
   <!-- Build whole openide.jar from separate libraries -->
-  <target name="jars-from-libs" depends="libs,vers-prep,loaders_32143-compat" description="Create JAR files from copied directories." unless="no-openide.jar">
-    <property name="openide.jar" value="netbeans/lib/openide.jar" />
-    <mkdir dir="netbeans/lib"/>
+  <target name="jars-from-libs" depends="init,libs,vers-prep,loaders_32143-compat" description="Create JAR files from copied directories." unless="no-openide.jar">
+    <property name="openide.jar" value="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide.jar" />
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
     <jar jarfile="${openide.jar}" manifest="manifest-subst.mf" compress="false" duplicate="fail" >
       
@@ -810,7 +812,7 @@
     </zip>
   </target>
 
-  <target name="clean" description="Remove all build products." depends="libs-clean">
+  <target name="clean" description="Remove all build products." depends="init,libs-clean">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -821,8 +823,10 @@
       <fileset dir=".">
         <include name="*-subst.mf"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="openide.files"/>
+      </fileset>
     </delete>
-    <delete dir="netbeans"/>
     <delete file="openide-13javac-workaround.jar"/>
     <delete dir="javadoc"/>
     <delete file="nb-api-tutorial.zip"/>
Index: openide/compat/build.xml
===================================================================
RCS file: /cvs/openide/compat/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- openide/compat/build.xml	24 Nov 2003 14:45:52 -0000	1.5
+++ openide/compat/build.xml	8 Mar 2004 11:01:30 -0000
@@ -13,7 +13,9 @@
 -->
 
 <project name="openide/compat" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
+  <import file="../../nbbuild/default.xml"/>
+
+  <property name="nbroot" location="${nb_all}" />
 
   <property name="nbm_alias" value="nb_ide"/>
   <property name="homepage.base" value="netbeans.org"/>
@@ -34,7 +36,7 @@
     <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="include" value="**/*$$*.java" />
       <property name="localdir" location="src" />
@@ -110,7 +112,7 @@
                 <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
                 <pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
                 <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
            </classpath>
         </javac>
 
Index: openide/compiler/build.xml
===================================================================
RCS file: /cvs/openide/compiler/build.xml,v
retrieving revision 1.14
diff -u -r1.14 build.xml
--- openide/compiler/build.xml	8 Oct 2003 19:01:19 -0000	1.14
+++ openide/compiler/build.xml	8 Mar 2004 11:01:30 -0000
@@ -13,34 +13,29 @@
 -->
 
 <project name="openide/compiler" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="openide/compiler.files">
+        <include name="${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
             <classpath refid="cp"/>
         </javac>
         <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>
         <enhanceclass basedir="src">
             <classpath>
-                <pathelement location="../../core/netbeans/lib/ext/boot.jar"/>
+                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
                 <!-- See xtest/instance/build-clover.xml for explanation: -->
                 <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
             </classpath>
@@ -56,26 +51,28 @@
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/openide-compiler.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-compiler.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="openide/compiler.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="openide-compiler.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/openide-compiler.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/openide-compiler.jar"
                  homepage="http://openide.${homepage.base}/"
                  distribution="http://${dist.base}/openide-compiler.nbm">
             <license file="${license.file}"/>
@@ -83,7 +80,7 @@
         </makenbm>
     </target>
 
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="CompilerAPI"/>
@@ -97,10 +94,13 @@
         </ant>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
+            </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="openide/compiler.files"/>
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
Index: openide/deprecated/build.xml
===================================================================
RCS file: /cvs/openide/deprecated/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- openide/deprecated/build.xml	20 Jun 2003 20:07:06 -0000	1.17
+++ openide/deprecated/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,62 +13,60 @@
 -->
 
 <project name="openide/deprecated" default="netbeans" basedir=".">
-
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
+    <import file="../../nbbuild/default.xml"/>
     
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="openide/deprecated.files">
+        <include name="${nb.modules/autoload.dir}/openide-deprecated.jar"/>
+        <include name="${nb.system.dir}/ModuleAutoDeps/org-openide-deprecated.xml"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_all}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="${nb_all}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="${nb_all}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-        <pathelement location="${nb_all}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/openide-deprecated.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
-    <target name="release">
-        <copy todir="netbeans" includeEmptyDirs="false">
+    <target name="release" depends="init">
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}" includeEmptyDirs="false">
             <fileset dir="release" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
         </copy>
     </target>
 
     <target name="netbeans" depends="jars,release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-deprecated.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="openide/deprecated.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="openide-deprecated.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/openide-deprecated.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/openide-deprecated.jar"
                  homepage="http://openide.${homepage.base}/"
                  distribution="http://${dist.base}/openide-deprecated.nbm">
             <license file="${license.file}"/>
@@ -76,7 +74,7 @@
         </makenbm>
     </target>
     
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="DeprecatedAPIs"/>
@@ -87,15 +85,17 @@
         </ant>
     </target>
     
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="openide/deprecated.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="openide-deprecated.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="javadoc"/>
         <delete dir="Info"/>
     </target>
Index: openide/execution/build.xml
===================================================================
RCS file: /cvs/openide/execution/build.xml,v
retrieving revision 1.10
diff -u -r1.10 build.xml
--- openide/execution/build.xml	20 Jun 2003 20:07:06 -0000	1.10
+++ openide/execution/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,52 +13,49 @@
 -->
 
 <project name="openide/execution" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="openide/execution.files">
+        <include name="${nb.modules/autoload.dir}/openide-execution.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_all}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
     </target>
 
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/openide-execution.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-execution.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
-    <target name="netbeans" depends="jars" description="Build everything.">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars" description="Build everything.">
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-execution.jar">
+        <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+          <patternset refID="openide/execution.files"/>
+        </fileset>
+      </genlist>
     </target>
 
     <target name="nbm" depends="netbeans" description="Build NBM.">
         <makenbm file="openide-execution.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/openide-execution.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/openide-execution.jar"
                  homepage="http://openide.${homepage.base}/"
                  distribution="http://${dist.base}/openide-execution.nbm">
             <license file="${license.file}"/>
@@ -66,7 +63,7 @@
         </makenbm>
     </target>
   
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="ExecutionAPI"/>
@@ -79,10 +76,13 @@
         </ant>
     </target>
   
-    <target name="clean" description="Clean everything.">
+    <target name="clean" depends="init" description="Clean everything.">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
+            </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="openide/execution.files"/>
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
Index: openide/explorer/build.xml
===================================================================
RCS file: /cvs/openide/explorer/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- openide/explorer/build.xml	21 Nov 2003 14:44:45 -0000	1.4
+++ openide/explorer/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,6 +13,13 @@
 -->
 
 <project name="openide/explorer" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/>
+
+  <target name="boot">
+    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
+    <property file="${moduleCluster.file}"/>
+  </target>
+
   <property name="nbroot" location="../.." />
 
   <property name="nbm_alias" value="nb_ide"/>
@@ -31,7 +38,7 @@
        <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.explorer" />
@@ -40,11 +47,10 @@
   
   <target name="patch" depends="compile" >
     <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
     
     <enhanceclass basedir="src" >
         <classpath>
-            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
             <!-- See xtest/instance/build-clover.xml for explanation: -->
             <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
         </classpath>
Index: openide/fs/build.xml
===================================================================
RCS file: /cvs/openide/fs/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- openide/fs/build.xml	21 Nov 2003 14:44:46 -0000	1.4
+++ openide/fs/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,6 +13,13 @@
 -->
 
 <project name="openide/fs" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/>
+
+  <target name="boot">
+    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
+    <property file="${moduleCluster.file}"/>
+  </target>
+
   <property name="nbroot" location="../.." />
 
   <property name="nbm_alias" value="nb_ide"/>
@@ -27,7 +34,7 @@
     <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.fs" />
@@ -40,7 +47,7 @@
     
     <enhanceclass basedir="src" >
         <classpath>
-            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
             <!-- See xtest/instance/build-clover.xml for explanation: -->
             <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
         </classpath>
Index: openide/io/build.xml
===================================================================
RCS file: /cvs/openide/io/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- openide/io/build.xml	20 Jun 2003 20:07:06 -0000	1.12
+++ openide/io/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,24 +13,19 @@
 -->
 
 <project name="openide/io" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="openide/io.files">
+        <include name="${nb.modules/autoload.dir}/openide-io.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath refid="cp"/>
         </javac>
@@ -40,7 +35,7 @@
              classpath="${nb_all}/nbbuild/nbantext.jar"/>
         <enhanceclass basedir="src">
             <classpath>
-                <pathelement location="../../core/netbeans/lib/ext/boot.jar"/>
+                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
                 <!-- See xtest/instance/build-clover.xml for explanation: -->
                 <pathelement location="../../core/netbeans/lib/ext/clover.jar"/>
             </classpath>
@@ -50,27 +45,29 @@
         </enhanceclass>
     </target>
 
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/openide-io.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openide-io.jar"
                 manifest="manifest-subst.mf"
                 basedir="src"
 	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+	        compress="false"/>
     </target>
 
-    <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="init,jars">
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openide-io.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="openide/io.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="openide-io.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/openide-io.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload}/openide-io.jar"
                  homepage="http://openide.${homepage.base}/"
                  distribution="http://${dist.base}/openide-io.nbm">
             <license file="${license.file}"/>
@@ -90,15 +87,17 @@
         </ant>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="openide/io.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="openide-io.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
     </target>
Index: openide/loaders/build.xml
===================================================================
RCS file: /cvs/openide/loaders/build.xml,v
retrieving revision 1.15
diff -u -r1.15 build.xml
--- openide/loaders/build.xml	3 Feb 2004 04:02:53 -0000	1.15
+++ openide/loaders/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,19 +13,13 @@
 -->
 
 <project name="openide/loaders" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/alpha/dev"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
-
-    <path id="cp">
+    <target name="init" depends="default.init">
+      <patternset id="openide/loaders.files">
+        <include name="${nb.lib.dir}/openide-loaders.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
         <pathelement location="${nb_all}/openide/fs/netbeans/lib/openide-fs.jar"/>
         <pathelement location="${nb_all}/openide/util/netbeans/lib/openide-util.jar"/>
@@ -38,17 +32,19 @@
         <pathelement location="${nb_all}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
         <pathelement location="${nb_all}/openide/modules/netbeans/lib/openide-modules.jar"/>
         <!-- By transitivity from text and explorer; needed for Javadoc, apparently: -->
-        <pathelement location="${nb_all}/openide/options/netbeans/lib/openide-options.jar"/>
-    </path>
-  
-    <target name="compile">
+<!--        <pathelement location="${nb_all}/openide/options/netbeans/lib/openide-options.jar"/>-->
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      </path>
+    </target>
+ 
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
             <classpath refid="cp"/>
         </javac>
         <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../../nbbuild/nbantext.jar"/>
         <enhanceclass basedir="src">
             <classpath>
-                <pathelement location="${nb_all}/core/netbeans/lib/ext/boot.jar"/>
+                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
                 <!-- See xtest/instance/build-clover.xml for explanation: -->
                 <pathelement location="${nb_all}/core/netbeans/lib/ext/clover.jar"/>
             </classpath>
@@ -78,27 +74,29 @@
         </enhanceclass>
     </target>
 
-    <target name="jars" depends="compile">
-        <mkdir dir="netbeans/lib"/>
+    <target name="jars" depends="init,compile">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/lib/openide-loaders.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide-loaders.jar"
                 manifest="manifest-subst.mf"
                 basedir="src"
 	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+	        compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars" description="Build module.">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/openide-loaders.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="openide/loaders.files"/>
+          </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans" description="Build NBM.">
         <makenbm file="openide-loaders.nbm"
-                 topdir="."
-                 module="netbeans/lib/openide-loaders.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.lib.dir}/openide-loaders.jar"
                  homepage="http://openide.${homepage.base}/"
                  distribution="http://${dist.base}/openide-loaders.nbm">
             <license file="${license.file}"/>
@@ -106,7 +104,7 @@
         </makenbm>
     </target>
 
-    <target name="javadoc" description="Build Javadoc.">
+    <target name="javadoc" depends="init" description="Build Javadoc.">
         <ant dir="${nb_all}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
             <property name="javadoc.base" location="."/>
             <property name="javadoc.name" value="LoadersAPI"/>
@@ -120,15 +118,17 @@
         </ant>
     </target>
   
-    <target name="clean" description="Clean build products.">
+    <target name="clean" depends="init" description="Clean build products.">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="openide/loaders.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="openide-loaders.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
     </target>
Index: openide/nodes/build.xml
===================================================================
RCS file: /cvs/openide/nodes/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- openide/nodes/build.xml	21 Nov 2003 14:44:59 -0000	1.4
+++ openide/nodes/build.xml	8 Mar 2004 11:01:31 -0000
@@ -13,6 +13,13 @@
 -->
 
 <project name="openide/nodes" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/>
+
+  <target name="boot">
+    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
+    <property file="${moduleCluster.file}"/>
+  </target>
+
   <property name="nbroot" location="../.." />
 
   <property name="nbm_alias" value="nb_ide"/>
@@ -29,7 +36,7 @@
     <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.nodes" />
@@ -38,11 +45,10 @@
 
   <target name="patch" depends="compile" >
     <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
     
     <enhanceclass basedir="src" >
         <classpath>
-            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
             <!-- See xtest/instance/build-clover.xml for explanation: -->
             <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
         </classpath>
Index: openide/test/build.xml
===================================================================
RCS file: /cvs/openide/test/build.xml,v
retrieving revision 1.54
diff -u -r1.54 build.xml
--- openide/test/build.xml	3 Feb 2004 09:38:41 -0000	1.54
+++ openide/test/build.xml	8 Mar 2004 11:01:44 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="openide tests" basedir="." default="all">
+    <import file="../../nbbuild/default-properties.xml"/>
 
     <!-- Ant property. Value 'ignore' means that system classpath is ignored
          and only classpath specified in build file is used. -->
@@ -220,30 +221,8 @@
     <!-- ========================= -->
     
     <target name="prepare-compile-classpath"
-         depends="jarcompile-classpath,srccompile-classpath,idecompile-classpath"/>
+         depends="srccompile-classpath,idecompile-classpath"/>
     
-    <target name="jarcompile-classpath" depends="which-classpath" if="jarcode.classpath">
-        <echo message="Using jars classpath for compilation."/>
-    	<!-- this classpath will be used for compiling tests against jars -->
-	<path id="compiletest.classpath">        
-	    <!-- If you need e.g. openide.jar, write this:
-	           <pathelement location="../netbeans/lib/openide.jar"/>
- 	      -->
-                <pathelement location="../openide-13javac-workaround.jar"/>
-                <pathelement location="../netbeans/lib/openide.jar"/>
-                <!-- XXX -->
-                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../io/netbeans/modules/autoload/openide-io.jar"/>
-
-                <fileset dir="../../core/netbeans/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-                </fileset>             
-	</path>
-    </target>
-        
     <target name="srccompile-classpath" depends="which-classpath" if="srccode.classpath">
         <echo message="Using srcs classpath for compilation."/>
     	<!-- this classpath will be used for compiling tests against sources -->
@@ -273,11 +252,8 @@
                 <pathelement location="../execution/src/"/>
                 <pathelement location="../io/src/"/>
                 <pathelement location="../windows/src/"/>
-                
+                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
                 <pathelement location="../../core/src/"/>
-                <fileset dir="../../core/netbeans/lib">
-            		<include name="ext/*.jar"/>
-                </fileset>             
 	</path>
     </target>
     
@@ -290,20 +266,15 @@
 	         If you need e.g. your tested module, write this:
 	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
  	      -->
-             <fileset dir="${netbeans.home}/lib">
-            		<include name="core.jar"/>
-                        <include name="openide.jar"/>
-            		<include name="ext/*.jar"/>
-             </fileset>             
+	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+             <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
              <!-- XXX -->
-             <fileset dir="${netbeans.home}/lib">
-                    <include name="openide-loaders.jar" />
-             </fileset>
-             <fileset dir="${netbeans.home}/modules/autoload">
-                     <include name="openide-*.jar"/>
-                     <include name="core-*.jar"/>
-             </fileset>
-             
+             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+             <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+             <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+             <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
    	</path>
     </target>
     
@@ -312,39 +283,8 @@
     <!-- ================================== -->
     
     <target name="prepare-codetest-classpath" 
-            depends="jartest-classpath,srctest-classpath,idetest-classpath"/>
-    
-    <target name="jartest-classpath" depends="which-classpath" if="jarcode.classpath">
-        <echo message="Using jars classpath."/>
-        <!-- this classpath will be used for executing tests against jars -->
-	<path id="codetest.classpath">
-       	    <!-- If you need e.g. openide.jar, write this:
-	           <pathelement location="../netbeans/lib/openide.jar"/>
- 	      -->
-                <pathelement location="../openide-13javac-workaround.jar"/>
-                <pathelement location="../netbeans/lib/openide.jar"/>
-                <!-- XXX -->
-                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-                <pathelement location="../execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="../io/netbeans/modules/autoload/openide-io.jar"/>
-                
-                <fileset dir="../../core/netbeans/lib">
-            		<include name="core.jar"/>
-            		<include name="ext/*.jar"/>
-                </fileset>             
-                <fileset dir="../../core/windows/netbeans/modules">
-            		<include name="core-windows.jar"/>
-                </fileset>             
-                
-                <!-- Cf. #36294: XMLUtilTest.testNamespaces requires Xerces to pass -->
-                <fileset dir="../../libs/external">
-                    <include name="xerces-*.jar"/>
-                    <include name="xml-commons-dom-ranges-*.jar"/>
-                </fileset>
-    	</path>
-    </target>
-        
+            depends="srctest-classpath,idetest-classpath"/>
+       
     <target name="srctest-classpath" depends="which-classpath" if="srccode.classpath">
         <echo message="Using srcs classpath."/>
         <!-- this classpath will be used for executing tests against sources -->
@@ -354,7 +294,7 @@
 	         If you need e.g. sources of your tested module, write this:
 	           <pathelement location="../src"/>
  	      -->
-                <pathelement location="../openide-13javac-workaround.jar"/>
+                <pathelement location="${nb_all}/openide-13javac-workaround.jar"/>
                 <pathelement location="../src/"/>
                 <pathelement location="../../core/src/"/>
                 <!-- XXX -->
@@ -363,15 +303,11 @@
                 <pathelement location="../execution/src/"/>
                 <pathelement location="../io/src/"/>
                 
-                <fileset dir="../../core/netbeans/lib">
-            		<include name="core.jar"/> <!-- for the manifest -->
-            		<include name="ext/*.jar"/>
-                </fileset>             
-                <fileset dir="../../core/windows/netbeans/modules">
-            		<include name="core-windows.jar"/>
-                </fileset>             
-                <pathelement location="../netbeans/lib/openide.jar"/> <!-- for the manifest -->
-                <pathelement location="../loaders/netbeans/lib/openide-loaders.jar"/> <!-- for the manifest -->
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/> <!-- for the manifest -->
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/> <!-- for the manifest -->
+                <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- for the manifest -->
+                <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+                <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
 
                 <fileset dir="../../libs/external">
                     <include name="xerces-*.jar"/>
@@ -390,23 +326,18 @@
 	         If you need e.g. your tested module, write this:
 	           <pathelement location="${netbeans.home}/modules/somemodule.jar"/>
  	      --> 
-             <fileset dir="${netbeans.home}/lib">
-            		<include name="core.jar"/>
-                        <include name="openide.jar"/>
-                        <include name="openide-loaders.jar"/>
-            		<include name="ext/*.jar"/>
-             </fileset>             
-             <fileset dir="${netbeans.home}/modules">
-            		<include name="core-windows.jar"/>
-             </fileset>
-             <!-- XXX -->
-             <fileset dir="${netbeans.home}/modules/autoload">
-                     <include name="openide-*.jar"/>
-                     <include name="core-*.jar"/>
-             </fileset>
-
+	     <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+             <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+             <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+             <pathelement location="${core/windows.dir}/${nb.modules.dir}/core-windows.jar"/>
+             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+             <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+             <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+             <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> 
+             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
+             <pathelement location="${core.dir}/${nb.modules/autoload.dir}/terminalemulator.jar"/>
                 
-             <fileset dir="${netbeans.home}/modules/autoload/ext">
+             <fileset dir="${libs/xerces.dir}/${nb.modules/autoload.dir}/ext">
                   <include name="xerces-*.jar"/>
                   <include name="xml-commons-dom-ranges-*.jar"/>
             </fileset>
Index: openide/text/build.xml
===================================================================
RCS file: /cvs/openide/text/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- openide/text/build.xml	21 Nov 2003 14:45:17 -0000	1.5
+++ openide/text/build.xml	8 Mar 2004 11:01:45 -0000
@@ -13,7 +13,9 @@
 -->
 
 <project name="openide/text" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
+  <import file="../../nbbuild/default.xml"/>
+
+  <property name="nbroot" location="${nb_all}" />
 
   <property name="nbm_alias" value="nb_ide"/>
   <property name="homepage.base" value="netbeans.org"/>
@@ -30,9 +32,10 @@
        <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
        <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
        <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
+       <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.text" />
@@ -64,7 +67,7 @@
             <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
             <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
             <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
-            <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
+            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
           </classpath>  
         </javac>
 
Index: openide/util/build.xml
===================================================================
RCS file: /cvs/openide/util/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- openide/util/build.xml	24 Nov 2003 08:07:56 -0000	1.5
+++ openide/util/build.xml	8 Mar 2004 11:01:45 -0000
@@ -13,7 +13,14 @@
 -->
 
 <project name="openide/util" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
+  <import file="../../nbbuild/default.xml"/>
+
+  <target name="boot">
+    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
+    <property file="${moduleCluster.file}"/>
+  </target>
+
+  <property name="nbroot" location="${nb_all}" />
 
   <property name="nbm_alias" value="nb_ide"/>
   <property name="homepage.base" value="netbeans.org"/>
@@ -27,20 +34,19 @@
       <pathelement location="src" />
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.util" />
     </ant>
   </target>
   
-  <target name="patch" depends="compile" >
+  <target name="patch" depends="compile,boot" >
     <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
     
     <enhanceclass basedir="src" >
         <classpath>
-            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
             <!-- See xtest/instance/build-clover.xml for explanation: -->
             <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
         </classpath>
Index: openide/windows/build.xml
===================================================================
RCS file: /cvs/openide/windows/build.xml,v
retrieving revision 1.7
diff -u -r1.7 build.xml
--- openide/windows/build.xml	21 Nov 2003 17:20:21 -0000	1.7
+++ openide/windows/build.xml	8 Mar 2004 11:01:45 -0000
@@ -13,6 +13,8 @@
 -->
 
 <project name="openide/windows" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/>
+
   <property name="nbroot" location="../.." />
 
   <property name="nbm_alias" value="nb_ide"/>
@@ -30,7 +32,7 @@
        <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
   </path>
   
-  <target name="compile" >
+  <target name="compile" depends="init">
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.windows" />
@@ -60,7 +62,7 @@
              <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
              <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
              <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
-             <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
+             <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
            </classpath>
         </javac>
 
Index: openidex/build.xml
===================================================================
RCS file: /cvs/openidex/build.xml,v
retrieving revision 1.35
diff -u -r1.35 build.xml
--- openidex/build.xml	5 Jun 2003 19:29:12 -0000	1.35
+++ openidex/build.xml	8 Mar 2004 11:01:45 -0000
@@ -15,47 +15,49 @@
 <!-- ToDo: may need to ensure that SearchTask.java is compiled before Utilities2.java -->
 <!--       due to an obscure 1.3 compiler bug                                         -->
 <project name="openidex" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="openidex.files">
+      <include name="${nb.modules/autoload.dir}/openidex.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="../openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/openidex.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/openidex.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+         compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars" description="Build everything.">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/openidex.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="openidex.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build NBM.">
     <makenbm file="openidex.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/openidex.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/openidex.jar"
 	     homepage="http://openidex.${homepage.base}/"
 	     distribution="http://${dist.base}/openidex.nbm">
       <license file="${license.file}"/>
@@ -63,20 +65,22 @@
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean everything.">
+  <target name="clean" depends="init" description="Clean everything.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="openidex.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="openidex.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build openidex module API documentation.">
+  <target name="javadoc" depends="init" description="Build openidex module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build openidex module API documentation..."/>
@@ -96,12 +100,7 @@
         <pathelement location="src"/>
         <pathelement location="looks/src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: projects/build.xml
===================================================================
RCS file: /cvs/projects/build.xml,v
retrieving revision 1.43
diff -u -r1.43 build.xml
--- projects/build.xml	6 Sep 2003 16:46:15 -0000	1.43
+++ projects/build.xml	8 Mar 2004 11:01:46 -0000
@@ -13,55 +13,54 @@
 -->
 
 <project name="projects" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="projects.files">
+      <include name="${nb.modules.dir}/projects.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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="build.sysclasspath" value="ignore"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <path id="cp">
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/>
-    <pathelement location="../openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-    <pathelement location="../debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-    <pathelement location="../core/netbeans/lib/core.jar"/>
-  </path>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
       <classpath refid="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/projects.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/projects.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/projects.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="projects.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="projects.nbm"
-             topdir="."
-             module="netbeans/modules/projects.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/projects.jar"
 	     homepage="http://projects.${homepage.base}/"
 	     distribution="http://${dist.base}/projects.nbm">
       <license file="${license.file}"/>
@@ -69,15 +68,17 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="projects.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="projects.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
Index: properties/build.xml
===================================================================
RCS file: /cvs/properties/build.xml,v
retrieving revision 1.35
diff -u -r1.35 build.xml
--- properties/build.xml	23 Feb 2004 16:24:53 -0000	1.35
+++ properties/build.xml	8 Mar 2004 11:01:46 -0000
@@ -13,11 +13,8 @@
 -->
 
 <project name="properties" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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="javadoc.private" value="false"/>
   <property name="docs.location.jdk"
             value="http://java.sun.com/j2se/1.4.2/docs/api"/>
@@ -26,21 +23,23 @@
   <property name="docs.location.openide-deprecated"
             value="http://www.netbeans.org/download/dev/javadoc/DeprecatedAPIs"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
+    <patternset id="properties.files">
+      <include name="${nb.modules.dir}/properties.jar"/>
+    </patternset>
+    <patternset id="properties-syntax.files">
+      <include name="${nb.modules/eager.dir}/properties-syntax.jar"/>
+    </patternset>
     <path id="properties-nosyntax-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
     </path>
     <path id="properties-syntax-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
-      <pathelement location="../editor/netbeans/modules/editor.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
       <!-- src must be on classpath, otherwise AspectJ compiler (ajc) wouldn't compile -->
       <pathelement location="src" />
     </path>
@@ -62,38 +61,51 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/eager"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/properties.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/properties.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false">
       <exclude name="org/netbeans/modules/properties/syntax/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
     <copy file="manifest-syntax.mf" tofile="manifest-syntax-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/eager/properties-syntax.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/properties-syntax.jar"
             manifest="manifest-syntax-subst.mf"
             basedir="src"
             excludesfile="../nbbuild/standard-jar-excludes.txt"
             compress="false">
       <include name="org/netbeans/modules/properties/syntax/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/properties.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="properties.files"/>
+      </fileset>
+    </genlist>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/properties-syntax.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="properties-syntax.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <!-- Make one NBM with both module JARs. -->
-    <!-- XXX now preferred to make separate NBMs. -->
     <makenbm file="properties.nbm"
-             topdir="."
-             module="netbeans/modules/properties.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/properties.jar"
+	     homepage="http://properties.${homepage.base}/"
+	     distribution="http://${dist.base}/properties.nbm">
+      <license file="${license.file}"/>
+      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
+    </makenbm>
+    <makenbm file="properties-syntax.nbm"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/eager.dir}/properties-syntax.jar"
 	     homepage="http://properties.${homepage.base}/"
 	     distribution="http://${dist.base}/properties.nbm">
       <license file="${license.file}"/>
@@ -101,16 +113,22 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="properties.files"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="properties-syntax.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="manifest-syntax-subst.mf"/>
     <delete file="properties.nbm"/>
-    <delete dir="netbeans"/>
+    <delete file="properties-syntax.nbm"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
Index: schema2beans/anttask/build.xml
===================================================================
RCS file: /cvs/schema2beans/anttask/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- schema2beans/anttask/build.xml	6 Feb 2004 08:02:52 -0000	1.6
+++ schema2beans/anttask/build.xml	8 Mar 2004 11:02:02 -0000
@@ -13,12 +13,12 @@
 -->
 
 <project name="schema2beans_anttask" default="jars" basedir=".">
-  <property name="nb_root" location="../.."/>
+  <import file="../../nbbuild/default-properties.xml"/> 
 
   <target name="jars" depends="compile">
 	<jar jarfile="s2banttask.jar"
 	  basedir="src"
-	  excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
+	  excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	  compress="false">
 	</jar>
   </target>
@@ -32,8 +32,8 @@
                 <!-- Ant in NB -->
                 <!-- Note: in NB 4.0, ${ant.home}/lib/ant.jar will work as is -->
                 <pathelement path="${netbeans.library.path}"/>
-		<pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-		<pathelement location="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
+		<pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+		<pathelement location="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
 	  </classpath>
 	</javac>
   </target>
Index: schema2beans/dev/build.xml
===================================================================
RCS file: /cvs/schema2beans/dev/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- schema2beans/dev/build.xml	4 Mar 2004 17:03:48 -0000	1.9
+++ schema2beans/dev/build.xml	8 Mar 2004 11:02:02 -0000
@@ -13,73 +13,74 @@
 -->
 
 <project name="schema2beansdev" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nbroot" location="../.."/>
-  <property name="nbext" location="${nbroot}/nbbuild"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="schema2beans/dev.files">
+      <include name="${nb.modules/autoload.dir}/schema2beansdev.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
+    </path>
+  </target>
 
   <!-- Primary targets. -->
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/schema2beansdev.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="schema2beans/dev.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-	<delete file="Info/info.xml"/>
     <makenbm file="schema2beansdev.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/schema2beansdev.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/schema2beansdev.jar"
 	     homepage="http://${homepage.base}/schema2beans.html"
 	     distribution="http://${dist.base}/schema2beansdev.nbm">
       <license file="${license.file}" />
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
-      <exclude name="**/nondist/**" />
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="schema2beans/dev.files"/>
+      </fileset>
     </delete>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete file="manifest-subst.mf"/>
     <delete file="schema2beansdev.nbm"/>
-    <delete dir="Info"/>
   </target>
 
 
   <!-- Secondary targets. -->
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf"
 	  filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/schema2beansdev.jar" manifest="manifest-subst.mf"
-      compress="false">
-      <locale name="ja"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" 
+         manifest="manifest-subst.mf"
+         compress="false">
       <fileset dir="src">
-        <patternset excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
+        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
           <include name="org/netbeans/modules/schema2beansdev/"/>
         </patternset>
       </fileset>
-    </locjar>
+    </jar>
   </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-	  <classpath>
-		<pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-	  </classpath>      
+	  <classpath refID="cp"/>
 	  <patternset>
         <include name="org/netbeans/modules/schema2beansdev/"/>
       </patternset>
Index: schema2beans/rt/build.xml
===================================================================
RCS file: /cvs/schema2beans/rt/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- schema2beans/rt/build.xml	4 Mar 2004 17:03:50 -0000	1.5
+++ schema2beans/rt/build.xml	8 Mar 2004 11:02:03 -0000
@@ -13,47 +13,49 @@
 -->
 
 <project name="schema2beans" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nbroot" location="../.."/>
-  <property name="nbext" location="${nbroot}/nbbuild"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="schema2beans/rt.files">
+      <include name="${nb.modules/autoload.dir}/schema2beans.jar"/>
+    </patternset>
+    <path id="cp">
+    </path>
+  </target>
 
   <!-- Primary targets. -->
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/schema2beans.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="schema2beans/rt.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-	<delete file="Info/info.xml"/>
     <makenbm file="schema2beans.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/schema2beans.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/schema2beans.jar"
 	     homepage="http://${homepage.base}/schema2beans.html"
 	     distribution="http://${dist.base}/schema2beans.nbm">
       <license file="${license.file}" />
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
-      <exclude name="**/nondist/**" />
     </makenbm>
   </target>
   
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="schema2beans/rt.files"/>
+      </fileset>
     </delete>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete file="manifest-subst.mf"/>
     <delete file="schema2beans.nbm"/>
-    <delete dir="Info"/>
     <!-- Because build includes just rt and we need to clean other libs during real-clean: -->
     <ant dir="../dev" target="clean"/>
     <ant dir="../anttask" target="clean"/>
@@ -63,22 +65,18 @@
   <!-- Secondary targets. -->
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf"
           filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/schema2beans.jar" manifest="manifest-subst.mf"
-      compress="false">
-      <locale name="ja"/>
-      <fileset dir="src">
-        <patternset>
-		  <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-        </patternset>
-      </fileset>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/schema2beans.jar" 
+         manifest="manifest-subst.mf"
+         basedir="src"
+         compress="false"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
   </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
        <patternset>
         <include name="org/netbeans/modules/schema2beans/"/>
Index: tasklist/api/build.xml
===================================================================
RCS file: /cvs/tasklist/api/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- tasklist/api/build.xml	8 Jan 2004 14:56:40 -0000	1.17
+++ tasklist/api/build.xml	8 Mar 2004 11:02:04 -0000
@@ -13,57 +13,53 @@
 -->
 
 <project name="tasklist/api" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
     <property file="../version.properties"/>
-
-    <path id="cp">
+  
+    <target name="init" depends="default.init">
+      <patternset id="tasklist/api.files">
+        <include name="${nb.modules/autoload.dir}/tasklist-api.jar"/>
+      </patternset>
+      <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <fileset dir="${nb_all}/openide/netbeans/lib">
-            <include name="openide*.jar" />
-        </fileset>
-        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_all}/java/netbeans/modules/java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
-    </path>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
             <classpath refid="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <filter filtersfile="../version.properties"/>
         <filter token="tl.api.spec" value="${tl.api.spec}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/tasklist-api.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/tasklist-api.jar">
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="tasklist/api.files"/>
+           </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <makenbm file="../tasklist-api.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/tasklist-api.jar"
+        <makenbm file="tasklist-api.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/tasklist-api.jar"
                  homepage="http://tasklist.${homepage.base}/"
                  distribution="http://${dist.base}/tasklist-api.nbm"
                  needsrestart="false">
@@ -72,14 +68,15 @@
         </makenbm>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="." includes="**/*.class"/>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+               <patternset refID="tasklist/api.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../tasklist-api.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="tasklist-api.nbm"/>
         <delete dir="javadoc"/>
     </target>
 
Index: tasklist/core/build.xml
===================================================================
RCS file: /cvs/tasklist/core/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- tasklist/core/build.xml	10 Feb 2004 17:12:29 -0000	1.21
+++ tasklist/core/build.xml	8 Mar 2004 11:02:05 -0000
@@ -13,53 +13,53 @@
 -->
 
 <project name="tasklist/core" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
     <property file="../version.properties"/>
+
+    <target name="init" depends="default.init">
+      <patternset id="tasklist/core.files">
+        <include name="${nb.modules/autoload.dir}/tasklist-core.jar"/>
+        <include name="${nb.modules/autoload/docs.dir}/tasklist-manual.zip"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${core/settings.dir}/${nb.modules/autoload.dir}/core-settings.jar"/>
+        <!-- tasklist api -->
+        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
+        <!-- depend on core/output so we can override F12 action -->
+        <pathelement path="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4"> 
-            <classpath>
-                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nb_all}/core/settings/netbeans/modules/autoload/core-settings.jar"/>
-                <!-- tasklist api -->
-                <pathelement path="../api/src"/>
-                <!-- depend on core/output so we can override F12 action -->
-                <pathelement path="../../core/output/netbeans/modules/autoload/core-output.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <filter filtersfile="../version.properties"/>
         <filter token="tl.core.spec" value="${tl.core.spec}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/tasklist-core.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/tasklist-core.jar">
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="tasklist/core.files"/>
+           </fileset>
+        </genlist>
     </target>
 
     <target name="native">
@@ -68,9 +68,9 @@
     </target>
 
     <target name="nbm" depends="netbeans">
-        <makenbm file="../tasklist-core.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/tasklist-core.jar"
+        <makenbm file="tasklist-core.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/tasklist-core.jar"
                  homepage="http://tasklist.${homepage.base}/"
                  distribution="http://${dist.base}/tasklist-core.nbm"
                  needsrestart="false">
@@ -80,22 +80,25 @@
         </makenbm>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+               <patternset refID="tasklist/core.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../tasklist-core.nbm"/>
+        <delete file="tasklist-core.nbm"/>
         <delete dir="netbeans"/>
         <delete dir="Info"/>
         <delete dir="javadoc"/>
     </target>
 
 
-    <target name="javahelp">
-      <mkdir dir="netbeans/modules/autoload/docs"/>
+    <target name="javahelp" depends="init">
+      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
       <mkdir dir="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch"/>
       <jhindexer basedir="../javahelp/org/netbeans/modules/tasklist/help"
                  db="../javahelp/org/netbeans/modules/tasklist/help/JavaHelpSearch">
@@ -107,8 +110,8 @@
         <include name="**/*.html"/>
         <exclude name="JavaHelpSearch/"/>
       </jhindexer>
-      <mkdir dir="netbeans/modules/docs"/>
-      <zip zipfile="netbeans/modules/autoload/docs/tasklist-manual.zip" compress="true">
+      <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
+      <zip zipfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}/tasklist-manual.zip" compress="true">
         <fileset dir="../javahelp" excludesfile="../../nbbuild/standard-jar-excludes.txt">
         </fileset>
       </zip>
Index: tasklist/docscan/build.xml
===================================================================
RCS file: /cvs/tasklist/docscan/build.xml,v
retrieving revision 1.13
diff -u -r1.13 build.xml
--- tasklist/docscan/build.xml	8 Jan 2004 14:56:44 -0000	1.13
+++ tasklist/docscan/build.xml	8 Mar 2004 11:02:05 -0000
@@ -13,61 +13,57 @@
 -->
 
 <project name="tasklist/docscan" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
     <property file="../version.properties"/>
+
+    <target name="init" depends="default.init">
+      <patternset id="tasklist/docscan.files">
+        <include name="${nb.modules.dir}/tasklist-docscan.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
+        <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
+        <pathelement path="${tasklist/suggestions.dir}/${nb.modules/autoload.dir}/suggestions-framework.jar"/>
+        <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+        <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-            <classpath>
-                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <!-- tasklist api -->
-                <pathelement path="../api/src"/>
-                <!-- tasklist core -->
-                <pathelement path="../core/src"/>
-                <!-- usertasks -->
-                <pathelement path="../usertasks/src"/>
-                <pathelement path="../suggestions/src"/>
-                <pathelement location="../../editor/netbeans/modules/ext/nb-editor.jar"/>
-               <pathelement location="../../editor/netbeans/modules/editor.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <filter filtersfile="../version.properties"/>
         <filter token="tl.docscan.spec" value="${tl.docscan.spec}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/tasklist-docscan.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/tasklist-docscan.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+	     excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/tasklist-docscan.jar">
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="tasklist/docscan.files"/>
+           </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <makenbm file="../tasklist-docscan.nbm"
-                 topdir="."
-                 module="netbeans/modules/tasklist-docscan.jar"
+        <makenbm file="tasklist-docscan.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules.dir}/tasklist-docscan.jar"
                  homepage="http://tasklist.${homepage.base}/"
                  distribution="http://${dist.base}/tasklist-docscan.nbm"
                  needsrestart="false">
@@ -77,16 +73,17 @@
         </makenbm>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+               <patternset refID="tasklist/docscan.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../tasklist-docscan.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="tasklist-docscan.nbm"/>
         <delete dir="javadoc"/>
     </target>
 
Index: tasklist/suggestions/build.xml
===================================================================
RCS file: /cvs/tasklist/suggestions/build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- tasklist/suggestions/build.xml	8 Jan 2004 14:56:48 -0000	1.17
+++ tasklist/suggestions/build.xml	8 Mar 2004 11:02:06 -0000
@@ -13,58 +13,56 @@
 -->
 
 <project name="tasklist/suggestions" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
 
-    <property name="nb_all" value="../.."/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar"/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
     <property file="../version.properties"/>
+
+    <target name="init" depends="default.init">
+      <patternset id="tasklist/suggestions.files">
+        <include name="${nb.modules/autoload.dir}/suggestions-framework.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
+        <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
+      </path>
+    </target>
   
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-            <classpath>
-                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <!-- tasklist api -->
-                <pathelement path="../api/src"/>
-                <!-- tasklist core -->
-                <pathelement path="../core/src"/>
-		<pathelement path="../../core/external/xml-apis-1.0b2.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <filter filtersfile="../version.properties"/>
         <filter token="tl.suggestions.spec" value="${tl.suggestions.spec}"/>
-       <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/autoload/suggestions-framework.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-	        excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
-	        compress="false">
-            <locale name="ja"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/suggestions-framework.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	     compress="false">
             <exclude name="org/netbeans/modules/tasklist/suggestions/ui/*"/>
-        </locjar>
+        </jar>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/suggestions-framework.jar">
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="tasklist/suggestions.files"/>
+           </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
-        <makenbm file="../suggestions-framework.nbm"
-                 topdir="."
-                 module="netbeans/modules/autoload/suggestions-framework.jar"
+        <makenbm file="suggestions-framework.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules/autoload.dir}/suggestions-framework.jar"
                  homepage="http://tasklist.${homepage.base}/"
                  distribution="http://${dist.base}/suggestions-framework.nbm"
                  needsrestart="false">
@@ -73,16 +71,17 @@
         </makenbm>
     </target>
   
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+               <patternset refID="tasklist/suggestions.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../suggestions-framework.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="suggestions-framework.nbm"/>
         <delete dir="javadoc"/>
     </target>
 
Index: text/build.xml
===================================================================
RCS file: /cvs/text/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- text/build.xml	2 Apr 2003 09:46:55 -0000	1.25
+++ text/build.xml	8 Mar 2004 11:02:08 -0000
@@ -8,52 +8,54 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
 <project name="text" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/>
+  
+  <target name="init" depends="default.init">
+    <patternset id="text.files">
+      <include name="${nb.modules.dir}/text.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
+  </target>
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/text.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/text.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/text.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="text.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="text.nbm"
-             topdir="."
-             module="netbeans/modules/text.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/text.jar"
 	     homepage="http://text.${homepage.base}/"
 	     distribution="http://${dist.base}/text.nbm">
       <license file="${license.file}"/>
@@ -61,21 +63,23 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="text.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="text.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
     <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build text module API documentation.">
+  <target name="javadoc" depends="init" description="Build text module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build text module API documentation..."/>
@@ -94,12 +98,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: tomcatint/tomcat5/build.xml
===================================================================
RCS file: /cvs/tomcatint/tomcat5/build.xml,v
retrieving revision 1.42
diff -u -r1.42 build.xml
--- tomcatint/tomcat5/build.xml	4 Mar 2004 17:03:51 -0000	1.42
+++ tomcatint/tomcat5/build.xml	8 Mar 2004 11:02:40 -0000
@@ -13,52 +13,42 @@
 -->
 
 <project name="tomcat5" default="netbeans" basedir=".">
-<!-- 
-  <property name="nbm_alias" value="nb_ide"/>
--->
-  
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="license.file" value="../../nbbuild/standard-nbm-license.txt"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="nb_root" location="../.."/>
-  <property name="nbext" location="${nb_root}/nbbuild"/>
+  <import file="../../nbbuild/default.xml"/> 
+
   <property name="tomcat5_dir" location="src/org/netbeans/modules/tomcat5"/>
 	
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-
-  <path id="cp">
+  <target name="init" depends="default.init">
+    <patternset id="tomcatint/tomcat5.files">
+      <include name="${nb.modules.dir}/tomacat5.jar"/>
+    </patternset>
+    <path id="cp">
         <pathelement location="${jdkhome}/lib/tools.jar"/>
-        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-        <!--<pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>-->
-        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
-        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/external/ejb20.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/external/jmxri.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/external/javax77.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/external/jsr88javax.jar"/>
-        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar"/>
-        <pathelement location="${nb_root}/debuggercore/api/netbeans/modules/autoload/debugger-api.jar"/>
-        <pathelement location="${nb_root}/debuggerjpda/netbeans/modules/jpdaDebugger.jar"/>
-        <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-        <pathelement location="${nb_root}/libs/external/xerces-2.6.0.jar"/>
-        <fileset dir="${nb_root}/openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-  </path>
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/> <!-- XXX -->
+        <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar"/>
+        <pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
+        <pathelement location="${nb_all}/j2eeserver/external/ejb20.jar"/>
+        <pathelement location="${nb_all}/j2eeserver/external/jmxri.jar"/>
+        <pathelement location="${nb_all}/j2eeserver/external/javax77.jar"/>
+        <pathelement location="${nb_all}/j2eeserver/external/jsr88javax.jar"/>
+        <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar"/>
+        <pathelement location="${debuggercore/api.dir}/${nb.modules/autoload.dir}/debugger-api.jar"/>
+        <pathelement location="${debuggerjpda.dir}/${nb.modules.dir}/jpdaDebugger.jar"/>
+        <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
+        <pathelement location="${nb_all}/libs/external/xerces-2.6.0.jar"/>
+    </path>
+  </target>
   
-  <target name="s2binit">
+  <target name="s2binit" depends="init">
 	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
 	  <classpath>
-		<pathelement path="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-		<pathelement path="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
-		<pathelement path="${nb_root}/schema2beans/anttask/s2banttask.jar"/>
+		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
+		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
 	  </classpath>
 	</taskdef>
   </target>
@@ -77,44 +67,35 @@
 	  rootDir="src"/>
   </target>
   
-  <target name="compile" depends="dd2beans_gen">
+  <target name="compile" depends="init,dd2beans_gen">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath refid="cp"/>
     </javac>
   </target>
   
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/tomcat5.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/tomcat5.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
-  <target name="release">
-  <!--
-    <mkdir dir="netbeans/modules/ext"/>
-    <copy todir="netbeans/modules/ext">
-      <fileset dir="../external">
-         <include name="mx4j-tools.jar"/>
-      </fileset>
-    </copy>
-    -->
-  </target>
-
-  <target name="netbeans" depends="jars,release,javahelp">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+  <target name="netbeans" depends="jars,javahelp">
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/tomcat5.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="tomcatint/tomcat5.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="jars">
     <makenbm file="tomcat5.nbm"
-             topdir="."
-             module="netbeans/modules/tomcat5.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/tomcat5.jar"
 	     homepage="http://text.${homepage.base}/"
 	     distribution="http://${dist.base}/tomcat5.nbm">
       <license file="${license.file}"/>
@@ -122,33 +103,34 @@
     </makenbm>
   </target>
 
-    <target name="javadoc" description="Build Javadoc.">
-        <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
-            <property name="javadoc.base" location="."/>
-            <property name="javadoc.name" value="Tomcat5PluginAPI"/>
-            <property name="javadoc.title" value="Tomcat 5 Plugin API"/>
-            <property name="javadoc.packages" value="org.netbeans.modules.tomcat5,org.netbeans.modules.tomcat5.ide,org.netbeans.modules.tomcat5.nodes,org.netbeans.modules.tomcat5.progress"/>
-            <property name="javadoc.classpath" refid="cp"/>
-            <!--
-            <property name="javadoc.arch" location="../arch/arch-tomcatint-tomcat5.xml"/>
-            <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
-            <property name="javadoc.docfiles" location="api/doc"/>
-            -->
-        </ant>
-    </target>
+  <target name="javadoc" depends="init" description="Build Javadoc.">
+      <ant dir="../../nbbuild/javadoctools" antfile="template.xml" target="javadoc">
+          <property name="javadoc.base" location="."/>
+          <property name="javadoc.name" value="Tomcat5PluginAPI"/>
+          <property name="javadoc.title" value="Tomcat 5 Plugin API"/>
+          <property name="javadoc.packages" value="org.netbeans.modules.tomcat5,org.netbeans.modules.tomcat5.ide,org.netbeans.modules.tomcat5.nodes,org.netbeans.modules.tomcat5.progress"/>
+          <property name="javadoc.classpath" refid="cp"/>
+          <!--
+          <property name="javadoc.arch" location="../arch/arch-tomcatint-tomcat5.xml"/>
+          <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
+          <property name="javadoc.docfiles" location="api/doc"/>
+          -->
+      </ant>
+  </target>
   
-  <target name="clean">
+  <target name="clean" depends="init">
     <antcall target="clean-ddgen-src"/>  
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="tomcatint/tomcat5.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="tomcat5.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
     <delete dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
     <delete dir="javadoc"/>
   </target>
@@ -166,12 +148,12 @@
         <delete dir="${tomcat5_dir}/config"/>
   </target>
   
-  <target name="javahelp">
+  <target name="javahelp" depends="init">
     <mkdir dir="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/tomcat5/docs/"
                db="javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2">
       <classpath>
-        <fileset dir="${nb_root}/nbbuild/external">
+        <fileset dir="${nb_all}/nbbuild/external">
           <include name="jhall*.jar"/>
         </fileset>
       </classpath>
@@ -180,12 +162,11 @@
       <exclude name="ja/"/>
       <exclude name="credits.html"/>
     </jhindexer>
-    <mkdir dir="netbeans/modules/docs"/>
-    <locjar jarfile="netbeans/modules/docs/tomcat5.jar"
-            compress="true">
-      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
-      <locale name="ja"/>
-    </locjar>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/tomcat5.jar"
+         compress="true">
+      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+    </jar>
   </target>
   
   <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
Index: tomcatint/tomcat5/bundled/build.xml
===================================================================
RCS file: /cvs/tomcatint/tomcat5/bundled/build.xml,v
retrieving revision 1.10
diff -u -r1.10 build.xml
--- tomcatint/tomcat5/bundled/build.xml	5 Mar 2004 08:19:16 -0000	1.10
+++ tomcatint/tomcat5/bundled/build.xml	8 Mar 2004 11:02:40 -0000
@@ -13,58 +13,49 @@
 -->
 
 <project name="tomcatint-tomcat5-bundled" basedir="." default="netbeans">
+  <import file="../../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../../nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../../.."/>
-  <property name="nbext" location="${nb_root}/nbbuild"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
   <property name="tomcat.filename" value="jakarta-tomcat-5.0.19"/>
 
-  <target name="init">
-    <ant dir="${nb_root}/tomcatint/external" target="unscramble"/>
+  <target name="init" depends="default.init">
+    <ant dir="${nb_all}/tomcatint/external" target="unscramble"/>
+    <patternset id="tomcatint/tomcat5/bundled.files">
+      <include name="${nb.modules/eager.dir}/tomacat5-bundled.jar"/>
+      <include name="${tomcat.filename}"/>
+    </patternset>
+    <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${tomcatint/tomcat5.dir}/${nb.modules.dir}/tomcat40.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
   </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <!-- PENDING: code needs to be isolated from plugin
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <include name="org/netbeans/modules/tomcat5/bundled/**" />
-      <classpath>
-        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_root}/tomcatint/netbeans/modules/tomcat40.jar"/>
-        <fileset dir="${nb_root}/openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
     -->
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/eager/tomcat5-bundled.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-            compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/eager.dir}/tomcat5-bundled.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/tomcat5/bundled/**"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init,jars">
-    <mkdir dir="netbeans"/>
-    <unzip src="../../external/${tomcat.filename}.zip" dest="netbeans" />
+    <unzip src="../../external/${tomcat.filename}.zip" dest="${netbeans.dest.dir}/${cluster.dir}" />
     <chmod perm="ugo+x">
-      <fileset dir="netbeans/${tomcat.filename}/bin">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/bin">
         <include name="*.sh"/>
       </fileset>
     </chmod>
@@ -76,38 +67,45 @@
     <!-- XXX:copy IDE-README.txt
     <copy file="torelease/IDE-README.txt" tofile="netbeans/${tomcat.filename}/IDE-README.txt" includeEmptyDirs="false"/> -->
     <!-- copy dummy to empty directories -->
-    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
-    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
-    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
-    <copy file="torelease/dummy" tofile="netbeans/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
+    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
+    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
+    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
+    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
   </target>
 
   <target name="netbeans" depends="jars,release" description="Builds the module">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/eager.dir}/tomcat5-bundled.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="tomcatint/tomcat5/bundled.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
     <makenbm file="bundledtomcat.nbm"
-             topdir="."
-           module="netbeans/modules/eager/tomcat5-bundled.jar"
+           productdir="${netbeans.dest.dir}/${cluster.dir}"
+           module="${nb.modules/eager.dir}/tomcat5-bundled.jar"
            homepage="http://tomcatint.${homepage.base}/"
            distribution="http://${dist.base}/bundledtomcat.nbm">
       <license name="bundledtomcat-license.txt">
         <text>For the integration module:</text>
         <file location="${license.file}"/>
         <text>For Tomcat:</text>
-        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
+        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
       </license>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean all build products.">
+  <target name="clean" depends="init" description="Clean all build products.">
         <delete file="manifest-subst.mf"/>
-        <delete dir="netbeans"/>
         <delete file="bundledtomcat.nbm"/>
-        <delete dir="Info"/>
         <delete dir="test"/>
+        <delete>
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+            <patternset refID="tomcatint/tomcat5/bundled.files"/>
+          </fileset>
+        </delete>
 <!--
         <delete>
             <fileset dir="src">
Index: ui/welcome/build.xml
===================================================================
RCS file: /cvs/ui/welcome/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- ui/welcome/build.xml	2 Apr 2003 09:46:56 -0000	1.12
+++ ui/welcome/build.xml	8 Mar 2004 11:03:06 -0000
@@ -14,50 +14,53 @@
 -->
 
 <project basedir="." default="netbeans" name="welcome">
-    <property name="nbm_alias" value="nb_ide"/>
-    <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"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-    <target name="compile">
-        <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="../../openide/openide-13javac-workaround.jar"/>
-                <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-                <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="../../core/netbeans/lib/core.jar"/>
-								<pathelement location="../../utilities/netbeans/modules/utilities.jar"/> <!-- XXX: depends on OpenFile -->
-								<pathelement location="../../autoupdate/netbeans/modules/autoupdate.jar"/>
-								<pathelement location="../../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-            </classpath>
-        </javac>
-    </target>
+  <import file="../../nbbuild/default.xml"/> 
+
+  <target name="init" depends="default.init">
+    <patternset id="ui/welcome.files">
+      <include name="${nb.modules.dir}/junit.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      <pathelement location="${utilities.dir}/${nb.modules.dir}/utilities.jar"/> <!-- XXX: depends on OpenFile -->
+      <pathelement location="${autoupdate.dir}/${nb.modules.dir}/autoupdate.jar"/>
+      <pathelement location="${core/javahelp.dir}/$[nb.modules/autoload.dir}/javahelp-api.jar"/>
+    </path>
+  </target>
+
+
+  <target name="compile" depends="init">
+    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
+      <classpath refID="cp"/>
+    </javac>
+  </target>
       
-    <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+  <target name="jars" depends="compile">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/welcome.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-		</locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/welcome.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/welcome.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="ui/welcome.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="welcome.nbm"
-             topdir="."
-             module="netbeans/modules/welcome.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/welcome.jar"
 	     homepage="http://welcome.${homepage.base}/"
 	     distribution="http://${dist.base}/welcome.nbm">
       <license file="${license.file}"/>
@@ -65,16 +68,17 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="ui/welcome.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="welcome.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
   </target>
 
 <!--    <target depends="init" description="Javadoc for my API." name="javadoc">
Index: usersguide/build.xml
===================================================================
RCS file: /cvs/usersguide/build.xml,v
retrieving revision 1.37
diff -u -r1.37 build.xml
--- usersguide/build.xml	9 Oct 2003 00:36:40 -0000	1.37
+++ usersguide/build.xml	8 Mar 2004 11:03:27 -0000
@@ -13,25 +13,25 @@
 -->
 
 <project name="usersguide" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="usersguide.files">
+      <include name="${nb.modules.dir}/usersguide.jar"/>
+      <include name="${nb.modules/docs.dir}/usersguide.jar"/>
+      <include name="${nb.beans.dir}/TimerBean.jar"/>
+      <include name="${nb.sources.dir}/org/netbeans/examples/lib/timerbean/**"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
     <!-- #24191: always turn on debug info for these sources -->
     <javac destdir="demosrc" srcdir="demosrc" deprecation="true" debug="true">
@@ -49,30 +49,31 @@
   </target>
 
   <target name="jars" depends="tojar">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/usersguide.jar"
-            manifest="manifest-subst.mf"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false"
-            basedir="src">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/usersguide.jar"
+         manifest="manifest-subst.mf"
+	 excludesfile="../nbbuild/standard-jar-excludes.txt"
+	 compress="false"
+         basedir="src"/>
   </target>
 
-  <target name="release">
-    <copy todir="netbeans">
-      <fileset dir="release"/>
+  <target name="release" depends="init">
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.beans.dir}">
+      <fileset dir="release/beans"/>
+    </copy>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.sources.dir}">
+      <fileset dir="release/sources"/>
     </copy>
   </target>
 
-  <target name="javahelp">
+  <target name="javahelp" depends="init">
     <mkdir dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/usersguide"
                db="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2">
       <classpath>
-        <fileset dir="../nbbuild/external">
+        <fileset dir="${nb_all}/nbbuild/external">
           <include name="jhall*.jar"/>
         </fileset>
       </classpath>
@@ -82,8 +83,8 @@
       <exclude name="pending.html"/>
       <exclude name="ja/"/>
     </jhindexer>
-    <mkdir dir="netbeans/modules/docs"/>
-    <locjar jarfile="netbeans/modules/docs/usersguide.jar"
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/usersguide.jar"
 	    compress="true">
       <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt">
         <!-- Temporary files, or preprocessing scripts: -->
@@ -95,20 +96,23 @@
         <exclude name="**/usergdto.xml"/>
         <exclude name="org/netbeans/modules/usersguide/ide.css"/>
       </fileset>
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/docs/org/netbeans/modules/usersguide"/>
-    <copy file="javahelp/org/netbeans/modules/usersguide/ide.css" tofile="netbeans/docs/org/netbeans/modules/usersguide/ide.css"/>
+    </jar>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/org/netbeans/modules/usersguide"/>
+    <copy file="javahelp/org/netbeans/modules/usersguide/ide.css" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/org/netbeans/modules/usersguide/ide.css"/>
   </target>
 
   <target name="netbeans" depends="jars,release,javahelp">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/usersguide.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="usersguide.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="usersguide.nbm"
-             topdir="."
-             module="netbeans/modules/usersguide.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/usersguide.jar"
 	     homepage="http://usersguide.${homepage.base}/"
 	     distribution="http://${dist.base}/usersguide.nbm">
       <license file="${license.file}"/>
@@ -116,7 +120,7 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete file="manifest-subst.mf"/>
     <delete file="usersguide.nbm"/>
     <delete dir="netbeans"/>
@@ -128,6 +132,9 @@
       <fileset dir="demosrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="usersguide.files"/>
+      </fileset>
     </delete>
     <delete dir="javahelp/org/netbeans/modules/usersguide/JavaHelpSearch2"/>
     <delete file="src/org/netbeans/modules/usersguide/demosrc.zip"/>
@@ -137,8 +144,8 @@
   <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
     <taskdef name="checkhelpsets" classname="org.netbeans.nbbuild.CheckHelpSets">
       <classpath>
-        <pathelement location="../nbbuild/nbantext.jar"/>
-        <fileset dir="../nbbuild/external">
+        <pathelement location="${nb_all}/nbbuild/nbantext.jar"/>
+        <fileset dir="${nb_all}/nbbuild/external">
           <include name="jhall*.jar"/>
         </fileset>
       </classpath>
@@ -150,7 +157,7 @@
     </checkhelpsets>
   </target>
 
-  <target name="javadoc" description="Build usersguide module API documentation.">
+  <target name="javadoc" depends="init" description="Build usersguide module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build usersguide module API documentation..."/>
@@ -169,12 +176,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: utilities/build.xml
===================================================================
RCS file: /cvs/utilities/build.xml,v
retrieving revision 1.43
diff -u -r1.43 build.xml
--- utilities/build.xml	9 Jan 2004 18:40:27 -0000	1.43
+++ utilities/build.xml	8 Mar 2004 11:03:28 -0000
@@ -13,42 +13,41 @@
 -->
 
 <project name="utilities" default="netbeans" basedir=".">
-
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
+  <import file="../nbbuild/default.xml"/>
+  
   <property name="javadoc.destdir.default" value="javadoc"/>
   <property name="javadoc.extra.param" value=""/>
   <property name="javadoc.private" value="false"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <target name="init">
-    <path id="utilities-cp">
-      <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-      <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-      <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
-      <pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="utilities.files">
+      <include name="${nb.modules.dir}/utilities.jar"/>
+      <include name="${nb.lib.dir}/openfile-cli.jar"/>
+    </patternset>
+
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${core/javahelp.dir}/${nb.modules/autoload.dir}/javahelp-api.jar"/>
       <pathelement location="clisrc"/>
     </path>
+    <path id="cli-cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+    </path>
   </target>
-  
-  <target name="compile-cli">
+
+  <target name="compile-cli" depends="init">
     <javac srcdir="clisrc"
            destdir="clisrc"
            deprecation="${build.compiler.deprecation}"
            debug="${build.compiler.debug}"
            source="1.4">
-      <classpath>
-        <!-- Compiles against org.netbeans.CLIHandler: -->
-        <pathelement location="../core/netbeans/lib/ext/boot.jar"/>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      </classpath>
+      <classpath refID="cli-cp"/>
     </javac>
   </target>
 
@@ -58,35 +57,37 @@
            deprecation="${build.compiler.deprecation}"
            debug="${build.compiler.debug}"
            source="1.4">
-      <classpath refid="utilities-cp"/>
+      <classpath refid="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/utilities.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="../nbbuild/standard-jar-excludes.txt"
-            compress="false">
-      <locale name="ja"/>
-    </locjar>
-    <mkdir dir="netbeans/lib"/>
-    <jar jarfile="netbeans/lib/openfile-cli.jar">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/utilities.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="../nbbuild/standard-jar-excludes.txt"
+         compress="false"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openfile-cli.jar">
       <fileset dir="clisrc" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
     </jar>
   </target>
 
   <target name="netbeans" depends="jars" description="Build everything.">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/utilities.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="utilities.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Build an NBM.">
     <makenbm file="utilities.nbm"
-             topdir="."
-             module="netbeans/modules/utilities.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/utilities.jar"
 	     homepage="http://utilities.${homepage.base}/"
 	     distribution="http://${dist.base}/utilities.nbm">
       <license file="${license.file}"/>
@@ -94,7 +95,7 @@
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean everything.">
+  <target name="clean" depends="init" description="Clean everything.">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
@@ -102,10 +103,12 @@
       <fileset dir="clisrc">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="utilities.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="utilities.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="${javadoc.destdir.default}"/>
     <delete dir="Info"/>
   </target>
@@ -172,7 +175,7 @@
         <pathelement location="loaderswitcher/src"/>
         <pathelement location="group/src"/>
       </sourcepath>
-      <classpath refid="utilities-cp"/>
+      <classpath refid="cp"/>
       <classpath>
         <fileset dir="..">
           <patternset includes="openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
Index: utilities/group/build.xml
===================================================================
RCS file: /cvs/utilities/group/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- utilities/group/build.xml	14 Nov 2003 13:04:17 -0000	1.8
+++ utilities/group/build.xml	8 Mar 2004 11:03:28 -0000
@@ -13,52 +13,54 @@
 -->
 
 <project name="utilities/group" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/>
+  
 
-    <property name="nbroot" location="../.."/>
-
-    <property name="nbm_alias" value="nb_ide"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-    <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="utilities/group.files">
+        <include name="${nb.modules.dir}/group.jar"/>
+      </patternset>
+
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <javac srcdir="src"
                destdir="src"
                deprecation="${build.compiler.deprecation}"
                debug="${build.compiler.debug}"
                source="1.4">
-            <classpath>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-        <locjar jarfile="netbeans/modules/group.jar"
-                manifest="manifest-subst.mf"
-                basedir="src"
-                excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-                compress="false">
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/group.jar"
+             manifest="manifest-subst.mf"
+             basedir="src"
+             excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+             compress="false"/>
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+        <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/group.jar">
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="utilities/group.files"/>
+            </fileset>
+        </genlist>
     </target>
 
     <target name="nbm" depends="netbeans">
         <makenbm file="group.nbm"
-                 topdir="."
-                 module="netbeans/modules/group.jar"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
+                 module="${nb.modules.dir}/group.jar"
                  homepage="http://${homepage.base}/#group"
                  distribution="http://${dist.base}/group.nbm">
             <license file="${license.file}"/>
@@ -66,15 +68,17 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
           <fileset dir="src">
               <include name="**/*.class"/>
           </fileset>
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="utilities/group.files"/>
+          </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="group.nbm"/>
-        <delete dir="netbeans"/>
         <delete dir="Info"/>
     </target>
 
Index: vcscore/build.xml
===================================================================
RCS file: /cvs/vcscore/build.xml,v
retrieving revision 1.44
diff -u -r1.44 build.xml
--- vcscore/build.xml	30 Dec 2003 22:55:32 -0000	1.44
+++ vcscore/build.xml	8 Mar 2004 11:03:28 -0000
@@ -15,53 +15,51 @@
 <!-- Special targets: vcs-apis -->
 
 <project name="vcscore" default="netbeans" basedir=".">
+  <import file="../nbbuild/default.xml"/> 
 
-  <property name="nbroot" value=".."/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-
-  <path id="cp">
-    <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
-    <pathelement location="../openide/openide-13javac-workaround.jar"/>
-    <pathelement location="../openide/netbeans/lib/openide.jar"/>
-    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
-    <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
-    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-  </path>
+  <target name="init" depends="default.init">
+    <patternset id="vcscore.files">
+      <include name="${nb.modules/autoload.dir}/vcscore.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath refid="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/vcscore.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/vcscore.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/vcscore.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="vcscore.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="vcscore.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/vcscore.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/vcscore.jar"
 	     homepage="http://vcscore.${homepage.base}/"
 	     distribution="http://${dist.base}/vcscore.nbm">
       <license file="${license.file}"/>
@@ -69,7 +67,7 @@
     </makenbm>
   </target>
 
-  <target name="javadoc" description="Build Javadoc.">
+  <target name="javadoc" depends="init" description="Build Javadoc.">
     <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
       <property name="javadoc.base" location="."/>
       <property name="javadoc.name" value="VCSAPI"/>
@@ -82,10 +80,13 @@
     </ant>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcscore.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: vcscvs/compat/build.xml
===================================================================
RCS file: /cvs/vcscvs/compat/build.xml,v
retrieving revision 1.10
diff -u -r1.10 build.xml
--- vcscvs/compat/build.xml	6 Jun 2003 15:29:24 -0000	1.10
+++ vcscvs/compat/build.xml	8 Mar 2004 11:03:28 -0000
@@ -12,54 +12,54 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<project name="vcscvs" default="netbeans" basedir=".">
+<project name="vcscvs/compat" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="vcscvs/compat.files">
+      <include name="${nb.modules.dir}/cvscompat.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+      <fileset dir="${nb_all}/libs/external">
+        <include name="regexp*.jar" />
+      </fileset>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <fileset dir="../../libs/external">
-          <include name="regexp*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/cvscompat.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/cvscompat.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/cvscompat.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="vcscvs/compat.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="vcscvscompat.nbm"
-             topdir="."
-             module="netbeans/modules/cvscompat.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/cvscompat.jar"
 	     homepage="http://vcscvs.${homepage.base}/"
 	     distribution="http://${dist.base}/vcscvscompat.nbm">
       <license file="${license.file}"/>
@@ -67,19 +67,20 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcscvs/compat.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="vcscvscompat.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build vcscvs compat module API documentation.">
+  <target name="javadoc" depends="init" description="Build vcscvs compat module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build vcscvs compat module API documentation..."/>
@@ -98,17 +99,7 @@
       <sourcepath>
         <pathelement location="src"/>
       </sourcepath>
-      <classpath>
-        <pathelement location="../../vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="../../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <fileset dir="../../libs/external">
-          <include name="regexp*.jar" />
-        </fileset>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: vcsgeneric/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/build.xml,v
retrieving revision 1.64
diff -u -r1.64 build.xml
--- vcsgeneric/build.xml	12 Nov 2003 17:34:58 -0000	1.64
+++ vcsgeneric/build.xml	8 Mar 2004 11:03:28 -0000
@@ -14,42 +14,34 @@
 
 
 <project name="vcsgeneric" default="netbeans" basedir=".">
-
-  <property name="nbroot" location=".."/>
-  <property name="nbext" location="${nbroot}/nbbuild"/>
-  <property name="nbext_root" location="${nbroot}/nbbuild"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <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"/>
+  <import file="../nbbuild/default.xml"/> 
 
   <property name="stdprofiles" value="cvsprofiles, pvcs, vss"/>
+  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-  <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="${nbext}/nbantext.jar"/>
+  <target name="init" depends="default.init">
+    <patternset id="vcsgeneric.files">
+      <include name="${nb.modules.dir}/vcsgen.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
+    </path>
+  </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" 
         deprecation="${build.compiler.deprecation}" 
         debug="${build.compiler.debug}"
         destdir="src"
         excludes="org/netbeans/modules/vcs/advanced/config/">
-      <classpath>        
-	      <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-	      <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
-	      <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
-        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
-    <!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->
-    <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
   </target>
 
   <target name="jars" depends="compile">
@@ -74,17 +66,16 @@
     <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/advanced/config/layer-includes-resources.xml" absolutepath="true">
        <include name="org/netbeans/modules/vcs/profiles/resources/*.*"/>
     </makelayer>
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/vcsgen.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/vcsgen.jar"
          manifest="manifest-subst.mf"
          basedir="src"
-         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	 excludes="org/netbeans/modules/vcs/advanced/config/mf-layer_XX.xml" 
          compress="false">
-      <locale name="ja"/>
-      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
+      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
         <include name="org/netbeans/modules/vcs/profiles/**/*"/>
 	<exclude name="org/netbeans/modules/vcs/profiles/config/*_XX.*"/>
       </fileset>
@@ -92,33 +83,7 @@
         <include name="org/netbeans/modules/vcs/profiles/**/*.java"/>
         <include name="org/netbeans/modules/vcs/profiles/**/*.form"/>
       </fileset>
-    </locjar>
-    <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
-<!--    <nbmerge dest="netbeans" topdir="profiles" modules="${stdprofiles}" targetprefix="profile-"/>-->
-   <!--
-    <patternset id="stdprofilesFolders" includes="${stdprofiles}"/>
-    <copy todir="netbeans/modules" flatten="true" includeEmptyDirs="false">
-      <fileset dir="profiles">
-        <patternset refid="stdprofilesFolders">
-          <include name="**/*.jar"/>
-          <exclude name="**/*_??.jar"/>
-        </patternset>
-      </fileset>
-    </copy>
-   -->
-   <!--
-    <copydir src="profiles" dest="netbeans/modules" flatten="true" includes="${stdprofiles}">
-      <patternset id="stdprofiles.jars">
-        <include name="**/*.jar"/>
-        <exclude name="**/*_??.jar"/>
-      </patternset>
-    </copydir>
-    <copydir src="profiles" dest="netbeans/modules/locale" flatten="true" includes="${stdprofiles}">
-      <patternset id="stdprofiles.jars">
-        <include name="**/*_??.jar"/>
-      </patternset>
-    </copydir>
-  -->
+    </jar>
   </target>
 
   <target name="profile-cvsprofiles">
@@ -135,13 +100,17 @@
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/vcsgen.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="vcsgeneric.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="vcsgen.nbm"
-             topdir="."
-             module="netbeans/modules/vcsgen.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/vcsgen.jar"
 	     homepage="http://vcsgeneric.${homepage.base}/"
 	     distribution="http://${dist.base}/vcsgen.nbm">
       <license file="${license.file}"/>
@@ -149,22 +118,23 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
         <include name="org/netbeans/modules/vcs/advanced/config/layer-include*.xml"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="vcsgen.nbm"/>
-    <delete dir="netbeans"/>
     <delete dir="javadoc"/>
-    <delete dir="Info"/>
   </target>
 
-  <target name="javadoc" description="Build vcsgeneric module API documentation.">
+  <target name="javadoc" depends="init" description="Build vcsgeneric module API documentation.">
     <tstamp/>
     <property name="apis-footer" value="&lt;font size=-2 color=gray&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/font&gt;"/>
     <echo message="Build vcsgeneric module API documentation..."/>
@@ -188,17 +158,7 @@
         <pathelement location="profiles/starteam/common"/>
         <pathelement location="profiles/vss/src"/>
       </sourcepath>
-      <classpath>
-	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <!--<pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>-->
-        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <fileset dir="${nbroot}/openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
-	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
-        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javadoc>    
   </target>
 
Index: vcsgeneric/profiles/cvsprofiles/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/cvsprofiles/build.xml,v
retrieving revision 1.20
diff -u -r1.20 build.xml
--- vcsgeneric/profiles/cvsprofiles/build.xml	12 Nov 2003 17:35:02 -0000	1.20
+++ vcsgeneric/profiles/cvsprofiles/build.xml	8 Mar 2004 11:03:28 -0000
@@ -14,34 +14,33 @@
 
 
 <project name="vcsgeneric/profiles/cvsprofiles" default="netbeans" basedir=".">
+  <import file="../../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../../.."/>
-  <property name="nbext" location="${nbroot}/nbbuild"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
+  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-  <target name="compile">
+  <target name="init" depends="default.init">
+    <patternset id="vcsgeneric/profiles/cvsprofiles.files">
+      <include name="${nb.modules.dir}/cvs-profile.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
+      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
+      <pathelement location="${javacvs/libmodule.dir}/${nb.modules/autoload.dir}/cvslib.jar"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
     <!--<echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}, nbext1 = ${nbext1}"/>-->
     <javac srcdir="src" 
         deprecation="${build.compiler.deprecation}" 
         debug="${build.compiler.debug}"
         destdir="src">
-      <classpath>        
-				<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-	      <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
-	      <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	      <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
-        <pathelement location="${nbroot}/javacvs/libmodule/netbeans/modules/autoload/cvslib.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
@@ -76,17 +75,16 @@
        <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.java"/>
        <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.properties"/>
     </makelayer>
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/cvs-profile.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/cvs-profile.jar"
          manifest="manifest-subst.mf"
          basedir="src"
-         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	 excludes="src/org/netbeans/modules/vcs/profiles/cvsprofiles/mf-layer_XX.xml" 
          compress="false">
-      <locale name="ja"/>
-      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
+      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
         <include name="**/*"/>
 	<exclude name="src/org/netbeans/modules/vcs/profiles/cvsprofiles/**/*_XX.*"/>
       </fileset>
@@ -94,17 +92,21 @@
         <include name="**/*.java"/>
         <include name="**/*.form"/>
       </fileset>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/cvs-profile.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="cvs-profile.nbm"
-             topdir="."
-             module="netbeans/modules/cvs-profile.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/cvs-profile.jar"
 	     homepage="http://vcsgeneric.${homepage.base}/"
 	     distribution="http://${dist.base}/cvs-profile.nbm">
       <license file="${license.file}"/>
@@ -112,18 +114,19 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
         <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/layer-include*.xml"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="cvs-profile.nbm"/>
-    <delete dir="netbeans"/>
-    <delete dir="Info"/>
   </target>
 
 </project>
Index: vcsgeneric/profiles/pvcs/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/pvcs/build.xml,v
retrieving revision 1.16
diff -u -r1.16 build.xml
--- vcsgeneric/profiles/pvcs/build.xml	29 Oct 2003 14:49:15 -0000	1.16
+++ vcsgeneric/profiles/pvcs/build.xml	8 Mar 2004 11:03:29 -0000
@@ -14,34 +14,33 @@
 
 
 <project name="vcsgeneric/profiles/pvcs" default="netbeans" basedir=".">
+  <import file="../../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../../.."/>
-  <property name="nbext" location="${nbroot}/nbbuild"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
+  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-  <target name="compile">
+  <target name="init" depends="default.init">
+    <patternset id="vcsgeneric/profiles/pvcs.files">
+      <include name="${nb.modules.dir}/pvcs-profile.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
+      <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar"/>
+      <pathelement location="${javacvs/libmodule.dir}/${nb.modules/autoload.dir}/cvslib.jar"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
     <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
     <javac srcdir="src" 
         deprecation="${build.compiler.deprecation}" 
         debug="${build.compiler.debug}"
         destdir="src">
-      <classpath>        
-	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
-	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-        <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
@@ -68,17 +67,16 @@
        <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.java"/>
        <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.properties"/>
     </makelayer>
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/pvcs-profile.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/pvcs-profile.jar"
          manifest="manifest-subst.mf"
          basedir="src"
-         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	 excludes="org/netbeans/modules/vcs/profiles/pvcs/mf-layer_XX.xml"
          compress="false">
-      <locale name="ja"/>
-      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
+      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
         <include name="**/*"/>
 	<exclude name="org/netbeans/modules/vcs/profiles/pvcs/config/*_XX.*"/>
       </fileset>
@@ -86,17 +84,21 @@
         <include name="**/*.java"/>
         <include name="**/*.form"/>
       </fileset>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/pvcs-profile.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/pvcs.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="pvcs-profile.nbm"
-             topdir="."
-             module="netbeans/modules/pvcs-profile.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/pvcs-profile.jar"
 	     homepage="http://vcsgeneric.${homepage.base}/"
 	     distribution="http://${dist.base}/pvcs-profile.nbm">
       <license file="${license.file}"/>
@@ -104,12 +106,15 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
         <include name="org/netbeans/modules/vcs/profiles/pvcs/layer-include*.xml"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/pvcs.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: vcsgeneric/profiles/vss/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/profiles/vss/build.xml,v
retrieving revision 1.12
diff -u -r1.12 build.xml
--- vcsgeneric/profiles/vss/build.xml	11 Apr 2003 16:33:40 -0000	1.12
+++ vcsgeneric/profiles/vss/build.xml	8 Mar 2004 11:03:44 -0000
@@ -14,36 +14,31 @@
 
 
 <project name="vcsgeneric/profiles/vss" default="netbeans" basedir=".">
+  <import file="../../../nbbuild/default.xml"/>
 
-  <property name="nbroot" value="../../.."/>
-  <property name="nbext" value="${nbroot}/nbbuild"/>
-  <property name="nbm_alias" value="nb_ide"/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
-  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
+  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-  <target name="compile">
+  <target name="init" depends="default.init">
+    <patternset id="vcsgeneric/profiles/vss.files">
+      <include name="${nb.modules.dir}/vss-profile.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${vcscore.dir}/${nb.modules/autoload.dir}/vcscore.jar"/>
+      <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
     <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
     <javac srcdir="src" 
         deprecation="${build.compiler.deprecation}" 
         debug="${build.compiler.debug}"
         destdir="src">
-      <classpath>        
-	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <!--<pathelement location="${nbroot1}/openide/netbeans/lib/openide.jar"/>-->
-        <fileset dir="${nbroot}/openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
-        <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
-	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
-	<pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
@@ -72,17 +67,16 @@
        <include name="org/netbeans/modules/vcs/profiles/vss/list/*.properties"/>
        <exclude name="org/netbeans/modules/vcs/profiles/vss/list/*_ja.properties"/>
     </makelayer>
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/vss-profile.jar"
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/vss-profile.jar"
          manifest="manifest-subst.mf"
          basedir="src"
-         excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	 excludes="org/netbeans/modules/vcs/profiles/vss/mf-layer_XX.xml"
          compress="false">
-      <locale name="ja"/>
-      <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
+      <fileset dir="src/" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
         <include name="**/*"/>
 	<exclude name="org/netbeans/modules/vcs/profiles/vss/config/*_XX.*"/>
       </fileset>
@@ -90,17 +84,21 @@
         <include name="**/*.java"/>
         <include name="**/*.form"/>
       </fileset>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/vss-profile.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/vss.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
     <makenbm file="vss-profile.nbm"
-             topdir="."
-             module="netbeans/modules/vss-profile.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/vss-profile.jar"
 	     homepage="http://vcsgeneric.${homepage.base}/"
 	     distribution="http://${dist.base}/vss-profile.nbm">
       <license file="${license.file}"/>
@@ -108,12 +106,15 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
         <include name="**/*.jar"/>
         <include name="org/netbeans/modules/vcs/profiles/vss/layer-include*.xml"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="vcsgeneric/profiles/vss.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: web/advanced/build.xml
===================================================================
RCS file: /cvs/web/advanced/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- web/advanced/build.xml	4 Mar 2004 17:03:53 -0000	1.34
+++ web/advanced/build.xml	8 Mar 2004 11:03:45 -0000
@@ -13,68 +13,62 @@
 -->
 
 <project name="web_advanced" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nb_root}/nbbuild/nbantext.jar"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <property name="ddapi.implementation.version" value="${buildnumber}"/>
     <filter token="DDAPI_BUILD_NUMBER_SUBST"  value="${ddapi.implementation.version}"/>
+    <ant dir="../external" target="unscramble"/>
+    <patternset id="web/advanced.files">
+      <include name="${nb.modules.dir}/jspie.jar"/>
+      <include name="${nb.modules/docs.dir}/jspie.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openidex.dir}/{nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar" />
+      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
+    </path>
   </target>
   
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-         <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
-         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
-         <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
-         <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
-         <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
-         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar"/>
-        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/> <!-- XXX -->
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/jspie.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jspie.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false">
       <include name="org/netbeans/modules/web/"/>
-      <locale name="ja"/>
       <fileset dir="src">
-        <patternset excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt">
+        <patternset excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt">
           <include name="**/org/netbeans/modules/web/**"/>
         </patternset>
       </fileset>
-    </locjar>
+    </jar>
   </target>
 
-  <target name="javahelp">
+  <target name="javahelp" depends="init">
     <mkdir dir="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2"/>
     <jhindexer basedir="javahelp/org/netbeans/modules/web/ie/docs/"
                db="javahelp/org/netbeans/modules/web/ie/docs/JavaHelpSearch2">
       <classpath>
-        <fileset dir="${nb_root}/nbbuild/external">
+        <fileset dir="${nb_all}/nbbuild/external">
           <include name="jhall*.jar"/>
         </fileset>
       </classpath>
@@ -83,12 +77,11 @@
       <exclude name="ja/"/>
       <exclude name="credits.html"/>
     </jhindexer>
-    <mkdir dir="netbeans/modules/docs"/>
-    <locjar jarfile="netbeans/modules/docs/jspie.jar"
-            compress="true">
-      <fileset dir="javahelp" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
-      <locale name="ja"/>
-    </locjar>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}"/>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/docs.dir}/jspie.jar"
+         compress="true">
+      <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+    </jar>
   </target>
 
   <target name="check-javahelp" depends="javahelp" description="Validate helpset for various errors.">
@@ -108,14 +101,17 @@
   </target>
 
   <target name="netbeans" depends="jars,javahelp">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jspie.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/advanced.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="jspie.nbm"
-             topdir="."
-             module="netbeans/modules/jspie.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/jspie.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/jspie.nbm">
       <license file="${license.file}"/>
@@ -123,10 +119,13 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/advanced.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: web/core/build.xml
===================================================================
RCS file: /cvs/web/core/build.xml,v
retrieving revision 1.47
diff -u -r1.47 build.xml
--- web/core/build.xml	4 Mar 2004 17:03:54 -0000	1.47
+++ web/core/build.xml	8 Mar 2004 11:03:45 -0000
@@ -13,88 +13,86 @@
 -->
 
 <project name="web_core" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="../external" target="unscramble"/>
+    <patternset id="web/core.files">
+      <include name="${nb.modules.dir}/jsp.jar"/>
+      <include name="${nb.docs.dir}/servlet24-docs.zip"/>
+      <include name="${nb.docs.dir}/jsp20-docs.zip"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/> <!-- XXX: ExLocalFileSystem in UnpackWarAction -->
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openidex.dir}/{nb.modules/autoload.dir}/openidex.jar"/>
+      <pathelement location="${html.dir}/${nb.modules.dir}/html.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
+      <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
+      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
+      <pathelement location="${projects.dir}/${nb.modules.dir}/projects.jar"/>
+      <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar" />
+      <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar" />
+      <pathelement location="${xml/catalog.dir}/${nb.modules.dir}/xml-catalog.jar"/>
+      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/jsp-parser.jar" />
+      <pathelement location="${web/jspsyntax.dir}/${nb.modules/autoload.dir}/jsp-syntax.jar" />
+      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar" />
+      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar" />
+      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
+    </path>
   </target>
 
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/> <!-- XXX: ExLocalFileSystem in UnpackWarAction -->
-        <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
-        <pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
-        <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
-        <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
-        <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX: Needed for compilation ServletDO extends JDO that implements ElementCookie -->
-        <pathelement location="${nb_root}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
-        <pathelement location="${nb_root}/projects/netbeans/modules/projects.jar"/>
-        <pathelement path="${nb_root}/xml/api/netbeans/modules/autoload/xml-api.jar" />
-        <pathelement path="${nb_root}/xml/core/netbeans/modules/autoload/xml-core.jar" />
-        <pathelement location="${nb_root}/xml/catalog/netbeans/modules/xml-catalog.jar"/>
-        <pathelement path="${nb_root}/web/jspparser/netbeans/modules/autoload/jsp-parser.jar" />
-        <pathelement path="${nb_root}/web/jspsyntax/netbeans/modules/autoload/jsp-syntax.jar" />
-        <pathelement path="${nb_root}/web/servletapi24/netbeans/modules/autoload/ext/jsp-api-2.0.jar" />
-        <pathelement path="${nb_root}/web/servletapi24/netbeans/modules/autoload/ext/servlet-api-2.4.jar" />
-        <pathelement location="${nb_root}/web/ddapi/netbeans/modules/autoload/ddapi.jar" />
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <property file="${nb_root}/web/spec-vers.properties"/>
-    <property file="${nb_root}/xml/spec-vers.properties"/>
-    <mkdir dir="netbeans/modules"/>
+    <property file="${nb_all}/web/spec-vers.properties"/>
+    <property file="${nb_all}/xml/spec-vers.properties"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
     <filter token="XML_CORE_IMPL_VERSION" value="${xml.common.impl.version}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/jsp.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jsp.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/web/"/>
       <include name="META-INF/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init">
     <!-- javadoc -->
-    <copy file="../external/servlet24-docs.zip" todir="netbeans/docs"/>
-    <copy file="../external/jsp20-docs.zip" todir="netbeans/docs"/>
+    <copy file="../external/servlet24-docs.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
+    <copy file="../external/jsp20-docs.zip" todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}"/>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jsp.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/core.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="web-jsp.nbm"
-             topdir="."
-             module="netbeans/modules/jsp.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/jsp.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/web-jsp.nbm">
       <license file="${license.file}"/>
@@ -102,16 +100,17 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/core.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="web-jsp.nbm"/>
-    <delete dir="Info"/>
-    <delete dir="netbeans"/>
   </target>
 
   <!-- This target will only work *inside* the IDE! -->
Index: web/ddapi/build.xml
===================================================================
RCS file: /cvs/web/ddapi/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- web/ddapi/build.xml	4 Mar 2004 17:03:55 -0000	1.6
+++ web/ddapi/build.xml	8 Mar 2004 11:03:46 -0000
@@ -13,26 +13,28 @@
 -->
 
 <project name="web_core" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
   <property name="s2b_root_2_3" location="src/org/netbeans/modules/web/dd/impl/model_2_3"/>
   <property name="s2b_root_2_4" location="src/org/netbeans/modules/web/dd/impl/model_2_4"/>
   <property name="s2b_res_root" location="src/org/netbeans/modules/web/dd/impl/resources"/>
 
-  <target name="s2binit">
+  <target name="init" depends="default.init">
+    <patternset id="web/ddapi.files">
+      <include name="${nb.modules/autoload.dir}/ddapi.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+    </path>
+  </target>
+
+  <target name="s2binit" depends="init">
 	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
 	  <classpath>
-		<pathelement path="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-		<pathelement path="${nb_root}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar" />
-		<pathelement path="${nb_root}/schema2beans/anttask/s2banttask.jar"/>
+		<pathelement path="${schema2beans/rt.dir}/${nb.modules/autoload.dir}/schema2beans.jar" />
+		<pathelement path="${schema2beans/dev.dir}/${nb.modules/autoload.dir}/schema2beansdev.jar" />
+		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
 	  </classpath>
 	</taskdef>
   </target>
@@ -58,46 +60,37 @@
 	  <!--<delete file="${s2b_root_2_4}/WebAppType.java"/>-->
   </target>
 
-  <target name="compile" depends="dd2beansgen">
+  <target name="compile" depends="init,dd2beansgen">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-        <pathelement location="${nb_root}/openide/fs/netbeans/lib/openide-fs.jar"/>
-        <pathelement location="${nb_root}/openide/util/netbeans/lib/openide-util.jar"/>
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <property file="${nb_root}/web/spec-vers.properties"/>
-    <mkdir dir="netbeans/modules"/>
+    <property file="${nb_all}/web/spec-vers.properties"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <filter token="DDAPI_IMPL_VERSION" value="${ddap.impl.version}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/ddapi.jar"
-            manifest="manifest-subst.mf"
-	    compress="false">
-      <fileset dir="src" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
-      <locale name="ja"/>
-    </locjar>
-  </target>
-
-  <target name="release">
-  </target>
-  
-  <target name="javahelp">
-    <!-- No one provided. -->
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ddapi.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 compress="false"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/ddapi.jar">
+       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+         <patternset refID="web/ddapi.files"/>
+       </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="ddapi.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/ddapi.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/ddapi.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/ddapi.nbm">
       <license file="${license.file}"/>
@@ -105,16 +98,17 @@
     </makenbm>
   </target>
 
-  <target name="clean" depends="clean-ddgen-src, clean-javadoc">
+  <target name="clean" depends="init,clean-ddgen-src, clean-javadoc">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/ddapi.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="ddapi.nbm"/>
-    <delete dir="Info"/>
-    <delete dir="netbeans"/>
   </target>
 
   <target name="clean-ddgen-src">
@@ -134,7 +128,7 @@
         <delete dir="${s2b_root_2_4}"/>
   </target>
   
-  <target name="javadoc" description="Build Javadoc."> 
+  <target name="javadoc" depends="init" description="Build Javadoc."> 
       <property name="_cp" refid="cp"/> 
       <ant dir="${nb_root}/nbbuild/javadoctools" antfile="template.xml" target="javadoc"> 
        <property name="javadoc.base" location="."/> 
@@ -155,12 +149,6 @@
   <target name="clean-javadoc">
   	<delete dir="javadoc"/>
   </target>
-
-  <path id="cp">
-	 <pathelement location="${nb_root}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar" />
-	 <pathelement location="${nb_root}/openide/fs/netbeans/lib/openide-fs.jar"/> 
-	 <pathelement location="${nb_root}/openide/util/netbeans/lib/openide-util.jar"/>
-  </path>
 
   <!-- This target will only work *inside* the IDE! -->
   <target depends="jars" description="Test the module inside the running IDE." name= "test">
Index: web/jspdebug/build.xml
===================================================================
RCS file: /cvs/web/jspdebug/build.xml,v
retrieving revision 1.16
diff -u -r1.16 build.xml
--- web/jspdebug/build.xml	15 Dec 2003 20:13:40 -0000	1.16
+++ web/jspdebug/build.xml	8 Mar 2004 11:03:46 -0000
@@ -13,70 +13,69 @@
 -->
 
 <project name="web_jspdebug" default="netbeans" basedir=".">
-
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
+  <import file="../../nbbuild/default.xml"/> 
   <property name="webbeans_root" location="src/org/netbeans/modules/web/dd/model"/>
 
-  <target name="compile">
-    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-         <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/>
-         <pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
-         <pathelement location="${nb_root}/editor/netbeans/modules/editor.jar"/>
-         <pathelement location="${nb_root}/editor/netbeans/modules/ext/nb-editor.jar"/>
-         <pathelement location="${nb_root}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
-         <pathelement location="${nb_root}/debuggerjpda/netbeans/modules/jpdaDebugger.jar"/>
-         <pathelement location="${nb_root}/java/api/netbeans/modules/autoload/java-api.jar"/>
-         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
-         <pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
-         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
-         <pathelement location="${nb_root}/web/jspsyntax/netbeans/modules/jsp-syntax.jar"/>
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
-        <pathelement location="${nb_root}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
-        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_root}/debuggercore/oldapi/netbeans/modules/autoload/openide-debugger.jar"/>
-        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-        <!-- Hopefully set up by nbbuild/build.xml: -->
+  <target name="init" depends="default.init">
+    <patternset id="web/jspdebug.files">
+      <include name="${nb.modules.dir}/jspdebug.jar"/>
+    </patternset>
+    <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+        <pathelement location="${openidex.dir}/${nb.modules/autoload.dir}/openidex.jar"/>
+        <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
+        <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+        <pathelement location="${debuggercore.dir}/${nb.modules/autoload.dir}/debuggerCore.jar"/>
+        <pathelement location="${debuggerjpda.dir}/${nb.modules.dir}/jpdaDebugger.jar"/>
+        <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
+        <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+        <pathelement location="${html.dir}/${nb.modules.dir}/html.jar"/>
+        <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar"/>
+        <pathelement location="${web/jspsyntax.dir}/${nb.modules.dir}/jsp-syntax.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/deprecated.dir}/${nb.modules/autoload.dir}/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="${openide/compiler.dir}/${nb.modules/autoload.dir}/openide-compiler.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
+        <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
         <pathelement location="${jdkhome}/lib/tools.jar"/>
-	<pathelement location="${nb_root}/j2eeserver/netbeans/modules/autoload/j2eeserver.jar"/>
-      </classpath>
+	<pathelement location="${j2eeserver.dir}/${nb.modules/autoload.dir}/j2eeserver.jar"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="init">
+    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/jspdebug.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/jspdebug.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/web/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/jspdebug.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspdebug.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="jspdebug.nbm"
-             topdir="."
-             module="netbeans/modules/jspdebug.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules.dir}/jspdebug.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/jspdebug.nbm">
       <license file="${license.file}"/>
@@ -84,10 +83,13 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
+      </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspdebug.files"/>
       </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
Index: web/jspparser/build.xml
===================================================================
RCS file: /cvs/web/jspparser/build.xml,v
retrieving revision 1.24
diff -u -r1.24 build.xml
--- web/jspparser/build.xml	26 Feb 2004 13:44:03 -0000	1.24
+++ web/jspparser/build.xml	8 Mar 2004 11:03:46 -0000
@@ -13,25 +13,34 @@
 -->
 
 <project name="web_jspparser" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="core_root" location="../core"/>
-  <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="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="../external" target="unscramble"/>
     <property file="../spec-vers.properties"/>
     <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
     <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
     <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+    <patternset id="web/jspparser.files">
+      <include name="${nb.modules/autoload.dir}/jsp-parser.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jsp-parser-ext.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jasper-compiler-5.0.19.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jasper-runtime-5.0.19.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/commons-logging-api.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/commons-el.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
+      <pathelement location="../external/jsp-api-2.0.jar"/>
+      <pathelement location="../external/jasper-compiler-5.0.19.jar"/>
+      <pathelement location="../external/jasper-runtime-5.0.19.jar"/>
+      <pathelement location="../external/commons-logging-api.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/> <!-- used only indirectly -->
+    </path>
   </target>
 
   <target name="compile" depends="init">
@@ -40,49 +49,33 @@
       <include name="org/netbeans/modules/web/jsps/"/>
       <include name="org/netbeans/modules/web/jspparser_ext/"/>
       <include name="org/apache/jasper/"/>
-      <classpath>
-        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-        <fileset dir="${nb_root}/core/external">
-          <include name="xml-apis*.jar"/>
-        </fileset>
-        <pathelement location="../external/jsp-api-2.0.jar"/>
-        <pathelement location="../external/servlet-api-2.4.jar"/>
-        <pathelement location="../external/jasper-compiler-5.0.19.jar"/>
-        <pathelement location="../external/jasper-runtime-5.0.19.jar"/>
-        <pathelement location="../external/commons-logging-api.jar"/>
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-	<pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/> <!-- used only indirectly -->
-       <!-- <pathelement location="${nb_root}/openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/> -->
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/jsp-parser.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jsp-parser.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/web/jspparser/"/>
       <include name="org/netbeans/modules/web/jsps/"/>
-      <locale name="ja"/>
-    </locjar>
-    <locjar jarfile="netbeans/modules/autoload/ext/jsp-parser-ext.jar"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    </jar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/jsp-parser-ext.jar"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/web/jspparser_ext/"/>
       <include name="org/apache/jasper/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
-  <target name="release">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
-    <copy todir="netbeans/modules/autoload/ext">
+  <target name="release" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext">
       <fileset dir="../external">
         <include name="jasper-compiler-5.0.19.jar"/>
         <include name="jasper-runtime-5.0.19.jar"/>
@@ -93,36 +86,40 @@
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jsp-parser.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspparser.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="web-jspparser.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/jsp-parser.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/jsp-parser.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/web-jspparser.nbm">
       <license name="jspparser-license.txt">
         <text>For the JSP Parser module:</text>
         <file location="${license.file}"/>
         <text>For the Jasper compiler and runtime:</text>
-        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
+        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
       </license>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspparser.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="web-jspparser.nbm"/>
-    <delete dir="Info"/>
-    <delete dir="netbeans"/>
   </target>
 
   <target name="test-build" depends="compile">
Index: web/jspsyntax/build.xml
===================================================================
RCS file: /cvs/web/jspsyntax/build.xml,v
retrieving revision 1.24
diff -u -r1.24 build.xml
--- web/jspsyntax/build.xml	26 Feb 2004 13:45:27 -0000	1.24
+++ web/jspsyntax/build.xml	8 Mar 2004 11:03:46 -0000
@@ -13,79 +13,75 @@
 -->
 
 <project name="web_jspsyntax" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="core_root" location="../core"/>
-  <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="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init"> 
     <ant dir="../external" target="unscramble"/>
     <property file="../spec-vers.properties"/>
     <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
+    <patternset id="web/jspsyntax.files">
+      <include name="${nb.modules/autoload.dir}/jsp-syntax.jar"/>
+      <include name="${nb.system.dir}/ParserDB/jsp20.jc?"/>
+      <include name="${nb.system.dir}/ParserDB/servlet24.jc?"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${web/servletapi24.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
+      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
+      <pathelement location="${web/jspparser.dir}/${nb.modules/autoload.dir}/jsp-parser.jar"/>
+      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/ext/editor-lib.jar"/>
+      <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
+      <pathelement location="${xml/text-edit.dir}/${nb.modules.dir}/xml-text-edit.jar"/>
+    </path>
   </target>
 
   <target name="compile" depends="init">
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <classpath>
-        <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-        <pathelement location="${nb_root}/editor/netbeans/modules/ext/nb-editor.jar"/>
-        <pathelement location="${nb_root}/editor/netbeans/modules/ext/editor-lib.jar"/>
-        <pathelement location="${nb_root}/editor/netbeans/modules/editor.jar"/>
-        <pathelement location="${nb_root}/xml/text-edit/netbeans/modules/xml-text-edit.jar"/>
-        <pathelement location="../external/servlet-api-2.4.jar"/>
-        <pathelement location="../external/jsp-api-2.0.jar"/>
-        <pathelement location="${nb_root}/web/jspparser/netbeans/modules/autoload/jsp-parser.jar"/>
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <!--<pathelement location="${nb_root}/openide/registry/netbeans/modules/org-netbeans-modules-registry.jar"/>-->
-      </classpath>
+      <classpath refID="cp"/>
     </javac>
 
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <!--<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>-->
-    <property file="${nb_root}/xml/spec-vers.properties"/>
+    <property file="${nb_all}/xml/spec-vers.properties"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf">
       <filterchain>
         <expandproperties/>
       </filterchain>
     </copy>
-    <locjar jarfile="netbeans/modules/autoload/jsp-syntax.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/jsp-syntax.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false"/>
   </target>
 
   <target name="release">
     <!-- parser database -->
-    <copy todir="netbeans">
-      <fileset dir="release" excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"/>
+    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}">
+      <fileset dir="release/system" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
     </copy>
   </target>
 
   <target name="netbeans" depends="jars,release">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/jsp-syntax.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspsyntax.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="web-jspsyntax.nbm"
-             topdir="."
-             module="netbeans/modules/autoload/jsp-syntax.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+             module="${nb.modules/autoload.dir}/jsp-syntax.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/web-jspsyntax.nbm">
       <license file="${license.file}"/>
@@ -93,16 +89,17 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/jspsyntax.files"/>
+      </fileset>
     </delete>
     <delete file="manifest-subst.mf"/>
     <delete file="web-jspsyntax.nbm"/>
-    <delete dir="Info"/>
-    <delete dir="netbeans"/>
   </target>
 
   <target name="real-clean" depends="clean">
@@ -117,7 +114,7 @@
     <locjar jarfile="reload/jsp-syntax.jar"
             manifest="manifest-subst.mf"
             basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
+	    excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
 	    compress="false">
       <include name="org/netbeans/modules/web/core/syntax/"/>
       <locale name="ja"/>
Index: web/servletapi23/build.xml
===================================================================
RCS file: /cvs/web/servletapi23/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- web/servletapi23/build.xml	11 Dec 2002 17:07:47 -0000	1.8
+++ web/servletapi23/build.xml	8 Mar 2004 11:03:46 -0000
@@ -13,49 +13,47 @@
 -->
 
 <project name="servletapi23" basedir="." default="netbeans">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="../external" target="unscramble"/>
+    <patternset id="web/servletapi23.files">
+      <include name="${nb.modules/autoload.dir}/servletapi23.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
+    </patternset>
   </target>
 
-  <target name="jars">
-    <mkdir dir="netbeans/modules/autoload"/>
+  <target name="jars" depends="init">
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/servletapi23.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-            compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi23.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/servletapi23/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
     <copy file="../external/servlet-2.3.jar"
-          tofile="netbeans/modules/autoload/ext/servlet-2.3.jar"/>
+          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-2.3.jar"/>
   </target>
 
   <target name="netbeans" depends="jars,release" description="Builds the module">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi23.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/servletapi23.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
     <makenbm file="servletapi23.nbm"
-             topdir="."
-           module="netbeans/modules/autoload/servletapi23.jar"
+           productdir="${netbeans.dest.dir}/${cluster.dir}"
+           module="${nb.modules/autoload.dir}/servletapi23.jar"
            homepage="http://web.${homepage.base}/"
            distribution="http://${dist.base}/servletapi23.nbm">
       <license file="${license.file}"/>
@@ -69,15 +67,16 @@
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean all build products.">
+  <target name="clean" depends="init" description="Clean all build products.">
         <delete>
             <fileset dir="src">
                 <include name="org/netbeans/modules/servletapi23/**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="web/servletapi23.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
         <delete file="servletapi23.nbm"/>
   </target>
 
Index: web/servletapi24/build.xml
===================================================================
RCS file: /cvs/web/servletapi24/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- web/servletapi24/build.xml	30 Jan 2004 16:30:44 -0000	1.3
+++ web/servletapi24/build.xml	8 Mar 2004 11:03:47 -0000
@@ -13,56 +13,55 @@
 -->
 
 <project name="servletapi24" basedir="." default="netbeans">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-
-  <property name="nb_root" location="../.."/>
-  <property name="homepage.base" value="netbeans.org"/>
-  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
-  <property name="license.file" value="${nb_root}/nbbuild/standard-nbm-license.txt"/>
-  <property name="nbm_alias" value="nb_ide"/>
-
-  <target name="init">
+  <target name="init" depends="default.init">
     <ant dir="../external" target="unscramble"/>
     <property file="../spec-vers.properties"/>
     <filter token="CORE_SPEC_VERS_SUBST" value="${web.core.specification.version}"/>
     <filter token="SERVLET24_SPEC_VERS_SUBST" value="${web.servletapi24.specification.version}"/>
     <filter token="JSPPARSER_SPEC_VERS_SUBST" value="${web.jspparser.specification.version}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+    <patternset id="web/servletapi24.files">
+      <include name="${nb.modules/autoload.dir}/servletapi24.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
+      <include name="${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
+    </patternset>
   </target>
 
   <target name="jars" depends="init">
-    <mkdir dir="netbeans/modules/autoload"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/autoload/servletapi24.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-            excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-            compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/servletapi24.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+         excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+         compress="false">
       <include name="org/netbeans/modules/servletapi24/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="release" depends="init">
-    <mkdir dir="netbeans/modules/autoload/ext"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext"/>
     <copy file="../external/servlet-api-2.4.jar"
-          tofile="netbeans/modules/autoload/ext/servlet-api-2.4.jar"/>
+          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/servlet-api-2.4.jar"/>
     <copy file="../external/jsp-api-2.0.jar"
-          tofile="netbeans/modules/autoload/ext/jsp-api-2.0.jar"/>
+          tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/ext/jsp-api-2.0.jar"/>
   </target>
 
   <target name="netbeans" depends="jars,release" description="Builds the module">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/servletapi24.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/servletapi24.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
     <makenbm file="servletapi24.nbm"
-             topdir="."
-           module="netbeans/modules/autoload/servletapi24.jar"
+           productdir="${netbeans.dest.dir}/${cluster.dir}"
+           module="${nb.modules/autoload.dir}/servletapi24.jar"
            homepage="http://web.${homepage.base}/"
            distribution="http://${dist.base}/servletapi24.nbm">
       <license file="${license.file}"/>
@@ -70,21 +69,22 @@
         <text>For the integration module:</text>
         <file location="${license.file}"/>
         <text>For the Servlet library:</text>
-        <file location="${nb_root}/nbbuild/external/apache-license.txt"/>
+        <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
       </license>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
 
-  <target name="clean" description="Clean all build products.">
+  <target name="clean" depends="init" description="Clean all build products.">
         <delete>
             <fileset dir="src">
                 <include name="org/netbeans/modules/servletapi24/**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="web/servletapi24.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
         <delete file="servletapi24.nbm"/>
   </target>
 
Index: web/taglibed/build.xml
===================================================================
RCS file: /cvs/web/taglibed/build.xml,v
retrieving revision 1.34
diff -u -r1.34 build.xml
--- web/taglibed/build.xml	16 Feb 2004 20:27:55 -0000	1.34
+++ web/taglibed/build.xml	8 Mar 2004 11:03:47 -0000
@@ -14,29 +14,41 @@
 
 
 <project name="web_taglibed" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
-  <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="../../nbbuild/nbantext.jar"/>
-	   
-
-  <property name="nb_root" 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"/>
-  <property name="nbm_alias" value="nb_ide"/>
+  <target name="init" depends="default.init">
+    <patternset id="web/taglibed.files">
+      <include name="${nb.modules.dir}/taglibed.jar"/>
+    </patternset>
+    <path id="cp">
+      <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+      <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+      <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+      <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>
+      <pathelement location="${jarpackager.dir}/${nb.modules.dir}/jarpackager.jar"/>
+      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+      <pathelement location="${web/core.dir}/${nb.modules.dir}/jsp.jar" />
+      <pathelement location="${web/ddapi.dir}/${nb.modules/autoload.dir}/ddapi.jar" />
+      <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
+      <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
+    </path>
+  </target>
 
   <!-- These are the primary targets. -->
   <target name="netbeans" depends="jars">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/taglibed.jar">
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/taglibed.files"/>
+      </fileset>
+    </genlist>
   </target>
 
   <target name="nbm" depends="netbeans">
-    <delete dir="Info"/>
     <makenbm file="web-taglibed.nbm"
-             topdir="."
-	     module="netbeans/modules/taglibed.jar"
+             productdir="${netbeans.dest.dir}/${cluster.dir}"
+	     module="${nb.modules.dir}/taglibed.jar"
 	     homepage="http://web.${homepage.base}/"
 	     distribution="http://${dist.base}/web-taglibed.nbm">
       <license file="${license.file}" />
@@ -44,11 +56,14 @@
     </makenbm>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <delete>
       <fileset dir="src">
         <include name="**/*.class"/>
       </fileset>
+      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+        <patternset refID="web/taglibed.files"/>
+      </fileset>
     </delete>
     <delete dir="netbeans"/>
     <delete dir="reload"/>
@@ -62,46 +77,30 @@
   <target name="javahelp">
   </target>
 
-  <target name="compile">
+  <target name="compile" depends="init">
     <javac srcdir="src" destdir="src"
        deprecation="${build.compiler.deprecation}" 
        debug="${build.compiler.debug}">
-       <classpath>
-         <pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
-
-         <!-- PENDING: Invalid dependency on core -->
-	 <pathelement location="${nb_root}/core/netbeans/lib/core.jar"/>
-         <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
-         <pathelement location="${nb_root}/java/api/netbeans/modules/autoload/java-api.jar"/>
-         <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
-
-         <pathelement location="${nb_root}/httpserver/external/servlet-2.2.jar"/>
-         <pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
-        <pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
-        <pathelement location="${nb_root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-        <pathelement location="${nb_root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-        <pathelement location="${nb_root}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-       </classpath>
+       <classpath refID="cp"/>
      </javac>
   </target>
 
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
-    <property file="${nb_root}/xml/spec-vers.properties"/>
+    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
+    <property file="${nb_all}/xml/spec-vers.properties"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf">
       <filterchain>
         <expandproperties/>
       </filterchain>
     </copy>
-    <locjar jarfile="netbeans/modules/taglibed.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nb_root}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
+    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/taglibed.jar"
+         manifest="manifest-subst.mf"
+         basedir="src"
+	 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
+	 compress="false">
       <include name="org/netbeans/modules/web/"/>
-      <locale name="ja"/>
-    </locjar>
+    </jar>
   </target>
 
   <target name="test-build" depends="compile">
Index: xml/api/build.xml
===================================================================
RCS file: /cvs/xml/api/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- xml/api/build.xml	19 Jan 2004 13:09:26 -0000	1.32
+++ xml/api/build.xml	8 Mar 2004 11:03:48 -0000
@@ -13,62 +13,57 @@
 -->
 
 <project name="xml/api" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
-    <property name="xml_root" location=".."/>
-
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
+    <target name="init" depends="default.init">
+      <patternset id="xml/api.files">
+        <include name="${nb.modules/autoload.dir}/xml-api.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+      </path>
+    </target>
 
-    <property name="build.compiler.debug" value="on"/>
+    <property name="xml_root" location=".."/>
 
-    <target name="compile"> 
+    <target name="compile" depends="init"> 
         <echo message="Compiling XML tools API classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+       <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/autoload/xml-api.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-api.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="netbeans" depends="jars">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+      <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-api.jar">
+         <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+           <patternset refID="xml/api.files"/>
+         </fileset>
+      </genlist>
     </target>
 
         
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-api.nbm"
-                 topdir="."
+        <makenbm file="xml-api.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/autoload/xml-api.jar"
+                 module="${nb.modules/autoload.dir}/xml-api.jar"
                  homepage="http://xml.${homepage.base}/api/"
                  distribution="http://${dist.base}/xml-api.nbm">
             <license file="${license.file}"/>
@@ -76,16 +71,17 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="xml/api.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-api.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-api.nbm"/>
         <delete dir="javadoc"/>
         <delete dir="XML-APIs"/>
         <delete file="XML-APIs.zip"/>
@@ -108,7 +104,7 @@
         </copy>
     </target>
 
-    <target name="xml-apis">
+    <target name="xml-apis" depends="init">
         <delete dir="XML-APIs"/>
         <mkdir dir="XML-APIs"/>
         
@@ -129,11 +125,7 @@
                 <pathelement location="doc"/> <!-- doc-files -->
                 <pathelement location="src"/>
             </sourcepath>        
-            <classpath>        
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-            </classpath>                       
+            <classpath refID="cp"/>        
             
             <link href="${jdk-docs-location}"
                   offline="true"
Index: xml/catalog/build.xml
===================================================================
RCS file: /cvs/xml/catalog/build.xml,v
retrieving revision 1.53
diff -u -r1.53 build.xml
--- xml/catalog/build.xml	19 Jan 2004 13:09:28 -0000	1.53
+++ xml/catalog/build.xml	8 Mar 2004 11:03:48 -0000
@@ -13,78 +13,68 @@
 -->
 
 <project name="xml/catalog" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
     <property name="core_root" location="${xml_root}/core"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
-    <target name="init">
-        <ant dir="${nbroot}/xml/external" target="unscramble"/>
+    <target name="init" depends="default.init">
+        <ant dir="${nb_all}/xml/external" target="unscramble"/>
+        <patternset id="xml/catalog.files">
+          <include name="${nb.modules.dir}/xml-catalog.jar"/>
+          <include name="${nb.modules.dir}/ext/resolver-1_1_nb.jar"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+          <fileset dir="${nb_all}/xml/external">
+            <include name="resolver*.jar"/>
+          </fileset>
+        </path>
     </target>
 
     <target name="compile" depends="init">
         <echo message="Compiling XML catalog module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <fileset dir="${nbroot}/xml/external">
-                    <include name="resolver*.jar"/>
-                </fileset>
-                <pathelement location="${core_root}/src/"/>
-                <pathelement location="${api_root}/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
 
         <for-each locations="compat"/>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/xml-catalog.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-catalog.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/ext"/>
-        <copy file="${nbroot}/xml/external/resolver-1_1_nb.jar" tofile="netbeans/modules/ext/resolver-1_1_nb.jar"/>
-    </target>
-
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+        <copy file="${nb_all}/xml/external/resolver-1_1_nb.jar" 
+              tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext/resolver-1_1_nb.jar"/>
     </target>
 
-    <target name="netbeans" depends="jars,release,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars,release">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-catalog.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/catalog.files"/>
+          </fileset>
+       </genlist>
     </target>
     
     <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -98,11 +88,10 @@
     </target>
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-catalog.nbm"
-                 topdir="."
+        <makenbm file="xml-catalog.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/xml-catalog.jar"
+                 module="${nb.modules.dir}/xml-catalog.jar"
                  homepage="http://xml.${homepage.base}/catalog/"
                  distribution="http://${dist.base}/xml-catalog.nbm">
             <license file="${license.file}"/>
@@ -110,22 +99,23 @@
                  <text>For the XML Entity Catalog module itself:</text>
                  <file location="${license.file}"/>
                  <text>For the XML Resolver library:</text>
-                 <file location="${nbroot}/xml/external/resolver-license.txt"/>
+                 <file location="${nb_all}/xml/external/resolver-license.txt"/>
             </license>
             <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="xml/catalog.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-catalog.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-catalog.nbm"/>
 
         <for-each locations="compat"/>
     </target>
@@ -138,7 +128,7 @@
 
     <target name="all" depends="clean,nbm"/>
 
-    <target name="javadoc">
+    <target name="javadoc" depends="init">
         <delete dir="javadoc"/>
         <mkdir dir="javadoc"/>
 
@@ -156,13 +146,8 @@
             <sourcepath>
                 <pathelement location="src"/>
             </sourcepath>        
-            <classpath>        
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
-            </classpath>
-            
+            <classpath refID="cp"/>
+           
             <link href="${jdk-docs-location}"
                   offline="true"
                   packagelistLoc="${api_root}/doc/external/jdk"
Index: xml/catalog/compat/build.xml
===================================================================
RCS file: /cvs/xml/catalog/compat/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- xml/catalog/compat/build.xml	11 Dec 2002 17:07:51 -0000	1.9
+++ xml/catalog/compat/build.xml	8 Mar 2004 11:03:48 -0000
@@ -13,24 +13,18 @@
 -->
 
 <project name="xml/catalog/compat" default="compile" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="catalog_root" location=".."/>
     <property name="xml_root" location="${catalog_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
     <target name="compile">
         <echo message="Compiling backward compatibility Catalog module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
                 <pathelement location="${catalog_root}/src/"/>
             </classpath>
         </javac>
Index: xml/core/build.xml
===================================================================
RCS file: /cvs/xml/core/build.xml,v
retrieving revision 1.63
diff -u -r1.63 build.xml
--- xml/core/build.xml	19 Jan 2004 13:09:29 -0000	1.63
+++ xml/core/build.xml	8 Mar 2004 11:04:05 -0000
@@ -13,67 +13,60 @@
 -->
 
 <project name="xml/core" default="netbeans" basedir=".">
+  <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
     <property name="tax_root" location="${xml_root}/tax"/>
     <property name="tax_lib_root" location="${tax_root}/lib"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
+    <target name="init" depends="default.init">
+      <patternset id="xml/core.files">
+        <include name="${nb.modules/autoload.dir}/xml-core.jar"/>
+      </patternset>
+      <path id="cp">
+        <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+        <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <echo message="Compiling XML core module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="${api_root}/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
 
         <for-each locations="compat"/>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/autoload/xml-core.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-core.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>
     </target>
 
-    <target name="javahelp">
+    <target name="javahelp" depends="init">
         <mkdir dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
         <jhindexer basedir="javahelp/org/netbeans/modules/xml/core/docs/"
                    db="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch">
             <classpath>
-                <fileset dir="${nbroot}/nbbuild/external">
+                <fileset dir="${nb_all}/nbbuild/external">
                     <include name="jhall*.jar"/>
                 </fileset>
             </classpath>
@@ -81,16 +74,19 @@
             <exclude name="JavaHelpSearch/"/>
         </jhindexer>
 
-        <mkdir dir="netbeans/modules/docs"/>
-        <locjar jarfile="netbeans/modules/autoload/docs/xml-core.jar"
-                compress="true">
-            <fileset dir="javahelp" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}"/>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload/docs.dir}/xml-core.jar"
+             compress="true">
+            <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>
     </target>
 
     <target name="netbeans" depends="jars,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-core.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/core.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     
@@ -99,19 +95,18 @@
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
         <jar jarfile="test/xml-core-test.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"/>
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="javahelp" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
         </jar>
         <nbinstaller module="test/xml-core-test.jar" action="reinstall"/>
     </target>
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-core.nbm"
-                 topdir="."
+        <makenbm file="xml-core.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/autoload/xml-core.jar"
+                 module="${nb.modules/autoload.dir}/xml-core.jar"
                  homepage="http://xml.${homepage.base}/core/"
                  distribution="http://${dist.base}/xml-core.nbm">
             <license file="${license.file}"/>
@@ -119,16 +114,17 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="xml/core.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-core.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-core.nbm"/>
         <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
 
         <for-each locations="compat"/>
@@ -142,7 +138,7 @@
 
     <target name="all" depends="clean,nbm"/>
 
-    <target name="javadoc">
+    <target name="javadoc" depends="init">
         <delete dir="javadoc"/>
         <mkdir dir="javadoc"/>
 
@@ -159,13 +155,8 @@
         >
             <sourcepath>
                 <pathelement location="src"/>
-            </sourcepath>        
-            <classpath>        
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-            </classpath>
-            
+            </sourcepath>
+            <classpath refID="cp"/>
             <link href="${jdk-docs-location}"
                   offline="true"
                   packagelistLoc="${api_root}/doc/external/jdk"
Index: xml/core/compat/build.xml
===================================================================
RCS file: /cvs/xml/core/compat/build.xml,v
retrieving revision 1.10
diff -u -r1.10 build.xml
--- xml/core/compat/build.xml	5 Jun 2003 19:29:21 -0000	1.10
+++ xml/core/compat/build.xml	8 Mar 2004 11:04:05 -0000
@@ -13,25 +13,18 @@
 -->
 
 <project name="xml/core/compat" default="compile" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="core_root" location=".."/>
     <property name="xml_root" location="${core_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
     <target name="compile">
         <echo message="Compiling backward compatibility Core module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
+                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
                 <pathelement location="${core_root}/src/"/>
                 <pathelement location="${xml_root}/tax/lib/src" /> <!-- makes AspectJ ajc happy -->
             </classpath>
Index: xml/css/build.xml
===================================================================
RCS file: /cvs/xml/css/build.xml,v
retrieving revision 1.56
diff -u -r1.56 build.xml
--- xml/css/build.xml	19 Jan 2004 13:09:32 -0000	1.56
+++ xml/css/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,82 +13,73 @@
 -->
 
 <project name="xml/css" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
-    <target name="init">
-        <ant dir="${nbroot}/xml/external" target="unscramble"/>
+    <target name="init" depends="default.init">
+        <ant dir="${nb_all}/xml/external" target="unscramble"/>
+        <patternset id="xml/css.files">
+          <include name="${nb.modules.dir}/css.jar"/>
+          <include name="${nb.modules.dir}/ext/sac.jar"/>
+          <include name="${nb.modules.dir}/ext/flute.jar"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+          <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
+          <pathelement location="${nb_all}/xml/external/sac.jar"/>
+          <pathelement location="${nb_all}/xml/external/flute.jar"/>
+        </path>
     </target>
 
     <target name="compile" depends="init">
         <echo message="Compiling CSS module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nbroot}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-                <pathelement location="${api_root}/src/"/>
-                <pathelement location="${nbroot}/editor/netbeans/modules/ext/nb-editor.jar"/>
-                <pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
-                <pathelement location="${nbroot}/xml/external/sac.jar"/>
-                <pathelement location="${nbroot}/xml/external/flute.jar"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
 
         <for-each locations="compat"/>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/css.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/css.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/ext"/>
-        <copy todir="netbeans/modules/ext">
-            <fileset dir="${nbroot}/xml/external">
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
+            <fileset dir="${nb_all}/xml/external">
                 <include name="flute*.jar"/>
                 <include name="sac*.jar"/>
             </fileset>
         </copy>
     </target>
 
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars,release">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/css.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/css.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -102,11 +93,10 @@
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../css.nbm"
-                 topdir="."
+        <makenbm file="css.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/css.jar"
+                 module="${nb.modules.dir}/css.jar"
                  homepage="http://xml.${homepage.base}/css/"
                  distribution="http://${dist.base}/css.nbm">
             <license name="css-license.txt">
@@ -114,22 +104,23 @@
                  <file location="${license.file}"/>
                  <text>For the W3C's SAC and Flute libraries:</text>
                  <!-- XXX better to include text not HTML -->
-                 <file location="${nbroot}/xml/external/flute-sac-license.html"/>
+                 <file location="${nb_all}/xml/external/flute-sac-license.html"/>
             </license>            
             <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="xml/css.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
         <delete file="../css.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
 
         <for-each locations="compat"/>
     </target>
Index: xml/css/manifest.mf
===================================================================
RCS file: /cvs/xml/css/manifest.mf,v
retrieving revision 1.16
diff -u -r1.16 manifest.mf
--- xml/css/manifest.mf	19 Jan 2004 13:09:33 -0000	1.16
+++ xml/css/manifest.mf	8 Mar 2004 11:04:06 -0000
@@ -17,7 +17,6 @@
 
 Name: org/netbeans/modules/css/CSSLoader.class
 OpenIDE-Module-Class: Loader
-Install-After: org.netbeans.modules.xml.core.XMLDataObject
-Install-After: org.netbeans.modules.xml.core.DTDDataObject
+Install-After: org.netbeans.modules.xml.core.XMLDataObject, org.netbeans.modules.xml.core.DTDDataObject
 Install-Before: org.netbeans.modules.text.TXTDataObject
 
Index: xml/css/compat/build.xml
===================================================================
RCS file: /cvs/xml/css/compat/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- xml/css/compat/build.xml	11 Dec 2002 17:07:53 -0000	1.9
+++ xml/css/compat/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,24 +13,18 @@
 -->
 
 <project name="xml/css/compat" default="compile" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="css_root" location=".."/>
     <property name="xml_root" location="${css_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
     <target name="compile">
         <echo message="Compiling backward compatibility CSS module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
                 <pathelement location="${css_root}/src/"/>
             </classpath>
         </javac>
Index: xml/schema/build.xml
===================================================================
RCS file: /cvs/xml/schema/build.xml,v
retrieving revision 1.14
diff -u -r1.14 build.xml
--- xml/schema/build.xml	19 Jan 2004 13:09:34 -0000	1.14
+++ xml/schema/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,63 +13,56 @@
 -->
 
 <project name="xml/schema" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
     <property name="tax_root" location="${xml_root}/tax"/>
     <property name="tax_lib_root" location="${tax_root}/lib"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
+    <target name="init" depends="default.init">
+        <patternset id="xml/schema.files">
+          <include name="${nb.modules.dir}/xml-schema.jar"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+        </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <echo message="Compiling XML schema module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${api_root}/src/"/>
-                <pathelement location="${xml_root}/core/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/xml-schema.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-schema.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
-    <target name="release">
-    </target>
-
-
-    <target name="netbeans" depends="jars,release">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-schema.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/schema.files"/>
+          </fileset>
+       </genlist>
     </target>
    
     <target name="javahelp" description="Please use xml/core javahelp target instead." />
@@ -86,11 +79,10 @@
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-schema.nbm"
-                 topdir="."
+        <makenbm file="xml-schema.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/xml-schema.jar"
+                 module="${nb.modules.dir}/xml-schema.jar"
                  homepage="http://xml.${homepage.base}/schema/"
                  distribution="http://${dist.base}/xml-schema.nbm">
             <license file="${license.file}"/>
@@ -98,18 +90,18 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="xml/schema.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-schema.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-schema.nbm"/>
         <delete dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
-
     </target>
 
     <target name="real-clean" depends="clean">
Index: xml/tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.52
diff -u -r1.52 build.xml
--- xml/tax/build.xml	19 Jan 2004 13:09:36 -0000	1.52
+++ xml/tax/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,39 +13,36 @@
 -->
 
 <project name="xml/tax" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="lib_root" location="lib"/>
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
+    <target name="init" depends="default.init">
+      <patternset id="xml/tax.files">
+        <include name="${nb.modules/autoload.dir}/xml-tax.jar"/>
+        <include name="${nb.modules/autoload.dir}/ext/tax.jar"/>
+        <include name="${nb.modules/autoload.dir}/ext/xerces2.jar"/>
+      </patternset>
+      <path id="cp">
+         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+         <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+         <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+         <pathelement location="${lib_root}/src"/>
+         <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+         <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+      </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <for-each locations="lib"/>
 
         <echo message="Compiling TAX module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${lib_root}/src"/>
-                <pathelement location="${api_root}/src/"/>
-                <pathelement location="../core/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
 
         <for-each locations="compat"/>
@@ -53,34 +50,32 @@
 
     <target name="jars" depends="compile">
         <for-each locations="lib"/>
-        <mkdir dir="netbeans/modules/autoload"/>   
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/autoload/xml-tax.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}/xml-tax.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>
     </target>
 
     <target name="release">
         <for-each locations="lib"/>
     </target>
 
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
-        <for-each locations="lib"/>
-
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars,release">
+       <for-each locations="lib"/>
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules/autoload.dir}/xml-tax.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/tax.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -88,43 +83,43 @@
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
         <jar jarfile="test/xml-tax-test.jar" manifest="manifest-subst.mf" compress="false">
-            <fileset dir="src" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="${lib_root}/src" excludesfile="../../nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="${lib_root}/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
         </jar>
         <nbinstaller module="test/xml-tax-test.jar" action="reinstall"/>
     </target>
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-tax.nbm"
-                 topdir="."
+        <makenbm file="xml-tax.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/autoload/xml-tax.jar"
+                 module="${nb.modules/autoload.dir}/xml-tax.jar"
                  homepage="http://xml.${homepage.base}/tax/"
                  distribution="http://${dist.base}/xml-tax.nbm">
              <license name="xml-tax-license.txt">
                  <text>For the Tree API for XML ("TAX") module itself:</text>
                  <file location="${license.file}"/>
                  <text>For the Apache's XML Parser (Xerces):</text>
-                 <file location="${nbroot}/nbbuild/external/apache-license.txt"/>
+                 <file location="${nb_all}/nbbuild/external/apache-license.txt"/>
             </license>
             <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <for-each locations="lib"/>
 
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="xml/tax.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-tax.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-tax.nbm"/>
 
         <for-each locations="compat"/>
     </target>
Index: xml/tax/compat/build.xml
===================================================================
RCS file: /cvs/xml/tax/compat/build.xml,v
retrieving revision 1.11
diff -u -r1.11 build.xml
--- xml/tax/compat/build.xml	11 Dec 2002 17:07:55 -0000	1.11
+++ xml/tax/compat/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,25 +13,19 @@
 -->
 
 <project name="xml/tax/compat" default="compile" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="tax_root" location=".."/>
     <property name="lib_root" location="${lib_root}/lib"/>
     <property name="xml_root" location="${tax_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
     <target name="compile">
         <echo message="Compiling backward compatibility TAX module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
                 <pathelement location="${lib_root}/src/"/>
             </classpath>
         </javac>
Index: xml/tax/lib/build.xml
===================================================================
RCS file: /cvs/xml/tax/lib/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- xml/tax/lib/build.xml	19 Jan 2004 13:09:39 -0000	1.21
+++ xml/tax/lib/build.xml	8 Mar 2004 11:04:06 -0000
@@ -13,21 +13,15 @@
 -->
 
 <project name="xml/tax/lib" default="jars" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="tax_root" location=".."/>
     <property name="xml_root" location="${tax_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="xerces2_jar" location="${nbroot}/xml/external/xerces2.jar"/> <!-- Apache's XNI API - parser implementation used internally by module -->
-
-    <property name="build.compiler.debug" value="on"/>
-
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
+    <property name="xerces2_jar" location="${nb_all}/xml/external/xerces2.jar"/> <!-- Apache's XNI API - parser implementation used internally by module -->
 
     <target name="init">
-        <ant dir="${nbroot}/xml/external" target="unscramble"/>
+        <ant dir="${nb_all}/xml/external" target="unscramble"/>
     </target>
 
     <target name="compile" depends="init">
@@ -40,32 +34,27 @@
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
+        <mkdir dir="${xml/tax.dir}/${nb.modules/autoload.dir}/ext"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/autoload/ext/tax.jar"
+        <jar jarfile="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/tax.jar"
              manifest="manifest-subst.mf"
              compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>
     </target>
 
     <target name="release" depends="init">
-        <mkdir dir="netbeans/modules/autoload/ext"/>
-        <copy file="${nbroot}/xml/external/xerces2.jar" tofile="netbeans/modules/autoload/ext/xerces2.jar"/>
+        <mkdir dir="${xml/tax.dir}/${nb.modules/autoload.dir}/ext"/>
+        <copy file="${nb_all}/xml/external/xerces2.jar" tofile="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/xerces2.jar"/>
     </target>
 
-    <target name="netbeans" depends="jars,release">
-        <copy todir="../netbeans">
-            <fileset dir="netbeans"/>
-        </copy>
-    </target>
+    <target name="netbeans" depends="release,jars"/>
 
     <target name="clean">
         <delete>
@@ -73,7 +62,6 @@
                 <include name="**/*.class"/>
             </fileset>
         </delete>
-        <delete dir="netbeans"/>
         <delete>
             <fileset dir="library">
                 <include name="*.jar"/>
Index: xml/text-edit/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/build.xml,v
retrieving revision 1.52
diff -u -r1.52 build.xml
--- xml/text-edit/build.xml	19 Jan 2004 13:09:40 -0000	1.52
+++ xml/text-edit/build.xml	8 Mar 2004 11:04:08 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="xml/text-edit" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
@@ -20,65 +21,54 @@
     <property name="tax_lib_root" location="${tax_root}/lib"/>
     <property name="core_root" location="${xml_root}/core"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
+    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
+    <target name="init" depends="default.init">
+        <patternset id="xml/text-edit.files">
+          <include name="${nb.modules.dir}/xml-text-edit.jar"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+          <pathelement location="${editor.dir}/${nb.modules.dir}/ext/nb-editor.jar"/>
+          <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
+        </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <echo message="Compiling XML text-edit module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nbroot}/editor/netbeans/modules/ext/nb-editor.jar"/>
-                <pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
-                <pathelement location="${core_root}/src/"/>
-                <pathelement location="${api_root}/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
 
         <for-each locations="compat"/>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/xml-text-edit.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
-    </target>
-
-    <target name="release">
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-text-edit.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-text-edit.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/text-edit.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -93,11 +83,10 @@
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xml-text-edit.nbm"
-                 topdir="."
+        <makenbm file="xml-text-edit.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/xml-text-edit.jar"
+                 module="${nb.modules.dir}/xml-text-edit.jar"
                  homepage="http://xml.${homepage.base}/text-edit/"
                  distribution="http://${dist.base}/xml-text-edit.nbm">
             <license file="${license.file}"/>
@@ -105,16 +94,17 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+              <patternset refID="xml/text-edit.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xml-text-edit.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xml-text-edit.nbm"/>
 
         <for-each locations="compat"/>
     </target>
Index: xml/text-edit/compat/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/compat/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- xml/text-edit/compat/build.xml	11 Dec 2002 17:07:56 -0000	1.8
+++ xml/text-edit/compat/build.xml	8 Mar 2004 11:04:08 -0000
@@ -13,24 +13,18 @@
 -->
 
 <project name="xml/text-edit/compat" default="compile" basedir=".">
+    <import file="../../../nbbuild/default-properties.xml"/> 
 
     <property name="text-edit_root" location=".."/>
     <property name="xml_root" location="${text-edit_root}/.."/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
     <target name="compile">
         <echo message="Compiling backward compatibility Text Editing module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
             <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <fileset dir="${nbroot}/openide/netbeans/lib">
-                    <include name="openide*.jar"/>
-                </fileset>
+                <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+                <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+                <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
                 <pathelement location="${text-edit_root}/src/"/>
             </classpath>
         </javac>
Index: xml/tools/build.xml
===================================================================
RCS file: /cvs/xml/tools/build.xml,v
retrieving revision 1.55
diff -u -r1.55 build.xml
--- xml/tools/build.xml	19 Jan 2004 13:09:19 -0000	1.55
+++ xml/tools/build.xml	8 Mar 2004 11:04:08 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="xml/tools" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
@@ -20,65 +21,62 @@
     <property name="tax_lib_root" location="${tax_root}/lib"/>
     <property name="core_root" location="${xml_root}/core"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
-
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
+    <target name="init" depends="default.init">
+        <patternset id="xml/tools.files">
+          <include name="${nb.modules.dir}/xml-tools.jar"/>
+          <include name="${nb.docs.dir}/xml-apis.zip"/>
+          <include name="${nb.system.dir}/ParserDB/xml-apis.jc*"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${xml/tax.dir}/${nb.modules/autoload.dir}/xml-tax.jar"/>
+          <pathelement location="${xml/tax.dir}/${nb.modules/autoload.dir}/ext/tax.jar"/>
+          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+        </path>
+    </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <echo message="Compiling XML tools module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>        
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
-                <pathelement location="${core_root}/src/"/>
-                <pathelement location="${tax_lib_root}/src/"/>
-                <pathelement location="${tax_root}/src/"/>
-                <pathelement location="${api_root}/src/"/>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/xml-tools.jar"
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xml-tools.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <fileset dir="compat/src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+            <fileset dir="compat/src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
     <target name="release">
-        <copy todir="netbeans" includeEmptyDirs="false">
-            <fileset dir="release" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.docs.dir}" includeEmptyDirs="false">
+            <fileset dir="release/docs" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </copy>
+        <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}" includeEmptyDirs="false">
+            <fileset dir="release/system" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
         </copy>
     </target>
 
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars,release">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xml-tools.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/tools.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -93,11 +91,10 @@
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
         <makenbm file="../xml-tools.nbm"
-                 topdir="."
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/xml-tools.jar"
+                 module="${nb.modules.dir}/xml-tools.jar"
                  homepage="http://xml.${homepage.base}/tools/"
                  distribution="http://${dist.base}/xml-tools.nbm">
             <license file="${license.file}"/>
@@ -105,10 +102,13 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
+            </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="xml/tools.files"/>
             </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
Index: xml/xsl/build.xml
===================================================================
RCS file: /cvs/xml/xsl/build.xml,v
retrieving revision 1.23
diff -u -r1.23 build.xml
--- xml/xsl/build.xml	19 Jan 2004 13:09:25 -0000	1.23
+++ xml/xsl/build.xml	8 Mar 2004 11:04:10 -0000
@@ -13,6 +13,7 @@
 -->
 
 <project name="xml/xsl" default="netbeans" basedir=".">
+    <import file="../../nbbuild/default.xml"/> 
 
     <property name="xml_root" location=".."/>
     <property name="api_root" location="${xml_root}/api"/>
@@ -20,26 +21,23 @@
     <property name="tax_lib_root" location="${tax_root}/lib"/>
     <property name="core_root" location="${xml_root}/core"/>
 
-    <property name="nbroot" location="${xml_root}/.."/>
-    <property name="nbext_root" location="${nbroot}/nbbuild"/>
     <property name="libs_root" location="${nbroot}/libs"/>
 
-    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
-    <property name="homepage.base" value="netbeans.org"/>
-    <property name="dist.base" value="www.netbeans.org/download/nbms/40/xml"/>
-    <property name="nbm_alias" value="nb_ide"/>
-
-    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
-    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
-
-    <property name="build.compiler.debug" value="on"/>
-
-
-    <target name="init">
-        <ant dir="${nbroot}/xml/external" target="unscramble"/>
-        <ant dir="${nbroot}/libs/external" target="unscramble"/>
+    <target name="init" depends="default.init">
+        <ant dir="${nb_all}/xml/external" target="unscramble"/>
+        <patternset id="xml/xsl.files">
+          <include name="${nb.modules.dir}/xsl.jar"/>
+        </patternset>
+        <path id="cp">
+          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
+          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
+          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
+          <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+          <pathelement location="${xml/api.dir}/${nb.modules/autoload.dir}/xml-api.jar"/>
+          <pathelement location="${xml/core.dir}/${nb.modules/autoload.dir}/xml-core.jar"/>
+          <pathelement location="${httpserver/servletapi.dir}/${nb.modules/autoload.dir}/ext/servlet-2.2.jar"/>
+          <pathelement location="${libs/xalan.dir}/${nb.modules/autoload.dir}/ext/xalan-2.5.2.jar"/>
+        </path>
     </target>
 
     <target name="compile" depends="init">
@@ -47,47 +45,31 @@
 
         <echo message="Compiling XSL module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-            <classpath>
-                <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-                <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
-                <pathelement location="${nbroot}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-                <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-                <pathelement location="${core_root}/src/"/>
-                <pathelement location="${api_root}/src/"/>
-                <!--Servlet API-->
-                <pathelement location="${nbroot}/httpserver/external/servlet-2.2.jar"/>
-                <fileset dir="${nbroot}/libs/external">
-                    <include name="xalan*.jar"/>
-                </fileset>
-            </classpath>
+            <classpath refID="cp"/>
         </javac>
     </target>
 
     <target name="jars" depends="compile">
-        <mkdir dir="netbeans/modules"/>
+        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
         <property file="${xml_root}/spec-vers.properties"/>
         <copy file="manifest.mf" tofile="manifest-subst.mf">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <locjar jarfile="netbeans/modules/xsl.jar"
-                manifest="manifest-subst.mf"
-                compress="false">
-            <fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
-            <locale name="ja"/>
-        </locjar>    
+        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/xsl.jar"
+             manifest="manifest-subst.mf"
+             compress="false">
+            <fileset dir="src" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
+        </jar>    
     </target>
 
-    <target name="release">
-    </target>
-
-    <target name="javahelp">
-        <!-- It is a part of core module now. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
-        <genlist targetname="nbm" outputfiledir="netbeans"/>
+    <target name="netbeans" depends="jars">
+       <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.modules.dir}/xsl.jar">
+          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+             <patternset refID="xml/xsl.files"/>
+          </fileset>
+       </genlist>
     </target>
 
     <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
@@ -102,11 +84,10 @@
     
     
     <target name="nbm" depends="netbeans">
-        <delete dir="Info"/>
-        <makenbm file="../xsl.nbm"
-                 topdir="."
+        <makenbm file="xsl.nbm"
+                 productdir="${netbeans.dest.dir}/${cluster.dir}"
                  needsrestart="false"
-                 module="netbeans/modules/xsl.jar"
+                 module="${nb.modules.dir}/xsl.jar"
                  homepage="http://xml.${homepage.base}/xsl/"
                  distribution="http://${dist.base}/xsl.nbm">
             <license file="${license.file}"/>
@@ -114,16 +95,17 @@
         </makenbm>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="init">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>
             </fileset>
+            <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
+                <patternset refID="xml/xsl.files"/>
+            </fileset>
         </delete>
         <delete file="manifest-subst.mf"/>
-        <delete file="../xsl.nbm"/>
-        <delete dir="netbeans"/>
-        <delete dir="Info"/>
+        <delete file="xsl.nbm"/>
     </target>
 
     <target name="real-clean" depends="clean">
Index: xtest/plugins_src/deprecated/build.xml
===================================================================
RCS file: /cvs/xtest/plugins_src/deprecated/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- xtest/plugins_src/deprecated/build.xml	6 Feb 2004 14:52:14 -0000	1.3
+++ xtest/plugins_src/deprecated/build.xml	8 Mar 2004 11:04:10 -0000
@@ -14,6 +14,8 @@
 
 <!-- build script for deprecated XTest plugin -->
 <project basedir="." default="all" name="XTest deprecated plugin">
+    <import file="../../../nbbuild/default-properties.xml"/>
+
     <target name="all">
         <!-- WRITEME -->
     </target>
@@ -22,16 +24,14 @@
     <target name="compile">
         <path id="basecp">
             <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
-            <fileset dir="${nball.cvs.root}/openide/netbeans/lib">
-                <include name="openide*.jar" />
-            </fileset>
-            <pathelement location="${nball.cvs.root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            <pathelement location="${nball.cvs.root}/core/netbeans/lib/core.jar"/>
-            <pathelement location="${nball.cvs.root}/core/netbeans/lib/ext/boot.jar"/>
-            <pathelement location="${nball.cvs.root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-            <pathelement location="${nball.cvs.root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-            <pathelement location="${nball.cvs.root}/core/output/netbeans/modules/autoload/core-output.jar"/>
-            <pathelement location="${nball.cvs.root}/core/execution/netbeans/modules/autoload/core-execution.jar"/>
+            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
+            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
+            <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+            <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+            <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+            <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
+            <pathelement location="${core/execution.dir}/${nb.modules/autoload.dir}/core-execution.jar"/>
             <!-- use junit with already compiled extensions -->        
             <pathelement location="../../lib/xtest.jar"/>
             <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
Index: xtest/plugins_src/ide/build.xml
===================================================================
RCS file: /cvs/xtest/plugins_src/ide/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- xtest/plugins_src/ide/build.xml	6 Feb 2004 14:52:26 -0000	1.2
+++ xtest/plugins_src/ide/build.xml	8 Mar 2004 11:04:10 -0000
@@ -14,6 +14,8 @@
 
 <!-- build script for IDE XTest plugin -->
 <project basedir="." default="all" name="XTest IDE plugin">
+    <import file="../../../nbbuild/default-properties.xml"/>
+
     <target name="all">
         <!-- WRITEME -->
     </target>
@@ -22,16 +24,14 @@
     <target name="compile">
         <path id="basecp">
             <pathelement location="${nball.cvs.root}/openide/openide-13javac-workaround.jar"/>
-            <fileset dir="${nball.cvs.root}/openide/netbeans/lib">
-                <include name="openide*.jar" />
-            </fileset>
-            <pathelement location="${nball.cvs.root}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-            <pathelement location="${nball.cvs.root}/core/netbeans/lib/core.jar"/>
-            <pathelement location="${nball.cvs.root}/core/netbeans/lib/ext/boot.jar"/>
-            <pathelement location="${nball.cvs.root}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
-            <pathelement location="${nball.cvs.root}/openide/io/netbeans/modules/autoload/openide-io.jar"/>
-            <pathelement location="${nball.cvs.root}/core/output/netbeans/modules/autoload/core-output.jar"/>
-            <pathelement location="${nball.cvs.root}/core/execution/netbeans/modules/autoload/core-execution.jar"/>
+            <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
+            <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
+            <pathelement location="${core.dir}/${nb.lib.dir}/core.jar"/>
+            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
+            <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
+            <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
+            <pathelement location="${core/output.dir}/${nb.modules/autoload.dir}/core-output.jar"/>
+            <pathelement location="${core/execution.dir}/${nb.modules/autoload.dir}/core-execution.jar"/>
             <!-- use junit with already compiled extensions -->        
             <pathelement location="../../lib/xtest.jar"/>
             <pathelement location="../../lib/xtest-junit-testrunner.jar"/>