1.1 --- a/samples/singletons/nbproject/build-impl.xml Wed Jan 27 18:30:57 2010 +0100
1.2 +++ b/samples/singletons/nbproject/build-impl.xml Mon Nov 11 13:17:34 2019 +0100
1.3 @@ -12,18 +12,18 @@
1.4 - execution
1.5 - debugging
1.6 - javadoc
1.7 - - junit compilation
1.8 - - junit execution
1.9 - - junit debugging
1.10 + - test compilation
1.11 + - test execution
1.12 + - test debugging
1.13 - applet
1.14 - cleanup
1.15
1.16 -->
1.17 -<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="singletons-impl">
1.18 - <fail message="Please build using Ant 1.7.1 or higher.">
1.19 +<project xmlns:if="ant:if" 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" xmlns:unless="ant:unless" basedir=".." default="default" name="singletons-impl">
1.20 + <fail message="Please build using Ant 1.8.0 or higher.">
1.21 <condition>
1.22 <not>
1.23 - <antversion atleast="1.7.1"/>
1.24 + <antversion atleast="1.8.0"/>
1.25 </not>
1.26 </condition>
1.27 </fail>
1.28 @@ -46,15 +46,89 @@
1.29 <property file="${user.properties.file}"/>
1.30 <!-- The two properties below are usually overridden -->
1.31 <!-- by the active platform. Just a fallback. -->
1.32 - <property name="default.javac.source" value="1.4"/>
1.33 - <property name="default.javac.target" value="1.4"/>
1.34 + <property name="default.javac.source" value="1.6"/>
1.35 + <property name="default.javac.target" value="1.6"/>
1.36 </target>
1.37 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.38 <property file="nbproject/configs/${config}.properties"/>
1.39 <property file="nbproject/project.properties"/>
1.40 </target>
1.41 - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.42 + <target name="-init-modules-supported">
1.43 + <condition property="modules.supported.internal" value="true">
1.44 + <not>
1.45 + <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
1.46 + </not>
1.47 + </condition>
1.48 + </target>
1.49 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
1.50 + <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
1.51 + <attribute name="property"/>
1.52 + <attribute name="sourcepath"/>
1.53 + <sequential>
1.54 + <loadresource property="@{property}" quiet="true">
1.55 + <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
1.56 + <filterchain>
1.57 + <stripjavacomments/>
1.58 + <linecontainsregexp>
1.59 + <regexp pattern="module .* \{"/>
1.60 + </linecontainsregexp>
1.61 + <tokenfilter>
1.62 + <linetokenizer/>
1.63 + <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
1.64 + </tokenfilter>
1.65 + <striplinebreaks/>
1.66 + </filterchain>
1.67 + </loadresource>
1.68 + </sequential>
1.69 + </macrodef>
1.70 + </target>
1.71 + <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
1.72 + <fail message="Java 9 support requires Ant 1.10.0 or higher.">
1.73 + <condition>
1.74 + <not>
1.75 + <antversion atleast="1.10.0"/>
1.76 + </not>
1.77 + </condition>
1.78 + </fail>
1.79 + <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
1.80 + <condition property="named.module.internal">
1.81 + <and>
1.82 + <isset property="module.name"/>
1.83 + <length length="0" string="${module.name}" when="greater"/>
1.84 + </and>
1.85 + </condition>
1.86 + <condition property="unnamed.module.internal">
1.87 + <not>
1.88 + <isset property="named.module.internal"/>
1.89 + </not>
1.90 + </condition>
1.91 + <property name="javac.modulepath" value=""/>
1.92 + <property name="run.modulepath" value="${javac.modulepath}"/>
1.93 + <property name="module.build.classes.dir" value="${build.classes.dir}"/>
1.94 + <property name="debug.modulepath" value="${run.modulepath}"/>
1.95 + <property name="javac.upgrademodulepath" value=""/>
1.96 + <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
1.97 + <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
1.98 + <and>
1.99 + <isset property="javac.systemmodulepath"/>
1.100 + <length length="0" string="${javac.systemmodulepath}" when="greater"/>
1.101 + </and>
1.102 + </condition>
1.103 + <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
1.104 + <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
1.105 + <property name="module.name" value=""/>
1.106 + </target>
1.107 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
1.108 + <property name="platform.java" value="${java.home}/bin/java"/>
1.109 <available file="${manifest.file}" property="manifest.available"/>
1.110 + <condition property="splashscreen.available">
1.111 + <and>
1.112 + <not>
1.113 + <equals arg1="${application.splash}" arg2="" trim="true"/>
1.114 + </not>
1.115 + <available file="${application.splash}"/>
1.116 + </and>
1.117 + </condition>
1.118 <condition property="main.class.available">
1.119 <and>
1.120 <isset property="main.class"/>
1.121 @@ -63,43 +137,46 @@
1.122 </not>
1.123 </and>
1.124 </condition>
1.125 - <condition property="manifest.available+main.class">
1.126 + <condition property="profile.available">
1.127 <and>
1.128 - <isset property="manifest.available"/>
1.129 - <isset property="main.class.available"/>
1.130 - </and>
1.131 - </condition>
1.132 - <condition property="do.mkdist">
1.133 - <and>
1.134 - <isset property="libs.CopyLibs.classpath"/>
1.135 + <isset property="javac.profile"/>
1.136 + <length length="0" string="${javac.profile}" when="greater"/>
1.137 <not>
1.138 - <istrue value="${mkdist.disabled}"/>
1.139 + <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
1.140 </not>
1.141 </and>
1.142 </condition>
1.143 - <condition property="manifest.available+main.class+mkdist.available">
1.144 + <condition property="do.archive">
1.145 + <or>
1.146 + <not>
1.147 + <istrue value="${jar.archive.disabled}"/>
1.148 + </not>
1.149 + <istrue value="${not.archive.disabled}"/>
1.150 + </or>
1.151 + </condition>
1.152 + <condition property="do.archive+manifest.available">
1.153 <and>
1.154 - <istrue value="${manifest.available+main.class}"/>
1.155 - <isset property="do.mkdist"/>
1.156 + <isset property="manifest.available"/>
1.157 + <istrue value="${do.archive}"/>
1.158 </and>
1.159 </condition>
1.160 - <condition property="manifest.available+mkdist.available">
1.161 + <condition property="do.archive+main.class.available">
1.162 <and>
1.163 - <istrue value="${manifest.available}"/>
1.164 - <isset property="do.mkdist"/>
1.165 + <isset property="main.class.available"/>
1.166 + <istrue value="${do.archive}"/>
1.167 </and>
1.168 </condition>
1.169 - <condition property="manifest.available-mkdist.available">
1.170 - <or>
1.171 - <istrue value="${manifest.available}"/>
1.172 - <isset property="do.mkdist"/>
1.173 - </or>
1.174 + <condition property="do.archive+splashscreen.available">
1.175 + <and>
1.176 + <isset property="splashscreen.available"/>
1.177 + <istrue value="${do.archive}"/>
1.178 + </and>
1.179 </condition>
1.180 - <condition property="manifest.available+main.class-mkdist.available">
1.181 - <or>
1.182 - <istrue value="${manifest.available+main.class}"/>
1.183 - <isset property="do.mkdist"/>
1.184 - </or>
1.185 + <condition property="do.archive+profile.available">
1.186 + <and>
1.187 + <isset property="profile.available"/>
1.188 + <istrue value="${do.archive}"/>
1.189 + </and>
1.190 </condition>
1.191 <condition property="have.tests">
1.192 <or>
1.193 @@ -124,6 +201,7 @@
1.194 </and>
1.195 </condition>
1.196 <property name="run.jvmargs" value=""/>
1.197 + <property name="run.jvmargs.ide" value=""/>
1.198 <property name="javac.compilerargs" value=""/>
1.199 <property name="work.dir" value="${basedir}"/>
1.200 <condition property="no.deps">
1.201 @@ -136,6 +214,7 @@
1.202 <property name="application.args" value=""/>
1.203 <property name="source.encoding" value="${file.encoding}"/>
1.204 <property name="runtime.encoding" value="${source.encoding}"/>
1.205 + <property name="manifest.encoding" value="${source.encoding}"/>
1.206 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.207 <and>
1.208 <isset property="javadoc.encoding"/>
1.209 @@ -153,9 +232,56 @@
1.210 </condition>
1.211 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
1.212 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
1.213 - <length length="0" string="${endorsed.classpath}" when="greater"/>
1.214 + <and>
1.215 + <isset property="endorsed.classpath"/>
1.216 + <not>
1.217 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
1.218 + </not>
1.219 + </and>
1.220 </condition>
1.221 - <property name="javac.fork" value="false"/>
1.222 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
1.223 + <isset property="profile.available"/>
1.224 + </condition>
1.225 + <condition else="false" property="jdkBug6558476">
1.226 + <and>
1.227 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
1.228 + <not>
1.229 + <os family="unix"/>
1.230 + </not>
1.231 + </and>
1.232 + </condition>
1.233 + <condition else="false" property="javac.fork">
1.234 + <or>
1.235 + <istrue value="${jdkBug6558476}"/>
1.236 + <istrue value="${javac.external.vm}"/>
1.237 + </or>
1.238 + </condition>
1.239 + <property name="jar.index" value="false"/>
1.240 + <property name="jar.index.metainf" value="${jar.index}"/>
1.241 + <property name="copylibs.rebase" value="true"/>
1.242 + <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
1.243 + <condition property="junit.available">
1.244 + <or>
1.245 + <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
1.246 + <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
1.247 + </or>
1.248 + </condition>
1.249 + <condition property="testng.available">
1.250 + <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
1.251 + </condition>
1.252 + <condition property="junit+testng.available">
1.253 + <and>
1.254 + <istrue value="${junit.available}"/>
1.255 + <istrue value="${testng.available}"/>
1.256 + </and>
1.257 + </condition>
1.258 + <condition else="testng" property="testng.mode" value="mixed">
1.259 + <istrue value="${junit+testng.available}"/>
1.260 + </condition>
1.261 + <condition else="" property="testng.debug.mode" value="-mixed">
1.262 + <istrue value="${junit+testng.available}"/>
1.263 + </condition>
1.264 + <property name="java.failonerror" value="true"/>
1.265 </target>
1.266 <target name="-post-init">
1.267 <!-- Empty placeholder for easier customization. -->
1.268 @@ -182,11 +308,125 @@
1.269 </sequential>
1.270 </macrodef>
1.271 </target>
1.272 - <target name="-init-macrodef-javac">
1.273 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
1.274 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.275 <attribute default="${src.dir}" name="srcdir"/>
1.276 <attribute default="${build.classes.dir}" name="destdir"/>
1.277 <attribute default="${javac.classpath}" name="classpath"/>
1.278 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.279 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.280 + <attribute default="${javac.processorpath}" name="processorpath"/>
1.281 + <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
1.282 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.283 + <attribute default="${includes}" name="includes"/>
1.284 + <attribute default="${excludes}" name="excludes"/>
1.285 + <attribute default="${javac.debug}" name="debug"/>
1.286 + <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
1.287 + <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
1.288 + <attribute default="${empty.dir}" name="gensrcdir"/>
1.289 + <element name="customize" optional="true"/>
1.290 + <sequential>
1.291 + <condition property="warn.excludes.internal">
1.292 + <and>
1.293 + <isset property="named.module.internal"/>
1.294 + <length length="0" string="@{excludes}" trim="true" when="greater"/>
1.295 + </and>
1.296 + </condition>
1.297 + <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
1.298 + <property location="${build.dir}/empty" name="empty.dir"/>
1.299 + <mkdir dir="${empty.dir}"/>
1.300 + <mkdir dir="@{apgeneratedsrcdir}"/>
1.301 + <condition property="processormodulepath.set">
1.302 + <resourcecount count="0" when="greater">
1.303 + <path>
1.304 + <pathelement path="@{processormodulepath}"/>
1.305 + </path>
1.306 + </resourcecount>
1.307 + </condition>
1.308 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
1.309 + <src>
1.310 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
1.311 + <include name="*"/>
1.312 + </dirset>
1.313 + </src>
1.314 + <classpath>
1.315 + <path path="@{classpath}"/>
1.316 + </classpath>
1.317 + <modulepath>
1.318 + <path path="@{modulepath}"/>
1.319 + </modulepath>
1.320 + <upgrademodulepath>
1.321 + <path path="@{upgrademodulepath}"/>
1.322 + </upgrademodulepath>
1.323 + <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
1.324 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.325 + <compilerarg line="${javac.compilerargs}"/>
1.326 + <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
1.327 + <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
1.328 + <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
1.329 + <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
1.330 + <compilerarg line="${ap.processors.internal}"/>
1.331 + <compilerarg line="${annotation.processing.processor.options}"/>
1.332 + <compilerarg value="-s"/>
1.333 + <compilerarg path="@{apgeneratedsrcdir}"/>
1.334 + <compilerarg line="${ap.proc.none.internal}"/>
1.335 + <customize/>
1.336 + </javac>
1.337 + </sequential>
1.338 + </macrodef>
1.339 + </target>
1.340 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
1.341 + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.342 + <attribute default="${src.dir}" name="srcdir"/>
1.343 + <attribute default="${build.classes.dir}" name="destdir"/>
1.344 + <attribute default="${javac.classpath}" name="classpath"/>
1.345 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.346 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.347 + <attribute default="${javac.processorpath}" name="processorpath"/>
1.348 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.349 + <attribute default="${includes}" name="includes"/>
1.350 + <attribute default="${excludes}" name="excludes"/>
1.351 + <attribute default="${javac.debug}" name="debug"/>
1.352 + <attribute default="${empty.dir}" name="sourcepath"/>
1.353 + <attribute default="${empty.dir}" name="gensrcdir"/>
1.354 + <element name="customize" optional="true"/>
1.355 + <sequential>
1.356 + <property location="${build.dir}/empty" name="empty.dir"/>
1.357 + <mkdir dir="${empty.dir}"/>
1.358 + <mkdir dir="@{apgeneratedsrcdir}"/>
1.359 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
1.360 + <src>
1.361 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
1.362 + <include name="*"/>
1.363 + </dirset>
1.364 + </src>
1.365 + <classpath>
1.366 + <path path="@{classpath}"/>
1.367 + </classpath>
1.368 + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.369 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.370 + <compilerarg line="${javac.compilerargs}"/>
1.371 + <compilerarg value="-processorpath"/>
1.372 + <compilerarg path="@{processorpath}:${empty.dir}"/>
1.373 + <compilerarg line="${ap.processors.internal}"/>
1.374 + <compilerarg line="${annotation.processing.processor.options}"/>
1.375 + <compilerarg value="-s"/>
1.376 + <compilerarg path="@{apgeneratedsrcdir}"/>
1.377 + <compilerarg line="${ap.proc.none.internal}"/>
1.378 + <customize/>
1.379 + </javac>
1.380 + </sequential>
1.381 + </macrodef>
1.382 + </target>
1.383 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
1.384 + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.385 + <attribute default="${src.dir}" name="srcdir"/>
1.386 + <attribute default="${build.classes.dir}" name="destdir"/>
1.387 + <attribute default="${javac.classpath}" name="classpath"/>
1.388 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.389 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.390 + <attribute default="${javac.processorpath}" name="processorpath"/>
1.391 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.392 <attribute default="${includes}" name="includes"/>
1.393 <attribute default="${excludes}" name="excludes"/>
1.394 <attribute default="${javac.debug}" name="debug"/>
1.395 @@ -206,11 +446,14 @@
1.396 <path path="@{classpath}"/>
1.397 </classpath>
1.398 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.399 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.400 <compilerarg line="${javac.compilerargs}"/>
1.401 <customize/>
1.402 </javac>
1.403 </sequential>
1.404 </macrodef>
1.405 + </target>
1.406 + <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
1.407 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
1.408 <attribute default="${src.dir}" name="srcdir"/>
1.409 <attribute default="${build.classes.dir}" name="destdir"/>
1.410 @@ -227,52 +470,383 @@
1.411 <attribute default="${build.classes.dir}" name="destdir"/>
1.412 <sequential>
1.413 <fail unless="javac.includes">Must set javac.includes</fail>
1.414 - <pathconvert pathsep="," property="javac.includes.binary">
1.415 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
1.416 <path>
1.417 <filelist dir="@{destdir}" files="${javac.includes}"/>
1.418 </path>
1.419 <globmapper from="*.java" to="*.class"/>
1.420 </pathconvert>
1.421 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
1.422 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
1.423 <delete>
1.424 - <files includes="${javac.includes.binary}"/>
1.425 + <files includesfile="${javac.includesfile.binary}"/>
1.426 + </delete>
1.427 + <delete>
1.428 + <fileset file="${javac.includesfile.binary}"/>
1.429 </delete>
1.430 </sequential>
1.431 </macrodef>
1.432 </target>
1.433 - <target name="-init-macrodef-junit">
1.434 + <target if="${junit.available}" name="-init-macrodef-junit-init">
1.435 + <condition else="false" property="nb.junit.batch" value="true">
1.436 + <and>
1.437 + <istrue value="${junit.available}"/>
1.438 + <not>
1.439 + <isset property="test.method"/>
1.440 + </not>
1.441 + </and>
1.442 + </condition>
1.443 + <condition else="false" property="nb.junit.single" value="true">
1.444 + <and>
1.445 + <istrue value="${junit.available}"/>
1.446 + <isset property="test.method"/>
1.447 + </and>
1.448 + </condition>
1.449 + </target>
1.450 + <target name="-init-test-properties">
1.451 + <property name="test.binaryincludes" value="<nothing>"/>
1.452 + <property name="test.binarytestincludes" value=""/>
1.453 + <property name="test.binaryexcludes" value=""/>
1.454 + </target>
1.455 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
1.456 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
1.457 + <attribute default="${includes}" name="includes"/>
1.458 + <attribute default="${excludes}" name="excludes"/>
1.459 + <element name="customizePrototype" optional="true"/>
1.460 + <sequential>
1.461 + <property name="junit.forkmode" value="perTest"/>
1.462 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.463 + <syspropertyset>
1.464 + <propertyref prefix="test-sys-prop."/>
1.465 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.466 + </syspropertyset>
1.467 + <classpath>
1.468 + <path path="${run.test.classpath}"/>
1.469 + </classpath>
1.470 + <modulepath>
1.471 + <path path="${run.test.modulepath}"/>
1.472 + </modulepath>
1.473 + <formatter type="brief" usefile="false"/>
1.474 + <formatter type="xml"/>
1.475 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.476 + <jvmarg value="-ea"/>
1.477 + <jvmarg line="${run.test.jvmargs}"/>
1.478 + <customizePrototype/>
1.479 + </junit>
1.480 + </sequential>
1.481 + </macrodef>
1.482 + </target>
1.483 + <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
1.484 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
1.485 + <attribute default="${includes}" name="includes"/>
1.486 + <attribute default="${excludes}" name="excludes"/>
1.487 + <element name="customizePrototype" optional="true"/>
1.488 + <sequential>
1.489 + <property name="junit.forkmode" value="perTest"/>
1.490 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.491 + <syspropertyset>
1.492 + <propertyref prefix="test-sys-prop."/>
1.493 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.494 + </syspropertyset>
1.495 + <classpath>
1.496 + <path path="${run.test.classpath}"/>
1.497 + </classpath>
1.498 + <formatter type="brief" usefile="false"/>
1.499 + <formatter type="xml"/>
1.500 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.501 + <jvmarg value="-ea"/>
1.502 + <customizePrototype/>
1.503 + </junit>
1.504 + </sequential>
1.505 + </macrodef>
1.506 + </target>
1.507 + <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
1.508 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.509 <attribute default="${includes}" name="includes"/>
1.510 <attribute default="${excludes}" name="excludes"/>
1.511 <attribute default="**" name="testincludes"/>
1.512 + <attribute default="" name="testmethods"/>
1.513 + <element name="customize" optional="true"/>
1.514 <sequential>
1.515 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
1.516 - <batchtest todir="${build.test.results.dir}">
1.517 - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.518 - <filename name="@{testincludes}"/>
1.519 - </fileset>
1.520 - </batchtest>
1.521 + <j2seproject3:junit-prototype>
1.522 + <customizePrototype>
1.523 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.524 + <customize/>
1.525 + </customizePrototype>
1.526 + </j2seproject3:junit-prototype>
1.527 + </sequential>
1.528 + </macrodef>
1.529 + </target>
1.530 + <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
1.531 + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.532 + <attribute default="${includes}" name="includes"/>
1.533 + <attribute default="${excludes}" name="excludes"/>
1.534 + <attribute default="**" name="testincludes"/>
1.535 + <attribute default="" name="testmethods"/>
1.536 + <element name="customize" optional="true"/>
1.537 + <sequential>
1.538 + <j2seproject3:junit-prototype>
1.539 + <customizePrototype>
1.540 + <batchtest todir="${build.test.results.dir}">
1.541 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.542 + <filename name="@{testincludes}"/>
1.543 + </fileset>
1.544 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
1.545 + <filename name="${test.binarytestincludes}"/>
1.546 + </fileset>
1.547 + </batchtest>
1.548 + <customize/>
1.549 + </customizePrototype>
1.550 + </j2seproject3:junit-prototype>
1.551 + </sequential>
1.552 + </macrodef>
1.553 + </target>
1.554 + <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
1.555 + <target if="${testng.available}" name="-init-macrodef-testng">
1.556 + <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
1.557 + <attribute default="${includes}" name="includes"/>
1.558 + <attribute default="${excludes}" name="excludes"/>
1.559 + <attribute default="**" name="testincludes"/>
1.560 + <attribute default="" name="testmethods"/>
1.561 + <element name="customize" optional="true"/>
1.562 + <sequential>
1.563 + <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
1.564 + <isset property="test.method"/>
1.565 + </condition>
1.566 + <union id="test.set">
1.567 + <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
1.568 + <filename name="@{testincludes}"/>
1.569 + </fileset>
1.570 + </union>
1.571 + <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
1.572 + <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="singletons" testname="TestNG tests" workingDir="${work.dir}">
1.573 + <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
1.574 + <propertyset>
1.575 + <propertyref prefix="test-sys-prop."/>
1.576 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.577 + </propertyset>
1.578 <classpath>
1.579 <path path="${run.test.classpath}"/>
1.580 </classpath>
1.581 - <syspropertyset>
1.582 - <propertyref prefix="test-sys-prop."/>
1.583 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.584 - </syspropertyset>
1.585 - <formatter type="brief" usefile="false"/>
1.586 - <formatter type="xml"/>
1.587 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.588 - <jvmarg line="${run.jvmargs}"/>
1.589 - </junit>
1.590 + <customize/>
1.591 + </testng>
1.592 </sequential>
1.593 </macrodef>
1.594 </target>
1.595 + <target name="-init-macrodef-test-impl">
1.596 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.597 + <attribute default="${includes}" name="includes"/>
1.598 + <attribute default="${excludes}" name="excludes"/>
1.599 + <attribute default="**" name="testincludes"/>
1.600 + <attribute default="" name="testmethods"/>
1.601 + <element implicit="true" name="customize" optional="true"/>
1.602 + <sequential>
1.603 + <echo>No tests executed.</echo>
1.604 + </sequential>
1.605 + </macrodef>
1.606 + </target>
1.607 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
1.608 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.609 + <attribute default="${includes}" name="includes"/>
1.610 + <attribute default="${excludes}" name="excludes"/>
1.611 + <attribute default="**" name="testincludes"/>
1.612 + <attribute default="" name="testmethods"/>
1.613 + <element implicit="true" name="customize" optional="true"/>
1.614 + <sequential>
1.615 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.616 + <customize/>
1.617 + </j2seproject3:junit>
1.618 + </sequential>
1.619 + </macrodef>
1.620 + </target>
1.621 + <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
1.622 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.623 + <attribute default="${includes}" name="includes"/>
1.624 + <attribute default="${excludes}" name="excludes"/>
1.625 + <attribute default="**" name="testincludes"/>
1.626 + <attribute default="" name="testmethods"/>
1.627 + <element implicit="true" name="customize" optional="true"/>
1.628 + <sequential>
1.629 + <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.630 + <customize/>
1.631 + </j2seproject3:testng>
1.632 + </sequential>
1.633 + </macrodef>
1.634 + </target>
1.635 + <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
1.636 + <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
1.637 + <attribute default="${includes}" name="includes"/>
1.638 + <attribute default="${excludes}" name="excludes"/>
1.639 + <attribute default="**" name="testincludes"/>
1.640 + <attribute default="" name="testmethods"/>
1.641 + <sequential>
1.642 + <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.643 + <customize>
1.644 + <jvmarg line="${run.jvmargs}"/>
1.645 + <jvmarg line="${run.jvmargs.ide}"/>
1.646 + </customize>
1.647 + </j2seproject3:test-impl>
1.648 + </sequential>
1.649 + </macrodef>
1.650 + </target>
1.651 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
1.652 + <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.653 + <attribute default="${includes}" name="includes"/>
1.654 + <attribute default="${excludes}" name="excludes"/>
1.655 + <attribute default="**" name="testincludes"/>
1.656 + <attribute default="" name="testmethods"/>
1.657 + <element name="customizeDebuggee" optional="true"/>
1.658 + <sequential>
1.659 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.660 + <customize>
1.661 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.662 + <customizeDebuggee/>
1.663 + </customize>
1.664 + </j2seproject3:junit>
1.665 + </sequential>
1.666 + </macrodef>
1.667 + </target>
1.668 + <target if="${testng.available}" name="-init-macrodef-testng-debug">
1.669 + <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.670 + <attribute default="${main.class}" name="testClass"/>
1.671 + <attribute default="" name="testMethod"/>
1.672 + <element name="customize2" optional="true"/>
1.673 + <sequential>
1.674 + <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
1.675 + <isset property="test.method"/>
1.676 + </condition>
1.677 + <condition else="-suitename singletons -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
1.678 + <matches pattern=".*\.xml" string="@{testClass}"/>
1.679 + </condition>
1.680 + <delete dir="${build.test.results.dir}" quiet="true"/>
1.681 + <mkdir dir="${build.test.results.dir}"/>
1.682 + <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
1.683 + <customizeDebuggee>
1.684 + <customize2/>
1.685 + <jvmarg value="-ea"/>
1.686 + <arg line="${testng.debug.mode}"/>
1.687 + <arg line="-d ${build.test.results.dir}"/>
1.688 + <arg line="-listener org.testng.reporters.VerboseReporter"/>
1.689 + <arg line="${testng.cmd.args}"/>
1.690 + </customizeDebuggee>
1.691 + </j2seproject3:debug>
1.692 + </sequential>
1.693 + </macrodef>
1.694 + </target>
1.695 + <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
1.696 + <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.697 + <attribute default="${main.class}" name="testClass"/>
1.698 + <attribute default="" name="testMethod"/>
1.699 + <element implicit="true" name="customize2" optional="true"/>
1.700 + <sequential>
1.701 + <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
1.702 + <customize2/>
1.703 + </j2seproject3:testng-debug>
1.704 + </sequential>
1.705 + </macrodef>
1.706 + </target>
1.707 + <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
1.708 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.709 + <attribute default="${includes}" name="includes"/>
1.710 + <attribute default="${excludes}" name="excludes"/>
1.711 + <attribute default="**" name="testincludes"/>
1.712 + <attribute default="" name="testmethods"/>
1.713 + <attribute default="${main.class}" name="testClass"/>
1.714 + <attribute default="" name="testMethod"/>
1.715 + <sequential>
1.716 + <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.717 + <customizeDebuggee>
1.718 + <jvmarg line="${run.jvmargs}"/>
1.719 + <jvmarg line="${run.jvmargs.ide}"/>
1.720 + </customizeDebuggee>
1.721 + </j2seproject3:test-debug-impl>
1.722 + </sequential>
1.723 + </macrodef>
1.724 + </target>
1.725 + <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
1.726 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.727 + <attribute default="${includes}" name="includes"/>
1.728 + <attribute default="${excludes}" name="excludes"/>
1.729 + <attribute default="**" name="testincludes"/>
1.730 + <attribute default="" name="testmethods"/>
1.731 + <attribute default="${main.class}" name="testClass"/>
1.732 + <attribute default="" name="testMethod"/>
1.733 + <sequential>
1.734 + <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
1.735 + <customize2>
1.736 + <syspropertyset>
1.737 + <propertyref prefix="test-sys-prop."/>
1.738 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.739 + </syspropertyset>
1.740 + </customize2>
1.741 + </j2seproject3:testng-debug-impl>
1.742 + </sequential>
1.743 + </macrodef>
1.744 + </target>
1.745 + <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
1.746 + <!--
1.747 + pre NB7.2 profiling section; consider it deprecated
1.748 + -->
1.749 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
1.750 + <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
1.751 + <!-- Empty placeholder for easier customization. -->
1.752 + <!-- You can override this target in the ../build.xml file. -->
1.753 + </target>
1.754 + <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
1.755 + <!-- Empty placeholder for easier customization. -->
1.756 + <!-- You can override this target in the ../build.xml file. -->
1.757 + </target>
1.758 + <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
1.759 + <macrodef name="resolve">
1.760 + <attribute name="name"/>
1.761 + <attribute name="value"/>
1.762 + <sequential>
1.763 + <property name="@{name}" value="${env.@{value}}"/>
1.764 + </sequential>
1.765 + </macrodef>
1.766 + <macrodef name="profile">
1.767 + <attribute default="${main.class}" name="classname"/>
1.768 + <element name="customize" optional="true"/>
1.769 + <sequential>
1.770 + <property environment="env"/>
1.771 + <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.772 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
1.773 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.774 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.775 + <jvmarg line="${profiler.info.jvmargs}"/>
1.776 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.777 + <arg line="${application.args}"/>
1.778 + <classpath>
1.779 + <path path="${run.classpath}"/>
1.780 + </classpath>
1.781 + <syspropertyset>
1.782 + <propertyref prefix="run-sys-prop."/>
1.783 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.784 + </syspropertyset>
1.785 + <customize/>
1.786 + </java>
1.787 + </sequential>
1.788 + </macrodef>
1.789 + </target>
1.790 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
1.791 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
1.792 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
1.793 + </target>
1.794 + <!--
1.795 + end of pre NB7.2 profiling section
1.796 + -->
1.797 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
1.798 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
1.799 <attribute default="${main.class}" name="name"/>
1.800 + <attribute default="${debug.modulepath}" name="modulepath"/>
1.801 <attribute default="${debug.classpath}" name="classpath"/>
1.802 <attribute default="" name="stopclassname"/>
1.803 <sequential>
1.804 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
1.805 + <modulepath>
1.806 + <path path="@{modulepath}"/>
1.807 + </modulepath>
1.808 <classpath>
1.809 <path path="@{classpath}"/>
1.810 </classpath>
1.811 @@ -291,18 +865,6 @@
1.812 </macrodef>
1.813 </target>
1.814 <target name="-init-debug-args">
1.815 - <property name="version-output" value="java version "${ant.java.version}"/>
1.816 - <condition property="have-jdk-older-than-1.4">
1.817 - <or>
1.818 - <contains string="${version-output}" substring="java version "1.0"/>
1.819 - <contains string="${version-output}" substring="java version "1.1"/>
1.820 - <contains string="${version-output}" substring="java version "1.2"/>
1.821 - <contains string="${version-output}" substring="java version "1.3"/>
1.822 - </or>
1.823 - </condition>
1.824 - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
1.825 - <istrue value="${have-jdk-older-than-1.4}"/>
1.826 - </condition>
1.827 <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
1.828 <os family="windows"/>
1.829 </condition>
1.830 @@ -312,17 +874,103 @@
1.831 </target>
1.832 <target depends="-init-debug-args" name="-init-macrodef-debug">
1.833 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.834 + <attribute default="${module.name}" name="modulename"/>
1.835 <attribute default="${main.class}" name="classname"/>
1.836 + <attribute default="${debug.modulepath}" name="modulepath"/>
1.837 <attribute default="${debug.classpath}" name="classpath"/>
1.838 + <element name="customizeDebuggee" optional="true"/>
1.839 + <sequential>
1.840 + <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
1.841 + <customize>
1.842 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.843 + <customizeDebuggee/>
1.844 + </customize>
1.845 + </j2seproject1:java>
1.846 + </sequential>
1.847 + </macrodef>
1.848 + </target>
1.849 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
1.850 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.851 + <attribute default="${module.name}" name="modulename"/>
1.852 + <attribute default="${main.class}" name="classname"/>
1.853 + <attribute default="${run.modulepath}" name="modulepath"/>
1.854 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
1.855 + <attribute default="${run.classpath}" name="classpath"/>
1.856 + <attribute default="jvm" name="jvm"/>
1.857 <element name="customize" optional="true"/>
1.858 <sequential>
1.859 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.860 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.861 - <jvmarg line="${debug-args-line}"/>
1.862 - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.863 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
1.864 + <classpath>
1.865 + <path path="@{classpath}"/>
1.866 + </classpath>
1.867 + <modulepath>
1.868 + <pathelement path="@{modulepath}"/>
1.869 + <pathelement location="${module.build.classes.dir}"/>
1.870 + </modulepath>
1.871 + <upgrademodulepath>
1.872 + <path path="@{upgrademodulepath}"/>
1.873 + </upgrademodulepath>
1.874 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.875 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.876 <jvmarg line="${run.jvmargs}"/>
1.877 + <jvmarg line="${run.jvmargs.ide}"/>
1.878 + <syspropertyset>
1.879 + <propertyref prefix="run-sys-prop."/>
1.880 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.881 + </syspropertyset>
1.882 + <customize/>
1.883 + </java>
1.884 + </sequential>
1.885 + </macrodef>
1.886 + </target>
1.887 + <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
1.888 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.889 + <attribute default="" name="modulename"/>
1.890 + <attribute default="${main.class}" name="classname"/>
1.891 + <attribute default="${run.modulepath}" name="modulepath"/>
1.892 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
1.893 + <attribute default="${run.classpath}" name="classpath"/>
1.894 + <attribute default="jvm" name="jvm"/>
1.895 + <element name="customize" optional="true"/>
1.896 + <sequential>
1.897 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.898 + <classpath>
1.899 + <path path="@{classpath}"/>
1.900 + </classpath>
1.901 + <modulepath>
1.902 + <path path="@{modulepath}"/>
1.903 + </modulepath>
1.904 + <upgrademodulepath>
1.905 + <path path="@{upgrademodulepath}"/>
1.906 + </upgrademodulepath>
1.907 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.908 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.909 + <jvmarg line="${run.jvmargs}"/>
1.910 + <jvmarg line="${run.jvmargs.ide}"/>
1.911 + <syspropertyset>
1.912 + <propertyref prefix="run-sys-prop."/>
1.913 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.914 + </syspropertyset>
1.915 + <customize/>
1.916 + </java>
1.917 + </sequential>
1.918 + </macrodef>
1.919 + </target>
1.920 + <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
1.921 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.922 + <attribute default="" name="modulename"/>
1.923 + <attribute default="${main.class}" name="classname"/>
1.924 + <attribute default="" name="modulepath"/>
1.925 + <attribute default="${run.classpath}" name="classpath"/>
1.926 + <attribute default="jvm" name="jvm"/>
1.927 + <element name="customize" optional="true"/>
1.928 + <sequential>
1.929 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.930 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.931 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.932 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.933 + <jvmarg line="${run.jvmargs}"/>
1.934 + <jvmarg line="${run.jvmargs.ide}"/>
1.935 <classpath>
1.936 <path path="@{classpath}"/>
1.937 </classpath>
1.938 @@ -335,37 +983,70 @@
1.939 </sequential>
1.940 </macrodef>
1.941 </target>
1.942 - <target name="-init-macrodef-java">
1.943 - <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.944 - <attribute default="${main.class}" name="classname"/>
1.945 - <attribute default="${run.classpath}" name="classpath"/>
1.946 + <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
1.947 + <target name="-init-macrodef-copylibs">
1.948 + <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
1.949 + <attribute default="${manifest.file}" name="manifest"/>
1.950 <element name="customize" optional="true"/>
1.951 <sequential>
1.952 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.953 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.954 - <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.955 - <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.956 - <jvmarg line="${run.jvmargs}"/>
1.957 - <classpath>
1.958 - <path path="@{classpath}"/>
1.959 - </classpath>
1.960 - <syspropertyset>
1.961 - <propertyref prefix="run-sys-prop."/>
1.962 - <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.963 - </syspropertyset>
1.964 - <customize/>
1.965 - </java>
1.966 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.967 + <pathconvert property="run.classpath.without.build.classes.dir">
1.968 + <path path="${run.classpath}"/>
1.969 + <map from="${build.classes.dir.resolved}" to=""/>
1.970 + </pathconvert>
1.971 + <pathconvert pathsep=" " property="jar.classpath">
1.972 + <path path="${run.classpath.without.build.classes.dir}"/>
1.973 + <chainedmapper>
1.974 + <flattenmapper/>
1.975 + <filtermapper>
1.976 + <replacestring from=" " to="%20"/>
1.977 + </filtermapper>
1.978 + <globmapper from="*" to="lib/*"/>
1.979 + </chainedmapper>
1.980 + </pathconvert>
1.981 + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.982 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.983 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.984 + <manifest>
1.985 + <attribute name="Class-Path" value="${jar.classpath}"/>
1.986 + <customize/>
1.987 + </manifest>
1.988 + </copylibs>
1.989 </sequential>
1.990 </macrodef>
1.991 </target>
1.992 <target name="-init-presetdef-jar">
1.993 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.994 - <jar compress="${jar.compress}" jarfile="${dist.jar}">
1.995 - <j2seproject1:fileset dir="${build.classes.dir}"/>
1.996 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
1.997 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.998 </jar>
1.999 </presetdef>
1.1000 </target>
1.1001 - <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"/>
1.1002 + <target name="-init-ap-cmdline-properties">
1.1003 + <property name="annotation.processing.enabled" value="true"/>
1.1004 + <property name="annotation.processing.processors.list" value=""/>
1.1005 + <property name="annotation.processing.processor.options" value=""/>
1.1006 + <property name="annotation.processing.run.all.processors" value="true"/>
1.1007 + <property name="javac.processorpath" value="${javac.classpath}"/>
1.1008 + <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
1.1009 + <condition property="ap.supported.internal" value="true">
1.1010 + <not>
1.1011 + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
1.1012 + </not>
1.1013 + </condition>
1.1014 + </target>
1.1015 + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
1.1016 + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
1.1017 + <isfalse value="${annotation.processing.run.all.processors}"/>
1.1018 + </condition>
1.1019 + <condition else="" property="ap.proc.none.internal" value="-proc:none">
1.1020 + <isfalse value="${annotation.processing.enabled}"/>
1.1021 + </condition>
1.1022 + </target>
1.1023 + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
1.1024 + <property name="ap.cmd.line.internal" value=""/>
1.1025 + </target>
1.1026 + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
1.1027 <!--
1.1028 ===================
1.1029 COMPILATION SECTION
1.1030 @@ -392,7 +1073,9 @@
1.1031 <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
1.1032 </target>
1.1033 <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
1.1034 - <antcall target="clean"/>
1.1035 + <antcall target="clean">
1.1036 + <param name="no.dependencies" value="true"/>
1.1037 + </antcall>
1.1038 </target>
1.1039 <target depends="init,deps-jar" name="-pre-pre-compile">
1.1040 <mkdir dir="${build.classes.dir}"/>
1.1041 @@ -409,12 +1092,18 @@
1.1042 </pathconvert>
1.1043 <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
1.1044 </target>
1.1045 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
1.1046 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
1.1047 <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
1.1048 <copy todir="${build.classes.dir}">
1.1049 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.1050 </copy>
1.1051 </target>
1.1052 + <target if="has.persistence.xml" name="-copy-persistence-xml">
1.1053 + <mkdir dir="${build.classes.dir}/META-INF"/>
1.1054 + <copy todir="${build.classes.dir}/META-INF">
1.1055 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
1.1056 + </copy>
1.1057 + </target>
1.1058 <target name="-post-compile">
1.1059 <!-- Empty placeholder for easier customization. -->
1.1060 <!-- You can override this target in the ../build.xml file. -->
1.1061 @@ -427,7 +1116,7 @@
1.1062 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.1063 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.1064 <j2seproject3:force-recompile/>
1.1065 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.1066 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
1.1067 </target>
1.1068 <target name="-post-compile-single">
1.1069 <!-- Empty placeholder for easier customization. -->
1.1070 @@ -447,99 +1136,191 @@
1.1071 <!-- Empty placeholder for easier customization. -->
1.1072 <!-- You can override this target in the ../build.xml file. -->
1.1073 </target>
1.1074 - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
1.1075 - <j2seproject1:jar/>
1.1076 + <target depends="init,compile" name="-check-module-main-class">
1.1077 + <pathconvert property="main.class.file">
1.1078 + <string value="${main.class}"/>
1.1079 + <unpackagemapper from="*" to="*.class"/>
1.1080 + </pathconvert>
1.1081 + <condition property="do.module.main.class">
1.1082 + <and>
1.1083 + <isset property="main.class.available"/>
1.1084 + <available file="${build.classes.dir}/module-info.class"/>
1.1085 + <available file="${build.classes.dir}/${main.class.file}"/>
1.1086 + <isset property="libs.CopyLibs.classpath"/>
1.1087 + <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
1.1088 + </and>
1.1089 + </condition>
1.1090 </target>
1.1091 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
1.1092 - <j2seproject1:jar manifest="${manifest.file}"/>
1.1093 + <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
1.1094 + <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
1.1095 + <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
1.1096 </target>
1.1097 - <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">
1.1098 - <j2seproject1:jar manifest="${manifest.file}">
1.1099 - <j2seproject1:manifest>
1.1100 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1.1101 - </j2seproject1:manifest>
1.1102 - </j2seproject1:jar>
1.1103 - <echo>To run this application from the command line without Ant, try:</echo>
1.1104 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
1.1105 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.1106 + <touch file="${tmp.manifest.file}" verbose="false"/>
1.1107 + </target>
1.1108 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.1109 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.1110 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
1.1111 + </target>
1.1112 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.1113 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.1114 + <attribute name="Main-Class" value="${main.class}"/>
1.1115 + </manifest>
1.1116 + </target>
1.1117 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.1118 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.1119 + <attribute name="Profile" value="${javac.profile}"/>
1.1120 + </manifest>
1.1121 + </target>
1.1122 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
1.1123 + <basename file="${application.splash}" property="splashscreen.basename"/>
1.1124 + <mkdir dir="${build.classes.dir}/META-INF"/>
1.1125 + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.1126 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.1127 + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.1128 + </manifest>
1.1129 + </target>
1.1130 + <target depends="init,compile" name="-check-do-mkdist">
1.1131 + <condition property="do.mkdist">
1.1132 + <and>
1.1133 + <isset property="do.archive"/>
1.1134 + <isset property="libs.CopyLibs.classpath"/>
1.1135 + <not>
1.1136 + <istrue value="${mkdist.disabled}"/>
1.1137 + </not>
1.1138 + <not>
1.1139 + <available file="${build.classes.dir}/module-info.class"/>
1.1140 + </not>
1.1141 + </and>
1.1142 + </condition>
1.1143 + </target>
1.1144 + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
1.1145 + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
1.1146 + <echo level="info">To run this application from the command line without Ant, try:</echo>
1.1147 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.1148 + <echo level="info">java -jar "${dist.jar.resolved}"</echo>
1.1149 + </target>
1.1150 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
1.1151 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
1.1152 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.1153 <property location="${dist.jar}" name="dist.jar.resolved"/>
1.1154 + <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
1.1155 + <isset property="named.module.internal"/>
1.1156 + </condition>
1.1157 <pathconvert property="run.classpath.with.dist.jar">
1.1158 <path path="${run.classpath}"/>
1.1159 + <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
1.1160 + </pathconvert>
1.1161 + <pathconvert property="run.modulepath.with.dist.jar">
1.1162 + <path location="${dist.jar.resolved}"/>
1.1163 + <path path="${run.modulepath}"/>
1.1164 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.1165 </pathconvert>
1.1166 - <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.1167 + <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
1.1168 + <isset property="named.module.internal"/>
1.1169 + </condition>
1.1170 + <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
1.1171 + <and>
1.1172 + <isset property="modules.supported.internal"/>
1.1173 + <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
1.1174 + </and>
1.1175 + </condition>
1.1176 + <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
1.1177 + <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
1.1178 + </condition>
1.1179 + <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
1.1180 + <isset property="do.module.main.class"/>
1.1181 + </condition>
1.1182 + <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
1.1183 + <isset property="named.module.internal"/>
1.1184 + </condition>
1.1185 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
1.1186 + <isset property="main.class.available"/>
1.1187 + </condition>
1.1188 + <condition else="debug" property="jar.usage.level" value="info">
1.1189 + <isset property="main.class.available"/>
1.1190 + </condition>
1.1191 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1.1192 </target>
1.1193 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
1.1194 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.1195 - <pathconvert property="run.classpath.without.build.classes.dir">
1.1196 - <path path="${run.classpath}"/>
1.1197 - <map from="${build.classes.dir.resolved}" to=""/>
1.1198 - </pathconvert>
1.1199 - <pathconvert pathsep=" " property="jar.classpath">
1.1200 - <path path="${run.classpath.without.build.classes.dir}"/>
1.1201 - <chainedmapper>
1.1202 - <flattenmapper/>
1.1203 - <globmapper from="*" to="lib/*"/>
1.1204 - </chainedmapper>
1.1205 - </pathconvert>
1.1206 - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.1207 - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.1208 - <fileset dir="${build.classes.dir}"/>
1.1209 - <manifest>
1.1210 - <attribute name="Main-Class" value="${main.class}"/>
1.1211 - <attribute name="Class-Path" value="${jar.classpath}"/>
1.1212 - </manifest>
1.1213 - </copylibs>
1.1214 - <echo>To run this application from the command line without Ant, try:</echo>
1.1215 - <property location="${dist.jar}" name="dist.jar.resolved"/>
1.1216 - <echo>java -jar "${dist.jar.resolved}"</echo>
1.1217 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
1.1218 + <delete>
1.1219 + <fileset file="${tmp.manifest.file}"/>
1.1220 + </delete>
1.1221 </target>
1.1222 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
1.1223 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.1224 - <pathconvert property="run.classpath.without.build.classes.dir">
1.1225 - <path path="${run.classpath}"/>
1.1226 - <map from="${build.classes.dir.resolved}" to=""/>
1.1227 - </pathconvert>
1.1228 - <pathconvert pathsep=" " property="jar.classpath">
1.1229 - <path path="${run.classpath.without.build.classes.dir}"/>
1.1230 - <chainedmapper>
1.1231 - <flattenmapper/>
1.1232 - <globmapper from="*" to="lib/*"/>
1.1233 - </chainedmapper>
1.1234 - </pathconvert>
1.1235 - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.1236 - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.1237 - <fileset dir="${build.classes.dir}"/>
1.1238 - <manifest>
1.1239 - <attribute name="Class-Path" value="${jar.classpath}"/>
1.1240 - </manifest>
1.1241 - </copylibs>
1.1242 - </target>
1.1243 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
1.1244 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.1245 - <pathconvert property="run.classpath.without.build.classes.dir">
1.1246 - <path path="${run.classpath}"/>
1.1247 - <map from="${build.classes.dir.resolved}" to=""/>
1.1248 - </pathconvert>
1.1249 - <pathconvert pathsep=" " property="jar.classpath">
1.1250 - <path path="${run.classpath.without.build.classes.dir}"/>
1.1251 - <chainedmapper>
1.1252 - <flattenmapper/>
1.1253 - <globmapper from="*" to="lib/*"/>
1.1254 - </chainedmapper>
1.1255 - </pathconvert>
1.1256 - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.1257 - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.1258 - <fileset dir="${build.classes.dir}"/>
1.1259 - <manifest>
1.1260 - <attribute name="Class-Path" value="${jar.classpath}"/>
1.1261 - </manifest>
1.1262 - </copylibs>
1.1263 - </target>
1.1264 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
1.1265 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
1.1266 <target name="-post-jar">
1.1267 <!-- Empty placeholder for easier customization. -->
1.1268 <!-- You can override this target in the ../build.xml file. -->
1.1269 </target>
1.1270 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
1.1271 + <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1.1272 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
1.1273 + <!--
1.1274 + =================
1.1275 + DEPLOY SECTION
1.1276 + =================
1.1277 + -->
1.1278 + <target name="-pre-deploy">
1.1279 + <!-- Empty placeholder for easier customization. -->
1.1280 + <!-- You can override this target in the ../build.xml file. -->
1.1281 + </target>
1.1282 + <target depends="init" name="-check-jlink">
1.1283 + <condition property="do.jlink.internal">
1.1284 + <and>
1.1285 + <istrue value="${do.jlink}"/>
1.1286 + <isset property="do.archive"/>
1.1287 + <isset property="named.module.internal"/>
1.1288 + </and>
1.1289 + </condition>
1.1290 + </target>
1.1291 + <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
1.1292 + <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
1.1293 + <property name="jlink.launcher.name" value="${application.title}"/>
1.1294 + <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
1.1295 + <and>
1.1296 + <isset property="jlink.additionalmodules"/>
1.1297 + <length length="0" string="${jlink.additionalmodules}" when="greater"/>
1.1298 + </and>
1.1299 + </condition>
1.1300 + <condition property="jlink.do.strip.internal">
1.1301 + <and>
1.1302 + <isset property="jlink.strip"/>
1.1303 + <istrue value="${jlink.strip}"/>
1.1304 + </and>
1.1305 + </condition>
1.1306 + <condition property="jlink.do.additionalparam.internal">
1.1307 + <and>
1.1308 + <isset property="jlink.additionalparam"/>
1.1309 + <length length="0" string="${jlink.additionalparam}" when="greater"/>
1.1310 + </and>
1.1311 + </condition>
1.1312 + <condition property="jlink.do.launcher.internal">
1.1313 + <and>
1.1314 + <istrue value="${jlink.launcher}"/>
1.1315 + <isset property="main.class.available"/>
1.1316 + </and>
1.1317 + </condition>
1.1318 + <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
1.1319 + <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
1.1320 + <exec executable="${platform.jlink}">
1.1321 + <arg value="--module-path"/>
1.1322 + <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
1.1323 + <arg value="--add-modules"/>
1.1324 + <arg value="${jlink.add.modules}"/>
1.1325 + <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
1.1326 + <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
1.1327 + <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
1.1328 + <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
1.1329 + <arg value="--output"/>
1.1330 + <arg value="${dist.jlink.output}"/>
1.1331 + </exec>
1.1332 + </target>
1.1333 + <target name="-post-deploy">
1.1334 + <!-- Empty placeholder for easier customization. -->
1.1335 + <!-- You can override this target in the ../build.xml file. -->
1.1336 + </target>
1.1337 + <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
1.1338 <!--
1.1339 =================
1.1340 EXECUTION SECTION
1.1341 @@ -576,9 +1357,9 @@
1.1342 </target>
1.1343 <target depends="init,compile" name="-debug-start-debuggee">
1.1344 <j2seproject3:debug>
1.1345 - <customize>
1.1346 + <customizeDebuggee>
1.1347 <arg line="${application.args}"/>
1.1348 - </customize>
1.1349 + </customizeDebuggee>
1.1350 </j2seproject3:debug>
1.1351 </target>
1.1352 <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
1.1353 @@ -605,23 +1386,146 @@
1.1354 </target>
1.1355 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
1.1356 <!--
1.1357 + =================
1.1358 + PROFILING SECTION
1.1359 + =================
1.1360 + -->
1.1361 + <!--
1.1362 + pre NB7.2 profiler integration
1.1363 + -->
1.1364 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
1.1365 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.1366 + <nbprofiledirect>
1.1367 + <classpath>
1.1368 + <path path="${run.classpath}"/>
1.1369 + </classpath>
1.1370 + </nbprofiledirect>
1.1371 + <profile/>
1.1372 + </target>
1.1373 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
1.1374 + <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
1.1375 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.1376 + <nbprofiledirect>
1.1377 + <classpath>
1.1378 + <path path="${run.classpath}"/>
1.1379 + </classpath>
1.1380 + </nbprofiledirect>
1.1381 + <profile classname="${profile.class}"/>
1.1382 + </target>
1.1383 + <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
1.1384 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.1385 + <nbprofiledirect>
1.1386 + <classpath>
1.1387 + <path path="${run.classpath}"/>
1.1388 + </classpath>
1.1389 + </nbprofiledirect>
1.1390 + <profile classname="sun.applet.AppletViewer">
1.1391 + <customize>
1.1392 + <arg value="${applet.url}"/>
1.1393 + </customize>
1.1394 + </profile>
1.1395 + </target>
1.1396 + <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
1.1397 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.1398 + <nbprofiledirect>
1.1399 + <classpath>
1.1400 + <path path="${run.test.classpath}"/>
1.1401 + </classpath>
1.1402 + </nbprofiledirect>
1.1403 + <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
1.1404 + <customize>
1.1405 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.1406 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.1407 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.1408 + <jvmarg line="${profiler.info.jvmargs}"/>
1.1409 + <classpath>
1.1410 + <path path="${run.test.classpath}"/>
1.1411 + </classpath>
1.1412 + </customize>
1.1413 + </j2seproject3:junit>
1.1414 + </target>
1.1415 + <!--
1.1416 + end of pre NB72 profiling section
1.1417 + -->
1.1418 + <target if="netbeans.home" name="-profile-check">
1.1419 + <condition property="profiler.configured">
1.1420 + <or>
1.1421 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
1.1422 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
1.1423 + </or>
1.1424 + </condition>
1.1425 + </target>
1.1426 + <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
1.1427 + <startprofiler/>
1.1428 + <antcall target="run"/>
1.1429 + </target>
1.1430 + <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
1.1431 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.1432 + <startprofiler/>
1.1433 + <antcall target="run-single"/>
1.1434 + </target>
1.1435 + <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
1.1436 + <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
1.1437 + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.1438 + <startprofiler/>
1.1439 + <antcall target="test-single"/>
1.1440 + </target>
1.1441 + <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1.1442 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.1443 + <startprofiler/>
1.1444 + <antcall target="run-test-with-main"/>
1.1445 + </target>
1.1446 + <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1.1447 + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.1448 + <startprofiler/>
1.1449 + <antcall target="run-applet"/>
1.1450 + </target>
1.1451 + <!--
1.1452 ===============
1.1453 JAVADOC SECTION
1.1454 ===============
1.1455 -->
1.1456 - <target depends="init" name="-javadoc-build">
1.1457 + <target depends="init" if="have.sources" name="-javadoc-build">
1.1458 <mkdir dir="${dist.javadoc.dir}"/>
1.1459 - <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}">
1.1460 + <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
1.1461 + <and>
1.1462 + <isset property="endorsed.classpath.cmd.line.arg"/>
1.1463 + <not>
1.1464 + <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
1.1465 + </not>
1.1466 + </and>
1.1467 + </condition>
1.1468 + <condition else="" property="bug5101868workaround" value="*.java">
1.1469 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
1.1470 + </condition>
1.1471 + <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
1.1472 + <and>
1.1473 + <isset property="javadoc.html5"/>
1.1474 + <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
1.1475 + </and>
1.1476 + </condition>
1.1477 + <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${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}">
1.1478 <classpath>
1.1479 <path path="${javac.classpath}"/>
1.1480 </classpath>
1.1481 - <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.1482 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.1483 <filename name="**/*.java"/>
1.1484 </fileset>
1.1485 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.1486 <include name="**/*.java"/>
1.1487 + <exclude name="*.java"/>
1.1488 </fileset>
1.1489 + <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1.1490 + <arg line="${javadoc.html5.cmd.line.arg}"/>
1.1491 </javadoc>
1.1492 + <copy todir="${dist.javadoc.dir}">
1.1493 + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.1494 + <filename name="**/doc-files/**"/>
1.1495 + </fileset>
1.1496 + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.1497 + <include name="**/doc-files/**"/>
1.1498 + </fileset>
1.1499 + </copy>
1.1500 </target>
1.1501 <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
1.1502 <nbbrowse file="${dist.javadoc.dir}/index.html"/>
1.1503 @@ -629,7 +1533,7 @@
1.1504 <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
1.1505 <!--
1.1506 =========================
1.1507 - JUNIT COMPILATION SECTION
1.1508 + TEST COMPILATION SECTION
1.1509 =========================
1.1510 -->
1.1511 <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
1.1512 @@ -639,11 +1543,63 @@
1.1513 <!-- Empty placeholder for easier customization. -->
1.1514 <!-- You can override this target in the ../build.xml file. -->
1.1515 </target>
1.1516 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
1.1517 + <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
1.1518 + <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
1.1519 + <and>
1.1520 + <isset property="test.module.name"/>
1.1521 + <length length="0" string="${test.module.name}" when="greater"/>
1.1522 + </and>
1.1523 + </condition>
1.1524 + <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
1.1525 + <and>
1.1526 + <isset property="test.module.name"/>
1.1527 + <length length="0" string="${test.module.name}" when="greater"/>
1.1528 + </and>
1.1529 + </condition>
1.1530 + </target>
1.1531 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
1.1532 + <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
1.1533 + <and>
1.1534 + <isset property="test.module.name"/>
1.1535 + <length length="0" string="${test.module.name}" when="greater"/>
1.1536 + </and>
1.1537 + </condition>
1.1538 + <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
1.1539 + <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
1.1540 + <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
1.1541 + <chainedmapper>
1.1542 + <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
1.1543 + <filtermapper>
1.1544 + <uniqfilter/>
1.1545 + <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
1.1546 + </filtermapper>
1.1547 + <cutdirsmapper dirs="1"/>
1.1548 + <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
1.1549 + </chainedmapper>
1.1550 + </pathconvert>
1.1551 + <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
1.1552 + <and>
1.1553 + <isset property="test.module.name"/>
1.1554 + <length length="0" string="${test.module.name}" when="greater"/>
1.1555 + </and>
1.1556 + </condition>
1.1557 + </target>
1.1558 + <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
1.1559 + <property name="javac.test.sourcepath" value="${empty.dir}"/>
1.1560 + <property name="javac.test.compilerargs" value=""/>
1.1561 + <property name="run.test.jvmargs" value=""/>
1.1562 + </target>
1.1563 + <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
1.1564 <target if="do.depend.true" name="-compile-test-depend">
1.1565 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.1566 </target>
1.1567 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1.1568 - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.1569 + <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1.1570 + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
1.1571 + <customize>
1.1572 + <compilerarg line="${javac.test.compilerargs}"/>
1.1573 + </customize>
1.1574 + </j2seproject3:javac>
1.1575 <copy todir="${build.test.classes.dir}">
1.1576 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.1577 </copy>
1.1578 @@ -657,10 +1613,14 @@
1.1579 <!-- Empty placeholder for easier customization. -->
1.1580 <!-- You can override this target in the ../build.xml file. -->
1.1581 </target>
1.1582 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
1.1583 + <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
1.1584 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.1585 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
1.1586 - <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}"/>
1.1587 + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
1.1588 + <customize>
1.1589 + <compilerarg line="${javac.test.compilerargs}"/>
1.1590 + </customize>
1.1591 + </j2seproject3:javac>
1.1592 <copy todir="${build.test.classes.dir}">
1.1593 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.1594 </copy>
1.1595 @@ -672,14 +1632,14 @@
1.1596 <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
1.1597 <!--
1.1598 =======================
1.1599 - JUNIT EXECUTION SECTION
1.1600 + TEST EXECUTION SECTION
1.1601 =======================
1.1602 -->
1.1603 <target depends="init" if="have.tests" name="-pre-test-run">
1.1604 <mkdir dir="${build.test.results.dir}"/>
1.1605 </target>
1.1606 - <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.1607 - <j2seproject3:junit testincludes="**/*Test.java"/>
1.1608 + <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
1.1609 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
1.1610 </target>
1.1611 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.1612 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1613 @@ -690,41 +1650,42 @@
1.1614 <target depends="init" if="have.tests" name="-pre-test-run-single">
1.1615 <mkdir dir="${build.test.results.dir}"/>
1.1616 </target>
1.1617 - <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.1618 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.1619 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.1620 - <j2seproject3:junit excludes="" includes="${test.includes}"/>
1.1621 + <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
1.1622 </target>
1.1623 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1.1624 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1625 </target>
1.1626 - <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
1.1627 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
1.1628 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
1.1629 + <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
1.1630 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1.1631 + <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
1.1632 + </target>
1.1633 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
1.1634 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1635 + </target>
1.1636 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
1.1637 <!--
1.1638 =======================
1.1639 - JUNIT DEBUGGING SECTION
1.1640 + TEST DEBUGGING SECTION
1.1641 =======================
1.1642 -->
1.1643 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
1.1644 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
1.1645 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.1646 - <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
1.1647 - <delete file="${test.report.file}"/>
1.1648 - <mkdir dir="${build.test.results.dir}"/>
1.1649 - <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}">
1.1650 - <customize>
1.1651 - <syspropertyset>
1.1652 - <propertyref prefix="test-sys-prop."/>
1.1653 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.1654 - </syspropertyset>
1.1655 - <arg value="${test.class}"/>
1.1656 - <arg value="showoutput=true"/>
1.1657 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
1.1658 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
1.1659 - </customize>
1.1660 - </j2seproject3:debug>
1.1661 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
1.1662 + </target>
1.1663 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
1.1664 + <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.1665 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1.1666 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
1.1667 </target>
1.1668 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1.1669 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1.1670 </target>
1.1671 - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.1672 + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.1673 + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
1.1674 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1.1675 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1.1676 </target>
1.1677 @@ -750,9 +1711,9 @@
1.1678 <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
1.1679 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.1680 <j2seproject3:debug classname="sun.applet.AppletViewer">
1.1681 - <customize>
1.1682 + <customizeDebuggee>
1.1683 <arg value="${applet.url}"/>
1.1684 - </customize>
1.1685 + </customizeDebuggee>
1.1686 </j2seproject3:debug>
1.1687 </target>
1.1688 <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
1.1689 @@ -779,6 +1740,7 @@
1.1690 </target>
1.1691 <target depends="init" name="-do-clean">
1.1692 <delete dir="${build.dir}"/>
1.1693 + <delete dir="${dist.jlink.output}"/>
1.1694 <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
1.1695 </target>
1.1696 <target name="-post-clean">
1.1697 @@ -789,9 +1751,12 @@
1.1698 <target name="-check-call-dep">
1.1699 <property file="${call.built.properties}" prefix="already.built."/>
1.1700 <condition property="should.call.dep">
1.1701 - <not>
1.1702 - <isset property="already.built.${call.subproject}"/>
1.1703 - </not>
1.1704 + <and>
1.1705 + <not>
1.1706 + <isset property="already.built.${call.subproject}"/>
1.1707 + </not>
1.1708 + <available file="${call.script}"/>
1.1709 + </and>
1.1710 </condition>
1.1711 </target>
1.1712 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">