# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1241004134 -7200
# Node ID 6244a7528045fa729783e558a586a45380c3d479
# Parent  a45aff330c0dae513e26635266bb643f903e050a
#164053: Moving NetBeans own Ant tasks into separate Java SE project

diff --git a/nbbuild/ant/build.xml b/nbbuild/ant/build.xml
new file mode 100644
--- /dev/null
+++ b/nbbuild/ant/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="NetBeans Ant Tasks" default="default" basedir=".">
+    <description>Builds, tests, and runs the project ant.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="ant-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/nbbuild/ant/nbproject/build-impl.xml b/nbbuild/ant/nbproject/build-impl.xml
new file mode 100644
--- /dev/null
+++ b/nbbuild/ant/nbproject/build-impl.xml
@@ -0,0 +1,680 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ant-impl">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="/does/not/exist" name="sourcepath"/>
+            <attribute default="/does/not/exist" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+</project>
diff --git a/nbbuild/ant/nbproject/genfiles.properties b/nbbuild/ant/nbproject/genfiles.properties
new file mode 100644
--- /dev/null
+++ b/nbbuild/ant/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=d20959e0
+build.xml.script.CRC32=1f4574eb
+build.xml.stylesheet.CRC32=958a1d3e@1.25.0.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=d20959e0
+nbproject/build-impl.xml.script.CRC32=c4ab9a2c
+nbproject/build-impl.xml.stylesheet.CRC32=ce896a9e@1.25.0.45
diff --git a/nbbuild/ant/nbproject/project.properties b/nbbuild/ant/nbproject/project.properties
new file mode 100644
--- /dev/null
+++ b/nbbuild/ant/nbproject/project.properties
@@ -0,0 +1,66 @@
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+
+# nb_all
+nb_all=../..
+nbbuild=${nb_all}/nbbuild
+
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${nbbuild}/nbantext.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=${ant.core.lib}:${nb_all}/javahelp/external/jh-2.0_05.jar:${nb_all}/apisupport.harness/external/jsearch-2.0_05.jar
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${nb_all}/libs.junit4/external/junit-4.5.jar:\
+    ${nbbuild}/netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
+    ${nbbuild}/netbeans/harness/modules/org-netbeans-insane.jar
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/nbbuild/ant/nbproject/project.xml b/nbbuild/ant/nbproject/project.xml
new file mode 100644
--- /dev/null
+++ b/nbbuild/ant/nbproject/project.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>ant</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/nbbuild/antsrc/com/sun/java/help/search/ModifiedHTMLIndexerKit.java b/nbbuild/ant/src/com/sun/java/help/search/ModifiedHTMLIndexerKit.java
rename from nbbuild/antsrc/com/sun/java/help/search/ModifiedHTMLIndexerKit.java
rename to nbbuild/ant/src/com/sun/java/help/search/ModifiedHTMLIndexerKit.java
diff --git a/nbbuild/antsrc/com/sun/java/help/search/ModifiedIndexer.java b/nbbuild/ant/src/com/sun/java/help/search/ModifiedIndexer.java
rename from nbbuild/antsrc/com/sun/java/help/search/ModifiedIndexer.java
rename to nbbuild/ant/src/com/sun/java/help/search/ModifiedIndexer.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml b/nbbuild/ant/src/org/netbeans/nbbuild/Arch-api-questions.xml
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch-api-questions.xml
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl b/nbbuild/ant/src/org/netbeans/nbbuild/Arch-default-arch-where.xsl
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch-default-arch-where.xsl
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-dep-nb.xsl b/nbbuild/ant/src/org/netbeans/nbbuild/Arch-default-dep-nb.xsl
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-dep-nb.xsl
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch-default-dep-nb.xsl
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd b/nbbuild/ant/src/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd b/nbbuild/ant/src/org/netbeans/nbbuild/Arch.dtd
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch.dtd
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch.java b/nbbuild/ant/src/org/netbeans/nbbuild/Arch.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch.xsl b/nbbuild/ant/src/org/netbeans/nbbuild/Arch.xsl
rename from nbbuild/antsrc/org/netbeans/nbbuild/Arch.xsl
rename to nbbuild/ant/src/org/netbeans/nbbuild/Arch.xsl
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Branding.java b/nbbuild/ant/src/org/netbeans/nbbuild/Branding.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Branding.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Branding.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckBundles.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckBundles.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckBundles.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckBundles.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckHelpSets.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckHelpSets.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckHelpSets.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckHelpSets.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckHelpSetsBin.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckHelpSetsBin.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckHelpSetsBin.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckHelpSetsBin.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckLicense.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckLicense.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckLicense.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckLicense.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckLinks.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckLinks.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckModuleConfigs.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckModuleConfigs.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckValue.java b/nbbuild/ant/src/org/netbeans/nbbuild/CheckValue.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CheckValue.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CheckValue.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CleanAll.java b/nbbuild/ant/src/org/netbeans/nbbuild/CleanAll.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CleanAll.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CleanAll.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ConfigureModules.java b/nbbuild/ant/src/org/netbeans/nbbuild/ConfigureModules.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ConfigureModules.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ConfigureModules.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ConvertClusterPath.java b/nbbuild/ant/src/org/netbeans/nbbuild/ConvertClusterPath.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ConvertClusterPath.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ConvertClusterPath.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ConvertImport.java b/nbbuild/ant/src/org/netbeans/nbbuild/ConvertImport.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ConvertImport.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ConvertImport.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CopyIcons.java b/nbbuild/ant/src/org/netbeans/nbbuild/CopyIcons.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CopyIcons.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CopyIcons.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CreateModuleXML.java b/nbbuild/ant/src/org/netbeans/nbbuild/CreateModuleXML.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CreateModuleXML.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CreateModuleXML.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java b/nbbuild/ant/src/org/netbeans/nbbuild/CustomJavac.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/CustomJavac.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/DeleteUnreferencedClusterFiles.java b/nbbuild/ant/src/org/netbeans/nbbuild/DeleteUnreferencedClusterFiles.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/DeleteUnreferencedClusterFiles.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/DeleteUnreferencedClusterFiles.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java b/nbbuild/ant/src/org/netbeans/nbbuild/ExportedAPICondition.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ExportedAPICondition.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/FindBadConstructions.java b/nbbuild/ant/src/org/netbeans/nbbuild/FindBadConstructions.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/FindBadConstructions.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/FindBadConstructions.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/FixDependencies.java b/nbbuild/ant/src/org/netbeans/nbbuild/FixDependencies.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/FixDependencies.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/FixDependencies.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/FixTestDependencies.java b/nbbuild/ant/src/org/netbeans/nbbuild/FixTestDependencies.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/FixTestDependencies.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/FixTestDependencies.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/GenerateJavadoc.java b/nbbuild/ant/src/org/netbeans/nbbuild/GenerateJavadoc.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/GenerateJavadoc.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/GenerateJavadoc.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/GetDependsClusters.java b/nbbuild/ant/src/org/netbeans/nbbuild/GetDependsClusters.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/GetDependsClusters.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/GetDependsClusters.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java b/nbbuild/ant/src/org/netbeans/nbbuild/GetModuleName.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/GetModuleName.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/HgExec.java b/nbbuild/ant/src/org/netbeans/nbbuild/HgExec.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/HgExec.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/HgExec.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/IncrementSpecificationVersions.java b/nbbuild/ant/src/org/netbeans/nbbuild/IncrementSpecificationVersions.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/IncrementSpecificationVersions.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/IncrementSpecificationVersions.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java b/nbbuild/ant/src/org/netbeans/nbbuild/InsertModuleAllTargets.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/InsertModuleAllTargets.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Issue.java b/nbbuild/ant/src/org/netbeans/nbbuild/Issue.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Issue.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Issue.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JHIndexer.java b/nbbuild/ant/src/org/netbeans/nbbuild/JHIndexer.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/JHIndexer.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/JHIndexer.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-1.5.dtd b/nbbuild/ant/src/org/netbeans/nbbuild/JNLP-1.5.dtd
rename from nbbuild/antsrc/org/netbeans/nbbuild/JNLP-1.5.dtd
rename to nbbuild/ant/src/org/netbeans/nbbuild/JNLP-1.5.dtd
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd b/nbbuild/ant/src/org/netbeans/nbbuild/JNLP-6.0.dtd
rename from nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd
rename to nbbuild/ant/src/org/netbeans/nbbuild/JNLP-6.0.dtd
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JUnitReportWriter.java b/nbbuild/ant/src/org/netbeans/nbbuild/JUnitReportWriter.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/JUnitReportWriter.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/JUnitReportWriter.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JarWithModuleAttributes.java b/nbbuild/ant/src/org/netbeans/nbbuild/JarWithModuleAttributes.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/JarWithModuleAttributes.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/JarWithModuleAttributes.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JavadocIndex.java b/nbbuild/ant/src/org/netbeans/nbbuild/JavadocIndex.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/JavadocIndex.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/JavadocIndex.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Kvetcher.java b/nbbuild/ant/src/org/netbeans/nbbuild/Kvetcher.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Kvetcher.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Kvetcher.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/L10nTask.java b/nbbuild/ant/src/org/netbeans/nbbuild/L10nTask.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/L10nTask.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/L10nTask.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java b/nbbuild/ant/src/org/netbeans/nbbuild/LayerIndex.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/LayerIndex.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LayerOptionsImport.java b/nbbuild/ant/src/org/netbeans/nbbuild/LayerOptionsImport.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/LayerOptionsImport.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/LayerOptionsImport.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LocJHIndexer.java b/nbbuild/ant/src/org/netbeans/nbbuild/LocJHIndexer.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/LocJHIndexer.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/LocJHIndexer.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LocMakeNBM.java b/nbbuild/ant/src/org/netbeans/nbbuild/LocMakeNBM.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/LocMakeNBM.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/LocMakeNBM.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LocalizedJar.java b/nbbuild/ant/src/org/netbeans/nbbuild/LocalizedJar.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/LocalizedJar.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/LocalizedJar.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeJNLP.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeJNLP.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeLNBM.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeLNBM.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeLayer.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeLayer.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeLayer.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeLayer.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeListOfNBM.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeListOfNBM.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeMasterJNLP.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeMasterJNLP.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeMasterJNLP.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeMasterJNLP.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeNBM.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeNBM.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java b/nbbuild/ant/src/org/netbeans/nbbuild/MakeUpdateDesc.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/MakeUpdateDesc.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleDependencies.java b/nbbuild/ant/src/org/netbeans/nbbuild/ModuleDependencies.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ModuleDependencies.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ModuleDependencies.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java b/nbbuild/ant/src/org/netbeans/nbbuild/ModuleListParser.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ModuleListParser.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java b/nbbuild/ant/src/org/netbeans/nbbuild/ModuleSelector.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ModuleSelector.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java b/nbbuild/ant/src/org/netbeans/nbbuild/ModuleStateSelector.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ModuleStateSelector.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java b/nbbuild/ant/src/org/netbeans/nbbuild/ModuleTestDependencies.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ModuleTestDependencies.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java b/nbbuild/ant/src/org/netbeans/nbbuild/NbMerge.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/NbMerge.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java b/nbbuild/ant/src/org/netbeans/nbbuild/ParseProjectXml.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ParseProjectXml.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/PathFileSet.java b/nbbuild/ant/src/org/netbeans/nbbuild/PathFileSet.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/PathFileSet.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/PathFileSet.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Postprocess.java b/nbbuild/ant/src/org/netbeans/nbbuild/Postprocess.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Postprocess.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Postprocess.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Preprocess.java b/nbbuild/ant/src/org/netbeans/nbbuild/Preprocess.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Preprocess.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Preprocess.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/PrintIcon.java b/nbbuild/ant/src/org/netbeans/nbbuild/PrintIcon.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/PrintIcon.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/PrintIcon.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java b/nbbuild/ant/src/org/netbeans/nbbuild/RefreshDependencyVersions.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/RefreshDependencyVersions.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Repeat.java b/nbbuild/ant/src/org/netbeans/nbbuild/Repeat.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Repeat.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Repeat.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java b/nbbuild/ant/src/org/netbeans/nbbuild/ResolveList.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ResolveList.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/SetCluster.java b/nbbuild/ant/src/org/netbeans/nbbuild/SetCluster.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/SetCluster.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/SetCluster.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java b/nbbuild/ant/src/org/netbeans/nbbuild/ShorterPaths.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ShorterPaths.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java b/nbbuild/ant/src/org/netbeans/nbbuild/Sigtest.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/Sigtest.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/SimpleMerge.java b/nbbuild/ant/src/org/netbeans/nbbuild/SimpleMerge.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/SimpleMerge.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/SimpleMerge.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/SortSuiteModules.java b/nbbuild/ant/src/org/netbeans/nbbuild/SortSuiteModules.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/SortSuiteModules.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/SortSuiteModules.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/SubAntJUnitReport.java b/nbbuild/ant/src/org/netbeans/nbbuild/SubAntJUnitReport.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/SubAntJUnitReport.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/SubAntJUnitReport.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/TryElse.java b/nbbuild/ant/src/org/netbeans/nbbuild/TryElse.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/TryElse.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/TryElse.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java b/nbbuild/ant/src/org/netbeans/nbbuild/UpdateTracking.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/UpdateTracking.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ValidateHgConfiguration.java b/nbbuild/ant/src/org/netbeans/nbbuild/ValidateHgConfiguration.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/ValidateHgConfiguration.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/ValidateHgConfiguration.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/VerifyClassLinkage.java b/nbbuild/ant/src/org/netbeans/nbbuild/VerifyClassLinkage.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/VerifyClassLinkage.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/VerifyClassLinkage.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/VerifyJNLP.java b/nbbuild/ant/src/org/netbeans/nbbuild/VerifyJNLP.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/VerifyJNLP.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/VerifyJNLP.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/VerifyUpdateCenter.java b/nbbuild/ant/src/org/netbeans/nbbuild/VerifyUpdateCenter.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/VerifyUpdateCenter.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/VerifyUpdateCenter.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/XMLUtil.java b/nbbuild/ant/src/org/netbeans/nbbuild/XMLUtil.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/XMLUtil.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/XMLUtil.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DeregisterExternalHook.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/DeregisterExternalHook.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DeregisterExternalHook.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/DeregisterExternalHook.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesCopy.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesCopy.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesCopy.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesCopy.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesExtra.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesExtra.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesExtra.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesExtra.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesLicense.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesLicense.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReleaseFilesLicense.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ReleaseFilesLicense.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-binaries
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-binaries
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-overlaps
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/ignored-overlaps
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html b/nbbuild/ant/src/org/netbeans/nbbuild/extlibs/package.html
rename from nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html
rename to nbbuild/ant/src/org/netbeans/nbbuild/extlibs/package.html
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/package.html b/nbbuild/ant/src/org/netbeans/nbbuild/package.html
rename from nbbuild/antsrc/org/netbeans/nbbuild/package.html
rename to nbbuild/ant/src/org/netbeans/nbbuild/package.html
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/testdist/TestDistFilter.java b/nbbuild/ant/src/org/netbeans/nbbuild/testdist/TestDistFilter.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/testdist/TestDistFilter.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/testdist/TestDistFilter.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/testdist/ValidatePath.java b/nbbuild/ant/src/org/netbeans/nbbuild/testdist/ValidatePath.java
rename from nbbuild/antsrc/org/netbeans/nbbuild/testdist/ValidatePath.java
rename to nbbuild/ant/src/org/netbeans/nbbuild/testdist/ValidatePath.java
diff --git a/nbbuild/antsrc/package-list b/nbbuild/ant/src/package-list
rename from nbbuild/antsrc/package-list
rename to nbbuild/ant/src/package-list
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ArchQuestionsTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ArchQuestionsTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ArchQuestionsTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ArchQuestionsTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseAnt.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseAnt.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseXmlExample.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLicenseXmlExample.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLinksTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/CheckLinksTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLinksTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/CheckLinksTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ConvertImportTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ConvertImportTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ConvertImportTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ConvertImportTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CreateModuleXMLTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/CreateModuleXMLTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/CreateModuleXMLTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/CreateModuleXMLTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/FixDependenciesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixDependenciesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependencies.properties
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependencies.properties
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesPass.properties
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesPass.properties
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject.xml b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProject.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProject.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectStandalone.xml b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectStandalone.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectStandalone.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectStandalone.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectStandalonePass.xml b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectStandalonePass.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectStandalonePass.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesProjectStandalonePass.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/FixTestDependenciesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/GarbageUnderPackages.xml b/nbbuild/ant/test/org/netbeans/nbbuild/GarbageUnderPackages.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/GarbageUnderPackages.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/GarbageUnderPackages.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/IncrementSpecificationVersionsTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/IncrementSpecificationVersionsTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/IncrementSpecificationVersionsTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/IncrementSpecificationVersionsTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/JarWithModuleAttributesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/JarWithModuleAttributesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/JarWithModuleAttributesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/JarWithModuleAttributesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/MakeJNLPTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/MakeJNLPTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/MakeJNLPTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/MakeJNLPTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/MakeMasterJNLPTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/MakeMasterJNLPTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/MakeMasterJNLPTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/MakeMasterJNLPTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/MakeNBMTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/MakeNBMTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/MakeNBMTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/MakeNBMTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleDependenciesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ModuleDependenciesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleDependenciesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ModuleDependenciesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ModuleListParserTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ModuleListParserTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleSelectorTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ModuleSelectorTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleSelectorTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ModuleSelectorTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleStateSelectorTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ModuleStateSelectorTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleStateSelectorTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ModuleStateSelectorTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/PathFileSetTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/PathFileSetTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/PathFileSetTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/PathFileSetTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/PrintIconTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/PrintIconTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/PrintIconTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/PrintIconTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/PublicPackagesInProjectizedXMLTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/PublicPackagesInProjectizedXMLTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/PublicPackagesInProjectizedXMLTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/PublicPackagesInProjectizedXMLTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDeps.xml b/nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDeps.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDeps.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDeps.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDepsProject.xml b/nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDepsProject.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDepsProject.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDepsProject.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDepsTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDepsTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/RecursiveDepsTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/RecursiveDepsTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/ShorterPathsTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/ShorterPathsTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.xml b/nbbuild/ant/test/org/netbeans/nbbuild/ShorterPathsTest.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/ShorterPathsTest.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/ShorterPathsTest.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/SortSuiteModulesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/SortSuiteModulesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/SortSuiteModulesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/SortSuiteModulesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestDeps.xml b/nbbuild/ant/test/org/netbeans/nbbuild/TestDeps.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/TestDeps.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/TestDeps.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsMissingModuleEntry.xml b/nbbuild/ant/test/org/netbeans/nbbuild/TestDepsMissingModuleEntry.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsMissingModuleEntry.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/TestDepsMissingModuleEntry.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsProject.xml b/nbbuild/ant/test/org/netbeans/nbbuild/TestDepsProject.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsProject.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/TestDepsProject.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsProjectNoTestDeps.xml b/nbbuild/ant/test/org/netbeans/nbbuild/TestDepsProjectNoTestDeps.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsProjectNoTestDeps.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/TestDepsProjectNoTestDeps.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/TestDepsTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/TestDepsTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/TestDepsTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/arch-preferences.xml b/nbbuild/ant/test/org/netbeans/nbbuild/arch-preferences.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/arch-preferences.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/arch-preferences.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/arch-profiler.xml b/nbbuild/ant/test/org/netbeans/nbbuild/arch-profiler.xml
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/arch-profiler.xml
rename to nbbuild/ant/test/org/netbeans/nbbuild/arch-profiler.xml
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/data/Category.png b/nbbuild/ant/test/org/netbeans/nbbuild/data/Category.png
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/data/Category.png
rename to nbbuild/ant/test/org/netbeans/nbbuild/data/Category.png
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/data/columnIndex.gif b/nbbuild/ant/test/org/netbeans/nbbuild/data/columnIndex.gif
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/data/columnIndex.gif
rename to nbbuild/ant/test/org/netbeans/nbbuild/data/columnIndex.gif
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/data/instanceBroken.gif b/nbbuild/ant/test/org/netbeans/nbbuild/data/instanceBroken.gif
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/data/instanceBroken.gif
rename to nbbuild/ant/test/org/netbeans/nbbuild/data/instanceBroken.gif
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/data/instanceObject.gif b/nbbuild/ant/test/org/netbeans/nbbuild/data/instanceObject.gif
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/data/instanceObject.gif
rename to nbbuild/ant/test/org/netbeans/nbbuild/data/instanceObject.gif
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/testdist/TestDistFilterTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/testdist/TestDistFilterTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/testdist/TestDistFilterTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/testdist/TestDistFilterTest.java
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/testdist/ValidatePathTest.java b/nbbuild/ant/test/org/netbeans/nbbuild/testdist/ValidatePathTest.java
rename from nbbuild/test/unit/src/org/netbeans/nbbuild/testdist/ValidatePathTest.java
rename to nbbuild/ant/test/org/netbeans/nbbuild/testdist/ValidatePathTest.java
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -79,8 +79,8 @@
         </condition>
     </fail>
 
