This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 219651
Collapse All | Expand All

(-)a/apisupport.harness/release/build.xml (-10 / +8 lines)
Lines 212-230 Link Here
212 
        <property name="build.javahelp.dir" location="${build.dir}/javahelp"/>
 212 
        <property name="build.javahelp.dir" location="${build.dir}/javahelp"/>
213 
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
 213 
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
214 
        <property name="javahelp.search" value="JavaHelpSearch"/>
 214 
        <property name="javahelp.search" value="JavaHelpSearch"/>
215 
        <pathconvert property="retouche.javac.api.patterns" pathsep=",">
216 
            <path path="${cluster.path.final}"/>
217 
            <regexpmapper from="(.*)" to="\1/modules/ext/*javac*api*.jar"/>
218 
        </pathconvert>
219 
        <pathconvert property="retouche.javac.api">
 215 
        <pathconvert property="retouche.javac.api">
220 
            <files includes="${retouche.javac.api.patterns}"/>
 216 
            <pathfileset>
221 
        </pathconvert>
 217 
                <path path="${cluster.path.final}"/>
222 
        <pathconvert property="retouche.javac.impl.patterns" pathsep=",">
 218 
                <filename name="modules/ext/*javac*api*.jar"/>
223 
            <path path="${cluster.path.final}"/>
 219 
            </pathfileset>
224 
            <regexpmapper from="(.*)" to="\1/modules/ext/*javac*impl*.jar"/>
225 
        </pathconvert>
 220 
        </pathconvert>
226 
        <pathconvert property="retouche.javac.impl">
 221 
        <pathconvert property="retouche.javac.impl">
227 
            <files includes="${retouche.javac.impl.patterns}"/>
 222 
            <pathfileset>
223 
                <path path="${cluster.path.final}"/>
224 
                <filename name="modules/ext/*javac*impl*.jar"/>
225 
            </pathfileset>
228 
            <fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
 226 
            <fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
229 
                <include name="*.jar"/>
 227 
                <include name="*.jar"/>
230 
            </fileset>
 228 
            </fileset>
(-)a/nbbuild/templates/common.xml (-11 / +11 lines)
Lines 466-472 Link Here
466 
        <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
 466 
        <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
467 
            <isset property="bootclasspath.prepend"/>
 467 
            <isset property="bootclasspath.prepend"/>
468 
        </condition>
 468 
        </condition>
469 
        <property name="test.bootclasspath.prepend.args" value=""/>
 469 
        <property name="test.bootclasspath.prepend.args" value="-Dno.netbeans.bootclasspath.prepend.needed=true"/>
470 
        <macrodef name="test-init">
 470 
        <macrodef name="test-init">
471 
            <attribute name="test.type"/>
 471 
            <attribute name="test.type"/>
472 
            <sequential>
 472 
            <sequential>
Lines 674-680 Link Here
674 
                    </batchtest>
 674 
                    </batchtest>
675 
                    <classpath refid="test.@{test.type}.run.cp"/>
 675 
                    <classpath refid="test.@{test.type}.run.cp"/>
676 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 676 
                    <syspropertyset refid="test.@{test.type}.properties"/>
677 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 677 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
678 
                    <jvmarg line="${test.run.args}"/>
 678 
                    <jvmarg line="${test.run.args}"/>
679 
                    <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
 679 
                    <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
680 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
 680 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
Lines 702-708 Link Here
702 
                    <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="${test.includes}"/>
 702 
                    <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="${test.includes}"/>
703 
                    <propertyset refid="test.@{test.type}.properties"/>
 703 
                    <propertyset refid="test.@{test.type}.properties"/>
704 
                    <classpath refid="test.@{test.type}.run.cp"/>
 704 
                    <classpath refid="test.@{test.type}.run.cp"/>
705 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 705 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
706 
                    <jvmarg line="${test.run.args}"/>
 706 
                    <jvmarg line="${test.run.args}"/>
707 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
 707 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
708 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
 708 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
Lines 770-776 Link Here
770 
                    <classpath refid="test.@{test.type}.run.cp"/>
 770 
                    <classpath refid="test.@{test.type}.run.cp"/>
771 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 771 
                    <syspropertyset refid="test.@{test.type}.properties"/>
772 
                    <jvmarg line="${test.run.args}"/>
 772 
                    <jvmarg line="${test.run.args}"/>
773 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 773 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
774 
                    <jvmarg line="${run.args.ide}"/>
 774 
                    <jvmarg line="${run.args.ide}"/>
775 
                    <jvmarg line="${run.jvmargs.ide}"/>
 775 
                    <jvmarg line="${run.jvmargs.ide}"/>
776 
                    <formatter type="brief" usefile="false"/>
 776 
                    <formatter type="brief" usefile="false"/>
Lines 797-803 Link Here
797 
                >
 797 
                >
798 
                    <propertyset refid="test.@{test.type}.properties"/>
 798 
                    <propertyset refid="test.@{test.type}.properties"/>
