1.1 --- a/ada.editor/build.xml	Wed Jun 08 23:11:18 2011 +0400
     1.2 +++ b/ada.editor/build.xml	Thu Jun 09 10:34:16 2011 -0400
     1.3 @@ -62,14 +62,14 @@
     1.4  
     1.5  <!--
     1.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
     1.7 -        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
     1.8 +        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nbantext.jar}"/>
     1.9          <gsfjar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    1.10              <fileset dir="${build.classes.dir}"/>
    1.11          </gsfjar>
    1.12      </target>
    1.13  -->
    1.14      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
    1.15 -        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
    1.16 +        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nbantext.jar}"/>
    1.17          <csljar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    1.18              <fileset dir="${build.classes.dir}"/>
    1.19          </csljar>

     2.1 --- a/api.mdr/arch/build.xml	Wed Jun 08 23:11:18 2011 +0400
     2.2 +++ b/api.mdr/arch/build.xml	Thu Jun 09 10:34:16 2011 -0400
     2.3 @@ -44,7 +44,7 @@
     2.4  <project name="Arch Questions and Answers Generator" default="answer" basedir=".">
     2.5    <!-- modify this property to point to root of NetBeans CVS
     2.6         so necessary files in the build system may be found -->
     2.7 -  <property name="ide.root" value="../../.." />
     2.8 +  <property name="nb_all" value="../../.." />
     2.9  
    2.10    <!-- choose a name of your project. It will be used to name
    2.11         input and output files -->
    2.12 @@ -57,14 +57,14 @@
    2.13    <property name="arch.generate" value="true" /> 
    2.14    -->
    2.15    
    2.16 -  <taskdef name="arch" classname="org.netbeans.nbbuild.Arch" classpath="${ide.root}/nbbuild/nbantext.jar"/>
    2.17 +  <taskdef name="arch" classname="org.netbeans.nbbuild.Arch" classpath="${nb_all}/nbbuild/build/nbantext.jar"/>
    2.18  
    2.19    <target name="answer" description="Generates HTML file with answers to architecture questions" >
    2.20      <arch answers="arch-${arch.name}.xml" output="${arch.outputdir}/${arch.name}.html" />
    2.21    </target>
    2.22    
    2.23    <target name="question" description="Generates HTML file with well formated questions" >
    2.24 -    <style in="${ide.root}/nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml" style="arch2html.xsl" out="${arch.outputdir}/questions.html" />
    2.25 +    <style in="${nb_all}/nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml" style="arch2html.xsl" out="${arch.outputdir}/questions.html" />
    2.26    </target>
    2.27  
    2.28    <target name="clean">

     3.1 --- a/bookmarks/test/dummy/build.xml	Wed Jun 08 23:11:18 2011 +0400
     3.2 +++ b/bookmarks/test/dummy/build.xml	Thu Jun 09 10:34:16 2011 -0400
     3.3 @@ -20,9 +20,9 @@
     3.4      <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
     3.5      <property location="${nb_all}/nbbuild/standard-nbm-license.txt" name="license.file"/>
     3.6  
     3.7 -    <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar" name="makenbm"/>
     3.8 -    <taskdef classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar" name="genlist"/>
     3.9 -    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar" name="locjar"/>
    3.10 +    <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbbuild/nbantext.jar" name="makenbm"/>
    3.11 +    <taskdef classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbbuild/nbantext.jar" name="genlist"/>
    3.12 +    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbbuild/nbantext.jar" name="locjar"/>
    3.13  
    3.14      <target name="jars">
    3.15          <mkdir dir="netbeans/modules"/>

     4.1 --- a/erlang.editor/build.xml	Wed Jun 08 23:11:18 2011 +0400
     4.2 +++ b/erlang.editor/build.xml	Thu Jun 09 10:34:16 2011 -0400
     4.3 @@ -23,7 +23,7 @@
     4.4  
     4.5      <!-- special jar target for csl -->
     4.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
     4.7 -        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
     4.8 +        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nbantext.jar}"/>
     4.9          <csljar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    4.10              <fileset dir="${build.classes.dir}"/>
    4.11          </csljar>

     5.1 --- a/fortress.editing/build.xml	Wed Jun 08 23:11:18 2011 +0400
     5.2 +++ b/fortress.editing/build.xml	Thu Jun 09 10:34:16 2011 -0400
     5.3 @@ -16,7 +16,7 @@
     5.4      </target>
     5.5      
     5.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
     5.7 -        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
     5.8 +        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nbantext.jar}"/>
     5.9          <gsfjar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    5.10              <fileset dir="${build.classes.dir}"/>
    5.11          </gsfjar>

     6.1 --- a/gsf.api/anttask/build.xml	Wed Jun 08 23:11:18 2011 +0400
     6.2 +++ b/gsf.api/anttask/build.xml	Thu Jun 09 10:34:16 2011 -0400
     6.3 @@ -64,7 +64,7 @@
     6.4                  <!-- Note: in NB 4.0, ${ant.home}/lib/ant.jar will work as is -->
     6.5                  <pathelement path="${netbeans.library.path}"/>
     6.6                  <pathelement path="${ant.home}/lib/ant.jar"/>
     6.7 -                <pathelement location="${nb_all}/nbbuild/nbantext.jar"/>
     6.8 +                <pathelement location="${nbantext.jar}"/>
     6.9  		<!--<pathelement location="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />-->
    6.10  		<!--<pathelement location="${nb_all}/schema2beans/dev/schema2beansdev.jar" />-->
    6.11  	  </classpath>

     7.1 --- a/j2ee.blueprints/build.xml	Wed Jun 08 23:11:18 2011 +0400
     7.2 +++ b/j2ee.blueprints/build.xml	Thu Jun 09 10:34:16 2011 -0400
     7.3 @@ -113,7 +113,7 @@
     7.4        </and>
     7.5        </condition>  
     7.6        <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat"
     7.7 -               classpath="${nb_all}/nbbuild/nbantext.jar"/>
     7.8 +               classpath="${nbantext.jar}"/>
     7.9        <repeat target="setup-one-locale" name="locale" values="${locales}"/>
    7.10      </target>
    7.11      
    7.12 @@ -134,7 +134,7 @@
    7.13     <target name="jar-ml" depends="buildjar-ml">
    7.14          <taskdef name="locjar" 
    7.15                   classname="org.netbeans.nbbuild.LocalizedJar" 
    7.16 -                 classpath="${nb_all}/nbbuild/nbantext.jar"/>
    7.17 +                 classpath="${nbantext.jar}"/>
    7.18          <locjar warnMissingDir="true"
    7.19                  basedir="${bp.locale.dir}/src"
    7.20                  jarfile="${cluster}/modules/org-netbeans-modules-j2ee-blueprints.jar"/>
    7.21 @@ -150,7 +150,7 @@
    7.22        </and>
    7.23        </condition>  
    7.24        <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat"
    7.25 -               classpath="${nb_all}/nbbuild/nbantext.jar"/>
    7.26 +               classpath="${nbantext.jar}"/>
    7.27        <repeat target="update-one-locale" name="locale" values="${locales}"/>
    7.28      </target>
    7.29      

     8.1 --- a/languages.ejs/build.xml	Wed Jun 08 23:11:18 2011 +0400
     8.2 +++ b/languages.ejs/build.xml	Thu Jun 09 10:34:16 2011 -0400
     8.3 @@ -7,7 +7,7 @@
     8.4      <import file="../../nbbuild/templates/projectized.xml"/>
     8.5  
     8.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
     8.7 -        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
     8.8 +        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nbantext.jar}"/>
     8.9          <gsfjar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    8.10              <fileset dir="${build.classes.dir}"/>
    8.11          </gsfjar>

     9.1 --- a/php.fuse/build.xml	Wed Jun 08 23:11:18 2011 +0400
     9.2 +++ b/php.fuse/build.xml	Thu Jun 09 10:34:16 2011 -0400
     9.3 @@ -4,7 +4,7 @@
     9.4      <import file="../../nbbuild/templates/projectized.xml"/>
     9.5  
     9.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
     9.7 -        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
     9.8 +        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nbantext.jar}"/>
     9.9          <csljar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
    9.10              <fileset dir="${build.classes.dir}"/>
    9.11          </csljar>

    10.1 --- a/php.prado/build.xml	Wed Jun 08 23:11:18 2011 +0400
    10.2 +++ b/php.prado/build.xml	Thu Jun 09 10:34:16 2011 -0400
    10.3 @@ -7,7 +7,7 @@
    10.4      <import file="../../nbbuild/templates/projectized.xml"/>
    10.5  
    10.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
    10.7 -        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
    10.8 +        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nbantext.jar}"/>
    10.9          <gsfjar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
   10.10              <fileset dir="${build.classes.dir}"/>
   10.11          </gsfjar>

    11.1 --- a/php.smarty/build.xml	Wed Jun 08 23:11:18 2011 +0400
    11.2 +++ b/php.smarty/build.xml	Thu Jun 09 10:34:16 2011 -0400
    11.3 @@ -4,7 +4,7 @@
    11.4      <import file="../../nbbuild/templates/projectized.xml"/>
    11.5  
    11.6     <!-- <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
    11.7 -        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
    11.8 +        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nbantext.jar}"/>
    11.9          <csljar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
   11.10              <fileset dir="${build.classes.dir}"/>
   11.11          </csljar>

    12.1 --- a/python.editor/build.xml	Wed Jun 08 23:11:18 2011 +0400
    12.2 +++ b/python.editor/build.xml	Thu Jun 09 10:34:16 2011 -0400
    12.3 @@ -7,7 +7,7 @@
    12.4      <import file="../../nbbuild/templates/projectized.xml"/>
    12.5  
    12.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
    12.7 -        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
    12.8 +        <taskdef name="gsfjar" classname="org.netbeans.modules.gsf.GsfJar" classpath="${nb_all}/contrib/gsf.api/anttask/gsfanttask.jar:${nbantext.jar}"/>
    12.9          <gsfjar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
   12.10              <fileset dir="${build.classes.dir}"/>
   12.11          </gsfjar>

    13.1 --- a/rats.editor/build.xml	Wed Jun 08 23:11:18 2011 +0400
    13.2 +++ b/rats.editor/build.xml	Thu Jun 09 10:34:16 2011 -0400
    13.3 @@ -23,7 +23,7 @@
    13.4  
    13.5      <!-- special jar target for csl -->
    13.6      <target name="jar" depends="init,compile,jar-prep" unless="is.jar.uptodate">
    13.7 -        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nb_all}/nbbuild/nbantext.jar"/>
    13.8 +        <taskdef name="csljar" classname="org.netbeans.modules.csl.CslJar" classpath="${nb_all}/csl.api/anttask/build/cslanttask.jar:${nbantext.jar}"/>
    13.9          <csljar jarfile="${cluster}/${module.jar}" compress="${build.package.compress}" index="${build.package.index}" manifest="${manifest.mf}" stamp="${cluster}/.lastModified">
   13.10              <fileset dir="${build.classes.dir}"/>
   13.11          </csljar>

    14.1 --- a/vcs.advanced/test/unit/testprofile/build.xml	Wed Jun 08 23:11:18 2011 +0400
    14.2 +++ b/vcs.advanced/test/unit/testprofile/build.xml	Thu Jun 09 10:34:16 2011 -0400
    14.3 @@ -47,9 +47,9 @@
    14.4  
    14.5    <property name="build.compiler.debug" value="on"/>
    14.6  
    14.7 -  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nb_all}/nbbuild/nbantext.jar"/>
    14.8 +  <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbantext.jar}"/>
    14.9  
   14.10 -  <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="${nb_all}/nbbuild/nbantext.jar"/>
   14.11 +  <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="${nbantext.jar}"/>
   14.12  
   14.13    <target name="init" depends="default.init">
   14.14      <patternset id="vcsgeneric/profiles/testprofiles.files">

    15.1 --- a/zeroadmin/perftest/build.xml	Wed Jun 08 23:11:18 2011 +0400
    15.2 +++ b/zeroadmin/perftest/build.xml	Thu Jun 09 10:34:16 2011 -0400
    15.3 @@ -10,9 +10,9 @@
    15.4      <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
    15.5      <property location="${nb_all}/nbbuild/standard-nbm-license.txt" name="license.file"/>
    15.6  
    15.7 -    <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar" name="makenbm"/>
    15.8 -    <taskdef classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar" name="genlist"/>
    15.9 -    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/nbantext.jar" name="locjar"/>
   15.10 +    <taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/build/nbantext.jar" name="makenbm"/>
   15.11 +    <taskdef classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/build/nbantext.jar" name="genlist"/>
   15.12 +    <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nb_all}/nbbuild/build/nbantext.jar" name="locjar"/>
   15.13  
   15.14      <target name="compile">
   15.15          <javac destdir="src"