-    <mkdir dir="build/antclasses"/>
-    <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.5" target="1.5">
+    <mkdir dir="ant/build/classes"/>
+    <javac srcdir="ant/src" destdir="ant/build/classes" deprecation="true" debug="${build.compiler.debug}" source="1.5" target="1.5">
         <classpath>
             <pathelement location="${ant.core.lib}"/>
         </classpath>
@@ -90,11 +90,11 @@
         <include name="org/netbeans/nbbuild/extlibs/DownloadBinaries.java"/>
         <compilerarg line="-Xlint -Xlint:-serial"/>
     </javac>
-    <taskdef name="validate-hg-configuration" classname="org.netbeans.nbbuild.ValidateHgConfiguration" classpath="build/antclasses"/>
+    <taskdef name="validate-hg-configuration" classname="org.netbeans.nbbuild.ValidateHgConfiguration" classpath="ant/build/classes"/>
     <validate-hg-configuration root=".."/>
-    <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="build/antclasses"/>
+    <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="ant/build/classes"/>
     <deregisterexternalhook root=".."/>
-    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="build/antclasses"/>
+    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="ant/build/classes"/>
     <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
         <manifest dir="${nb_all}">
             <include name="apisupport.harness/external/binaries-list"/>
@@ -115,7 +115,7 @@
     <!-- Sanity check: -->
     <pathconvert pathsep=":" property="class.files.in.antsrc">
         <path>