799 
                    <classpath refid="test.@{test.type}.run.cp"/>
 799 
                    <classpath refid="test.@{test.type}.run.cp"/>
800 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 800 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
801 
                    <jvmarg line="${test.run.args}"/>
 801 
                    <jvmarg line="${test.run.args}"/>
802 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
 802 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
803 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
 803 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
Lines 847-853 Link Here
847 
                        <pathelement location="${ant.home}/lib/ant-junit.jar"/>
 847 
                        <pathelement location="${ant.home}/lib/ant-junit.jar"/>
848 
                        <pathelement location="${ant.home}/lib/ant-junit4.jar"/>
 848 
                        <pathelement location="${ant.home}/lib/ant-junit4.jar"/>
849 
                    </classpath>
 849 
                    </classpath>
850 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 850 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
851 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 851 
                    <syspropertyset refid="test.@{test.type}.properties"/>
852 
                    <arg value="${test.class}"/>
 852 
                    <arg value="${test.class}"/>
853 
                    <arg value="showoutput=true"/>
 853 
                    <arg value="showoutput=true"/>
Lines 875-881 Link Here
875 
                    <jvmarg value="-Xdebug"/>
 875 
                    <jvmarg value="-Xdebug"/>
876 
                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
 876 
                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
877 
                    <jvmarg line="${test.run.args}"/>
 877 
                    <jvmarg line="${test.run.args}"/>
878 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 878 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
879 
                    <classpath refid="test.@{test.type}.run.cp"/>
 879 
                    <classpath refid="test.@{test.type}.run.cp"/>
880 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 880 
                    <syspropertyset refid="test.@{test.type}.properties"/>
881 
                    <jvmarg value="-ea"/>
 881 
                    <jvmarg value="-ea"/>
Lines 892-898 Link Here
892 
                    <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="**/*Test.class"/>
 892 
                    <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="**/*Test.class"/>
893 
                    <propertyset refid="test.@{test.type}.properties"/>
 893 
                    <propertyset refid="test.@{test.type}.properties"/>
894 
                    <classpath refid="test.@{test.type}.run.cp"/>
 894 
                    <classpath refid="test.@{test.type}.run.cp"/>
895 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 895 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
896 
                    <jvmarg line="${test.run.args}"/>
 896 
                    <jvmarg line="${test.run.args}"/>
897 
                    <jvmarg value="-Xdebug"/>
 897 
                    <jvmarg value="-Xdebug"/>
898 
                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
 898 
                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
Lines 954-960 Link Here
954 
                    <classpath refid="test.@{test.type}.run.cp"/>
 954 
                    <classpath refid="test.@{test.type}.run.cp"/>
955 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 955 
                    <syspropertyset refid="test.@{test.type}.properties"/>
956 
                    <jvmarg line="${test.run.args}"/>
 956 
                    <jvmarg line="${test.run.args}"/>
957 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 957 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
958 
                    <jvmarg line="${run.jvmargs.ide}"/>
 958 
                    <jvmarg line="${run.jvmargs.ide}"/>
959 
                    <formatter type="brief" usefile="false"/>
 959 
                    <formatter type="brief" usefile="false"/>
960 
                    <formatter type="xml"/>
 960 
                    <formatter type="xml"/>
Lines 979-985 Link Here
979 
                >
 979 
                >
980 
                    <propertyset refid="test.@{test.type}.properties"/>
 980 
                    <propertyset refid="test.@{test.type}.properties"/>
981 
                    <classpath refid="test.@{test.type}.run.cp"/>
 981 
                    <classpath refid="test.@{test.type}.run.cp"/>
982 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 982 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
983 
                    <jvmarg line="${test.run.args}"/>
 983 
                    <jvmarg line="${test.run.args}"/>
984 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
 984 
                    <!-- needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
985 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
 985 
                    <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
Lines 1102-1108 Link Here
1102 
                    <jvmarg line="${profiler.info.jvmargs}"/>
 1102 
                    <jvmarg line="${profiler.info.jvmargs}"/>
1103 
                    <test name="${profile.class}" todir="${build.test.@{test.type}.results.dir}"/>
 1103 
                    <test name="${profile.class}" todir="${build.test.@{test.type}.results.dir}"/>
1104 
                    <classpath refid="test.@{test.type}.run.cp"/>
 1104 
                    <classpath refid="test.@{test.type}.run.cp"/>
1105 
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
 1105 
                    <jvmarg value="${test.bootclasspath.prepend.args}"/>
1106 
                    <syspropertyset refid="test.@{test.type}.properties"/>
 1106 
                    <syspropertyset refid="test.@{test.type}.properties"/>
1107 
                    <jvmarg line="${test.run.args}"/>
 1107 
                    <jvmarg line="${test.run.args}"/>
1108 
                    <formatter type="brief" usefile="false"/>
 1108 
                    <formatter type="brief" usefile="false"/>

Return to bug 219651