1.1 --- a/contrib/latex/ant/antint/build.xml	Thu Jun 09 20:14:11 2005 +0000
     1.2 +++ b/contrib/latex/ant/antint/build.xml	Sat Jun 11 07:01:05 2005 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  http://www.sun.com/
     1.5  
     1.6  The Original Code is NetBeans. The Initial Developer of the Original
     1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     1.9  Microsystems, Inc. All Rights Reserved.
    1.10  -->
    1.11  
    1.12 @@ -27,8 +27,8 @@
    1.13      <target name="jar-ant">
    1.14          <ant dir=".." target="jar" inheritall="false">
    1.15          </ant>
    1.16 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/extra"/>
    1.17 -        <copy file="../dist/ant-latex.jar" todir="${netbeans.dest.dir}/${cluster.dir}/ant/extra/" />
    1.18 +        <mkdir dir="${cluster}/ant/extra"/>
    1.19 +        <copy file="../dist/ant-latex.jar" todir="${cluster}/ant/extra/" />
    1.20      </target>
    1.21  
    1.22      <target name="netbeans-extra" depends="jar-ant"/>

     2.1 --- a/contrib/latex/editor/build.xml	Thu Jun 09 20:14:11 2005 +0000
     2.2 +++ b/contrib/latex/editor/build.xml	Sat Jun 11 07:01:05 2005 +0000
     2.3 @@ -8,7 +8,7 @@
     2.4  http://www.sun.com/
     2.5  
     2.6  The Original Code is NetBeans. The Initial Developer of the Original
     2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     2.9  Microsystems, Inc. All Rights Reserved.
    2.10  -->
    2.11  
    2.12 @@ -31,9 +31,9 @@
    2.13    </target>
    2.14      
    2.15    <target name="do-editor-release">
    2.16 -    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/bin" />
    2.17 -    <copy file="../client/src/client.linux" tofile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/bin/lide-editor-client" failonerror="false" />
    2.18 -    <chmod file="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/bin/lide-editor-client" perm="uog+x" />
    2.19 +    <mkdir dir="${cluster}/${nb.modules.dir}/bin" />
    2.20 +    <copy file="../client/src/client.linux" tofile="${cluster}/${nb.modules.dir}/bin/lide-editor-client" failonerror="false" />
    2.21 +    <chmod file="${cluster}/${nb.modules.dir}/bin/lide-editor-client" perm="uog+x" />
    2.22    </target>
    2.23    
    2.24    <target name="compile-language-bibtex">

     3.1 --- a/contrib/latex/guiproject/build.xml	Thu Jun 09 20:14:11 2005 +0000
     3.2 +++ b/contrib/latex/guiproject/build.xml	Sat Jun 11 07:01:05 2005 +0000
     3.3 @@ -8,7 +8,7 @@
     3.4  http://www.sun.com/
     3.5  
     3.6  The Original Code is NetBeans. The Initial Developer of the Original
     3.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     3.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     3.9  Microsystems, Inc. All Rights Reserved.
    3.10  -->
    3.11  
    3.12 @@ -27,8 +27,8 @@
    3.13      <target name="jar-ant">
    3.14          <ant dir="../ant" target="jar" inheritall="false">
    3.15          </ant>
    3.16 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/extra"/>
    3.17 -        <copy file="../ant/dist/ant-latex.jar" todir="${netbeans.dest.dir}/${cluster.dir}/ant/extra/" />
    3.18 +        <mkdir dir="${cluster}/ant/extra"/>
    3.19 +        <copy file="../ant/dist/ant-latex.jar" todir="${cluster}/ant/extra/" />
    3.20      </target>
    3.21  
    3.22      <target name="netbeans-extra" depends="jar-ant"/>-->

     4.1 --- a/contrib/latex/hints/build.xml	Thu Jun 09 20:14:11 2005 +0000
     4.2 +++ b/contrib/latex/hints/build.xml	Sat Jun 11 07:01:05 2005 +0000
     4.3 @@ -8,7 +8,7 @@
     4.4  http://www.sun.com/
     4.5  
     4.6  The Original Code is NetBeans. The Initial Developer of the Original
     4.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
     4.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     4.9  Microsystems, Inc. All Rights Reserved.
    4.10  -->
    4.11  
    4.12 @@ -17,7 +17,7 @@
    4.13      
    4.14      <target name="jar-with-module-deps" if="module.dependencies">
    4.15          <property file="spec-ver.properties"/>
    4.16 -        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${module.jar}" compress="false" manifest="${manifest.mf}">
    4.17 +        <jar jarfile="${cluster}/${module.jar}" compress="false" manifest="${manifest.mf}">
    4.18              <manifest>
    4.19                  <attribute name="OpenIDE-Module-Public-Packages" value="${public.packages}"/>
    4.20                  <attribute name="OpenIDE-Module-IDE-Dependencies" value="${ide.dependencies}"/>

     5.1 --- a/de.hunsicker.jalopy.plugin.netbeans/build.xml	Thu Jun 09 20:14:11 2005 +0000
     5.2 +++ b/de.hunsicker.jalopy.plugin.netbeans/build.xml	Sat Jun 11 07:01:05 2005 +0000
     5.3 @@ -21,8 +21,8 @@
     5.4  
     5.5      <target name="release" depends="init">
     5.6          <property file="build.properties"/>
     5.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
     5.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
     5.9 +        <mkdir dir="${cluster}/modules/ext"/>
    5.10 +        <copy todir="${cluster}/modules/ext">
    5.11              <fileset dir="external">
    5.12                  <include name="${jalopy}"/>
    5.13                  <include name="${jdom}"/>
    5.14 @@ -37,7 +37,7 @@
    5.15      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
    5.16          <mkdir dir="build"/>
    5.17          <makenbm file="build/${nbm}"
    5.18 -            productdir="${netbeans.dest.dir}/${cluster.dir}"
    5.19 +            productdir="${cluster}"
    5.20              module="${module.jar}"
    5.21              homepage="${nbm.homepage}"
    5.22              distribution="http://${dist.base}/${nbm}"

     6.1 --- a/docbook/build.xml	Thu Jun 09 20:14:11 2005 +0000
     6.2 +++ b/docbook/build.xml	Sat Jun 11 07:01:05 2005 +0000
     6.3 @@ -46,7 +46,7 @@
     6.4      </target>
     6.5  
     6.6      <target name="jar" depends="init,compile,jar-prep,external">
     6.7 -        <jarwithmoduleattributes jarfile="${netbeans.dest.dir}/${cluster.dir}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}">
     6.8 +        <jarwithmoduleattributes jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}">
     6.9              <fileset dir="${build.classes.dir}"/>
    6.10              <zipfileset prefix="org/netbeans/modules/docbook/lib" dir="build/docbook-libs">
    6.11                  <include name="config.properties"/>
    6.12 @@ -71,7 +71,7 @@
    6.13      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
    6.14          <mkdir dir="build"/>
    6.15          <makenbm file="build/${nbm}"
    6.16 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
    6.17 +                 productdir="${cluster}"
    6.18                   module="${module.jar}"
    6.19                   homepage="${nbm.homepage}"
    6.20                   distribution="http://${dist.base}/${nbm}"

     7.1 --- a/hexeditor/build.xml	Thu Jun 09 20:14:11 2005 +0000
     7.2 +++ b/hexeditor/build.xml	Sat Jun 11 07:01:05 2005 +0000
     7.3 @@ -8,7 +8,7 @@
     7.4  http://www.sun.com/
     7.5  
     7.6  The Original Code is NetBeans. The Initial Developer of the Original
     7.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
     7.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     7.9  Microsystems, Inc. All Rights Reserved.
    7.10  -->
    7.11  
    7.12 @@ -25,8 +25,8 @@
    7.13    </target>
    7.14    
    7.15    <target name="netbeans" depends="projectized.netbeans">
    7.16 -    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext"/>
    7.17 -    <copy todir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/ext">
    7.18 +    <mkdir dir="${cluster}/${nb.modules.dir}/ext"/>
    7.19 +    <copy todir="${cluster}/${nb.modules.dir}/ext">
    7.20        <fileset dir="ext">
    7.21          <include name="*.jar"/>
    7.22        </fileset>

     8.1 --- a/insertunicode/build.xml	Thu Jun 09 20:14:11 2005 +0000
     8.2 +++ b/insertunicode/build.xml	Sat Jun 11 07:01:05 2005 +0000
     8.3 @@ -37,7 +37,7 @@
     8.4      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
     8.5          <mkdir dir="build"/>
     8.6          <makenbm file="build/${nbm}"
     8.7 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
     8.8 +                 productdir="${cluster}"
     8.9                   module="${module.jar}"
    8.10                   homepage="${nbm.homepage}"
    8.11                   distribution="http://${dist.base}/${nbm}"

     9.1 --- a/jabber/build.xml	Thu Jun 09 20:14:11 2005 +0000
     9.2 +++ b/jabber/build.xml	Sat Jun 11 07:01:05 2005 +0000
     9.3 @@ -20,7 +20,7 @@
     9.4      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
     9.5          <mkdir dir="build"/>
     9.6          <makenbm file="build/${nbm}"
     9.7 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
     9.8 +                 productdir="${cluster}"
     9.9                   module="${module.jar}"
    9.10                   homepage="${nbm.homepage}"
    9.11                   distribution="http://${dist.base}/${nbm}"
    9.12 @@ -32,7 +32,7 @@
    9.13      <target name="netbeans-extra" depends="release"/>
    9.14  
    9.15      <target name="release" depends="init">
    9.16 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    9.17 +        <copy todir="${cluster}/modules/ext">
    9.18              <fileset dir="external">
    9.19                  <include name="smack*.jar"/>
    9.20              </fileset>

    10.1 --- a/javax.jmi.model/build.xml	Thu Jun 09 20:14:11 2005 +0000
    10.2 +++ b/javax.jmi.model/build.xml	Sat Jun 11 07:01:05 2005 +0000
    10.3 @@ -20,8 +20,8 @@
    10.4      </target>
    10.5  
    10.6      <target name="release" depends="init,unscramble">
    10.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    10.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    10.9 +        <mkdir dir="${cluster}/modules/ext"/>
   10.10 +        <copy todir="${cluster}/modules/ext">
   10.11              <fileset dir="${external.dir}">
   10.12                  <include name="mof.jar"/>
   10.13              </fileset>
   10.14 @@ -33,7 +33,7 @@
   10.15      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
   10.16          <mkdir dir="build"/>
   10.17          <makenbm file="build/${nbm}"
   10.18 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
   10.19 +                 productdir="${cluster}"
   10.20                   module="${module.jar}"
   10.21                   homepage="${nbm.homepage}"
   10.22                   distribution="http://${dist.base}/${nbm}"

    11.1 --- a/javax.jmi.reflect/build.xml	Thu Jun 09 20:14:11 2005 +0000
    11.2 +++ b/javax.jmi.reflect/build.xml	Sat Jun 11 07:01:05 2005 +0000
    11.3 @@ -19,8 +19,8 @@
    11.4      </target>
    11.5  
    11.6      <target name="release" depends="init,unscramble">
    11.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    11.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    11.9 +        <mkdir dir="${cluster}/modules/ext"/>
   11.10 +        <copy todir="${cluster}/modules/ext">
   11.11              <fileset dir="${external.dir}">
   11.12                  <include name="jmi.jar"/>
   11.13              </fileset>
   11.14 @@ -32,7 +32,7 @@
   11.15      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
   11.16          <mkdir dir="build"/>
   11.17          <makenbm file="build/${nbm}"
   11.18 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
   11.19 +                 productdir="${cluster}"
   11.20                   module="${module.jar}"
   11.21                   homepage="${nbm.homepage}"
   11.22                   distribution="http://${dist.base}/${nbm}"

    12.1 --- a/jdiclib/build.xml	Thu Jun 09 20:14:11 2005 +0000
    12.2 +++ b/jdiclib/build.xml	Sat Jun 11 07:01:05 2005 +0000
    12.3 @@ -18,12 +18,12 @@
    12.4    <target name="netbeans-extra" depends="release"/>
    12.5  
    12.6    <target name="release" depends="init">
    12.7 -    <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    12.8 +    <copy todir="${cluster}/modules/ext">
    12.9          <fileset dir="../release/">
   12.10              <include name="*.jar"/>
   12.11          </fileset>
   12.12      </copy>
   12.13 -    <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/lib">
   12.14 +    <copy todir="${cluster}/modules/lib">
   12.15          <fileset dir="../release/">
   12.16              <include name="mozembed*"/>
   12.17              <include name="*.dll"/>

    13.1 --- a/jmiutils/build.xml	Thu Jun 09 20:14:11 2005 +0000
    13.2 +++ b/jmiutils/build.xml	Sat Jun 11 07:01:05 2005 +0000
    13.3 @@ -16,8 +16,8 @@
    13.4      <import file="../../nbbuild/templates/projectized.xml"/>
    13.5  
    13.6      <target name="release" depends="init">
    13.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    13.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    13.9 +        <mkdir dir="${cluster}/modules/ext"/>
   13.10 +        <copy todir="${cluster}/modules/ext">
   13.11              <fileset dir="../jmiutils/dist">
   13.12                  <include name="jmiutils.jar"/>
   13.13              </fileset>

    14.1 --- a/loaderswitcher/build.xml	Thu Jun 09 20:14:11 2005 +0000
    14.2 +++ b/loaderswitcher/build.xml	Sat Jun 11 07:01:05 2005 +0000
    14.3 @@ -33,10 +33,10 @@
    14.4    </target>
    14.5  
    14.6    <target name="jars" depends="compile">
    14.7 -    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules"/>
    14.8 +    <mkdir dir="${cluster}/modules"/>
    14.9      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   14.10      <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
   14.11 -    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/modules/loaderswitcher.jar"
   14.12 +    <jar jarfile="${cluster}/modules/loaderswitcher.jar"
   14.13              manifest="manifest-subst.mf"
   14.14              basedir="src"
   14.15  	    excludesfile="../../nbbuild/standard-jar-excludes.txt"
   14.16 @@ -45,8 +45,8 @@
   14.17    </target>
   14.18  
   14.19    <target name="netbeans" depends="jars">
   14.20 -    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="modules/loaderswitcher.jar">
   14.21 -      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   14.22 +    <genlist outputfiledir="${cluster}" module="modules/loaderswitcher.jar">
   14.23 +      <fileset dir="${cluster}">
   14.24          <patternset refID="utilities/loaderswitcher.files"/>
   14.25        </fileset>
   14.26      </genlist>
   14.27 @@ -54,7 +54,7 @@
   14.28  
   14.29    <target name="nbm" depends="netbeans">
   14.30      <makenbm file="loaderswitcher.nbm"
   14.31 -             productdir="${netbeans.dest.dir}/${cluster.dir}"
   14.32 +             productdir="${cluster}"
   14.33               module="modules/loaderswitcher.jar"
   14.34  	     homepage="http://utilities.${homepage.base}/loaderswitcher/"
   14.35  	     distribution="http://${dist.base}/loaderswitcher.nbm">
   14.36 @@ -69,7 +69,7 @@
   14.37          <include name="**/*.class"/>
   14.38          <include name="**/*.jar"/>
   14.39        </fileset>
   14.40 -      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   14.41 +      <fileset dir="${cluster}">
   14.42          <patternset refID="utilities/loaderswitcher.files"/>
   14.43        </fileset>
   14.44      </delete>

    15.1 --- a/mdr/build.xml	Thu Jun 09 20:14:11 2005 +0000
    15.2 +++ b/mdr/build.xml	Sat Jun 11 07:01:05 2005 +0000
    15.3 @@ -16,8 +16,8 @@
    15.4      <import file="../../nbbuild/templates/projectized.xml"/>
    15.5  
    15.6      <target name="release" depends="init">
    15.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    15.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    15.9 +        <mkdir dir="${cluster}/modules/ext"/>
   15.10 +        <copy todir="${cluster}/modules/ext">
   15.11              <fileset dir="../dist">
   15.12                  <include name="mdr.jar"/>
   15.13              </fileset>

    16.1 --- a/mount/build.xml	Thu Jun 09 20:14:11 2005 +0000
    16.2 +++ b/mount/build.xml	Sat Jun 11 07:01:05 2005 +0000
    16.3 @@ -25,8 +25,8 @@
    16.4          <copy todir="build/antclasses">
    16.5              <fileset dir="antsrc" excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"/>
    16.6          </copy>
    16.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/ant/nblib"/>
    16.8 -        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
    16.9 +        <mkdir dir="${cluster}/ant/nblib"/>
   16.10 +        <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
   16.11              <fileset dir="build/antclasses"/>
   16.12          </jar>
   16.13      </target>

    17.1 --- a/mount/nbproject/project.xml	Thu Jun 09 20:14:11 2005 +0000
    17.2 +++ b/mount/nbproject/project.xml	Sat Jun 11 07:01:05 2005 +0000
    17.3 @@ -104,7 +104,7 @@
    17.4                  <package-root>antsrc</package-root>
    17.5                  <classpath>${antsrc.cp}</classpath>
    17.6                  <built-to>build/antclasses</built-to>
    17.7 -                <built-to>${netbeans.dest.dir}/${cluster.dir}/ant/nblib/${code.name.base.dashes}.jar</built-to>
    17.8 +                <built-to>${cluster}/ant/nblib/${code.name.base.dashes}.jar</built-to>
    17.9              </extra-compilation-unit>
   17.10          </data>
   17.11      </configuration>

    18.1 --- a/o.n.swing.scrollbars/build.xml	Thu Jun 09 20:14:11 2005 +0000
    18.2 +++ b/o.n.swing.scrollbars/build.xml	Sat Jun 11 07:01:05 2005 +0000
    18.3 @@ -18,7 +18,7 @@
    18.4      <target name="demo-init" depends="build-init">
    18.5          <path id="demo.cp">
    18.6              <path refid="cp"/>
    18.7 -            <pathelement location="${netbeans.dest.dir}/${cluster.dir}/${module.jar}"/>
    18.8 +            <pathelement location="${cluster}/${module.jar}"/>
    18.9          </path>
   18.10          <path id="demo.run.cp">
   18.11              <path refid="demo.cp"/>

    19.1 --- a/performance.insane/build.xml	Thu Jun 09 20:14:11 2005 +0000
    19.2 +++ b/performance.insane/build.xml	Sat Jun 11 07:01:05 2005 +0000
    19.3 @@ -27,8 +27,8 @@
    19.4      </target>
    19.5  
    19.6      <target name="jar-cli" depends="init,compile-cli">
    19.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/core" />
    19.8 -        <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/core/org-netbeans-modules-performance-insane-cli.jar">
    19.9 +        <mkdir dir="${cluster}/core" />
   19.10 +        <jar jarfile="${cluster}/core/org-netbeans-modules-performance-insane-cli.jar">
   19.11              <fileset dir="build/cliclasses"/>
   19.12          </jar>
   19.13      </target>
   19.14 @@ -36,7 +36,7 @@
   19.15      <target name="compile-lib" depends="init">
   19.16          <echo message="Building library..."/>
   19.17          <ant dir="../insanelib" target="jar" inheritAll="false"/>
   19.18 -        <copy file="../insanelib/dist/insanelib.jar" todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext" />
   19.19 +        <copy file="../insanelib/dist/insanelib.jar" todir="${cluster}/modules/ext" />
   19.20      </target>
   19.21  
   19.22      <target name="clean-lib">

    20.1 --- a/performance.insane/nbproject/project.properties	Thu Jun 09 20:14:11 2005 +0000
    20.2 +++ b/performance.insane/nbproject/project.properties	Sat Jun 11 07:01:05 2005 +0000
    20.3 @@ -9,7 +9,7 @@
    20.4  # Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
    20.5  # Microsystems, Inc. All Rights Reserved.
    20.6  
    20.7 -cp.extra=${netbeans.dest.dir}/${cluster.dir}/core/org-netbeans-modules-performance-insane-cli.jar
    20.8 +cp.extra=${cluster}/core/org-netbeans-modules-performance-insane-cli.jar
    20.9  cp.cli=\
   20.10      ${openide/util.dir}/lib/org-openide-util.jar:\
   20.11      ${core/bootstrap.dir}/lib/boot.jar

    21.1 --- a/performance.insane/nbproject/project.xml	Thu Jun 09 20:14:11 2005 +0000
    21.2 +++ b/performance.insane/nbproject/project.xml	Sat Jun 11 07:01:05 2005 +0000
    21.3 @@ -36,7 +36,7 @@
    21.4                  <package-root>clisrc</package-root>
    21.5                  <classpath>${cp.cli}</classpath>
    21.6                  <built-to>build/cliclasses</built-to>
    21.7 -                <built-to>${netbeans.dest.dir}/${cluster.dir}/core/org-netbeans-modules-performance-insane-cli.jar</built-to>
    21.8 +                <built-to>${cluster}/core/org-netbeans-modules-performance-insane-cli.jar</built-to>
    21.9              </extra-compilation-unit>
   21.10          </data>
   21.11      </configuration>

    22.1 --- a/quickfilechooser/build.xml	Thu Jun 09 20:14:11 2005 +0000
    22.2 +++ b/quickfilechooser/build.xml	Sat Jun 11 07:01:05 2005 +0000
    22.3 @@ -2,6 +2,6 @@
    22.4  <project basedir="." default="netbeans" name="contrib/quickfilechooser">
    22.5      <import file="../../nbbuild/templates/projectized.xml"/>
    22.6      <target name="demo" depends="netbeans" description="Try a quick demo of the GUI.">
    22.7 -        <java fork="true" classpath="${netbeans.dest.dir}/${cluster.dir}/${module.jar}" classname="org.netbeans.modules.quickfilechooser.Demo"/>
    22.8 +        <java fork="true" classpath="${cluster}/${module.jar}" classname="org.netbeans.modules.quickfilechooser.Demo"/>
    22.9      </target>
   22.10  </project>

    23.1 --- a/tasklist.checkstyle/build.xml	Thu Jun 09 20:14:11 2005 +0000
    23.2 +++ b/tasklist.checkstyle/build.xml	Sat Jun 11 07:01:05 2005 +0000
    23.3 @@ -22,14 +22,14 @@
    23.4          <fail unless="checkstyle-all.present" message="Missing library. Read README for proper setup." />
    23.5          <available file="../external/checkstyle_checks.xml" property="checkstyle-rule.present" />
    23.6          <fail unless="checkstyle-rule.present" message="Missing ruleset. Read README for proper setup."/>
    23.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    23.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    23.9 +        <mkdir dir="${cluster}/modules/ext"/>
   23.10 +        <copy todir="${cluster}/modules/ext">
   23.11              <fileset dir="../external">
   23.12                  <include name="checkstyle-all.jar"/>
   23.13              </fileset>
   23.14          </copy>
   23.15 -       <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/configs"/>
   23.16 -       <copy todir="${netbeans.dest.dir}/${cluster.dir}/configs">
   23.17 +       <mkdir dir="${cluster}/configs"/>
   23.18 +       <copy todir="${cluster}/configs">
   23.19           <fileset dir="../external">
   23.20             <include name="checkstyle.xml"/>
   23.21           </fileset>

    24.1 --- a/tasklist.core/build.xml	Thu Jun 09 20:14:11 2005 +0000
    24.2 +++ b/tasklist.core/build.xml	Sat Jun 11 07:01:05 2005 +0000
    24.3 @@ -17,8 +17,8 @@
    24.4      
    24.5      <!-- XXX currently this target is not called, so this file is not in the build... delete target or add <target name="netbeans-extra" depends="native"/> -->
    24.6      <target name="native">
    24.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/lib"/>
    24.8 -        <copy file="native/libtasklist_bgthreads.so" todir="${netbeans.dest.dir}/${cluster.dir}/modules/lib"/>
    24.9 +        <mkdir dir="${cluster}/modules/lib"/>
   24.10 +        <copy file="native/libtasklist_bgthreads.so" todir="${cluster}/modules/lib"/>
   24.11      </target>
   24.12  
   24.13      <target name="changelog">

    25.1 --- a/tasklist.html/build.xml	Thu Jun 09 20:14:11 2005 +0000
    25.2 +++ b/tasklist.html/build.xml	Sat Jun 11 07:01:05 2005 +0000
    25.3 @@ -19,8 +19,8 @@
    25.4      
    25.5      <target name="release" depends="build-init">
    25.6          <ant antfile="../external/build.xml" dir="../external"/>
    25.7 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
    25.8 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
    25.9 +        <mkdir dir="${cluster}/modules/ext"/>
   25.10 +        <copy todir="${cluster}/modules/ext">
   25.11              <fileset dir="../external">
   25.12                  <include name="Tidy*.jar"/>
   25.13              </fileset>

    26.1 --- a/tasklist.usertasks/build.xml	Thu Jun 09 20:14:11 2005 +0000
    26.2 +++ b/tasklist.usertasks/build.xml	Sat Jun 11 07:01:05 2005 +0000
    26.3 @@ -22,7 +22,7 @@
    26.4      <target name="nbm" depends="init,netbeans" description="Build NBM archive.">
    26.5          <mkdir dir="build"/>
    26.6          <makenbm file="build/${nbm}"
    26.7 -                 productdir="${netbeans.dest.dir}/${cluster.dir}"
    26.8 +                 productdir="${cluster}"
    26.9                   module="${module.jar}"
   26.10                   homepage="${nbm.homepage}"
   26.11                   distribution="http://${dist.base}/${nbm}"
   26.12 @@ -40,8 +40,8 @@
   26.13      <target name="netbeans-extra" depends="release"/>
   26.14  
   26.15      <target name="release" depends="init">
   26.16 -        <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/ext"/>
   26.17 -        <copy todir="${netbeans.dest.dir}/${cluster.dir}/modules/ext">
   26.18 +        <mkdir dir="${cluster}/modules/ext"/>
   26.19 +        <copy todir="${cluster}/modules/ext">
   26.20              <fileset dir="../external/">
   26.21                  <include name="jcalendar*.jar"/>
   26.22              </fileset>

    27.1 --- a/tomcat5.bundled/build.xml	Thu Jun 09 20:14:11 2005 +0000
    27.2 +++ b/tomcat5.bundled/build.xml	Sat Jun 11 07:01:05 2005 +0000
    27.3 @@ -26,10 +26,10 @@
    27.4    </target>
    27.5  
    27.6    <target name="jars" depends="init">
    27.7 -    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules/eager"/>
    27.8 +    <mkdir dir="${cluster}/modules/eager"/>
    27.9      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   27.10      <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
   27.11 -    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/modules/eager/tomcat5-bundled.jar"
   27.12 +    <jar jarfile="${cluster}/modules/eager/tomcat5-bundled.jar"
   27.13           manifest="manifest-subst.mf"
   27.14           basedir="src"
   27.15           excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
   27.16 @@ -39,14 +39,14 @@
   27.17    </target>
   27.18  
   27.19    <target name="release" depends="init,jars">
   27.20 -    <unzip src="../../external/${tomcat.filename}.zip" dest="${netbeans.dest.dir}/${cluster.dir}" />
   27.21 +    <unzip src="../../external/${tomcat.filename}.zip" dest="${cluster}" />
   27.22      <!-- monitor -->
   27.23      <copy file="${schema2beans/rt.dir}/modules/org-netbeans-modules-schema2beans.jar" 
   27.24 -          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.5.7/common/lib/org-netbeans-modules-schema2beans.jar"/>
   27.25 +          tofile="${cluster}/jakarta-tomcat-5.5.7/common/lib/org-netbeans-modules-schema2beans.jar"/>
   27.26      <copy file="${monitor.dir}/modules/ext/org-netbeans-modules-web-httpmonitor.jar"
   27.27 -          tofile="${netbeans.dest.dir}/${cluster.dir}/jakarta-tomcat-5.5.7/common/lib/org-netbeans-modules-web-httpmonitor.jar"/>
   27.28 +          tofile="${cluster}/jakarta-tomcat-5.5.7/common/lib/org-netbeans-modules-web-httpmonitor.jar"/>
   27.29      <chmod perm="ugo+x">
   27.30 -      <fileset dir="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/bin">
   27.31 +      <fileset dir="${cluster}/${tomcat.filename}/bin">
   27.32          <include name="*.sh"/>
   27.33        </fileset>
   27.34      </chmod>
   27.35 @@ -54,15 +54,15 @@
   27.36      <!-- XXX:copy IDE-README.txt
   27.37      <copy file="torelease/IDE-README.txt" tofile="netbeans/${tomcat.filename}/IDE-README.txt" includeEmptyDirs="false"/> -->
   27.38      <!-- copy dummy to empty directories -->
   27.39 -    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
   27.40 -    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
   27.41 -    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
   27.42 -    <copy file="torelease/dummy" tofile="${netbeans.dest.dir}/${cluster.dir}/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
   27.43 +    <copy file="torelease/dummy" tofile="${cluster}/${tomcat.filename}/logs/dummy" includeEmptyDirs="false"/>
   27.44 +    <copy file="torelease/dummy" tofile="${cluster}/${tomcat.filename}/temp/dummy" includeEmptyDirs="false"/>
   27.45 +    <copy file="torelease/dummy" tofile="${cluster}/${tomcat.filename}/work/dummy" includeEmptyDirs="false"/>
   27.46 +    <copy file="torelease/dummy" tofile="${cluster}/${tomcat.filename}/common/classes/dummy" includeEmptyDirs="false"/>
   27.47    </target>
   27.48  
   27.49    <target name="netbeans" depends="jars,release" description="Builds the module">
   27.50 -    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="modules/eager/tomcat5-bundled.jar">
   27.51 -       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   27.52 +    <genlist outputfiledir="${cluster}" module="modules/eager/tomcat5-bundled.jar">
   27.53 +       <fileset dir="${cluster}">
   27.54           <patternset refID="tomcatint/tomcat5/bundled.files"/>
   27.55         </fileset>
   27.56      </genlist>
   27.57 @@ -70,7 +70,7 @@
   27.58  
   27.59    <target name="nbm" depends="netbeans" description="Prepare the module for distribution via Auto Update.">
   27.60      <makenbm file="bundledtomcat.nbm"
   27.61 -           productdir="${netbeans.dest.dir}/${cluster.dir}"
   27.62 +           productdir="${cluster}"
   27.63             module="modules/eager/tomcat5-bundled.jar"
   27.64             homepage="http://tomcatint.${homepage.base}/"
   27.65             distribution="http://${dist.base}/bundledtomcat.nbm">
   27.66 @@ -89,7 +89,7 @@
   27.67          <delete file="bundledtomcat.nbm"/>
   27.68          <delete dir="test"/>
   27.69          <delete>
   27.70 -          <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   27.71 +          <fileset dir="${cluster}">
   27.72              <patternset refID="tomcatint/tomcat5/bundled.files"/>
   27.73            </fileset>
   27.74          </delete>

    28.1 --- a/vcs.advanced/test/unit/testprofile/build.xml	Thu Jun 09 20:14:11 2005 +0000
    28.2 +++ b/vcs.advanced/test/unit/testprofile/build.xml	Sat Jun 11 07:01:05 2005 +0000
    28.3 @@ -61,26 +61,26 @@
    28.4         <include name="org/netbeans/modules/vcs/profiles/testprofiles/list/*.class"/>       
    28.5         <include name="org/netbeans/modules/vcs/profiles/testprofiles/list/*.properties"/>
    28.6      </makelayer>
    28.7 -    <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/modules"/>
    28.8 +    <mkdir dir="${cluster}/modules"/>
    28.9      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   28.10      <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
   28.11 -    <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/modules/test-profile.jar"
   28.12 +    <jar jarfile="${cluster}/modules/test-profile.jar"
   28.13           manifest="manifest-subst.mf"
   28.14           basedir="src"
   28.15           excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
   28.16  	 excludes="src/org/netbeans/modules/vcs/profiles/testprofiles/mf-layer_XX.xml" 
   28.17           compress="false">
   28.18      </jar>
   28.19 -    <createmodulexml xmldir="${netbeans.dest.dir}/${cluster.dir}/config/Modules">
   28.20 -      <enabled dir="${netbeans.dest.dir}/${cluster.dir}">
   28.21 +    <createmodulexml xmldir="${cluster}/config/Modules">
   28.22 +      <enabled dir="${cluster}">
   28.23          <include name="modules/test-profile.jar"/>
   28.24        </enabled>
   28.25      </createmodulexml>
   28.26    </target>
   28.27  
   28.28    <target name="netbeans" depends="jars">
   28.29 -    <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="modules/test-profile.jar">
   28.30 -      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   28.31 +    <genlist outputfiledir="${cluster}" module="modules/test-profile.jar">
   28.32 +      <fileset dir="${cluster}">
   28.33          <patternset refID="vcsgeneric/profiles/testprofiles.files"/>
   28.34        </fileset>
   28.35      </genlist>
   28.36 @@ -88,7 +88,7 @@
   28.37  
   28.38    <target name="nbm" depends="netbeans">
   28.39      <makenbm file="test-profile.nbm"
   28.40 -             productdir="${netbeans.dest.dir}/${cluster.dir}"
   28.41 +             productdir="${cluster}"
   28.42               module="modules/test-profile.jar"
   28.43  	     homepage="http://vcsgeneric.${homepage.base}/"
   28.44  	     distribution="http://${dist.base}/test-profile.nbm">
   28.45 @@ -104,7 +104,7 @@
   28.46          <include name="**/*.jar"/>
   28.47          <include name="org/netbeans/modules/vcs/profiles/testprofiles/layer-include*.xml"/>
   28.48        </fileset>
   28.49 -      <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
   28.50 +      <fileset dir="${cluster}">
   28.51          <patternset refID="vcsgeneric/profiles/testprofiles.files"/>
   28.52        </fileset>
   28.53      </delete>

    29.1 --- a/vcs.profiles.teamware/build.xml	Thu Jun 09 20:14:11 2005 +0000
    29.2 +++ b/vcs.profiles.teamware/build.xml	Sat Jun 11 07:01:05 2005 +0000
    29.3 @@ -17,7 +17,7 @@
    29.4  
    29.5    <target name="reload" depends="jar">
    29.6      <mkdir dir="module-test"/>
    29.7 -    <copy file="${netbeans.dest.dir}/${cluster.dir}/modules/${teamware.jar}"
    29.8 +    <copy file="${cluster}/modules/${teamware.jar}"
    29.9          tofile="module-test/${teamware.jar}"/>
   29.10      <nbinstaller module="module-test/${teamware.jar}" action="reinstall"/>
   29.11    </target>

    30.1 --- a/vcscore/test/build-unit.xml	Thu Jun 09 20:14:11 2005 +0000
    30.2 +++ b/vcscore/test/build-unit.xml	Sat Jun 11 07:01:05 2005 +0000
    30.3 @@ -21,7 +21,7 @@
    30.4          <buildTests srcdir="unit/src" compileexcludes="**/data/**">
    30.5              <classpath>
    30.6                  <path refid="test.unit.compile.cp"/>
    30.7 -                <pathelement location="${netbeans.dest.dir}/${cluster.dir}/modules/org-netbeans-modules-vcs-advanced.jar"/>
    30.8 +                <pathelement location="${cluster}/modules/org-netbeans-modules-vcs-advanced.jar"/>
    30.9                  <pathelement location="../../vcsgeneric/test/unit/testprofile/src"/>
   30.10              </classpath>
   30.11          </buildTests>
   30.12 @@ -31,7 +31,7 @@
   30.13          <executeTests pluginname="jvm">
   30.14              <classpath>
   30.15                  <path refid="test.unit.run.cp"/>
   30.16 -                <pathelement location="${netbeans.dest.dir}/${cluster.dir}/modules/org-netbeans-modules-vcs-advanced.jar"/>
   30.17 +                <pathelement location="${cluster}/modules/org-netbeans-modules-vcs-advanced.jar"/>
   30.18                  <pathelement location="../../vcsgeneric/test/unit/testprofile/src"/>
   30.19              </classpath>
   30.20          </executeTests>

    31.1 --- a/xtest/build.xml	Thu Jun 09 20:14:11 2005 +0000
    31.2 +++ b/xtest/build.xml	Sat Jun 11 07:01:05 2005 +0000
    31.3 @@ -18,11 +18,11 @@
    31.4      <!-- Called after jar target and before module-* targets in projectized.xml -->
    31.5      <target name="netbeans-extra">
    31.6          <ant dir=".." target="makedist" inheritall="false"/>
    31.7 -        <unzip src="../xtest-distribution.zip" dest="${netbeans.dest.dir}/${cluster.dir}/xtest-distribution" />
    31.8 +        <unzip src="../xtest-distribution.zip" dest="${cluster}/xtest-distribution" />
    31.9      </target>
   31.10  
   31.11      <target name="clean" depends="projectized-common.clean">
   31.12 -        <delete dir="${netbeans.dest.dir}/${cluster.dir}/xtest-distribution"/>
   31.13 +        <delete dir="${cluster}/xtest-distribution"/>
   31.14      </target>
   31.15  
   31.16    </project>