-            <fileset dir="antsrc">
+            <fileset dir="ant/src">
                 <include name="**/*.class"/>
             </fileset>
         </path>
@@ -126,20 +126,20 @@
                 <equals arg1="${class.files.in.antsrc}" arg2=""/>
             </not>
         </condition>
-        You have stray *.class files in ${basedir}/antsrc which you must remove.
+        You have stray *.class files in ${basedir}/ant/src which you must remove.
         Probably you failed to clean your sources before updating. Try: ant clean
     </fail>
     <!-- OK, continue: -->
     <available property="have.javahelp" file="../apisupport.harness/external" type="dir"/>
-    <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.5" target="1.5">
+    <javac srcdir="ant/src" destdir="ant/build/classes" deprecation="true" debug="${build.compiler.debug}" source="1.5" target="1.5">
       <classpath refid="bootstrap-cp"/>
       <exclude name="**/CheckHelpSets.java" unless="have.javahelp"/>
       <exclude name="**/CheckHelpSetsBin.java" unless="have.javahelp"/>
       <compilerarg line="-Xlint -Xlint:-serial"/>
     </javac>
     <jar jarfile="nbantext.jar">
-      <fileset dir="build/antclasses"/>
-      <fileset dir="antsrc">
+      <fileset dir="ant/build/classes"/>
+      <fileset dir="ant/src">
         <exclude name="**/*.java"/>
         <exclude name="**/package.html"/>
         <exclude name="package-list"/>
