1.1 --- a/samples/openfixed/nbproject/build-impl.xml Wed Aug 08 23:00:39 2012 +0200
1.2 +++ b/samples/openfixed/nbproject/build-impl.xml Mon Nov 11 13:17:34 2019 +0100
1.3 @@ -19,7 +19,7 @@
1.4 - cleanup
1.5
1.6 -->
1.7 -<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="openfixed-impl">
1.8 +<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="openfixed-impl">
1.9 <fail message="Please build using Ant 1.8.0 or higher.">
1.10 <condition>
1.11 <not>
1.12 @@ -46,14 +46,80 @@
1.13 <property file="${user.properties.file}"/>
1.14 <!-- The two properties below are usually overridden -->
1.15 <!-- by the active platform. Just a fallback. -->
1.16 - <property name="default.javac.source" value="1.4"/>
1.17 - <property name="default.javac.target" value="1.4"/>
1.18 + <property name="default.javac.source" value="1.6"/>
1.19 + <property name="default.javac.target" value="1.6"/>
1.20 </target>
1.21 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.22 <property file="nbproject/configs/${config}.properties"/>
1.23 <property file="nbproject/project.properties"/>
1.24 </target>
1.25 - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.26 + <target name="-init-modules-supported">
1.27 + <condition property="modules.supported.internal" value="true">
1.28 + <not>
1.29 + <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
1.30 + </not>
1.31 + </condition>
1.32 + </target>
1.33 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
1.34 + <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
1.35 + <attribute name="property"/>
1.36 + <attribute name="sourcepath"/>
1.37 + <sequential>
1.38 + <loadresource property="@{property}" quiet="true">
1.39 + <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
1.40 + <filterchain>
1.41 + <stripjavacomments/>
1.42 + <linecontainsregexp>
1.43 + <regexp pattern="module .* \{"/>
1.44 + </linecontainsregexp>
1.45 + <tokenfilter>
1.46 + <linetokenizer/>
1.47 + <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
1.48 + </tokenfilter>
1.49 + <striplinebreaks/>
1.50 + </filterchain>
1.51 + </loadresource>
1.52 + </sequential>
1.53 + </macrodef>
1.54 + </target>
1.55 + <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
1.56 + <fail message="Java 9 support requires Ant 1.10.0 or higher.">
1.57 + <condition>
1.58 + <not>
1.59 + <antversion atleast="1.10.0"/>
1.60 + </not>
1.61 + </condition>
1.62 + </fail>
1.63 + <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
1.64 + <condition property="named.module.internal">
1.65 + <and>
1.66 + <isset property="module.name"/>
1.67 + <length length="0" string="${module.name}" when="greater"/>
1.68 + </and>
1.69 + </condition>
1.70 + <condition property="unnamed.module.internal">
1.71 + <not>
1.72 + <isset property="named.module.internal"/>
1.73 + </not>
1.74 + </condition>
1.75 + <property name="javac.modulepath" value=""/>
1.76 + <property name="run.modulepath" value="${javac.modulepath}"/>
1.77 + <property name="module.build.classes.dir" value="${build.classes.dir}"/>
1.78 + <property name="debug.modulepath" value="${run.modulepath}"/>
1.79 + <property name="javac.upgrademodulepath" value=""/>
1.80 + <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
1.81 + <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
1.82 + <and>
1.83 + <isset property="javac.systemmodulepath"/>
1.84 + <length length="0" string="${javac.systemmodulepath}" when="greater"/>
1.85 + </and>
1.86 + </condition>
1.87 + <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
1.88 + <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
1.89 + <property name="module.name" value=""/>
1.90 + </target>
1.91 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
1.92 + <property name="platform.java" value="${java.home}/bin/java"/>
1.93 <available file="${manifest.file}" property="manifest.available"/>
1.94 <condition property="splashscreen.available">
1.95 <and>
1.96 @@ -71,31 +137,22 @@
1.97 </not>
1.98 </and>
1.99 </condition>
1.100 - <condition property="manifest.available+main.class">
1.101 + <condition property="profile.available">
1.102 <and>
1.103 - <isset property="manifest.available"/>
1.104 - <isset property="main.class.available"/>
1.105 + <isset property="javac.profile"/>
1.106 + <length length="0" string="${javac.profile}" when="greater"/>
1.107 + <not>
1.108 + <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
1.109 + </not>
1.110 </and>
1.111 </condition>
1.112 <condition property="do.archive">
1.113 - <not>
1.114 - <istrue value="${jar.archive.disabled}"/>
1.115 - </not>
1.116 - </condition>
1.117 - <condition property="do.mkdist">
1.118 - <and>
1.119 - <isset property="do.archive"/>
1.120 - <isset property="libs.CopyLibs.classpath"/>
1.121 + <or>
1.122 <not>
1.123 - <istrue value="${mkdist.disabled}"/>
1.124 + <istrue value="${jar.archive.disabled}"/>
1.125 </not>
1.126 - </and>
1.127 - </condition>
1.128 - <condition property="manifest.available+main.class+mkdist.available">
1.129 - <and>
1.130 - <istrue value="${manifest.available+main.class}"/>
1.131 - <isset property="do.mkdist"/>
1.132 - </and>
1.133 + <istrue value="${not.archive.disabled}"/>
1.134 + </or>
1.135 </condition>
1.136 <condition property="do.archive+manifest.available">
1.137 <and>
1.138 @@ -115,24 +172,12 @@
1.139 <istrue value="${do.archive}"/>
1.140 </and>
1.141 </condition>
1.142 - <condition property="do.archive+manifest.available+main.class">
1.143 + <condition property="do.archive+profile.available">
1.144 <and>
1.145 - <istrue value="${manifest.available+main.class}"/>
1.146 + <isset property="profile.available"/>
1.147 <istrue value="${do.archive}"/>
1.148 </and>
1.149 </condition>
1.150 - <condition property="manifest.available-mkdist.available">
1.151 - <or>
1.152 - <istrue value="${manifest.available}"/>
1.153 - <isset property="do.mkdist"/>
1.154 - </or>
1.155 - </condition>
1.156 - <condition property="manifest.available+main.class-mkdist.available">
1.157 - <or>
1.158 - <istrue value="${manifest.available+main.class}"/>
1.159 - <isset property="do.mkdist"/>
1.160 - </or>
1.161 - </condition>
1.162 <condition property="have.tests">
1.163 <or>
1.164 <available file="${test.src.dir}"/>
1.165 @@ -169,6 +214,7 @@
1.166 <property name="application.args" value=""/>
1.167 <property name="source.encoding" value="${file.encoding}"/>
1.168 <property name="runtime.encoding" value="${source.encoding}"/>
1.169 + <property name="manifest.encoding" value="${source.encoding}"/>
1.170 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.171 <and>
1.172 <isset property="javadoc.encoding"/>
1.173 @@ -186,7 +232,15 @@
1.174 </condition>
1.175 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
1.176 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
1.177 - <length length="0" string="${endorsed.classpath}" when="greater"/>
1.178 + <and>
1.179 + <isset property="endorsed.classpath"/>
1.180 + <not>
1.181 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
1.182 + </not>
1.183 + </and>
1.184 + </condition>
1.185 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
1.186 + <isset property="profile.available"/>
1.187 </condition>
1.188 <condition else="false" property="jdkBug6558476">
1.189 <and>
1.190 @@ -196,7 +250,12 @@
1.191 </not>
1.192 </and>
1.193 </condition>
1.194 - <property name="javac.fork" value="${jdkBug6558476}"/>
1.195 + <condition else="false" property="javac.fork">
1.196 + <or>
1.197 + <istrue value="${jdkBug6558476}"/>
1.198 + <istrue value="${javac.external.vm}"/>
1.199 + </or>
1.200 + </condition>
1.201 <property name="jar.index" value="false"/>
1.202 <property name="jar.index.metainf" value="${jar.index}"/>
1.203 <property name="copylibs.rebase" value="true"/>
1.204 @@ -222,6 +281,7 @@
1.205 <condition else="" property="testng.debug.mode" value="-mixed">
1.206 <istrue value="${junit+testng.available}"/>
1.207 </condition>
1.208 + <property name="java.failonerror" value="true"/>
1.209 </target>
1.210 <target name="-post-init">
1.211 <!-- Empty placeholder for easier customization. -->
1.212 @@ -248,11 +308,80 @@
1.213 </sequential>
1.214 </macrodef>
1.215 </target>
1.216 - <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
1.217 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
1.218 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.219 <attribute default="${src.dir}" name="srcdir"/>
1.220 <attribute default="${build.classes.dir}" name="destdir"/>
1.221 <attribute default="${javac.classpath}" name="classpath"/>
1.222 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.223 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.224 + <attribute default="${javac.processorpath}" name="processorpath"/>
1.225 + <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
1.226 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.227 + <attribute default="${includes}" name="includes"/>
1.228 + <attribute default="${excludes}" name="excludes"/>
1.229 + <attribute default="${javac.debug}" name="debug"/>
1.230 + <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
1.231 + <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
1.232 + <attribute default="${empty.dir}" name="gensrcdir"/>
1.233 + <element name="customize" optional="true"/>
1.234 + <sequential>
1.235 + <condition property="warn.excludes.internal">
1.236 + <and>
1.237 + <isset property="named.module.internal"/>
1.238 + <length length="0" string="@{excludes}" trim="true" when="greater"/>
1.239 + </and>
1.240 + </condition>
1.241 + <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
1.242 + <property location="${build.dir}/empty" name="empty.dir"/>
1.243 + <mkdir dir="${empty.dir}"/>
1.244 + <mkdir dir="@{apgeneratedsrcdir}"/>
1.245 + <condition property="processormodulepath.set">
1.246 + <resourcecount count="0" when="greater">
1.247 + <path>
1.248 + <pathelement path="@{processormodulepath}"/>
1.249 + </path>
1.250 + </resourcecount>
1.251 + </condition>
1.252 + <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.253 + <src>
1.254 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
1.255 + <include name="*"/>
1.256 + </dirset>
1.257 + </src>
1.258 + <classpath>
1.259 + <path path="@{classpath}"/>
1.260 + </classpath>
1.261 + <modulepath>
1.262 + <path path="@{modulepath}"/>
1.263 + </modulepath>
1.264 + <upgrademodulepath>
1.265 + <path path="@{upgrademodulepath}"/>
1.266 + </upgrademodulepath>
1.267 + <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
1.268 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.269 + <compilerarg line="${javac.compilerargs}"/>
1.270 + <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
1.271 + <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
1.272 + <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
1.273 + <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
1.274 + <compilerarg line="${ap.processors.internal}"/>
1.275 + <compilerarg line="${annotation.processing.processor.options}"/>
1.276 + <compilerarg value="-s"/>
1.277 + <compilerarg path="@{apgeneratedsrcdir}"/>
1.278 + <compilerarg line="${ap.proc.none.internal}"/>
1.279 + <customize/>
1.280 + </javac>
1.281 + </sequential>
1.282 + </macrodef>
1.283 + </target>
1.284 + <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.285 + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.286 + <attribute default="${src.dir}" name="srcdir"/>
1.287 + <attribute default="${build.classes.dir}" name="destdir"/>
1.288 + <attribute default="${javac.classpath}" name="classpath"/>
1.289 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.290 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.291 <attribute default="${javac.processorpath}" name="processorpath"/>
1.292 <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.293 <attribute default="${includes}" name="includes"/>
1.294 @@ -275,6 +404,7 @@
1.295 <path path="@{classpath}"/>
1.296 </classpath>
1.297 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.298 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.299 <compilerarg line="${javac.compilerargs}"/>
1.300 <compilerarg value="-processorpath"/>
1.301 <compilerarg path="@{processorpath}:${empty.dir}"/>
1.302 @@ -288,11 +418,13 @@
1.303 </sequential>
1.304 </macrodef>
1.305 </target>
1.306 - <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
1.307 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
1.308 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.309 <attribute default="${src.dir}" name="srcdir"/>
1.310 <attribute default="${build.classes.dir}" name="destdir"/>
1.311 <attribute default="${javac.classpath}" name="classpath"/>
1.312 + <attribute default="${javac.modulepath}" name="modulepath"/>
1.313 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
1.314 <attribute default="${javac.processorpath}" name="processorpath"/>
1.315 <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
1.316 <attribute default="${includes}" name="includes"/>
1.317 @@ -314,13 +446,14 @@
1.318 <path path="@{classpath}"/>
1.319 </classpath>
1.320 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.321 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.322 <compilerarg line="${javac.compilerargs}"/>
1.323 <customize/>
1.324 </javac>
1.325 </sequential>
1.326 </macrodef>
1.327 </target>
1.328 - <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
1.329 + <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
1.330 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
1.331 <attribute default="${src.dir}" name="srcdir"/>
1.332 <attribute default="${build.classes.dir}" name="destdir"/>
1.333 @@ -370,7 +503,64 @@
1.334 </and>
1.335 </condition>
1.336 </target>
1.337 - <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
1.338 + <target name="-init-test-properties">
1.339 + <property name="test.binaryincludes" value="<nothing>"/>
1.340 + <property name="test.binarytestincludes" value=""/>
1.341 + <property name="test.binaryexcludes" value=""/>
1.342 + </target>
1.343 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
1.344 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
1.345 + <attribute default="${includes}" name="includes"/>
1.346 + <attribute default="${excludes}" name="excludes"/>
1.347 + <element name="customizePrototype" optional="true"/>
1.348 + <sequential>
1.349 + <property name="junit.forkmode" value="perTest"/>
1.350 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.351 + <syspropertyset>
1.352 + <propertyref prefix="test-sys-prop."/>
1.353 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.354 + </syspropertyset>
1.355 + <classpath>
1.356 + <path path="${run.test.classpath}"/>
1.357 + </classpath>
1.358 + <modulepath>
1.359 + <path path="${run.test.modulepath}"/>
1.360 + </modulepath>
1.361 + <formatter type="brief" usefile="false"/>
1.362 + <formatter type="xml"/>
1.363 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.364 + <jvmarg value="-ea"/>
1.365 + <jvmarg line="${run.test.jvmargs}"/>
1.366 + <customizePrototype/>
1.367 + </junit>
1.368 + </sequential>
1.369 + </macrodef>
1.370 + </target>
1.371 + <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
1.372 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
1.373 + <attribute default="${includes}" name="includes"/>
1.374 + <attribute default="${excludes}" name="excludes"/>
1.375 + <element name="customizePrototype" optional="true"/>
1.376 + <sequential>
1.377 + <property name="junit.forkmode" value="perTest"/>
1.378 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.379 + <syspropertyset>
1.380 + <propertyref prefix="test-sys-prop."/>
1.381 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.382 + </syspropertyset>
1.383 + <classpath>
1.384 + <path path="${run.test.classpath}"/>
1.385 + </classpath>
1.386 + <formatter type="brief" usefile="false"/>
1.387 + <formatter type="xml"/>
1.388 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.389 + <jvmarg value="-ea"/>
1.390 + <customizePrototype/>
1.391 + </junit>
1.392 + </sequential>
1.393 + </macrodef>
1.394 + </target>
1.395 + <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.396 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.397 <attribute default="${includes}" name="includes"/>
1.398 <attribute default="${excludes}" name="excludes"/>
1.399 @@ -378,22 +568,16 @@
1.400 <attribute default="" name="testmethods"/>
1.401 <element name="customize" optional="true"/>
1.402 <sequential>
1.403 - <property name="junit.forkmode" value="perTest"/>
1.404 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.405 - <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.406 - <syspropertyset>
1.407 - <propertyref prefix="test-sys-prop."/>
1.408 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.409 - </syspropertyset>
1.410 - <formatter type="brief" usefile="false"/>
1.411 - <formatter type="xml"/>
1.412 - <jvmarg value="-ea"/>
1.413 - <customize/>
1.414 - </junit>
1.415 + <j2seproject3:junit-prototype>
1.416 + <customizePrototype>
1.417 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.418 + <customize/>
1.419 + </customizePrototype>
1.420 + </j2seproject3:junit-prototype>
1.421 </sequential>
1.422 </macrodef>
1.423 </target>
1.424 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
1.425 + <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.426 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.427 <attribute default="${includes}" name="includes"/>
1.428 <attribute default="${excludes}" name="excludes"/>
1.429 @@ -401,22 +585,19 @@
1.430 <attribute default="" name="testmethods"/>
1.431 <element name="customize" optional="true"/>
1.432 <sequential>
1.433 - <property name="junit.forkmode" value="perTest"/>
1.434 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.435 - <batchtest todir="${build.test.results.dir}">
1.436 - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.437 - <filename name="@{testincludes}"/>
1.438 - </fileset>
1.439 - </batchtest>
1.440 - <syspropertyset>
1.441 - <propertyref prefix="test-sys-prop."/>
1.442 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.443 - </syspropertyset>
1.444 - <formatter type="brief" usefile="false"/>
1.445 - <formatter type="xml"/>
1.446 - <jvmarg value="-ea"/>
1.447 - <customize/>
1.448 - </junit>
1.449 + <j2seproject3:junit-prototype>
1.450 + <customizePrototype>
1.451 + <batchtest todir="${build.test.results.dir}">
1.452 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.453 + <filename name="@{testincludes}"/>
1.454 + </fileset>
1.455 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
1.456 + <filename name="${test.binarytestincludes}"/>
1.457 + </fileset>
1.458 + </batchtest>
1.459 + <customize/>
1.460 + </customizePrototype>
1.461 + </j2seproject3:junit-prototype>
1.462 </sequential>
1.463 </macrodef>
1.464 </target>
1.465 @@ -438,12 +619,16 @@
1.466 </fileset>
1.467 </union>
1.468 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
1.469 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="openfixed" testname="TestNG tests" workingDir="${work.dir}">
1.470 + <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="openfixed" testname="TestNG tests" workingDir="${work.dir}">
1.471 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
1.472 <propertyset>
1.473 <propertyref prefix="test-sys-prop."/>
1.474 <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.475 </propertyset>
1.476 + <classpath>
1.477 + <path path="${run.test.classpath}"/>
1.478 + </classpath>
1.479 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.480 <customize/>
1.481 </testng>
1.482 </sequential>
1.483 @@ -498,10 +683,6 @@
1.484 <sequential>
1.485 <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.486 <customize>
1.487 - <classpath>
1.488 - <path path="${run.test.classpath}"/>
1.489 - </classpath>
1.490 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.491 <jvmarg line="${run.jvmargs}"/>
1.492 <jvmarg line="${run.jvmargs.ide}"/>
1.493 </customize>
1.494 @@ -509,71 +690,20 @@
1.495 </sequential>
1.496 </macrodef>
1.497 </target>
1.498 - <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
1.499 - <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.500 - <attribute default="${includes}" name="includes"/>
1.501 - <attribute default="${excludes}" name="excludes"/>
1.502 - <attribute default="**" name="testincludes"/>
1.503 - <attribute default="" name="testmethods"/>
1.504 - <element name="customize" optional="true"/>
1.505 - <sequential>
1.506 - <property name="junit.forkmode" value="perTest"/>
1.507 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.508 - <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.509 - <syspropertyset>
1.510 - <propertyref prefix="test-sys-prop."/>
1.511 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.512 - </syspropertyset>
1.513 - <formatter type="brief" usefile="false"/>
1.514 - <formatter type="xml"/>
1.515 - <jvmarg value="-ea"/>
1.516 - <jvmarg line="${debug-args-line}"/>
1.517 - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.518 - <customize/>
1.519 - </junit>
1.520 - </sequential>
1.521 - </macrodef>
1.522 - </target>
1.523 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
1.524 - <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.525 - <attribute default="${includes}" name="includes"/>
1.526 - <attribute default="${excludes}" name="excludes"/>
1.527 - <attribute default="**" name="testincludes"/>
1.528 - <attribute default="" name="testmethods"/>
1.529 - <element name="customize" optional="true"/>
1.530 - <sequential>
1.531 - <property name="junit.forkmode" value="perTest"/>
1.532 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.533 - <batchtest todir="${build.test.results.dir}">
1.534 - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.535 - <filename name="@{testincludes}"/>
1.536 - </fileset>
1.537 - </batchtest>
1.538 - <syspropertyset>
1.539 - <propertyref prefix="test-sys-prop."/>
1.540 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.541 - </syspropertyset>
1.542 - <formatter type="brief" usefile="false"/>
1.543 - <formatter type="xml"/>
1.544 - <jvmarg value="-ea"/>
1.545 - <jvmarg line="${debug-args-line}"/>
1.546 - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.547 - <customize/>
1.548 - </junit>
1.549 - </sequential>
1.550 - </macrodef>
1.551 - </target>
1.552 - <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
1.553 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
1.554 <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.555 <attribute default="${includes}" name="includes"/>
1.556 <attribute default="${excludes}" name="excludes"/>
1.557 <attribute default="**" name="testincludes"/>
1.558 <attribute default="" name="testmethods"/>
1.559 - <element implicit="true" name="customize" optional="true"/>
1.560 + <element name="customizeDebuggee" optional="true"/>
1.561 <sequential>
1.562 - <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.563 - <customize/>
1.564 - </j2seproject3:junit-debug>
1.565 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.566 + <customize>
1.567 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.568 + <customizeDebuggee/>
1.569 + </customize>
1.570 + </j2seproject3:junit>
1.571 </sequential>
1.572 </macrodef>
1.573 </target>
1.574 @@ -592,14 +722,14 @@
1.575 <delete dir="${build.test.results.dir}" quiet="true"/>
1.576 <mkdir dir="${build.test.results.dir}"/>
1.577 <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
1.578 - <customize>
1.579 + <customizeDebuggee>
1.580 <customize2/>
1.581 <jvmarg value="-ea"/>
1.582 <arg line="${testng.debug.mode}"/>
1.583 <arg line="-d ${build.test.results.dir}"/>
1.584 <arg line="-listener org.testng.reporters.VerboseReporter"/>
1.585 <arg line="${testng.cmd.args}"/>
1.586 - </customize>
1.587 + </customizeDebuggee>
1.588 </j2seproject3:debug>
1.589 </sequential>
1.590 </macrodef>
1.591 @@ -626,14 +756,10 @@
1.592 <attribute default="" name="testMethod"/>
1.593 <sequential>
1.594 <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.595 - <customize>
1.596 - <classpath>
1.597 - <path path="${run.test.classpath}"/>
1.598 - </classpath>
1.599 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.600 + <customizeDebuggee>
1.601 <jvmarg line="${run.jvmargs}"/>
1.602 <jvmarg line="${run.jvmargs.ide}"/>
1.603 - </customize>
1.604 + </customizeDebuggee>
1.605 </j2seproject3:test-debug-impl>
1.606 </sequential>
1.607 </macrodef>
1.608 @@ -685,7 +811,7 @@
1.609 <sequential>
1.610 <property environment="env"/>
1.611 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.612 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
1.613 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
1.614 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.615 <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.616 <jvmarg line="${profiler.info.jvmargs}"/>
1.617 @@ -713,10 +839,14 @@
1.618 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
1.619 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
1.620 <attribute default="${main.class}" name="name"/>
1.621 + <attribute default="${debug.modulepath}" name="modulepath"/>
1.622 <attribute default="${debug.classpath}" name="classpath"/>
1.623 <attribute default="" name="stopclassname"/>
1.624 <sequential>
1.625 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
1.626 + <modulepath>
1.627 + <path path="@{modulepath}"/>
1.628 + </modulepath>
1.629 <classpath>
1.630 <path path="@{classpath}"/>
1.631 </classpath>
1.632 @@ -735,18 +865,6 @@
1.633 </macrodef>
1.634 </target>
1.635 <target name="-init-debug-args">
1.636 - <property name="version-output" value="java version "${ant.java.version}"/>
1.637 - <condition property="have-jdk-older-than-1.4">
1.638 - <or>
1.639 - <contains string="${version-output}" substring="java version "1.0"/>
1.640 - <contains string="${version-output}" substring="java version "1.1"/>
1.641 - <contains string="${version-output}" substring="java version "1.2"/>
1.642 - <contains string="${version-output}" substring="java version "1.3"/>
1.643 - </or>
1.644 - </condition>
1.645 - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
1.646 - <istrue value="${have-jdk-older-than-1.4}"/>
1.647 - </condition>
1.648 <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
1.649 <os family="windows"/>
1.650 </condition>
1.651 @@ -756,21 +874,46 @@
1.652 </target>
1.653 <target depends="-init-debug-args" name="-init-macrodef-debug">
1.654 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.655 + <attribute default="${module.name}" name="modulename"/>
1.656 <attribute default="${main.class}" name="classname"/>
1.657 + <attribute default="${debug.modulepath}" name="modulepath"/>
1.658 <attribute default="${debug.classpath}" name="classpath"/>
1.659 + <element name="customizeDebuggee" optional="true"/>
1.660 + <sequential>
1.661 + <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
1.662 + <customize>
1.663 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.664 + <customizeDebuggee/>
1.665 + </customize>
1.666 + </j2seproject1:java>
1.667 + </sequential>
1.668 + </macrodef>
1.669 + </target>
1.670 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
1.671 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.672 + <attribute default="${module.name}" name="modulename"/>
1.673 + <attribute default="${main.class}" name="classname"/>
1.674 + <attribute default="${run.modulepath}" name="modulepath"/>
1.675 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
1.676 + <attribute default="${run.classpath}" name="classpath"/>
1.677 + <attribute default="jvm" name="jvm"/>
1.678 <element name="customize" optional="true"/>
1.679 <sequential>
1.680 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.681 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.682 - <jvmarg line="${debug-args-line}"/>
1.683 - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.684 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
1.685 + <classpath>
1.686 + <path path="@{classpath}"/>
1.687 + </classpath>
1.688 + <modulepath>
1.689 + <pathelement path="@{modulepath}"/>
1.690 + <pathelement location="${module.build.classes.dir}"/>
1.691 + </modulepath>
1.692 + <upgrademodulepath>
1.693 + <path path="@{upgrademodulepath}"/>
1.694 + </upgrademodulepath>
1.695 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.696 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.697 <jvmarg line="${run.jvmargs}"/>
1.698 <jvmarg line="${run.jvmargs.ide}"/>
1.699 - <classpath>
1.700 - <path path="@{classpath}"/>
1.701 - </classpath>
1.702 <syspropertyset>
1.703 <propertyref prefix="run-sys-prop."/>
1.704 <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.705 @@ -780,14 +923,49 @@
1.706 </sequential>
1.707 </macrodef>
1.708 </target>
1.709 - <target name="-init-macrodef-java">
1.710 + <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
1.711 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.712 + <attribute default="" name="modulename"/>
1.713 <attribute default="${main.class}" name="classname"/>
1.714 + <attribute default="${run.modulepath}" name="modulepath"/>
1.715 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
1.716 <attribute default="${run.classpath}" name="classpath"/>
1.717 <attribute default="jvm" name="jvm"/>
1.718 <element name="customize" optional="true"/>
1.719 <sequential>
1.720 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.721 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.722 + <classpath>
1.723 + <path path="@{classpath}"/>
1.724 + </classpath>
1.725 + <modulepath>
1.726 + <path path="@{modulepath}"/>
1.727 + </modulepath>
1.728 + <upgrademodulepath>
1.729 + <path path="@{upgrademodulepath}"/>
1.730 + </upgrademodulepath>
1.731 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.732 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.733 + <jvmarg line="${run.jvmargs}"/>
1.734 + <jvmarg line="${run.jvmargs.ide}"/>
1.735 + <syspropertyset>
1.736 + <propertyref prefix="run-sys-prop."/>
1.737 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.738 + </syspropertyset>
1.739 + <customize/>
1.740 + </java>
1.741 + </sequential>
1.742 + </macrodef>
1.743 + </target>
1.744 + <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
1.745 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.746 + <attribute default="" name="modulename"/>
1.747 + <attribute default="${main.class}" name="classname"/>
1.748 + <attribute default="" name="modulepath"/>
1.749 + <attribute default="${run.classpath}" name="classpath"/>
1.750 + <attribute default="jvm" name="jvm"/>
1.751 + <element name="customize" optional="true"/>
1.752 + <sequential>
1.753 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.754 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.755 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.756 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.757 @@ -805,6 +983,7 @@
1.758 </sequential>
1.759 </macrodef>
1.760 </target>
1.761 + <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
1.762 <target name="-init-macrodef-copylibs">
1.763 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
1.764 <attribute default="${manifest.file}" name="manifest"/>
1.765 @@ -826,8 +1005,8 @@
1.766 </chainedmapper>
1.767 </pathconvert>
1.768 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.769 - <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.770 - <fileset dir="${build.classes.dir}"/>
1.771 + <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.772 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.773 <manifest>
1.774 <attribute name="Class-Path" value="${jar.classpath}"/>
1.775 <customize/>
1.776 @@ -838,8 +1017,8 @@
1.777 </target>
1.778 <target name="-init-presetdef-jar">
1.779 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.780 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
1.781 - <j2seproject1:fileset dir="${build.classes.dir}"/>
1.782 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
1.783 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.784 </jar>
1.785 </presetdef>
1.786 </target>
1.787 @@ -894,7 +1073,9 @@
1.788 <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
1.789 </target>
1.790 <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
1.791 - <antcall target="clean"/>
1.792 + <antcall target="clean">
1.793 + <param name="no.dependencies" value="true"/>
1.794 + </antcall>
1.795 </target>
1.796 <target depends="init,deps-jar" name="-pre-pre-compile">
1.797 <mkdir dir="${build.classes.dir}"/>
1.798 @@ -920,7 +1101,7 @@
1.799 <target if="has.persistence.xml" name="-copy-persistence-xml">
1.800 <mkdir dir="${build.classes.dir}/META-INF"/>
1.801 <copy todir="${build.classes.dir}/META-INF">
1.802 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
1.803 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
1.804 </copy>
1.805 </target>
1.806 <target name="-post-compile">
1.807 @@ -935,7 +1116,7 @@
1.808 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.809 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.810 <j2seproject3:force-recompile/>
1.811 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.812 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
1.813 </target>
1.814 <target name="-post-compile-single">
1.815 <!-- Empty placeholder for easier customization. -->
1.816 @@ -955,65 +1136,191 @@
1.817 <!-- Empty placeholder for easier customization. -->
1.818 <!-- You can override this target in the ../build.xml file. -->
1.819 </target>
1.820 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
1.821 - <j2seproject1:jar/>
1.822 + <target depends="init,compile" name="-check-module-main-class">
1.823 + <pathconvert property="main.class.file">
1.824 + <string value="${main.class}"/>
1.825 + <unpackagemapper from="*" to="*.class"/>
1.826 + </pathconvert>
1.827 + <condition property="do.module.main.class">
1.828 + <and>
1.829 + <isset property="main.class.available"/>
1.830 + <available file="${build.classes.dir}/module-info.class"/>
1.831 + <available file="${build.classes.dir}/${main.class.file}"/>
1.832 + <isset property="libs.CopyLibs.classpath"/>
1.833 + <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
1.834 + </and>
1.835 + </condition>
1.836 </target>
1.837 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
1.838 - <j2seproject1:jar manifest="${manifest.file}"/>
1.839 + <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
1.840 + <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
1.841 + <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
1.842 </target>
1.843 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
1.844 - <j2seproject1:jar manifest="${manifest.file}">
1.845 - <j2seproject1:manifest>
1.846 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1.847 - </j2seproject1:manifest>
1.848 - </j2seproject1:jar>
1.849 - <echo level="info">To run this application from the command line without Ant, try:</echo>
1.850 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.851 - <property location="${dist.jar}" name="dist.jar.resolved"/>
1.852 - <pathconvert property="run.classpath.with.dist.jar">
1.853 - <path path="${run.classpath}"/>
1.854 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.855 - </pathconvert>
1.856 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.857 - </target>
1.858 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
1.859 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
1.860 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.861 <touch file="${tmp.manifest.file}" verbose="false"/>
1.862 </target>
1.863 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
1.864 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.865 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.866 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1.867 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
1.868 </target>
1.869 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
1.870 - <manifest file="${tmp.manifest.file}" mode="update">
1.871 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.872 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.873 <attribute name="Main-Class" value="${main.class}"/>
1.874 </manifest>
1.875 </target>
1.876 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
1.877 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.878 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.879 + <attribute name="Profile" value="${javac.profile}"/>
1.880 + </manifest>
1.881 + </target>
1.882 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
1.883 <basename file="${application.splash}" property="splashscreen.basename"/>
1.884 <mkdir dir="${build.classes.dir}/META-INF"/>
1.885 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.886 - <manifest file="${tmp.manifest.file}" mode="update">
1.887 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.888 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.889 </manifest>
1.890 </target>
1.891 - <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
1.892 + <target depends="init,compile" name="-check-do-mkdist">
1.893 + <condition property="do.mkdist">
1.894 + <and>
1.895 + <isset property="do.archive"/>
1.896 + <isset property="libs.CopyLibs.classpath"/>
1.897 + <not>
1.898 + <istrue value="${mkdist.disabled}"/>
1.899 + </not>
1.900 + <not>
1.901 + <available file="${build.classes.dir}/module-info.class"/>
1.902 + </not>
1.903 + </and>
1.904 + </condition>
1.905 + </target>
1.906 + <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.907 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
1.908 <echo level="info">To run this application from the command line without Ant, try:</echo>
1.909 <property location="${dist.jar}" name="dist.jar.resolved"/>
1.910 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
1.911 </target>
1.912 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
1.913 + <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.914 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
1.915 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.916 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.917 + <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
1.918 + <isset property="named.module.internal"/>
1.919 + </condition>
1.920 + <pathconvert property="run.classpath.with.dist.jar">
1.921 + <path path="${run.classpath}"/>
1.922 + <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
1.923 + </pathconvert>
1.924 + <pathconvert property="run.modulepath.with.dist.jar">
1.925 + <path location="${dist.jar.resolved}"/>
1.926 + <path path="${run.modulepath}"/>
1.927 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.928 + </pathconvert>
1.929 + <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
1.930 + <isset property="named.module.internal"/>
1.931 + </condition>
1.932 + <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
1.933 + <and>
1.934 + <isset property="modules.supported.internal"/>
1.935 + <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
1.936 + </and>
1.937 + </condition>
1.938 + <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
1.939 + <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
1.940 + </condition>
1.941 + <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
1.942 + <isset property="do.module.main.class"/>
1.943 + </condition>
1.944 + <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
1.945 + <isset property="named.module.internal"/>
1.946 + </condition>
1.947 + <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.948 + <isset property="main.class.available"/>
1.949 + </condition>
1.950 + <condition else="debug" property="jar.usage.level" value="info">
1.951 + <isset property="main.class.available"/>
1.952 + </condition>
1.953 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1.954 + </target>
1.955 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
1.956 <delete>
1.957 <fileset file="${tmp.manifest.file}"/>
1.958 </delete>
1.959 </target>
1.960 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
1.961 + <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.962 + <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.963 <target name="-post-jar">
1.964 <!-- Empty placeholder for easier customization. -->
1.965 <!-- You can override this target in the ../build.xml file. -->
1.966 </target>
1.967 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
1.968 + <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1.969 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
1.970 + <!--
1.971 + =================
1.972 + DEPLOY SECTION
1.973 + =================
1.974 + -->
1.975 + <target name="-pre-deploy">
1.976 + <!-- Empty placeholder for easier customization. -->
1.977 + <!-- You can override this target in the ../build.xml file. -->
1.978 + </target>
1.979 + <target depends="init" name="-check-jlink">
1.980 + <condition property="do.jlink.internal">
1.981 + <and>
1.982 + <istrue value="${do.jlink}"/>
1.983 + <isset property="do.archive"/>
1.984 + <isset property="named.module.internal"/>
1.985 + </and>
1.986 + </condition>
1.987 + </target>
1.988 + <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
1.989 + <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
1.990 + <property name="jlink.launcher.name" value="${application.title}"/>
1.991 + <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
1.992 + <and>
1.993 + <isset property="jlink.additionalmodules"/>
1.994 + <length length="0" string="${jlink.additionalmodules}" when="greater"/>
1.995 + </and>
1.996 + </condition>
1.997 + <condition property="jlink.do.strip.internal">
1.998 + <and>
1.999 + <isset property="jlink.strip"/>
1.1000 + <istrue value="${jlink.strip}"/>
1.1001 + </and>
1.1002 + </condition>
1.1003 + <condition property="jlink.do.additionalparam.internal">
1.1004 + <and>
1.1005 + <isset property="jlink.additionalparam"/>
1.1006 + <length length="0" string="${jlink.additionalparam}" when="greater"/>
1.1007 + </and>
1.1008 + </condition>
1.1009 + <condition property="jlink.do.launcher.internal">
1.1010 + <and>
1.1011 + <istrue value="${jlink.launcher}"/>
1.1012 + <isset property="main.class.available"/>
1.1013 + </and>
1.1014 + </condition>
1.1015 + <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
1.1016 + <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
1.1017 + <exec executable="${platform.jlink}">
1.1018 + <arg value="--module-path"/>
1.1019 + <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
1.1020 + <arg value="--add-modules"/>
1.1021 + <arg value="${jlink.add.modules}"/>
1.1022 + <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
1.1023 + <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
1.1024 + <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
1.1025 + <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
1.1026 + <arg value="--output"/>
1.1027 + <arg value="${dist.jlink.output}"/>
1.1028 + </exec>
1.1029 + </target>
1.1030 + <target name="-post-deploy">
1.1031 + <!-- Empty placeholder for easier customization. -->
1.1032 + <!-- You can override this target in the ../build.xml file. -->
1.1033 + </target>
1.1034 + <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
1.1035 <!--
1.1036 =================
1.1037 EXECUTION SECTION
1.1038 @@ -1050,9 +1357,9 @@
1.1039 </target>
1.1040 <target depends="init,compile" name="-debug-start-debuggee">
1.1041 <j2seproject3:debug>
1.1042 - <customize>
1.1043 + <customizeDebuggee>
1.1044 <arg line="${application.args}"/>
1.1045 - </customize>
1.1046 + </customizeDebuggee>
1.1047 </j2seproject3:debug>
1.1048 </target>
1.1049 <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
1.1050 @@ -1118,28 +1425,24 @@
1.1051 </customize>
1.1052 </profile>
1.1053 </target>
1.1054 - <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
1.1055 + <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
1.1056 <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.1057 <nbprofiledirect>
1.1058 <classpath>
1.1059 <path path="${run.test.classpath}"/>
1.1060 </classpath>
1.1061 </nbprofiledirect>
1.1062 - <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
1.1063 - <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.1064 - <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.1065 - <jvmarg line="${profiler.info.jvmargs}"/>
1.1066 - <test name="${profile.class}"/>
1.1067 - <classpath>
1.1068 - <path path="${run.test.classpath}"/>
1.1069 - </classpath>
1.1070 - <syspropertyset>
1.1071 - <propertyref prefix="test-sys-prop."/>
1.1072 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.1073 - </syspropertyset>
1.1074 - <formatter type="brief" usefile="false"/>
1.1075 - <formatter type="xml"/>
1.1076 - </junit>
1.1077 + <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
1.1078 + <customize>
1.1079 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
1.1080 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.1081 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.1082 + <jvmarg line="${profiler.info.jvmargs}"/>
1.1083 + <classpath>
1.1084 + <path path="${run.test.classpath}"/>
1.1085 + </classpath>
1.1086 + </customize>
1.1087 + </j2seproject3:junit>
1.1088 </target>
1.1089 <!--
1.1090 end of pre NB72 profiling section
1.1091 @@ -1170,7 +1473,7 @@
1.1092 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1.1093 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.1094 <startprofiler/>
1.1095 - <antcal target="run-test-with-main"/>
1.1096 + <antcall target="run-test-with-main"/>
1.1097 </target>
1.1098 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1.1099 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.1100 @@ -1192,11 +1495,20 @@
1.1101 </not>
1.1102 </and>
1.1103 </condition>
1.1104 - <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.1105 + <condition else="" property="bug5101868workaround" value="*.java">
1.1106 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
1.1107 + </condition>
1.1108 + <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
1.1109 + <and>
1.1110 + <isset property="javadoc.html5"/>
1.1111 + <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
1.1112 + </and>
1.1113 + </condition>
1.1114 + <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.1115 <classpath>
1.1116 <path path="${javac.classpath}"/>
1.1117 </classpath>
1.1118 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.1119 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.1120 <filename name="**/*.java"/>
1.1121 </fileset>
1.1122 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.1123 @@ -1204,6 +1516,7 @@
1.1124 <exclude name="*.java"/>
1.1125 </fileset>
1.1126 <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1.1127 + <arg line="${javadoc.html5.cmd.line.arg}"/>
1.1128 </javadoc>
1.1129 <copy todir="${dist.javadoc.dir}">
1.1130 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.1131 @@ -1230,11 +1543,63 @@
1.1132 <!-- Empty placeholder for easier customization. -->
1.1133 <!-- You can override this target in the ../build.xml file. -->
1.1134 </target>
1.1135 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
1.1136 + <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
1.1137 + <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
1.1138 + <and>
1.1139 + <isset property="test.module.name"/>
1.1140 + <length length="0" string="${test.module.name}" when="greater"/>
1.1141 + </and>
1.1142 + </condition>
1.1143 + <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.1144 + <and>
1.1145 + <isset property="test.module.name"/>
1.1146 + <length length="0" string="${test.module.name}" when="greater"/>
1.1147 + </and>
1.1148 + </condition>
1.1149 + </target>
1.1150 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
1.1151 + <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
1.1152 + <and>
1.1153 + <isset property="test.module.name"/>
1.1154 + <length length="0" string="${test.module.name}" when="greater"/>
1.1155 + </and>
1.1156 + </condition>
1.1157 + <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
1.1158 + <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
1.1159 + <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
1.1160 + <chainedmapper>
1.1161 + <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
1.1162 + <filtermapper>
1.1163 + <uniqfilter/>
1.1164 + <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
1.1165 + </filtermapper>
1.1166 + <cutdirsmapper dirs="1"/>
1.1167 + <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
1.1168 + </chainedmapper>
1.1169 + </pathconvert>
1.1170 + <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.1171 + <and>
1.1172 + <isset property="test.module.name"/>
1.1173 + <length length="0" string="${test.module.name}" when="greater"/>
1.1174 + </and>
1.1175 + </condition>
1.1176 + </target>
1.1177 + <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
1.1178 + <property name="javac.test.sourcepath" value="${empty.dir}"/>
1.1179 + <property name="javac.test.compilerargs" value=""/>
1.1180 + <property name="run.test.jvmargs" value=""/>
1.1181 + </target>
1.1182 + <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
1.1183 <target if="do.depend.true" name="-compile-test-depend">
1.1184 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.1185 </target>
1.1186 - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1.1187 - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
1.1188 + <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.1189 + <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.1190 + <customize>
1.1191 + <compilerarg line="${javac.test.compilerargs}"/>
1.1192 + </customize>
1.1193 + </j2seproject3:javac>
1.1194 <copy todir="${build.test.classes.dir}">
1.1195 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.1196 </copy>
1.1197 @@ -1248,10 +1613,14 @@
1.1198 <!-- Empty placeholder for easier customization. -->
1.1199 <!-- You can override this target in the ../build.xml file. -->
1.1200 </target>
1.1201 - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
1.1202 + <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.1203 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.1204 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
1.1205 - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
1.1206 + <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.1207 + <customize>
1.1208 + <compilerarg line="${javac.test.compilerargs}"/>
1.1209 + </customize>
1.1210 + </j2seproject3:javac>
1.1211 <copy todir="${build.test.classes.dir}">
1.1212 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.1213 </copy>
1.1214 @@ -1269,8 +1638,8 @@
1.1215 <target depends="init" if="have.tests" name="-pre-test-run">
1.1216 <mkdir dir="${build.test.results.dir}"/>
1.1217 </target>
1.1218 - <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.1219 - <j2seproject3:test testincludes="**/*Test.java"/>
1.1220 + <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
1.1221 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
1.1222 </target>
1.1223 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.1224 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1225 @@ -1281,14 +1650,14 @@
1.1226 <target depends="init" if="have.tests" name="-pre-test-run-single">
1.1227 <mkdir dir="${build.test.results.dir}"/>
1.1228 </target>
1.1229 - <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.1230 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.1231 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.1232 <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
1.1233 </target>
1.1234 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1.1235 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1236 </target>
1.1237 - <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.1238 + <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.1239 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
1.1240 <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
1.1241 <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1.1242 @@ -1297,7 +1666,7 @@
1.1243 <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.1244 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.1245 </target>
1.1246 - <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
1.1247 + <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.1248 <!--
1.1249 =======================
1.1250 TEST DEBUGGING SECTION
1.1251 @@ -1315,8 +1684,8 @@
1.1252 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1.1253 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1.1254 </target>
1.1255 - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.1256 - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
1.1257 + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.1258 + <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.1259 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1.1260 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1.1261 </target>
1.1262 @@ -1342,9 +1711,9 @@
1.1263 <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
1.1264 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.1265 <j2seproject3:debug classname="sun.applet.AppletViewer">
1.1266 - <customize>
1.1267 + <customizeDebuggee>
1.1268 <arg value="${applet.url}"/>
1.1269 - </customize>
1.1270 + </customizeDebuggee>
1.1271 </j2seproject3:debug>
1.1272 </target>
1.1273 <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
1.1274 @@ -1371,6 +1740,7 @@
1.1275 </target>
1.1276 <target depends="init" name="-do-clean">
1.1277 <delete dir="${build.dir}"/>
1.1278 + <delete dir="${dist.jlink.output}"/>
1.1279 <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
1.1280 </target>
1.1281 <target name="-post-clean">