diff -r 739cbfb459b1 apisupport.harness/release/build.xml
--- a/apisupport.harness/release/build.xml	Mon Oct 22 14:24:57 2012 +0200
+++ b/apisupport.harness/release/build.xml	Mon Oct 22 16:08:13 2012 +0200
@@ -212,19 +212,17 @@
         <property name="build.javahelp.dir" location="${build.dir}/javahelp"/>
         <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
         <property name="javahelp.search" value="JavaHelpSearch"/>
-        <pathconvert property="retouche.javac.api.patterns" pathsep=",">
-            <path path="${cluster.path.final}"/>
-            <regexpmapper from="(.*)" to="\1/modules/ext/*javac*api*.jar"/>
-        </pathconvert>
         <pathconvert property="retouche.javac.api">
-            <files includes="${retouche.javac.api.patterns}"/>
-        </pathconvert>
-        <pathconvert property="retouche.javac.impl.patterns" pathsep=",">
-            <path path="${cluster.path.final}"/>
-            <regexpmapper from="(.*)" to="\1/modules/ext/*javac*impl*.jar"/>
+            <pathfileset>
+                <path path="${cluster.path.final}"/>
+                <filename name="modules/ext/*javac*api*.jar"/>
+            </pathfileset>
         </pathconvert>
         <pathconvert property="retouche.javac.impl">
-            <files includes="${retouche.javac.impl.patterns}"/>
+            <pathfileset>
+                <path path="${cluster.path.final}"/>
+                <filename name="modules/ext/*javac*impl*.jar"/>
+            </pathfileset>
             <fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
                 <include name="*.jar"/>
             </fileset>
diff -r 739cbfb459b1 nbbuild/templates/common.xml
--- a/nbbuild/templates/common.xml	Mon Oct 22 14:24:57 2012 +0200
+++ b/nbbuild/templates/common.xml	Mon Oct 22 16:08:13 2012 +0200
@@ -466,7 +466,7 @@
         <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
             <isset property="bootclasspath.prepend"/>
         </condition>
-        <property name="test.bootclasspath.prepend.args" value=""/>
+        <property name="test.bootclasspath.prepend.args" value="-Dno.netbeans.bootclasspath.prepend.needed=true"/>
         <macrodef name="test-init">
             <attribute name="test.type"/>
             <sequential>
@@ -674,7 +674,7 @@
                     </batchtest>
                     <classpath refid="test.@{test.type}.run.cp"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
                     <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
@@ -702,7 +702,7 @@
                     <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="${test.includes}"/>
                     <propertyset refid="test.@{test.type}.properties"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
                     <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
@@ -770,7 +770,7 @@
                     <classpath refid="test.@{test.type}.run.cp"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
                     <jvmarg line="${test.run.args}"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${run.args.ide}"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
                     <formatter type="brief" usefile="false"/>
@@ -797,7 +797,7 @@
                 >
                     <propertyset refid="test.@{test.type}.properties"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
                     <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
@@ -847,7 +847,7 @@
                         <pathelement location="${ant.home}/lib/ant-junit.jar"/>
                         <pathelement location="${ant.home}/lib/ant-junit4.jar"/>
                     </classpath>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
                     <arg value="${test.class}"/>
                     <arg value="showoutput=true"/>
@@ -875,7 +875,7 @@
                     <jvmarg value="-Xdebug"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
                     <jvmarg line="${test.run.args}"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
                     <jvmarg value="-ea"/>
@@ -892,7 +892,7 @@
                     <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="**/*Test.class"/>
                     <propertyset refid="test.@{test.type}.properties"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <jvmarg value="-Xdebug"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
@@ -954,7 +954,7 @@
                     <classpath refid="test.@{test.type}.run.cp"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
                     <jvmarg line="${test.run.args}"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
@@ -979,7 +979,7 @@
                 >
                     <propertyset refid="test.@{test.type}.properties"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
                     <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
@@ -1102,7 +1102,7 @@
                     <jvmarg line="${profiler.info.jvmargs}"/>
                     <test name="${profile.class}" todir="${build.test.@{test.type}.results.dir}"/>
                     <classpath refid="test.@{test.type}.run.cp"/>
-                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
                     <syspropertyset refid="test.@{test.type}.properties"/>
                     <jvmarg line="${test.run.args}"/>
                     <formatter type="brief" usefile="false"/>