@@ -1407,7 +1407,7 @@
     <!-- This step must be last: -->
     <echo message="Cleaning NetBeans-specific Ant extensions..."/>
     <delete file="nbantext.jar" quiet="true"/>
-    <delete dir="build/antclasses"/>
+    <delete dir="ant/build/classes"/>
   </target>
 
   <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
@@ -1486,40 +1486,8 @@
     </antcall>
   </target>
 
-    <target name="localtest" depends="bootstrap">
-        <mkdir dir="build/test/unit/classes"/>
-        <path id="test.cp">
-            <pathelement path="../libs.junit4/external/junit-4.5.jar:netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:${ant.core.lib}:nbantext.jar"/>
-        </path>
-        <javac srcdir="test/unit/src" destdir="build/test/unit/classes" debug="true" source="1.5">
-            <classpath refid="test.cp"/>
-            <compilerarg line="-Xlint -Xlint:-serial"/>
-        </javac>
-        <copy todir="build/test/unit/classes">
-            <fileset dir="test/unit/src" excludes="**/*.java"/>
-        </copy>
-        <mkdir dir="build/test/unit/results"/>
-        <property name="includes" value="**/*Test"/>
-        <junit showoutput="true" fork="true" tempdir="build/test/unit/results">
-            <batchtest todir="build/test/unit/results">
-                <fileset dir="build/test/unit/classes">
-                    <include name="${includes}.class"/>
-                </fileset>
-            </batchtest>
-            <classpath>
-                <pathelement location="build/test/unit/classes"/>
-                <path refid="test.cp"/>
-                <pathelement location="netbeans/harness/modules/org-netbeans-insane.jar"/>
-                <fileset dir="../o.apache.tools.ant.module/external/lib" includes="*.jar"/>
-            </classpath>
-            <sysproperty key="nb_all" file=".."/>
-            <sysproperty key="netbeans.dest.dir.work" file="${netbeans.dest.dir}"/>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-  <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
-      <fail>Not implemented</fail>
+  <target name="localtest">
+    <ant dir="ant" target="test"/>
   </target>
 
   <target name="clean-cluster" description="Clean only one cluster - takes clean.cluster.name as parameters">
@@ -1891,7 +1859,7 @@
           <fileset dir="testdist/release"/>
       </copy>
       <jar jarfile="${test.dist.dir}/tasks.jar">
-          <fileset dir="build/antclasses">
+          <fileset dir="ant/build/classes">
               <include name="org/netbeans/nbbuild/testdist/"/>
           </fileset>
       </jar>
diff --git a/nbbuild/nbproject/project.xml b/nbbuild/nbproject/project.xml
--- a/nbbuild/nbproject/project.xml
+++ b/nbbuild/nbproject/project.xml
@@ -53,18 +53,6 @@
                 <property name="nbjdk.home">${java.home}/..</property>
                 <property name="nbjdk.bootclasspath">${nbjdk.home}/jre/lib/rt.jar:${nbjdk.home}/Classes/classes.jar</property>
             </properties>
-            <folders>
-                <source-folder>
-                    <label>Ant Tasks</label>
-                    <type>java</type>
-                    <location>antsrc</location>
-                </source-folder>
-                <source-folder>
-                    <label>Tests for Ant Tasks</label>
-                    <type>java</type>
-                    <location>test/unit/src</location>
-                </source-folder>
-            </folders>
             <ide-actions>
                 <action name="build">
                     <target>bootstrap</target>
@@ -79,30 +67,6 @@
                 <action name="test">
                     <target>localtest</target>
                 </action>
-                <action name="test.single">
-                    <target>localtest</target>
-                    <context>
-                        <property>includes</property>
-                        <folder>test/unit/src</folder>
-                        <pattern>\.java$</pattern>
-                        <format>relative-path-noext</format>
-                        <arity>
-                            <one-file-only/>
-                        </arity>
-                    </context>
-                </action>
-                <action name="debug.test.single">
-                    <target>localtest-single-nb-debug</target>
-                    <context>
-                        <property>includes</property>
-                        <folder>test/unit/src</folder>
-                        <pattern>\.java$</pattern>
-                        <format>relative-path-noext</format>
-                        <arity>
-                            <one-file-only/>
-                        </arity>
-                    </context>
-                </action>
                 <action name="javadoc">
                     <target>bootstrap-javadoc</target>
                 </action>
@@ -113,21 +77,15 @@
                     <target>tryme-debug</target>
                 </action>
             </ide-actions>
-            <export>
-                <type>jar</type>
-                <location>nbantext.jar</location>
-                <script>${ant.script}</script>
-                <build-target>bootstrap</build-target>
-            </export>
             <view>
                 <items>
                     <source-folder style="packages">
                         <label>Ant Tasks</label>
-                        <location>antsrc</location>
+                        <location>ant/src</location>
                     </source-folder>
 		    <source-folder style="packages">
                         <label>Tests for Ant Tasks</label>
-                        <location>test/unit/src</location>
+                        <location>ant/test</location>
                     </source-folder>
                     <source-file>
                         <location>build.xml</location>
@@ -183,23 +141,5 @@
             </view>
             <project-license>cddl-netbeans-sun</project-license>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
-            <compilation-unit>
-                <package-root>antsrc</package-root>
-                <classpath mode="compile">${ant.core.lib}:${nb_all}/javahelp/external/jh-2.0_05.jar:${nb_all}/apisupport.harness/external/jsearch-2.0_05.jar</classpath>
-                <classpath mode="boot">${nbjdk.bootclasspath}</classpath>
-                <built-to>build/antclasses</built-to>
-                <built-to>nbantext.jar</built-to>
-                <source-level>1.5</source-level>
-            </compilation-unit>
-            <compilation-unit>
-                <package-root>test/unit/src</package-root>
-                <unit-tests/>
-                <classpath mode="compile">../libs.junit4/external/junit-4.5.jar:netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:${ant.core.lib}:nbantext.jar</classpath>
-                <classpath mode="boot">${nbjdk.bootclasspath}</classpath>
-                <built-to>build/test/unit/classes</built-to>
-                <source-level>1.5</source-level>
-            </compilation-unit>
-        </java-data>
     </configuration>
 </project>