1.1 --- a/cmdline/ant/build.xml Fri May 01 19:13:18 2015 +0200
1.2 +++ b/cmdline/ant/build.xml Sun May 31 15:17:24 2015 +0200
1.3 @@ -51,8 +51,7 @@
1.4 -init-macrodef-junit: defines macro for junit execution
1.5 -init-macrodef-debug: defines macro for class debugging
1.6 -init-macrodef-java: defines macro for class execution
1.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
1.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
1.9 + -do-jar: JAR building
1.10 run: execution of project
1.11 -javadoc-build: Javadoc generation
1.12 test-report: JUnit report generation
2.1 --- a/cmdline/ant/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
2.2 +++ b/cmdline/ant/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
2.3 @@ -54,6 +54,7 @@
2.4 <property file="nbproject/project.properties"/>
2.5 </target>
2.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
2.7 + <property name="platform.java" value="${java.home}/bin/java"/>
2.8 <available file="${manifest.file}" property="manifest.available"/>
2.9 <condition property="splashscreen.available">
2.10 <and>
2.11 @@ -71,16 +72,20 @@
2.12 </not>
2.13 </and>
2.14 </condition>
2.15 - <condition property="manifest.available+main.class">
2.16 + <condition property="profile.available">
2.17 <and>
2.18 - <isset property="manifest.available"/>
2.19 - <isset property="main.class.available"/>
2.20 + <isset property="javac.profile"/>
2.21 + <length length="0" string="${javac.profile}" when="greater"/>
2.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
2.23 </and>
2.24 </condition>
2.25 <condition property="do.archive">
2.26 - <not>
2.27 - <istrue value="${jar.archive.disabled}"/>
2.28 - </not>
2.29 + <or>
2.30 + <not>
2.31 + <istrue value="${jar.archive.disabled}"/>
2.32 + </not>
2.33 + <istrue value="${not.archive.disabled}"/>
2.34 + </or>
2.35 </condition>
2.36 <condition property="do.mkdist">
2.37 <and>
2.38 @@ -91,12 +96,6 @@
2.39 </not>
2.40 </and>
2.41 </condition>
2.42 - <condition property="manifest.available+main.class+mkdist.available">
2.43 - <and>
2.44 - <istrue value="${manifest.available+main.class}"/>
2.45 - <isset property="do.mkdist"/>
2.46 - </and>
2.47 - </condition>
2.48 <condition property="do.archive+manifest.available">
2.49 <and>
2.50 <isset property="manifest.available"/>
2.51 @@ -115,24 +114,12 @@
2.52 <istrue value="${do.archive}"/>
2.53 </and>
2.54 </condition>
2.55 - <condition property="do.archive+manifest.available+main.class">
2.56 + <condition property="do.archive+profile.available">
2.57 <and>
2.58 - <istrue value="${manifest.available+main.class}"/>
2.59 + <isset property="profile.available"/>
2.60 <istrue value="${do.archive}"/>
2.61 </and>
2.62 </condition>
2.63 - <condition property="manifest.available-mkdist.available">
2.64 - <or>
2.65 - <istrue value="${manifest.available}"/>
2.66 - <isset property="do.mkdist"/>
2.67 - </or>
2.68 - </condition>
2.69 - <condition property="manifest.available+main.class-mkdist.available">
2.70 - <or>
2.71 - <istrue value="${manifest.available+main.class}"/>
2.72 - <isset property="do.mkdist"/>
2.73 - </or>
2.74 - </condition>
2.75 <condition property="have.tests">
2.76 <or>
2.77 <available file="${test.src.dir}"/>
2.78 @@ -186,7 +173,15 @@
2.79 </condition>
2.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
2.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
2.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
2.83 + <and>
2.84 + <isset property="endorsed.classpath"/>
2.85 + <not>
2.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
2.87 + </not>
2.88 + </and>
2.89 + </condition>
2.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
2.91 + <isset property="profile.available"/>
2.92 </condition>
2.93 <condition else="false" property="jdkBug6558476">
2.94 <and>
2.95 @@ -196,7 +191,12 @@
2.96 </not>
2.97 </and>
2.98 </condition>
2.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
2.100 + <condition else="false" property="javac.fork">
2.101 + <or>
2.102 + <istrue value="${jdkBug6558476}"/>
2.103 + <istrue value="${javac.external.vm}"/>
2.104 + </or>
2.105 + </condition>
2.106 <property name="jar.index" value="false"/>
2.107 <property name="jar.index.metainf" value="${jar.index}"/>
2.108 <property name="copylibs.rebase" value="true"/>
2.109 @@ -275,6 +275,7 @@
2.110 <path path="@{classpath}"/>
2.111 </classpath>
2.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
2.114 <compilerarg line="${javac.compilerargs}"/>
2.115 <compilerarg value="-processorpath"/>
2.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
2.117 @@ -314,6 +315,7 @@
2.118 <path path="@{classpath}"/>
2.119 </classpath>
2.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
2.122 <compilerarg line="${javac.compilerargs}"/>
2.123 <customize/>
2.124 </javac>
2.125 @@ -370,6 +372,11 @@
2.126 </and>
2.127 </condition>
2.128 </target>
2.129 + <target name="-init-test-properties">
2.130 + <property name="test.binaryincludes" value="<nothing>"/>
2.131 + <property name="test.binarytestincludes" value=""/>
2.132 + <property name="test.binaryexcludes" value=""/>
2.133 + </target>
2.134 <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
2.135 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
2.136 <attribute default="${includes}" name="includes"/>
2.137 @@ -393,7 +400,7 @@
2.138 </sequential>
2.139 </macrodef>
2.140 </target>
2.141 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
2.142 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
2.143 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
2.144 <attribute default="${includes}" name="includes"/>
2.145 <attribute default="${excludes}" name="excludes"/>
2.146 @@ -407,6 +414,9 @@
2.147 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
2.148 <filename name="@{testincludes}"/>
2.149 </fileset>
2.150 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
2.151 + <filename name="${test.binarytestincludes}"/>
2.152 + </fileset>
2.153 </batchtest>
2.154 <syspropertyset>
2.155 <propertyref prefix="test-sys-prop."/>
2.156 @@ -438,7 +448,7 @@
2.157 </fileset>
2.158 </union>
2.159 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
2.160 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Jackpot_3.0_Command_Line_Tool_Ant_Bridge" testname="TestNG tests" workingDir="${work.dir}">
2.161 + <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="Jackpot_3.0_Command_Line_Tool_Ant_Bridge" testname="TestNG tests" workingDir="${work.dir}">
2.162 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
2.163 <propertyset>
2.164 <propertyref prefix="test-sys-prop."/>
2.165 @@ -509,39 +519,73 @@
2.166 </sequential>
2.167 </macrodef>
2.168 </target>
2.169 - <target if="${junit.available}" name="-init-macrodef-junit-debug">
2.170 + <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
2.171 <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.172 - <attribute default="${main.class}" name="testClass"/>
2.173 - <attribute default="" name="testMethod"/>
2.174 - <element name="customize2" optional="true"/>
2.175 + <attribute default="${includes}" name="includes"/>
2.176 + <attribute default="${excludes}" name="excludes"/>
2.177 + <attribute default="**" name="testincludes"/>
2.178 + <attribute default="" name="testmethods"/>
2.179 + <element name="customize" optional="true"/>
2.180 <sequential>
2.181 - <property location="${build.test.results.dir}/TEST-@{testClass}.xml" name="test.report.file"/>
2.182 - <delete file="${test.report.file}"/>
2.183 - <mkdir dir="${build.test.results.dir}"/>
2.184 - <condition else="" property="junit.methods.arg" value="methods=@{testMethod}">
2.185 - <isset property="test.method"/>
2.186 - </condition>
2.187 - <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}">
2.188 - <customize>
2.189 - <arg value="@{testClass}"/>
2.190 - <arg value="${junit.methods.arg}"/>
2.191 - <arg value="showoutput=true"/>
2.192 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
2.193 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
2.194 - <customize2/>
2.195 - </customize>
2.196 - </j2seproject3:debug>
2.197 + <property name="junit.forkmode" value="perTest"/>
2.198 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.199 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
2.200 + <syspropertyset>
2.201 + <propertyref prefix="test-sys-prop."/>
2.202 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.203 + </syspropertyset>
2.204 + <formatter type="brief" usefile="false"/>
2.205 + <formatter type="xml"/>
2.206 + <jvmarg value="-ea"/>
2.207 + <jvmarg line="${debug-args-line}"/>
2.208 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
2.209 + <customize/>
2.210 + </junit>
2.211 </sequential>
2.212 </macrodef>
2.213 </target>
2.214 - <target depends="-init-macrodef-junit-debug" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
2.215 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
2.216 + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.217 + <attribute default="${includes}" name="includes"/>
2.218 + <attribute default="${excludes}" name="excludes"/>
2.219 + <attribute default="**" name="testincludes"/>
2.220 + <attribute default="" name="testmethods"/>
2.221 + <element name="customize" optional="true"/>
2.222 + <sequential>
2.223 + <property name="junit.forkmode" value="perTest"/>
2.224 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.225 + <batchtest todir="${build.test.results.dir}">
2.226 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
2.227 + <filename name="@{testincludes}"/>
2.228 + </fileset>
2.229 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
2.230 + <filename name="${test.binarytestincludes}"/>
2.231 + </fileset>
2.232 + </batchtest>
2.233 + <syspropertyset>
2.234 + <propertyref prefix="test-sys-prop."/>
2.235 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.236 + </syspropertyset>
2.237 + <formatter type="brief" usefile="false"/>
2.238 + <formatter type="xml"/>
2.239 + <jvmarg value="-ea"/>
2.240 + <jvmarg line="${debug-args-line}"/>
2.241 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
2.242 + <customize/>
2.243 + </junit>
2.244 + </sequential>
2.245 + </macrodef>
2.246 + </target>
2.247 + <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
2.248 <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.249 - <attribute default="${main.class}" name="testClass"/>
2.250 - <attribute default="" name="testMethod"/>
2.251 - <element implicit="true" name="customize2" optional="true"/>
2.252 + <attribute default="${includes}" name="includes"/>
2.253 + <attribute default="${excludes}" name="excludes"/>
2.254 + <attribute default="**" name="testincludes"/>
2.255 + <attribute default="" name="testmethods"/>
2.256 + <element implicit="true" name="customize" optional="true"/>
2.257 <sequential>
2.258 - <j2seproject3:junit-debug testClass="@{testClass}" testMethod="@{testMethod}">
2.259 - <customize2/>
2.260 + <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.261 + <customize/>
2.262 </j2seproject3:junit-debug>
2.263 </sequential>
2.264 </macrodef>
2.265 @@ -574,7 +618,7 @@
2.266 </macrodef>
2.267 </target>
2.268 <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
2.269 - <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.270 + <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.271 <attribute default="${main.class}" name="testClass"/>
2.272 <attribute default="" name="testMethod"/>
2.273 <element implicit="true" name="customize2" optional="true"/>
2.274 @@ -585,22 +629,49 @@
2.275 </sequential>
2.276 </macrodef>
2.277 </target>
2.278 - <target depends="-init-macrodef-junit-debug-impl,-init-macrodef-testng-debug-impl" name="-init-macrodef-test-debug">
2.279 + <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
2.280 <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.281 + <attribute default="${includes}" name="includes"/>
2.282 + <attribute default="${excludes}" name="excludes"/>
2.283 + <attribute default="**" name="testincludes"/>
2.284 + <attribute default="" name="testmethods"/>
2.285 <attribute default="${main.class}" name="testClass"/>
2.286 <attribute default="" name="testMethod"/>
2.287 <sequential>
2.288 - <j2seproject3:test-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
2.289 + <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.290 + <customize>
2.291 + <classpath>
2.292 + <path path="${run.test.classpath}"/>
2.293 + </classpath>
2.294 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.295 + <jvmarg line="${run.jvmargs}"/>
2.296 + <jvmarg line="${run.jvmargs.ide}"/>
2.297 + </customize>
2.298 + </j2seproject3:test-debug-impl>
2.299 + </sequential>
2.300 + </macrodef>
2.301 + </target>
2.302 + <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
2.303 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.304 + <attribute default="${includes}" name="includes"/>
2.305 + <attribute default="${excludes}" name="excludes"/>
2.306 + <attribute default="**" name="testincludes"/>
2.307 + <attribute default="" name="testmethods"/>
2.308 + <attribute default="${main.class}" name="testClass"/>
2.309 + <attribute default="" name="testMethod"/>
2.310 + <sequential>
2.311 + <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
2.312 <customize2>
2.313 <syspropertyset>
2.314 <propertyref prefix="test-sys-prop."/>
2.315 <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.316 </syspropertyset>
2.317 </customize2>
2.318 - </j2seproject3:test-debug-impl>
2.319 + </j2seproject3:testng-debug-impl>
2.320 </sequential>
2.321 </macrodef>
2.322 </target>
2.323 + <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
2.324 <!--
2.325 pre NB7.2 profiling section; consider it deprecated
2.326 -->
2.327 @@ -761,12 +832,15 @@
2.328 <path path="${run.classpath.without.build.classes.dir}"/>
2.329 <chainedmapper>
2.330 <flattenmapper/>
2.331 + <filtermapper>
2.332 + <replacestring from=" " to="%20"/>
2.333 + </filtermapper>
2.334 <globmapper from="*" to="lib/*"/>
2.335 </chainedmapper>
2.336 </pathconvert>
2.337 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
2.338 - <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}">
2.339 - <fileset dir="${build.classes.dir}"/>
2.340 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
2.341 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
2.342 <manifest>
2.343 <attribute name="Class-Path" value="${jar.classpath}"/>
2.344 <customize/>
2.345 @@ -778,7 +852,7 @@
2.346 <target name="-init-presetdef-jar">
2.347 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
2.348 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
2.349 - <j2seproject1:fileset dir="${build.classes.dir}"/>
2.350 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
2.351 </jar>
2.352 </presetdef>
2.353 </target>
2.354 @@ -859,7 +933,7 @@
2.355 <target if="has.persistence.xml" name="-copy-persistence-xml">
2.356 <mkdir dir="${build.classes.dir}/META-INF"/>
2.357 <copy todir="${build.classes.dir}/META-INF">
2.358 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
2.359 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
2.360 </copy>
2.361 </target>
2.362 <target name="-post-compile">
2.363 @@ -894,41 +968,25 @@
2.364 <!-- Empty placeholder for easier customization. -->
2.365 <!-- You can override this target in the ../build.xml file. -->
2.366 </target>
2.367 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
2.368 - <j2seproject1:jar/>
2.369 - </target>
2.370 - <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">
2.371 - <j2seproject1:jar manifest="${manifest.file}"/>
2.372 - </target>
2.373 - <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">
2.374 - <j2seproject1:jar manifest="${manifest.file}">
2.375 - <j2seproject1:manifest>
2.376 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
2.377 - </j2seproject1:manifest>
2.378 - </j2seproject1:jar>
2.379 - <echo level="info">To run this application from the command line without Ant, try:</echo>
2.380 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.381 - <property location="${dist.jar}" name="dist.jar.resolved"/>
2.382 - <pathconvert property="run.classpath.with.dist.jar">
2.383 - <path path="${run.classpath}"/>
2.384 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
2.385 - </pathconvert>
2.386 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
2.387 - </target>
2.388 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
2.389 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
2.390 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.391 <touch file="${tmp.manifest.file}" verbose="false"/>
2.392 </target>
2.393 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
2.394 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
2.395 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.396 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
2.397 </target>
2.398 - <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">
2.399 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
2.400 <manifest file="${tmp.manifest.file}" mode="update">
2.401 <attribute name="Main-Class" value="${main.class}"/>
2.402 </manifest>
2.403 </target>
2.404 - <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">
2.405 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
2.406 + <manifest file="${tmp.manifest.file}" mode="update">
2.407 + <attribute name="Profile" value="${javac.profile}"/>
2.408 + </manifest>
2.409 + </target>
2.410 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
2.411 <basename file="${application.splash}" property="splashscreen.basename"/>
2.412 <mkdir dir="${build.classes.dir}/META-INF"/>
2.413 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
2.414 @@ -936,23 +994,41 @@
2.415 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
2.416 </manifest>
2.417 </target>
2.418 - <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">
2.419 + <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" if="do.mkdist" name="-do-jar-copylibs">
2.420 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
2.421 <echo level="info">To run this application from the command line without Ant, try:</echo>
2.422 <property location="${dist.jar}" name="dist.jar.resolved"/>
2.423 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
2.424 </target>
2.425 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
2.426 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
2.427 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
2.428 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.429 + <property location="${dist.jar}" name="dist.jar.resolved"/>
2.430 + <pathconvert property="run.classpath.with.dist.jar">
2.431 + <path path="${run.classpath}"/>
2.432 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
2.433 + </pathconvert>
2.434 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
2.435 + <isset property="main.class.available"/>
2.436 + </condition>
2.437 + <condition else="debug" property="jar.usage.level" value="info">
2.438 + <isset property="main.class.available"/>
2.439 + </condition>
2.440 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
2.441 + </target>
2.442 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
2.443 <delete>
2.444 <fileset file="${tmp.manifest.file}"/>
2.445 </delete>
2.446 </target>
2.447 - <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"/>
2.448 + <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"/>
2.449 + <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"/>
2.450 <target name="-post-jar">
2.451 <!-- Empty placeholder for easier customization. -->
2.452 <!-- You can override this target in the ../build.xml file. -->
2.453 </target>
2.454 - <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"/>
2.455 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
2.456 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
2.457 <!--
2.458 =================
2.459 EXECUTION SECTION
2.460 @@ -1131,11 +1207,14 @@
2.461 </not>
2.462 </and>
2.463 </condition>
2.464 - <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}">
2.465 + <condition else="" property="bug5101868workaround" value="*.java">
2.466 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
2.467 + </condition>
2.468 + <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}">
2.469 <classpath>
2.470 <path path="${javac.classpath}"/>
2.471 </classpath>
2.472 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
2.473 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
2.474 <filename name="**/*.java"/>
2.475 </fileset>
2.476 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
2.477 @@ -1209,7 +1288,7 @@
2.478 <mkdir dir="${build.test.results.dir}"/>
2.479 </target>
2.480 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
2.481 - <j2seproject3:test testincludes="**/*Test.java"/>
2.482 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
2.483 </target>
2.484 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
2.485 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.486 @@ -1242,13 +1321,14 @@
2.487 TEST DEBUGGING SECTION
2.488 =======================
2.489 -->
2.490 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
2.491 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
2.492 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
2.493 - <j2seproject3:test-debug testClass="${test.class}"/>
2.494 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
2.495 </target>
2.496 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test-method">
2.497 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
2.498 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
2.499 - <j2seproject3:test-debug testClass="${test.class}" testMethod="${test.method}"/>
2.500 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
2.501 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
2.502 </target>
2.503 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
2.504 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
3.1 --- a/cmdline/ant/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
3.2 +++ b/cmdline/ant/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
3.3 @@ -1,8 +1,8 @@
3.4 build.xml.data.CRC32=3eef813c
3.5 -build.xml.script.CRC32=f280afc1
3.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
3.7 +build.xml.script.CRC32=b703d7de
3.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
3.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.11 nbproject/build-impl.xml.data.CRC32=3eef813c
3.12 -nbproject/build-impl.xml.script.CRC32=6e13d254
3.13 -nbproject/build-impl.xml.stylesheet.CRC32=5183f3c0@1.51.0.46
3.14 +nbproject/build-impl.xml.script.CRC32=81cfe403
3.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
4.1 --- a/cmdline/compiler/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
4.2 +++ b/cmdline/compiler/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
4.3 @@ -3,6 +3,6 @@
4.4 build.xml.stylesheet.CRC32=79c3b980@1.33
4.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.7 -nbproject/build-impl.xml.data.CRC32=dcf519c4
4.8 +nbproject/build-impl.xml.data.CRC32=bd5c4e9e
4.9 nbproject/build-impl.xml.script.CRC32=64f6fe95
4.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
4.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
5.1 --- a/cmdline/compiler/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
5.2 +++ b/cmdline/compiler/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
5.3 @@ -127,6 +127,14 @@
5.4 </run-dependency>
5.5 </dependency>
5.6 <dependency>
5.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
5.8 + <build-prerequisite/>
5.9 + <compile-dependency/>
5.10 + <run-dependency>
5.11 + <implementation-version/>
5.12 + </run-dependency>
5.13 + </dependency>
5.14 + <dependency>
5.15 <code-name-base>org.netbeans.modules.lexer</code-name-base>
5.16 <build-prerequisite/>
5.17 <compile-dependency/>
5.18 @@ -145,6 +153,14 @@
5.19 </run-dependency>
5.20 </dependency>
5.21 <dependency>
5.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
5.23 + <build-prerequisite/>
5.24 + <compile-dependency/>
5.25 + <run-dependency>
5.26 + <implementation-version/>
5.27 + </run-dependency>
5.28 + </dependency>
5.29 + <dependency>
5.30 <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
5.31 <build-prerequisite/>
5.32 <compile-dependency/>
5.33 @@ -226,6 +242,10 @@
5.34 <compile-dependency/>
5.35 </test-dependency>
5.36 <test-dependency>
5.37 + <code-name-base>org.netbeans.modules.editor.document</code-name-base>
5.38 + <compile-dependency/>
5.39 + </test-dependency>
5.40 + <test-dependency>
5.41 <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
5.42 <compile-dependency/>
5.43 </test-dependency>
5.44 @@ -253,6 +273,14 @@
5.45 <compile-dependency/>
5.46 </test-dependency>
5.47 <test-dependency>
5.48 + <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
5.49 + <compile-dependency/>
5.50 + </test-dependency>
5.51 + <test-dependency>
5.52 + <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
5.53 + <compile-dependency/>
5.54 + </test-dependency>
5.55 + <test-dependency>
5.56 <code-name-base>org.netbeans.modules.projectui</code-name-base>
5.57 <compile-dependency/>
5.58 </test-dependency>
6.1 --- a/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Fri May 01 19:13:18 2015 +0200
6.2 +++ b/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Sun May 31 15:17:24 2015 +0200
6.3 @@ -259,7 +259,7 @@
6.4 }
6.5
6.6 public ModificationResult computeResult() throws IOException, BadLocationException {
6.7 - ModificationResult mr = new ModificationResult(null);
6.8 + ModificationResult mr = new ModificationResult();
6.9
6.10 mr.diffs.put(getFileObject(), getChanges(new HashMap<Object, int[]>()));
6.11
7.1 --- a/cmdline/lib/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
7.2 +++ b/cmdline/lib/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
7.3 @@ -51,6 +51,14 @@
7.4 </run-dependency>
7.5 </dependency>
7.6 <dependency>
7.7 + <code-name-base>org.netbeans.modules.editor.document</code-name-base>
7.8 + <build-prerequisite/>
7.9 + <compile-dependency/>
7.10 + <run-dependency>
7.11 + <specification-version>1.4.0.1</specification-version>
7.12 + </run-dependency>
7.13 + </dependency>
7.14 + <dependency>
7.15 <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
7.16 <build-prerequisite/>
7.17 <compile-dependency/>
7.18 @@ -92,6 +100,14 @@
7.19 </run-dependency>
7.20 </dependency>
7.21 <dependency>
7.22 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
7.23 + <build-prerequisite/>
7.24 + <compile-dependency/>
7.25 + <run-dependency>
7.26 + <implementation-version/>
7.27 + </run-dependency>
7.28 + </dependency>
7.29 + <dependency>
7.30 <code-name-base>org.netbeans.modules.lexer</code-name-base>
7.31 <build-prerequisite/>
7.32 <compile-dependency/>
7.33 @@ -110,6 +126,14 @@
7.34 </run-dependency>
7.35 </dependency>
7.36 <dependency>
7.37 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
7.38 + <build-prerequisite/>
7.39 + <compile-dependency/>
7.40 + <run-dependency>
7.41 + <implementation-version/>
7.42 + </run-dependency>
7.43 + </dependency>
7.44 + <dependency>
7.45 <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
7.46 <build-prerequisite/>
7.47 <compile-dependency/>
7.48 @@ -212,6 +236,14 @@
7.49 <compile-dependency/>
7.50 </test-dependency>
7.51 <test-dependency>
7.52 + <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
7.53 + <compile-dependency/>
7.54 + </test-dependency>
7.55 + <test-dependency>
7.56 + <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
7.57 + <compile-dependency/>
7.58 + </test-dependency>
7.59 + <test-dependency>
7.60 <code-name-base>org.netbeans.modules.projectui</code-name-base>
7.61 <compile-dependency/>
7.62 </test-dependency>
8.1 --- a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/StandaloneTools.java Fri May 01 19:13:18 2015 +0200
8.2 +++ b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/StandaloneTools.java Sun May 31 15:17:24 2015 +0200
8.3 @@ -38,22 +38,26 @@
8.4 */
8.5 package org.netbeans.modules.jackpot30.cmdline.lib;
8.6
8.7 +import java.beans.PropertyChangeListener;
8.8 import java.beans.PropertyVetoException;
8.9 import java.io.File;
8.10 import java.io.IOException;
8.11 import java.net.MalformedURLException;
8.12 import java.net.URL;
8.13 import java.util.ArrayList;
8.14 +import java.util.Collections;
8.15 import java.util.Enumeration;
8.16 import java.util.LinkedList;
8.17 import java.util.List;
8.18 import java.util.Properties;
8.19 +import java.util.Set;
8.20 import java.util.StringTokenizer;
8.21 import java.util.prefs.AbstractPreferences;
8.22 import java.util.prefs.BackingStoreException;
8.23 import java.util.prefs.Preferences;
8.24 import java.util.prefs.PreferencesFactory;
8.25 import javax.swing.event.ChangeListener;
8.26 +import javax.swing.text.Document;
8.27 import org.netbeans.api.editor.mimelookup.MimePath;
8.28 import org.netbeans.api.java.classpath.ClassPath;
8.29 import org.netbeans.api.java.queries.SourceForBinaryQuery;
8.30 @@ -63,6 +67,8 @@
8.31 import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
8.32 import org.netbeans.modules.java.source.parsing.JavacParser;
8.33 import org.netbeans.modules.java.source.parsing.JavacParserFactory;
8.34 +import org.netbeans.modules.parsing.impl.indexing.implspi.ActiveDocumentProvider;
8.35 +import org.netbeans.spi.editor.document.EditorMimeTypesImplementation;
8.36 import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
8.37 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
8.38 import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
8.39 @@ -87,18 +93,6 @@
8.40 public class StandaloneTools {
8.41
8.42 @ServiceProvider(service=MimeDataProvider.class)
8.43 - public static final class MimeDataProviderImpl implements MimeDataProvider {
8.44 -
8.45 - private static final Lookup L = Lookups.fixed(new JavacParserFactory(), new JavaCustomIndexer.Factory());
8.46 -
8.47 - public Lookup getLookup(MimePath mimePath) {
8.48 - if ("text/x-java".equals(mimePath.getPath()))
8.49 - return L;
8.50 - return null;
8.51 - }
8.52 -
8.53 - }
8.54 -
8.55 public static final class StandaloneMimeDataProviderImpl implements MimeDataProvider {
8.56
8.57 private static final Lookup L = Lookups.fixed(NbPreferences.forModule(StandaloneTools.class), new JavacParserFactory(), new JavaCustomIndexer.Factory(), new GlobalSettingsProvider());
8.58 @@ -338,4 +332,47 @@
8.59 }
8.60
8.61 }
8.62 +
8.63 + @ServiceProvider(service=ActiveDocumentProvider.class)
8.64 + public static final class ActiveDocumentProviderImpl implements ActiveDocumentProvider {
8.65 +
8.66 + @Override
8.67 + public Document getActiveDocument() {
8.68 + return null;
8.69 + }
8.70 +
8.71 + @Override
8.72 + public Set<? extends Document> getActiveDocuments() {
8.73 + return Collections.emptySet();
8.74 + }
8.75 +
8.76 + @Override
8.77 + public void addActiveDocumentListener(ActiveDocumentListener listener) {
8.78 + }
8.79 +
8.80 + @Override
8.81 + public void removeActiveDocumentListener(ActiveDocumentListener listener) {
8.82 + }
8.83 +
8.84 + }
8.85 +
8.86 + @ServiceProvider(service=EditorMimeTypesImplementation.class)
8.87 + public static final class EditorMimeTypesImplementationImpl implements EditorMimeTypesImplementation {
8.88 +
8.89 + private static final Set<String> MIME_TYPES = Collections.singleton("text/x-java");
8.90 +
8.91 + @Override
8.92 + public Set<String> getSupportedMimeTypes() {
8.93 + return MIME_TYPES;
8.94 + }
8.95 +
8.96 + @Override
8.97 + public void addPropertyChangeListener(PropertyChangeListener listener) {
8.98 + }
8.99 +
8.100 + @Override
8.101 + public void removePropertyChangeListener(PropertyChangeListener listener) {
8.102 + }
8.103 +
8.104 + }
8.105 }
9.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java Fri May 01 19:13:18 2015 +0200
9.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java Sun May 31 15:17:24 2015 +0200
9.3 @@ -73,9 +73,14 @@
9.4 import org.netbeans.junit.NbTestCase;
9.5 import org.netbeans.modules.classfile.ClassFile;
9.6 import org.netbeans.modules.classfile.ClassName;
9.7 +import org.netbeans.modules.editor.mimelookup.MimeLookupCacheSPI;
9.8 +import org.netbeans.modules.editor.mimelookup.SharedMimeLookupCache;
9.9 +import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.ActiveDocumentProviderImpl;
9.10 +import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.EditorMimeTypesImplementationImpl;
9.11 import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.JavaMimeResolver;
9.12 import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.RepositoryImpl;
9.13 import org.netbeans.modules.jackpot30.common.api.IndexAccess;
9.14 +import org.netbeans.modules.java.classpath.DefaultGlobalPathRegistryImplementation;
9.15 import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
9.16 import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl;
9.17 import org.netbeans.modules.java.hints.providers.code.FSWrapper;
9.18 @@ -85,8 +90,17 @@
9.19 import org.netbeans.modules.java.hints.spiimpl.RulesManager;
9.20 import org.netbeans.modules.java.hints.spiimpl.RulesManagerImpl;
9.21 import org.netbeans.modules.java.hints.spiimpl.Utilities.SPI;
9.22 +import org.netbeans.modules.java.source.DefaultPositionRefProvider;
9.23 +import org.netbeans.modules.java.source.PositionRefProvider;
9.24 +import org.netbeans.modules.parsing.impl.indexing.implspi.ActiveDocumentProvider;
9.25 +import org.netbeans.modules.parsing.implspi.EnvironmentFactory;
9.26 +import org.netbeans.modules.parsing.nb.DataObjectEnvFactory;
9.27 +import org.netbeans.modules.projectapi.nb.NbProjectManager;
9.28 +import org.netbeans.spi.editor.document.EditorMimeTypesImplementation;
9.29 import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
9.30 +import org.netbeans.spi.java.classpath.GlobalPathRegistryImplementation;
9.31 import org.netbeans.spi.java.hints.Hint;
9.32 +import org.netbeans.spi.project.ProjectManagerImplementation;
9.33 import org.openide.filesystems.MIMEResolver;
9.34 import org.openide.util.NbCollections;
9.35 import org.openide.util.NbPreferences.Provider;
9.36 @@ -264,6 +278,9 @@
9.37 registrations.add(new MetaInfRegistration(MimeDataProvider.class.getName(), StandaloneTools.StandaloneMimeDataProviderImpl.class.getName()));
9.38 registrations.add(new MetaInfRegistration(SPI.class.getName(), StandaloneTools.UtilitiesSPIImpl.class.getName()));
9.39 registrations.add(new MetaInfRegistration(MIMEResolver.class.getName(), JavaMimeResolver.class.getName()));
9.40 + registrations.add(new MetaInfRegistration(ActiveDocumentProvider.class.getName(), ActiveDocumentProviderImpl.class.getName()));
9.41 + registrations.add(new MetaInfRegistration(EditorMimeTypesImplementation.class.getName(), EditorMimeTypesImplementationImpl.class.getName()));
9.42 + registrations.add(new MetaInfRegistration(PositionRefProvider.Factory.class.getName(), DefaultPositionRefProvider.FactoryImpl.class.getName()));
9.43 registrations.addAll(info.metaInf);
9.44
9.45 Map<String, Collection<MetaInfRegistration>> api2Registrations = new HashMap<String, Collection<MetaInfRegistration>>();
9.46 @@ -472,7 +489,12 @@
9.47 , Tree.class.getName()
9.48 ,JavacTool.class.getName()
9.49 ,JavaMimeResolver.class.getName()
9.50 - , "org.netbeans.api.java.source.support.OpenedEditors"
9.51 + , "org.netbeans.api.java.source.support.OpenedEditors",
9.52 + SharedMimeLookupCache.class.getName(),
9.53 + DataObjectEnvFactory.class.getName(),
9.54 + NbProjectManager.class.getName(),
9.55 + DefaultGlobalPathRegistryImplementation.class.getName(),
9.56 + DefaultPositionRefProvider.FactoryImpl.class.getName()
9.57 ));
9.58
9.59 private static final Set<String> COPY_REGISTRATION = new HashSet<String>(Arrays.<String>asList(
9.60 @@ -482,8 +504,12 @@
9.61 "org.netbeans.modules.openide.util.PreferencesProvider",
9.62 ClassPathBasedHintProvider.class.getName(),
9.63 IndexAccess.class.getName(),
9.64 - RulesManager.class.getName()
9.65 - ));
9.66 + RulesManager.class.getName(),
9.67 + MimeLookupCacheSPI.class.getName(),
9.68 + EnvironmentFactory.class.getName(),
9.69 + ProjectManagerImplementation.class.getName(),
9.70 + GlobalPathRegistryImplementation.class.getName()
9.71 + ));
9.72
9.73 private static final Set<String> RESOURCES = new HashSet<String>(Arrays.asList(
9.74 "com/sun/tools/javac/resources/javac_zh_CN.properties",
10.1 --- a/cmdline/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
10.2 +++ b/cmdline/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
10.3 @@ -7,5 +7,5 @@
10.4 nbproject/build-impl.xml.script.CRC32=01a664f5
10.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
10.6 nbproject/platform.xml.data.CRC32=56bbc279
10.7 -nbproject/platform.xml.script.CRC32=db9e1f43
10.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
10.9 +nbproject/platform.xml.script.CRC32=6dcbd131
10.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
11.1 --- a/cmdline/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
11.2 +++ b/cmdline/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
11.3 @@ -17,7 +17,7 @@
11.4 </pathconvert>
11.5 <property name="disabled.modules" value=""/>
11.6 <pathconvert property="module.includes" pathsep="">
11.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
11.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
11.9 <path>
11.10 <filelist files="${disabled.modules}" dir="."/>
11.11 </path>
12.1 --- a/cmdline/tool/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
12.2 +++ b/cmdline/tool/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
12.3 @@ -3,6 +3,6 @@
12.4 build.xml.stylesheet.CRC32=a56c6a5b@1.44
12.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.7 -nbproject/build-impl.xml.data.CRC32=4353b1db
12.8 +nbproject/build-impl.xml.data.CRC32=28a6110c
12.9 nbproject/build-impl.xml.script.CRC32=08f1fb11
12.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50
12.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
13.1 --- a/cmdline/tool/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
13.2 +++ b/cmdline/tool/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
13.3 @@ -57,6 +57,14 @@
13.4 <compile-dependency/>
13.5 </dependency>
13.6 <dependency>
13.7 + <code-name-base>org.netbeans.modules.editor.document</code-name-base>
13.8 + <build-prerequisite/>
13.9 + <compile-dependency/>
13.10 + <run-dependency>
13.11 + <specification-version>1.4.0.1</specification-version>
13.12 + </run-dependency>
13.13 + </dependency>
13.14 + <dependency>
13.15 <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
13.16 <build-prerequisite/>
13.17 <compile-dependency/>
13.18 @@ -114,6 +122,14 @@
13.19 </run-dependency>
13.20 </dependency>
13.21 <dependency>
13.22 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
13.23 + <build-prerequisite/>
13.24 + <compile-dependency/>
13.25 + <run-dependency>
13.26 + <implementation-version/>
13.27 + </run-dependency>
13.28 + </dependency>
13.29 + <dependency>
13.30 <code-name-base>org.netbeans.modules.options.editor</code-name-base>
13.31 <build-prerequisite/>
13.32 <compile-dependency/>
13.33 @@ -132,6 +148,14 @@
13.34 </run-dependency>
13.35 </dependency>
13.36 <dependency>
13.37 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
13.38 + <build-prerequisite/>
13.39 + <compile-dependency/>
13.40 + <run-dependency>
13.41 + <implementation-version/>
13.42 + </run-dependency>
13.43 + </dependency>
13.44 + <dependency>
13.45 <code-name-base>org.netbeans.modules.project.ant</code-name-base>
13.46 <build-prerequisite/>
13.47 <compile-dependency/>
13.48 @@ -167,6 +191,15 @@
13.49 </run-dependency>
13.50 </dependency>
13.51 <dependency>
13.52 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
13.53 + <build-prerequisite/>
13.54 + <compile-dependency/>
13.55 + <run-dependency>
13.56 + <release-version>1</release-version>
13.57 + <specification-version>1.79.0.9</specification-version>
13.58 + </run-dependency>
13.59 + </dependency>
13.60 + <dependency>
13.61 <code-name-base>org.netbeans.modules.queries</code-name-base>
13.62 <build-prerequisite/>
13.63 <compile-dependency/>
13.64 @@ -326,6 +359,14 @@
13.65 <compile-dependency/>
13.66 </test-dependency>
13.67 <test-dependency>
13.68 + <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
13.69 + <compile-dependency/>
13.70 + </test-dependency>
13.71 + <test-dependency>
13.72 + <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
13.73 + <compile-dependency/>
13.74 + </test-dependency>
13.75 + <test-dependency>
13.76 <code-name-base>org.netbeans.modules.projectui</code-name-base>
13.77 <compile-dependency/>
13.78 </test-dependency>
14.1 --- a/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java Fri May 01 19:13:18 2015 +0200
14.2 +++ b/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java Sun May 31 15:17:24 2015 +0200
14.3 @@ -82,6 +82,7 @@
14.4 import org.netbeans.api.java.classpath.GlobalPathRegistry;
14.5 import org.netbeans.api.java.source.CompilationController;
14.6 import org.netbeans.api.java.source.ModificationResult;
14.7 +import org.netbeans.api.project.ui.*;
14.8 import org.netbeans.core.startup.MainLookup;
14.9 import org.netbeans.modules.jackpot30.ui.settings.XMLHintPreferences;
14.10 import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
14.11 @@ -383,6 +384,9 @@
14.12 MainLookup.unregister(toUnRegister);
14.13 }
14.14 }
14.15 + } catch (Throwable e) {
14.16 + e.printStackTrace();
14.17 + throw new IllegalStateException(e);
14.18 } finally {
14.19 if (deleteCacheDir) {
14.20 FileObject cacheDirFO = FileUtil.toFileObject(cacheDir);
15.1 --- a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/CreateToolTest.java Fri May 01 19:13:18 2015 +0200
15.2 +++ b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/CreateToolTest.java Sun May 31 15:17:24 2015 +0200
15.3 @@ -52,6 +52,7 @@
15.4 import java.util.Set;
15.5 import junit.extensions.TestSetup;
15.6 import junit.framework.Test;
15.7 +import org.hamcrest.Condition;
15.8 import org.junit.runner.JUnitCore;
15.9 import org.netbeans.junit.NbTestSuite;
15.10 import org.openide.filesystems.FileUtil;
15.11 @@ -106,7 +107,7 @@
15.12 List<String> ll = new LinkedList<String>();
15.13 ll.add("java");
15.14 ll.add("-classpath");
15.15 - ll.add(compiler.getAbsolutePath() + File.pathSeparator + classes.getAbsolutePath() + File.pathSeparator + new File(JUnitCore.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getAbsolutePath());
15.16 + ll.add(compiler.getAbsolutePath() + File.pathSeparator + classes.getAbsolutePath() + File.pathSeparator + new File(JUnitCore.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getAbsolutePath() + File.pathSeparator + new File(Condition.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getAbsolutePath());
15.17
15.18 // ll.add("-Xdebug");
15.19 // ll.add("-Xrunjdwp:transport=dt_socket,suspend=y,server=y,address=8889");
16.1 --- a/duplicates/ide/impl/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
16.2 +++ b/duplicates/ide/impl/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
16.3 @@ -3,6 +3,6 @@
16.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
16.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
16.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
16.7 -nbproject/build-impl.xml.data.CRC32=f8b02bd8
16.8 +nbproject/build-impl.xml.data.CRC32=8cb9ba5d
16.9 nbproject/build-impl.xml.script.CRC32=5fd8da83
16.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50
16.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
17.1 --- a/duplicates/ide/impl/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
17.2 +++ b/duplicates/ide/impl/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
17.3 @@ -43,6 +43,14 @@
17.4 </run-dependency>
17.5 </dependency>
17.6 <dependency>
17.7 + <code-name-base>org.netbeans.api.progress.nb</code-name-base>
17.8 + <build-prerequisite/>
17.9 + <compile-dependency/>
17.10 + <run-dependency>
17.11 + <specification-version>1.45</specification-version>
17.12 + </run-dependency>
17.13 + </dependency>
17.14 + <dependency>
17.15 <code-name-base>org.netbeans.libs.javacapi</code-name-base>
17.16 <build-prerequisite/>
17.17 <compile-dependency/>
17.18 @@ -182,6 +190,14 @@
17.19 </run-dependency>
17.20 </dependency>
17.21 <dependency>
17.22 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
17.23 + <build-prerequisite/>
17.24 + <compile-dependency/>
17.25 + <run-dependency>
17.26 + <specification-version>2.4.1.2.25.8.1</specification-version>
17.27 + </run-dependency>
17.28 + </dependency>
17.29 + <dependency>
17.30 <code-name-base>org.netbeans.modules.lexer</code-name-base>
17.31 <build-prerequisite/>
17.32 <compile-dependency/>
17.33 @@ -209,6 +225,14 @@
17.34 </run-dependency>
17.35 </dependency>
17.36 <dependency>
17.37 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
17.38 + <build-prerequisite/>
17.39 + <compile-dependency/>
17.40 + <run-dependency>
17.41 + <implementation-version/>
17.42 + </run-dependency>
17.43 + </dependency>
17.44 + <dependency>
17.45 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
17.46 <build-prerequisite/>
17.47 <compile-dependency/>
17.48 @@ -343,6 +367,14 @@
17.49 </run-dependency>
17.50 </dependency>
17.51 <dependency>
17.52 + <code-name-base>org.openide.util.ui</code-name-base>
17.53 + <build-prerequisite/>
17.54 + <compile-dependency/>
17.55 + <run-dependency>
17.56 + <specification-version>9.3</specification-version>
17.57 + </run-dependency>
17.58 + </dependency>
17.59 + <dependency>
17.60 <code-name-base>org.openide.windows</code-name-base>
17.61 <build-prerequisite/>
17.62 <compile-dependency/>
18.1 --- a/duplicates/ide/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
18.2 +++ b/duplicates/ide/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
18.3 @@ -7,5 +7,5 @@
18.4 nbproject/build-impl.xml.script.CRC32=d800a24f
18.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.49
18.6 nbproject/platform.xml.data.CRC32=44b3f6ba
18.7 -nbproject/platform.xml.script.CRC32=db9e1f43
18.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.49
18.9 +nbproject/platform.xml.script.CRC32=6dcbd131
18.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
19.1 --- a/duplicates/ide/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
19.2 +++ b/duplicates/ide/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
19.3 @@ -17,7 +17,7 @@
19.4 </pathconvert>
19.5 <property name="disabled.modules" value=""/>
19.6 <pathconvert property="module.includes" pathsep="">
19.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
19.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
19.9 <path>
19.10 <filelist files="${disabled.modules}" dir="."/>
19.11 </path>
20.1 --- a/duplicates/server/indexer/impl/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
20.2 +++ b/duplicates/server/indexer/impl/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
20.3 @@ -1,8 +1,8 @@
20.4 -build.xml.data.CRC32=a5ddb0ad
20.5 +build.xml.data.CRC32=fc98a110
20.6 build.xml.script.CRC32=5603d4c2
20.7 -build.xml.stylesheet.CRC32=a56c6a5b@2.50
20.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.70
20.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
20.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
20.11 -nbproject/build-impl.xml.data.CRC32=a5ddb0ad
20.12 +nbproject/build-impl.xml.data.CRC32=fc98a110
20.13 nbproject/build-impl.xml.script.CRC32=8782c05b
20.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50
20.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
21.1 --- a/duplicates/server/indexer/impl/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
21.2 +++ b/duplicates/server/indexer/impl/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
21.3 @@ -74,6 +74,14 @@
21.4 </run-dependency>
21.5 </dependency>
21.6 <dependency>
21.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
21.8 + <build-prerequisite/>
21.9 + <compile-dependency/>
21.10 + <run-dependency>
21.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
21.12 + </run-dependency>
21.13 + </dependency>
21.14 + <dependency>
21.15 <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
21.16 <build-prerequisite/>
21.17 <compile-dependency/>
21.18 @@ -83,6 +91,14 @@
21.19 </run-dependency>
21.20 </dependency>
21.21 <dependency>
21.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
21.23 + <build-prerequisite/>
21.24 + <compile-dependency/>
21.25 + <run-dependency>
21.26 + <specification-version>9.6.0.1.1.8</specification-version>
21.27 + </run-dependency>
21.28 + </dependency>
21.29 + <dependency>
21.30 <code-name-base>org.openide.filesystems</code-name-base>
21.31 <build-prerequisite/>
21.32 <compile-dependency/>
22.1 --- a/duplicates/server/indexer/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
22.2 +++ b/duplicates/server/indexer/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
22.3 @@ -7,5 +7,5 @@
22.4 nbproject/build-impl.xml.script.CRC32=d8a24b22
22.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.50
22.6 nbproject/platform.xml.data.CRC32=8121b4f6
22.7 -nbproject/platform.xml.script.CRC32=db9e1f43
22.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.50
22.9 +nbproject/platform.xml.script.CRC32=6dcbd131
22.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
23.1 --- a/duplicates/server/indexer/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
23.2 +++ b/duplicates/server/indexer/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
23.3 @@ -17,7 +17,7 @@
23.4 </pathconvert>
23.5 <property name="disabled.modules" value=""/>
23.6 <pathconvert property="module.includes" pathsep="">
23.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
23.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
23.9 <path>
23.10 <filelist files="${disabled.modules}" dir="."/>
23.11 </path>
24.1 --- a/duplicates/server/web/duplicates.web.api/build.xml Fri May 01 19:13:18 2015 +0200
24.2 +++ b/duplicates/server/web/duplicates.web.api/build.xml Sun May 31 15:17:24 2015 +0200
24.3 @@ -51,8 +51,7 @@
24.4 -init-macrodef-junit: defines macro for junit execution
24.5 -init-macrodef-debug: defines macro for class debugging
24.6 -init-macrodef-java: defines macro for class execution
24.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
24.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
24.9 + -do-jar: JAR building
24.10 run: execution of project
24.11 -javadoc-build: Javadoc generation
24.12 test-report: JUnit report generation
25.1 --- a/duplicates/server/web/duplicates.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
25.2 +++ b/duplicates/server/web/duplicates.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
25.3 @@ -79,6 +79,7 @@
25.4 <property file="nbproject/project.properties"/>
25.5 </target>
25.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
25.7 + <property name="platform.java" value="${java.home}/bin/java"/>
25.8 <available file="${manifest.file}" property="manifest.available"/>
25.9 <condition property="splashscreen.available">
25.10 <and>
25.11 @@ -96,16 +97,20 @@
25.12 </not>
25.13 </and>
25.14 </condition>
25.15 - <condition property="manifest.available+main.class">
25.16 + <condition property="profile.available">
25.17 <and>
25.18 - <isset property="manifest.available"/>
25.19 - <isset property="main.class.available"/>
25.20 + <isset property="javac.profile"/>
25.21 + <length length="0" string="${javac.profile}" when="greater"/>
25.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
25.23 </and>
25.24 </condition>
25.25 <condition property="do.archive">
25.26 - <not>
25.27 - <istrue value="${jar.archive.disabled}"/>
25.28 - </not>
25.29 + <or>
25.30 + <not>
25.31 + <istrue value="${jar.archive.disabled}"/>
25.32 + </not>
25.33 + <istrue value="${not.archive.disabled}"/>
25.34 + </or>
25.35 </condition>
25.36 <condition property="do.mkdist">
25.37 <and>
25.38 @@ -116,12 +121,6 @@
25.39 </not>
25.40 </and>
25.41 </condition>
25.42 - <condition property="manifest.available+main.class+mkdist.available">
25.43 - <and>
25.44 - <istrue value="${manifest.available+main.class}"/>
25.45 - <isset property="do.mkdist"/>
25.46 - </and>
25.47 - </condition>
25.48 <condition property="do.archive+manifest.available">
25.49 <and>
25.50 <isset property="manifest.available"/>
25.51 @@ -140,24 +139,12 @@
25.52 <istrue value="${do.archive}"/>
25.53 </and>
25.54 </condition>
25.55 - <condition property="do.archive+manifest.available+main.class">
25.56 + <condition property="do.archive+profile.available">
25.57 <and>
25.58 - <istrue value="${manifest.available+main.class}"/>
25.59 + <isset property="profile.available"/>
25.60 <istrue value="${do.archive}"/>
25.61 </and>
25.62 </condition>
25.63 - <condition property="manifest.available-mkdist.available">
25.64 - <or>
25.65 - <istrue value="${manifest.available}"/>
25.66 - <isset property="do.mkdist"/>
25.67 - </or>
25.68 - </condition>
25.69 - <condition property="manifest.available+main.class-mkdist.available">
25.70 - <or>
25.71 - <istrue value="${manifest.available+main.class}"/>
25.72 - <isset property="do.mkdist"/>
25.73 - </or>
25.74 - </condition>
25.75 <condition property="have.tests">
25.76 <or>
25.77 <available file="${test.src.dir}"/>
25.78 @@ -211,7 +198,15 @@
25.79 </condition>
25.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
25.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
25.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
25.83 + <and>
25.84 + <isset property="endorsed.classpath"/>
25.85 + <not>
25.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
25.87 + </not>
25.88 + </and>
25.89 + </condition>
25.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
25.91 + <isset property="profile.available"/>
25.92 </condition>
25.93 <condition else="false" property="jdkBug6558476">
25.94 <and>
25.95 @@ -221,7 +216,12 @@
25.96 </not>
25.97 </and>
25.98 </condition>
25.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
25.100 + <condition else="false" property="javac.fork">
25.101 + <or>
25.102 + <istrue value="${jdkBug6558476}"/>
25.103 + <istrue value="${javac.external.vm}"/>
25.104 + </or>
25.105 + </condition>
25.106 <property name="jar.index" value="false"/>
25.107 <property name="jar.index.metainf" value="${jar.index}"/>
25.108 <property name="copylibs.rebase" value="true"/>
25.109 @@ -300,6 +300,7 @@
25.110 <path path="@{classpath}"/>
25.111 </classpath>
25.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
25.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
25.114 <compilerarg line="${javac.compilerargs}"/>
25.115 <compilerarg value="-processorpath"/>
25.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
25.117 @@ -339,6 +340,7 @@
25.118 <path path="@{classpath}"/>
25.119 </classpath>
25.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
25.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
25.122 <compilerarg line="${javac.compilerargs}"/>
25.123 <customize/>
25.124 </javac>
25.125 @@ -395,6 +397,11 @@
25.126 </and>
25.127 </condition>
25.128 </target>
25.129 + <target name="-init-test-properties">
25.130 + <property name="test.binaryincludes" value="<nothing>"/>
25.131 + <property name="test.binarytestincludes" value=""/>
25.132 + <property name="test.binaryexcludes" value=""/>
25.133 + </target>
25.134 <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
25.135 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
25.136 <attribute default="${includes}" name="includes"/>
25.137 @@ -418,7 +425,7 @@
25.138 </sequential>
25.139 </macrodef>
25.140 </target>
25.141 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
25.142 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
25.143 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
25.144 <attribute default="${includes}" name="includes"/>
25.145 <attribute default="${excludes}" name="excludes"/>
25.146 @@ -432,6 +439,9 @@
25.147 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
25.148 <filename name="@{testincludes}"/>
25.149 </fileset>
25.150 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
25.151 + <filename name="${test.binarytestincludes}"/>
25.152 + </fileset>
25.153 </batchtest>
25.154 <syspropertyset>
25.155 <propertyref prefix="test-sys-prop."/>
25.156 @@ -463,7 +473,7 @@
25.157 </fileset>
25.158 </union>
25.159 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
25.160 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="duplicates.web.api" testname="TestNG tests" workingDir="${work.dir}">
25.161 + <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="duplicates.web.api" testname="TestNG tests" workingDir="${work.dir}">
25.162 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
25.163 <propertyset>
25.164 <propertyref prefix="test-sys-prop."/>
25.165 @@ -559,7 +569,7 @@
25.166 </sequential>
25.167 </macrodef>
25.168 </target>
25.169 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
25.170 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
25.171 <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
25.172 <attribute default="${includes}" name="includes"/>
25.173 <attribute default="${excludes}" name="excludes"/>
25.174 @@ -573,6 +583,9 @@
25.175 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
25.176 <filename name="@{testincludes}"/>
25.177 </fileset>
25.178 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
25.179 + <filename name="${test.binarytestincludes}"/>
25.180 + </fileset>
25.181 </batchtest>
25.182 <syspropertyset>
25.183 <propertyref prefix="test-sys-prop."/>
25.184 @@ -851,8 +864,8 @@
25.185 </chainedmapper>
25.186 </pathconvert>
25.187 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
25.188 - <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}">
25.189 - <fileset dir="${build.classes.dir}"/>
25.190 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
25.191 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
25.192 <manifest>
25.193 <attribute name="Class-Path" value="${jar.classpath}"/>
25.194 <customize/>
25.195 @@ -864,7 +877,7 @@
25.196 <target name="-init-presetdef-jar">
25.197 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
25.198 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
25.199 - <j2seproject1:fileset dir="${build.classes.dir}"/>
25.200 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
25.201 </jar>
25.202 </presetdef>
25.203 </target>
25.204 @@ -919,6 +932,7 @@
25.205 <param location="${project.base_web_api}/build.xml" name="call.script"/>
25.206 <param name="call.target" value="jar"/>
25.207 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
25.208 + <param name="transfer.not.archive.disabled" value="true"/>
25.209 </antcall>
25.210 </target>
25.211 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
25.212 @@ -952,7 +966,7 @@
25.213 <target if="has.persistence.xml" name="-copy-persistence-xml">
25.214 <mkdir dir="${build.classes.dir}/META-INF"/>
25.215 <copy todir="${build.classes.dir}/META-INF">
25.216 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
25.217 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
25.218 </copy>
25.219 </target>
25.220 <target name="-post-compile">
25.221 @@ -987,41 +1001,25 @@
25.222 <!-- Empty placeholder for easier customization. -->
25.223 <!-- You can override this target in the ../build.xml file. -->
25.224 </target>
25.225 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
25.226 - <j2seproject1:jar/>
25.227 - </target>
25.228 - <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">
25.229 - <j2seproject1:jar manifest="${manifest.file}"/>
25.230 - </target>
25.231 - <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">
25.232 - <j2seproject1:jar manifest="${manifest.file}">
25.233 - <j2seproject1:manifest>
25.234 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
25.235 - </j2seproject1:manifest>
25.236 - </j2seproject1:jar>
25.237 - <echo level="info">To run this application from the command line without Ant, try:</echo>
25.238 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
25.239 - <property location="${dist.jar}" name="dist.jar.resolved"/>
25.240 - <pathconvert property="run.classpath.with.dist.jar">
25.241 - <path path="${run.classpath}"/>
25.242 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
25.243 - </pathconvert>
25.244 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
25.245 - </target>
25.246 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
25.247 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
25.248 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
25.249 <touch file="${tmp.manifest.file}" verbose="false"/>
25.250 </target>
25.251 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
25.252 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
25.253 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
25.254 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
25.255 </target>
25.256 - <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">
25.257 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
25.258 <manifest file="${tmp.manifest.file}" mode="update">
25.259 <attribute name="Main-Class" value="${main.class}"/>
25.260 </manifest>
25.261 </target>
25.262 - <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">
25.263 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
25.264 + <manifest file="${tmp.manifest.file}" mode="update">
25.265 + <attribute name="Profile" value="${javac.profile}"/>
25.266 + </manifest>
25.267 + </target>
25.268 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
25.269 <basename file="${application.splash}" property="splashscreen.basename"/>
25.270 <mkdir dir="${build.classes.dir}/META-INF"/>
25.271 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
25.272 @@ -1029,23 +1027,41 @@
25.273 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
25.274 </manifest>
25.275 </target>
25.276 - <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">
25.277 + <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" if="do.mkdist" name="-do-jar-copylibs">
25.278 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
25.279 <echo level="info">To run this application from the command line without Ant, try:</echo>
25.280 <property location="${dist.jar}" name="dist.jar.resolved"/>
25.281 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
25.282 </target>
25.283 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
25.284 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
25.285 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
25.286 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
25.287 + <property location="${dist.jar}" name="dist.jar.resolved"/>
25.288 + <pathconvert property="run.classpath.with.dist.jar">
25.289 + <path path="${run.classpath}"/>
25.290 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
25.291 + </pathconvert>
25.292 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
25.293 + <isset property="main.class.available"/>
25.294 + </condition>
25.295 + <condition else="debug" property="jar.usage.level" value="info">
25.296 + <isset property="main.class.available"/>
25.297 + </condition>
25.298 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
25.299 + </target>
25.300 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
25.301 <delete>
25.302 <fileset file="${tmp.manifest.file}"/>
25.303 </delete>
25.304 </target>
25.305 - <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"/>
25.306 + <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"/>
25.307 + <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"/>
25.308 <target name="-post-jar">
25.309 <!-- Empty placeholder for easier customization. -->
25.310 <!-- You can override this target in the ../build.xml file. -->
25.311 </target>
25.312 - <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"/>
25.313 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
25.314 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
25.315 <!--
25.316 =================
25.317 EXECUTION SECTION
25.318 @@ -1224,11 +1240,14 @@
25.319 </not>
25.320 </and>
25.321 </condition>
25.322 - <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}">
25.323 + <condition else="" property="bug5101868workaround" value="*.java">
25.324 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
25.325 + </condition>
25.326 + <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}">
25.327 <classpath>
25.328 <path path="${javac.classpath}"/>
25.329 </classpath>
25.330 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
25.331 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
25.332 <filename name="**/*.java"/>
25.333 </fileset>
25.334 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
25.335 @@ -1302,7 +1321,7 @@
25.336 <mkdir dir="${build.test.results.dir}"/>
25.337 </target>
25.338 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
25.339 - <j2seproject3:test testincludes="**/*Test.java"/>
25.340 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
25.341 </target>
25.342 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
25.343 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
25.344 @@ -1406,6 +1425,7 @@
25.345 <param location="${project.base_web_api}/build.xml" name="call.script"/>
25.346 <param name="call.target" value="clean"/>
25.347 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
25.348 + <param name="transfer.not.archive.disabled" value="true"/>
25.349 </antcall>
25.350 </target>
25.351 <target depends="init" name="-do-clean">
26.1 --- a/duplicates/server/web/duplicates.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
26.2 +++ b/duplicates/server/web/duplicates.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
26.3 @@ -1,8 +1,8 @@
26.4 build.xml.data.CRC32=56aa19cb
26.5 -build.xml.script.CRC32=bd5d8978
26.6 -build.xml.stylesheet.CRC32=28e38971@1.54.0.46
26.7 +build.xml.script.CRC32=35245b8d
26.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
26.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
26.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
26.11 nbproject/build-impl.xml.data.CRC32=56aa19cb
26.12 -nbproject/build-impl.xml.script.CRC32=4340035e
26.13 -nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.54.0.46
26.14 +nbproject/build-impl.xml.script.CRC32=aa055968
26.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
27.1 --- a/hudson.indexerinstaller/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
27.2 +++ b/hudson.indexerinstaller/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
27.3 @@ -1,8 +1,8 @@
27.4 -build.xml.data.CRC32=23fadb12
27.5 +build.xml.data.CRC32=dd261bbc
27.6 build.xml.script.CRC32=9653f76d
27.7 -build.xml.stylesheet.CRC32=a56c6a5b@1.47
27.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.70
27.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
27.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
27.11 -nbproject/build-impl.xml.data.CRC32=23fadb12
27.12 +nbproject/build-impl.xml.data.CRC32=dd261bbc
27.13 nbproject/build-impl.xml.script.CRC32=4d4ae753
27.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
27.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
28.1 --- a/hudson.indexerinstaller/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
28.2 +++ b/hudson.indexerinstaller/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
28.3 @@ -16,6 +16,14 @@
28.4 </run-dependency>
28.5 </dependency>
28.6 <dependency>
28.7 + <code-name-base>org.netbeans.api.progress.nb</code-name-base>
28.8 + <build-prerequisite/>
28.9 + <compile-dependency/>
28.10 + <run-dependency>
28.11 + <specification-version>1.45</specification-version>
28.12 + </run-dependency>
28.13 + </dependency>
28.14 + <dependency>
28.15 <code-name-base>org.netbeans.modules.hudson</code-name-base>
28.16 <build-prerequisite/>
28.17 <compile-dependency/>
29.1 --- a/java.hints/hintsimpl/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
29.2 +++ b/java.hints/hintsimpl/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
29.3 @@ -1,8 +1,8 @@
29.4 -build.xml.data.CRC32=4ab9923f
29.5 +build.xml.data.CRC32=a57d5a9d
29.6 build.xml.script.CRC32=ef577a91
29.7 -build.xml.stylesheet.CRC32=a56c6a5b@2.61
29.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.70
29.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
29.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
29.11 -nbproject/build-impl.xml.data.CRC32=4ab9923f
29.12 +nbproject/build-impl.xml.data.CRC32=a57d5a9d
29.13 nbproject/build-impl.xml.script.CRC32=9204f652
29.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.61
29.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
30.1 --- a/java.hints/hintsimpl/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
30.2 +++ b/java.hints/hintsimpl/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
30.3 @@ -50,6 +50,14 @@
30.4 </run-dependency>
30.5 </dependency>
30.6 <dependency>
30.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
30.8 + <build-prerequisite/>
30.9 + <compile-dependency/>
30.10 + <run-dependency>
30.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
30.12 + </run-dependency>
30.13 + </dependency>
30.14 + <dependency>
30.15 <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
30.16 <build-prerequisite/>
30.17 <compile-dependency/>
30.18 @@ -158,6 +166,14 @@
30.19 </run-dependency>
30.20 </dependency>
30.21 <dependency>
30.22 + <code-name-base>org.openide.util.ui</code-name-base>
30.23 + <build-prerequisite/>
30.24 + <compile-dependency/>
30.25 + <run-dependency>
30.26 + <specification-version>9.3</specification-version>
30.27 + </run-dependency>
30.28 + </dependency>
30.29 + <dependency>
30.30 <code-name-base>org.openide.windows</code-name-base>
30.31 <build-prerequisite/>
30.32 <compile-dependency/>
31.1 --- a/java.hints/java.hints.test/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
31.2 +++ b/java.hints/java.hints.test/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
31.3 @@ -1,8 +1,8 @@
31.4 -build.xml.data.CRC32=867e6f0d
31.5 +build.xml.data.CRC32=a15e90ee
31.6 build.xml.script.CRC32=fb578ef0
31.7 -build.xml.stylesheet.CRC32=a56c6a5b@2.58
31.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.70
31.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
31.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
31.11 -nbproject/build-impl.xml.data.CRC32=867e6f0d
31.12 +nbproject/build-impl.xml.data.CRC32=a15e90ee
31.13 nbproject/build-impl.xml.script.CRC32=c676886e
31.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.58
31.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
32.1 --- a/java.hints/java.hints.test/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
32.2 +++ b/java.hints/java.hints.test/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
32.3 @@ -103,6 +103,14 @@
32.4 </run-dependency>
32.5 </dependency>
32.6 <dependency>
32.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
32.8 + <build-prerequisite/>
32.9 + <compile-dependency/>
32.10 + <run-dependency>
32.11 + <implementation-version/>
32.12 + </run-dependency>
32.13 + </dependency>
32.14 + <dependency>
32.15 <code-name-base>org.netbeans.modules.lexer</code-name-base>
32.16 <build-prerequisite/>
32.17 <compile-dependency/>
32.18 @@ -130,6 +138,14 @@
32.19 </run-dependency>
32.20 </dependency>
32.21 <dependency>
32.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
32.23 + <build-prerequisite/>
32.24 + <compile-dependency/>
32.25 + <run-dependency>
32.26 + <implementation-version/>
32.27 + </run-dependency>
32.28 + </dependency>
32.29 + <dependency>
32.30 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
32.31 <build-prerequisite/>
32.32 <compile-dependency/>
32.33 @@ -148,6 +164,15 @@
32.34 </run-dependency>
32.35 </dependency>
32.36 <dependency>
32.37 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
32.38 + <build-prerequisite/>
32.39 + <compile-dependency/>
32.40 + <run-dependency>
32.41 + <release-version>1</release-version>
32.42 + <specification-version>1.79.0.9</specification-version>
32.43 + </run-dependency>
32.44 + </dependency>
32.45 + <dependency>
32.46 <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
32.47 <build-prerequisite/>
32.48 <compile-dependency/>
32.49 @@ -220,6 +245,14 @@
32.50 <specification-version>8.12</specification-version>
32.51 </run-dependency>
32.52 </dependency>
32.53 + <dependency>
32.54 + <code-name-base>org.openide.util.ui</code-name-base>
32.55 + <build-prerequisite/>
32.56 + <compile-dependency/>
32.57 + <run-dependency>
32.58 + <specification-version>9.3</specification-version>
32.59 + </run-dependency>
32.60 + </dependency>
32.61 </module-dependencies>
32.62 <public-packages>
32.63 <package>org.netbeans.modules.java.hints.test.api</package>
33.1 --- a/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java Fri May 01 19:13:18 2015 +0200
33.2 +++ b/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java Sun May 31 15:17:24 2015 +0200
33.3 @@ -98,6 +98,7 @@
33.4 import org.netbeans.api.java.source.Task;
33.5 import org.netbeans.api.java.source.WorkingCopy;
33.6 import org.netbeans.api.lexer.Language;
33.7 +import org.netbeans.api.project.ui.*;
33.8 import org.netbeans.core.startup.Main;
33.9 import org.netbeans.junit.NbTestCase;
33.10 import org.netbeans.modules.java.JavaDataLoader;
34.1 --- a/java.hints/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
34.2 +++ b/java.hints/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
34.3 @@ -7,5 +7,5 @@
34.4 nbproject/build-impl.xml.script.CRC32=82e0fe0b
34.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.58
34.6 nbproject/platform.xml.data.CRC32=85cca5f7
34.7 -nbproject/platform.xml.script.CRC32=db9e1f43
34.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.58
34.9 +nbproject/platform.xml.script.CRC32=6dcbd131
34.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
35.1 --- a/java.hints/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
35.2 +++ b/java.hints/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
35.3 @@ -17,7 +17,7 @@
35.4 </pathconvert>
35.5 <property name="disabled.modules" value=""/>
35.6 <pathconvert property="module.includes" pathsep="">
35.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
35.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
35.9 <path>
35.10 <filelist files="${disabled.modules}" dir="."/>
35.11 </path>
36.1 --- a/java.hints/spi.java.hints/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
36.2 +++ b/java.hints/spi.java.hints/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
36.3 @@ -1,8 +1,8 @@
36.4 -build.xml.data.CRC32=81a58345
36.5 +build.xml.data.CRC32=5b0c5014
36.6 build.xml.script.CRC32=caab83d9
36.7 -build.xml.stylesheet.CRC32=a56c6a5b@2.58
36.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.70
36.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
36.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
36.11 -nbproject/build-impl.xml.data.CRC32=81a58345
36.12 +nbproject/build-impl.xml.data.CRC32=5b0c5014
36.13 nbproject/build-impl.xml.script.CRC32=7438bc77
36.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.58
36.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
37.1 --- a/java.hints/spi.java.hints/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
37.2 +++ b/java.hints/spi.java.hints/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
37.3 @@ -43,6 +43,14 @@
37.4 </run-dependency>
37.5 </dependency>
37.6 <dependency>
37.7 + <code-name-base>org.netbeans.api.progress.nb</code-name-base>
37.8 + <build-prerequisite/>
37.9 + <compile-dependency/>
37.10 + <run-dependency>
37.11 + <specification-version>1.45</specification-version>
37.12 + </run-dependency>
37.13 + </dependency>
37.14 + <dependency>
37.15 <code-name-base>org.netbeans.lib.nbjavac</code-name-base>
37.16 <build-prerequisite/>
37.17 <compile-dependency/>
37.18 @@ -184,6 +192,14 @@
37.19 </run-dependency>
37.20 </dependency>
37.21 <dependency>
37.22 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
37.23 + <build-prerequisite/>
37.24 + <compile-dependency/>
37.25 + <run-dependency>
37.26 + <implementation-version/>
37.27 + </run-dependency>
37.28 + </dependency>
37.29 + <dependency>
37.30 <code-name-base>org.netbeans.modules.lexer</code-name-base>
37.31 <build-prerequisite/>
37.32 <compile-dependency/>
38.1 --- a/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilities.java Fri May 01 19:13:18 2015 +0200
38.2 +++ b/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilities.java Sun May 31 15:17:24 2015 +0200
38.3 @@ -101,6 +101,7 @@
38.4 import org.netbeans.modules.java.source.parsing.CompilationInfoImpl;
38.5 import org.netbeans.modules.java.source.save.DiffUtilities;
38.6 import org.netbeans.modules.java.source.save.ElementOverlay;
38.7 +import org.netbeans.modules.parsing.api.Source;
38.8 import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation;
38.9 import org.netbeans.spi.editor.hints.ErrorDescription;
38.10 import org.netbeans.spi.editor.hints.Fix;
38.11 @@ -201,11 +202,13 @@
38.12 Charset encoding = FileEncodingQuery.getEncoding(e.getKey());
38.13 final Document originalDocument = getDocument(e.getKey());
38.14 final String[] origContent = new String[1];
38.15 + final Source[] s = new Source[1];
38.16 if (originalDocument != null) {
38.17 originalDocument.render(new Runnable() {
38.18 @Override public void run() {
38.19 try {
38.20 origContent[0] = originalDocument.getText(0, originalDocument.getLength());
38.21 + s[0] = Source.create(originalDocument);
38.22 } catch (BadLocationException ex) {
38.23 Exceptions.printStackTrace(ex);
38.24 }
38.25 @@ -219,7 +222,7 @@
38.26 }
38.27 String newContent = encoding.newDecoder().decode(ByteBuffer.wrap(e.getValue())).toString();
38.28
38.29 - result.put(e.getKey(), DiffUtilities.diff2ModificationResultDifference(e.getKey(), null, Collections.<Integer, String>emptyMap(), origContent[0], newContent));
38.30 + result.put(e.getKey(), DiffUtilities.diff2ModificationResultDifference(e.getKey(), null, Collections.<Integer, String>emptyMap(), origContent[0], newContent, s[0]));
38.31 } catch (BadLocationException ex) {
38.32 Exceptions.printStackTrace(ex);
38.33 } catch (IOException ex) {
39.1 --- a/language/ide/bridges/apisupport/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
39.2 +++ b/language/ide/bridges/apisupport/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
39.3 @@ -3,6 +3,6 @@
39.4 build.xml.stylesheet.CRC32=79c3b980@1.40
39.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
39.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
39.7 -nbproject/build-impl.xml.data.CRC32=e186a96e
39.8 +nbproject/build-impl.xml.data.CRC32=64abc50a
39.9 nbproject/build-impl.xml.script.CRC32=83dd2c27
39.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
39.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
40.1 --- a/language/ide/indexing/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
40.2 +++ b/language/ide/indexing/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
40.3 @@ -3,6 +3,6 @@
40.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
40.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
40.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
40.7 -nbproject/build-impl.xml.data.CRC32=51835c0d
40.8 +nbproject/build-impl.xml.data.CRC32=1f8d0e92
40.9 nbproject/build-impl.xml.script.CRC32=d49586b3
40.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.52
40.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
41.1 --- a/language/ide/indexing/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
41.2 +++ b/language/ide/indexing/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
41.3 @@ -153,6 +153,14 @@
41.4 </run-dependency>
41.5 </dependency>
41.6 <dependency>
41.7 + <code-name-base>org.netbeans.modules.java.editor.base</code-name-base>
41.8 + <build-prerequisite/>
41.9 + <compile-dependency/>
41.10 + <run-dependency>
41.11 + <implementation-version/>
41.12 + </run-dependency>
41.13 + </dependency>
41.14 + <dependency>
41.15 <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
41.16 <build-prerequisite/>
41.17 <compile-dependency/>
41.18 @@ -187,6 +195,14 @@
41.19 </run-dependency>
41.20 </dependency>
41.21 <dependency>
41.22 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
41.23 + <build-prerequisite/>
41.24 + <compile-dependency/>
41.25 + <run-dependency>
41.26 + <implementation-version/>
41.27 + </run-dependency>
41.28 + </dependency>
41.29 + <dependency>
41.30 <code-name-base>org.netbeans.modules.lexer</code-name-base>
41.31 <build-prerequisite/>
41.32 <compile-dependency/>
41.33 @@ -214,6 +230,14 @@
41.34 </run-dependency>
41.35 </dependency>
41.36 <dependency>
41.37 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
41.38 + <build-prerequisite/>
41.39 + <compile-dependency/>
41.40 + <run-dependency>
41.41 + <implementation-version/>
41.42 + </run-dependency>
41.43 + </dependency>
41.44 + <dependency>
41.45 <code-name-base>org.netbeans.modules.parsing.lucene</code-name-base>
41.46 <build-prerequisite/>
41.47 <compile-dependency/>
41.48 @@ -241,6 +265,15 @@
41.49 </run-dependency>
41.50 </dependency>
41.51 <dependency>
41.52 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
41.53 + <build-prerequisite/>
41.54 + <compile-dependency/>
41.55 + <run-dependency>
41.56 + <release-version>1</release-version>
41.57 + <specification-version>1.79.0.9</specification-version>
41.58 + </run-dependency>
41.59 + </dependency>
41.60 + <dependency>
41.61 <code-name-base>org.netbeans.modules.queries</code-name-base>
41.62 <build-prerequisite/>
41.63 <compile-dependency/>
42.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/BatchUtilities.java Fri May 01 19:13:18 2015 +0200
42.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/BatchUtilities.java Sun May 31 15:17:24 2015 +0200
42.3 @@ -63,6 +63,8 @@
42.4 import org.netbeans.api.queries.FileEncodingQuery;
42.5 import org.netbeans.modules.diff.builtin.provider.BuiltInDiffProvider;
42.6 import org.netbeans.modules.diff.builtin.visualizer.TextDiffVisualizer;
42.7 +import org.netbeans.modules.java.editor.base.imports.UnusedImports;
42.8 +import org.netbeans.modules.java.editor.base.semantic.SemanticHighlighterBase;
42.9 import org.netbeans.modules.java.editor.semantic.SemanticHighlighter;
42.10 import org.netbeans.spi.diff.DiffProvider;
42.11 import org.openide.filesystems.FileObject;
42.12 @@ -150,7 +152,7 @@
42.13 }
42.14
42.15 //compute imports to remove:
42.16 - List<TreePathHandle> unusedImports = SemanticHighlighter.computeUnusedImports(wc);
42.17 + List<TreePathHandle> unusedImports = UnusedImports.computeUnusedImports(wc);
42.18 CompilationUnitTree cut = wc.getCompilationUnit();
42.19 // make the changes to the source
42.20 for (TreePathHandle handle : unusedImports) {
43.1 --- a/language/ide/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
43.2 +++ b/language/ide/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
43.3 @@ -7,5 +7,5 @@
43.4 nbproject/build-impl.xml.script.CRC32=74ef45bc
43.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.49
43.6 nbproject/platform.xml.data.CRC32=c11ee7c3
43.7 -nbproject/platform.xml.script.CRC32=db9e1f43
43.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.49
43.9 +nbproject/platform.xml.script.CRC32=6dcbd131
43.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
44.1 --- a/language/ide/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
44.2 +++ b/language/ide/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
44.3 @@ -17,7 +17,7 @@
44.4 </pathconvert>
44.5 <property name="disabled.modules" value=""/>
44.6 <pathconvert property="module.includes" pathsep="">
44.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
44.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
44.9 <path>
44.10 <filelist files="${disabled.modules}" dir="."/>
44.11 </path>
45.1 --- a/language/ide/ui/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
45.2 +++ b/language/ide/ui/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
45.3 @@ -3,6 +3,6 @@
45.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
45.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
45.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
45.7 -nbproject/build-impl.xml.data.CRC32=be2f2804
45.8 +nbproject/build-impl.xml.data.CRC32=f546dedb
45.9 nbproject/build-impl.xml.script.CRC32=e59dabeb
45.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50
45.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
46.1 --- a/language/ide/ui/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
46.2 +++ b/language/ide/ui/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
46.3 @@ -65,6 +65,14 @@
46.4 </run-dependency>
46.5 </dependency>
46.6 <dependency>
46.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
46.8 + <build-prerequisite/>
46.9 + <compile-dependency/>
46.10 + <run-dependency>
46.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
46.12 + </run-dependency>
46.13 + </dependency>
46.14 + <dependency>
46.15 <code-name-base>org.openide.awt</code-name-base>
46.16 <build-prerequisite/>
46.17 <compile-dependency/>
46.18 @@ -120,6 +128,14 @@
46.19 <specification-version>8.12</specification-version>
46.20 </run-dependency>
46.21 </dependency>
46.22 + <dependency>
46.23 + <code-name-base>org.openide.util.ui</code-name-base>
46.24 + <build-prerequisite/>
46.25 + <compile-dependency/>
46.26 + <run-dependency>
46.27 + <specification-version>9.3</specification-version>
46.28 + </run-dependency>
46.29 + </dependency>
46.30 </module-dependencies>
46.31 <test-dependencies>
46.32 <test-type>
47.1 --- a/language/server/web/language.web.api/build.xml Fri May 01 19:13:18 2015 +0200
47.2 +++ b/language/server/web/language.web.api/build.xml Sun May 31 15:17:24 2015 +0200
47.3 @@ -51,8 +51,7 @@
47.4 -init-macrodef-junit: defines macro for junit execution
47.5 -init-macrodef-debug: defines macro for class debugging
47.6 -init-macrodef-java: defines macro for class execution
47.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
47.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
47.9 + -do-jar: JAR building
47.10 run: execution of project
47.11 -javadoc-build: Javadoc generation
47.12 test-report: JUnit report generation
48.1 --- a/language/server/web/language.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
48.2 +++ b/language/server/web/language.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
48.3 @@ -79,6 +79,7 @@
48.4 <property file="nbproject/project.properties"/>
48.5 </target>
48.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
48.7 + <property name="platform.java" value="${java.home}/bin/java"/>
48.8 <available file="${manifest.file}" property="manifest.available"/>
48.9 <condition property="splashscreen.available">
48.10 <and>
48.11 @@ -96,16 +97,20 @@
48.12 </not>
48.13 </and>
48.14 </condition>
48.15 - <condition property="manifest.available+main.class">
48.16 + <condition property="profile.available">
48.17 <and>
48.18 - <isset property="manifest.available"/>
48.19 - <isset property="main.class.available"/>
48.20 + <isset property="javac.profile"/>
48.21 + <length length="0" string="${javac.profile}" when="greater"/>
48.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
48.23 </and>
48.24 </condition>
48.25 <condition property="do.archive">
48.26 - <not>
48.27 - <istrue value="${jar.archive.disabled}"/>
48.28 - </not>
48.29 + <or>
48.30 + <not>
48.31 + <istrue value="${jar.archive.disabled}"/>
48.32 + </not>
48.33 + <istrue value="${not.archive.disabled}"/>
48.34 + </or>
48.35 </condition>
48.36 <condition property="do.mkdist">
48.37 <and>
48.38 @@ -116,12 +121,6 @@
48.39 </not>
48.40 </and>
48.41 </condition>
48.42 - <condition property="manifest.available+main.class+mkdist.available">
48.43 - <and>
48.44 - <istrue value="${manifest.available+main.class}"/>
48.45 - <isset property="do.mkdist"/>
48.46 - </and>
48.47 - </condition>
48.48 <condition property="do.archive+manifest.available">
48.49 <and>
48.50 <isset property="manifest.available"/>
48.51 @@ -140,24 +139,12 @@
48.52 <istrue value="${do.archive}"/>
48.53 </and>
48.54 </condition>
48.55 - <condition property="do.archive+manifest.available+main.class">
48.56 + <condition property="do.archive+profile.available">
48.57 <and>
48.58 - <istrue value="${manifest.available+main.class}"/>
48.59 + <isset property="profile.available"/>
48.60 <istrue value="${do.archive}"/>
48.61 </and>
48.62 </condition>
48.63 - <condition property="manifest.available-mkdist.available">
48.64 - <or>
48.65 - <istrue value="${manifest.available}"/>
48.66 - <isset property="do.mkdist"/>
48.67 - </or>
48.68 - </condition>
48.69 - <condition property="manifest.available+main.class-mkdist.available">
48.70 - <or>
48.71 - <istrue value="${manifest.available+main.class}"/>
48.72 - <isset property="do.mkdist"/>
48.73 - </or>
48.74 - </condition>
48.75 <condition property="have.tests">
48.76 <or>
48.77 <available file="${test.src.dir}"/>
48.78 @@ -211,7 +198,15 @@
48.79 </condition>
48.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
48.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
48.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
48.83 + <and>
48.84 + <isset property="endorsed.classpath"/>
48.85 + <not>
48.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
48.87 + </not>
48.88 + </and>
48.89 + </condition>
48.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
48.91 + <isset property="profile.available"/>
48.92 </condition>
48.93 <condition else="false" property="jdkBug6558476">
48.94 <and>
48.95 @@ -221,7 +216,12 @@
48.96 </not>
48.97 </and>
48.98 </condition>
48.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
48.100 + <condition else="false" property="javac.fork">
48.101 + <or>
48.102 + <istrue value="${jdkBug6558476}"/>
48.103 + <istrue value="${javac.external.vm}"/>
48.104 + </or>
48.105 + </condition>
48.106 <property name="jar.index" value="false"/>
48.107 <property name="jar.index.metainf" value="${jar.index}"/>
48.108 <property name="copylibs.rebase" value="true"/>
48.109 @@ -300,6 +300,7 @@
48.110 <path path="@{classpath}"/>
48.111 </classpath>
48.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
48.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
48.114 <compilerarg line="${javac.compilerargs}"/>
48.115 <compilerarg value="-processorpath"/>
48.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
48.117 @@ -339,6 +340,7 @@
48.118 <path path="@{classpath}"/>
48.119 </classpath>
48.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
48.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
48.122 <compilerarg line="${javac.compilerargs}"/>
48.123 <customize/>
48.124 </javac>
48.125 @@ -471,7 +473,7 @@
48.126 </fileset>
48.127 </union>
48.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
48.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="language.web.api" testname="TestNG tests" workingDir="${work.dir}">
48.130 + <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="language.web.api" testname="TestNG tests" workingDir="${work.dir}">
48.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
48.132 <propertyset>
48.133 <propertyref prefix="test-sys-prop."/>
48.134 @@ -862,8 +864,8 @@
48.135 </chainedmapper>
48.136 </pathconvert>
48.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
48.138 - <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}">
48.139 - <fileset dir="${build.classes.dir}"/>
48.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
48.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
48.142 <manifest>
48.143 <attribute name="Class-Path" value="${jar.classpath}"/>
48.144 <customize/>
48.145 @@ -875,7 +877,7 @@
48.146 <target name="-init-presetdef-jar">
48.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
48.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
48.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
48.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
48.151 </jar>
48.152 </presetdef>
48.153 </target>
48.154 @@ -930,6 +932,7 @@
48.155 <param location="${project.base_web_api}/build.xml" name="call.script"/>
48.156 <param name="call.target" value="jar"/>
48.157 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
48.158 + <param name="transfer.not.archive.disabled" value="true"/>
48.159 </antcall>
48.160 <antcall target="-maybe-call-dep">
48.161 <param name="call.built.properties" value="${built-jar.properties}"/>
48.162 @@ -937,6 +940,7 @@
48.163 <param location="${project.org_netbeans_modules_jackpot30_indexing}/build.xml" name="call.script"/>
48.164 <param name="call.target" value="netbeans"/>
48.165 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
48.166 + <param name="transfer.not.archive.disabled" value="true"/>
48.167 </antcall>
48.168 <antcall target="-maybe-call-dep">
48.169 <param name="call.built.properties" value="${built-jar.properties}"/>
48.170 @@ -944,6 +948,7 @@
48.171 <param location="${project.resolve_web_api}/build.xml" name="call.script"/>
48.172 <param name="call.target" value="jar"/>
48.173 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
48.174 + <param name="transfer.not.archive.disabled" value="true"/>
48.175 </antcall>
48.176 <antcall target="-maybe-call-dep">
48.177 <param name="call.built.properties" value="${built-jar.properties}"/>
48.178 @@ -951,6 +956,7 @@
48.179 <param location="${project.source_web_api}/build.xml" name="call.script"/>
48.180 <param name="call.target" value="jar"/>
48.181 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
48.182 + <param name="transfer.not.archive.disabled" value="true"/>
48.183 </antcall>
48.184 </target>
48.185 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
48.186 @@ -1019,41 +1025,25 @@
48.187 <!-- Empty placeholder for easier customization. -->
48.188 <!-- You can override this target in the ../build.xml file. -->
48.189 </target>
48.190 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
48.191 - <j2seproject1:jar/>
48.192 - </target>
48.193 - <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">
48.194 - <j2seproject1:jar manifest="${manifest.file}"/>
48.195 - </target>
48.196 - <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">
48.197 - <j2seproject1:jar manifest="${manifest.file}">
48.198 - <j2seproject1:manifest>
48.199 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
48.200 - </j2seproject1:manifest>
48.201 - </j2seproject1:jar>
48.202 - <echo level="info">To run this application from the command line without Ant, try:</echo>
48.203 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
48.204 - <property location="${dist.jar}" name="dist.jar.resolved"/>
48.205 - <pathconvert property="run.classpath.with.dist.jar">
48.206 - <path path="${run.classpath}"/>
48.207 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
48.208 - </pathconvert>
48.209 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
48.210 - </target>
48.211 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
48.212 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
48.213 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
48.214 <touch file="${tmp.manifest.file}" verbose="false"/>
48.215 </target>
48.216 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
48.217 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
48.218 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
48.219 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
48.220 </target>
48.221 - <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">
48.222 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
48.223 <manifest file="${tmp.manifest.file}" mode="update">
48.224 <attribute name="Main-Class" value="${main.class}"/>
48.225 </manifest>
48.226 </target>
48.227 - <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">
48.228 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
48.229 + <manifest file="${tmp.manifest.file}" mode="update">
48.230 + <attribute name="Profile" value="${javac.profile}"/>
48.231 + </manifest>
48.232 + </target>
48.233 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
48.234 <basename file="${application.splash}" property="splashscreen.basename"/>
48.235 <mkdir dir="${build.classes.dir}/META-INF"/>
48.236 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
48.237 @@ -1061,23 +1051,41 @@
48.238 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
48.239 </manifest>
48.240 </target>
48.241 - <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">
48.242 + <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" if="do.mkdist" name="-do-jar-copylibs">
48.243 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
48.244 <echo level="info">To run this application from the command line without Ant, try:</echo>
48.245 <property location="${dist.jar}" name="dist.jar.resolved"/>
48.246 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
48.247 </target>
48.248 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
48.249 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
48.250 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
48.251 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
48.252 + <property location="${dist.jar}" name="dist.jar.resolved"/>
48.253 + <pathconvert property="run.classpath.with.dist.jar">
48.254 + <path path="${run.classpath}"/>
48.255 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
48.256 + </pathconvert>
48.257 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
48.258 + <isset property="main.class.available"/>
48.259 + </condition>
48.260 + <condition else="debug" property="jar.usage.level" value="info">
48.261 + <isset property="main.class.available"/>
48.262 + </condition>
48.263 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
48.264 + </target>
48.265 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
48.266 <delete>
48.267 <fileset file="${tmp.manifest.file}"/>
48.268 </delete>
48.269 </target>
48.270 - <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"/>
48.271 + <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"/>
48.272 + <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"/>
48.273 <target name="-post-jar">
48.274 <!-- Empty placeholder for easier customization. -->
48.275 <!-- You can override this target in the ../build.xml file. -->
48.276 </target>
48.277 - <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"/>
48.278 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
48.279 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
48.280 <!--
48.281 =================
48.282 EXECUTION SECTION
48.283 @@ -1256,11 +1264,14 @@
48.284 </not>
48.285 </and>
48.286 </condition>
48.287 - <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}">
48.288 + <condition else="" property="bug5101868workaround" value="*.java">
48.289 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
48.290 + </condition>
48.291 + <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}">
48.292 <classpath>
48.293 <path path="${javac.classpath}"/>
48.294 </classpath>
48.295 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
48.296 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
48.297 <filename name="**/*.java"/>
48.298 </fileset>
48.299 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
48.300 @@ -1334,7 +1345,7 @@
48.301 <mkdir dir="${build.test.results.dir}"/>
48.302 </target>
48.303 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
48.304 - <j2seproject3:test testincludes="**/*Test.java"/>
48.305 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
48.306 </target>
48.307 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
48.308 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
48.309 @@ -1438,6 +1449,7 @@
48.310 <param location="${project.base_web_api}/build.xml" name="call.script"/>
48.311 <param name="call.target" value="clean"/>
48.312 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
48.313 + <param name="transfer.not.archive.disabled" value="true"/>
48.314 </antcall>
48.315 <antcall target="-maybe-call-dep">
48.316 <param name="call.built.properties" value="${built-clean.properties}"/>
48.317 @@ -1445,6 +1457,7 @@
48.318 <param location="${project.org_netbeans_modules_jackpot30_indexing}/build.xml" name="call.script"/>
48.319 <param name="call.target" value="clean"/>
48.320 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
48.321 + <param name="transfer.not.archive.disabled" value="true"/>
48.322 </antcall>
48.323 <antcall target="-maybe-call-dep">
48.324 <param name="call.built.properties" value="${built-clean.properties}"/>
48.325 @@ -1452,6 +1465,7 @@
48.326 <param location="${project.resolve_web_api}/build.xml" name="call.script"/>
48.327 <param name="call.target" value="clean"/>
48.328 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
48.329 + <param name="transfer.not.archive.disabled" value="true"/>
48.330 </antcall>
48.331 <antcall target="-maybe-call-dep">
48.332 <param name="call.built.properties" value="${built-clean.properties}"/>
48.333 @@ -1459,6 +1473,7 @@
48.334 <param location="${project.source_web_api}/build.xml" name="call.script"/>
48.335 <param name="call.target" value="clean"/>
48.336 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
48.337 + <param name="transfer.not.archive.disabled" value="true"/>
48.338 </antcall>
48.339 </target>
48.340 <target depends="init" name="-do-clean">
49.1 --- a/language/server/web/language.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
49.2 +++ b/language/server/web/language.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
49.3 @@ -1,8 +1,8 @@
49.4 build.xml.data.CRC32=4be6b9c7
49.5 -build.xml.script.CRC32=7dcc1ec0
49.6 -build.xml.stylesheet.CRC32=28e38971@1.56.0.46
49.7 +build.xml.script.CRC32=ba5ea644
49.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
49.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
49.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
49.11 nbproject/build-impl.xml.data.CRC32=4be6b9c7
49.12 -nbproject/build-impl.xml.script.CRC32=76ba8c9e
49.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.0.46
49.14 +nbproject/build-impl.xml.script.CRC32=2ae307c6
49.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
50.1 --- a/lib/download.xml Fri May 01 19:13:18 2015 +0200
50.2 +++ b/lib/download.xml Sun May 31 15:17:24 2015 +0200
50.3 @@ -69,7 +69,7 @@
50.4
50.5 <target name="copy-from-platform">
50.6 <fail unless="nbplatform.active.dir" />
50.7 - <copy file="${nbplatform.active.dir}/java/modules/org-netbeans-modules-java-source.jar" todir="." />
50.8 + <copy file="${nbplatform.active.dir}/java/modules/org-netbeans-modules-java-source-base.jar" todir="." />
50.9 <copy file="${nbplatform.active.dir}/java/modules/org-netbeans-modules-java-hints.jar" todir="." />
50.10 <copy file="${nbplatform.active.dir}/platform/core/org-openide-filesystems.jar" todir="." />
50.11 <copy file="${nbplatform.active.dir}/platform/lib/org-openide-util.jar" todir="." />
51.1 --- a/remoting/common/api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
51.2 +++ b/remoting/common/api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
51.3 @@ -3,6 +3,6 @@
51.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
51.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
51.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
51.7 -nbproject/build-impl.xml.data.CRC32=11046abd
51.8 +nbproject/build-impl.xml.data.CRC32=5aa72342
51.9 nbproject/build-impl.xml.script.CRC32=29e163a7
51.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
51.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
52.1 --- a/remoting/common/api/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
52.2 +++ b/remoting/common/api/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
52.3 @@ -41,6 +41,14 @@
52.4 </run-dependency>
52.5 </dependency>
52.6 <dependency>
52.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
52.8 + <build-prerequisite/>
52.9 + <compile-dependency/>
52.10 + <run-dependency>
52.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
52.12 + </run-dependency>
52.13 + </dependency>
52.14 + <dependency>
52.15 <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
52.16 <build-prerequisite/>
52.17 <compile-dependency/>
52.18 @@ -50,6 +58,14 @@
52.19 </run-dependency>
52.20 </dependency>
52.21 <dependency>
52.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
52.23 + <build-prerequisite/>
52.24 + <compile-dependency/>
52.25 + <run-dependency>
52.26 + <specification-version>9.6.0.1.1.8</specification-version>
52.27 + </run-dependency>
52.28 + </dependency>
52.29 + <dependency>
52.30 <code-name-base>org.openide.filesystems</code-name-base>
52.31 <build-prerequisite/>
52.32 <compile-dependency/>
53.1 --- a/remoting/common/borrowedtests/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
53.2 +++ b/remoting/common/borrowedtests/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
53.3 @@ -3,6 +3,6 @@
53.4 build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
53.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
53.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
53.7 -nbproject/build-impl.xml.data.CRC32=ca7a8f66
53.8 +nbproject/build-impl.xml.data.CRC32=50f04a81
53.9 nbproject/build-impl.xml.script.CRC32=cb5fccc2
53.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
53.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
54.1 --- a/remoting/common/borrowedtests/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
54.2 +++ b/remoting/common/borrowedtests/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
54.3 @@ -139,6 +139,14 @@
54.4 </run-dependency>
54.5 </dependency>
54.6 <dependency>
54.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
54.8 + <build-prerequisite/>
54.9 + <compile-dependency/>
54.10 + <run-dependency>
54.11 + <implementation-version/>
54.12 + </run-dependency>
54.13 + </dependency>
54.14 + <dependency>
54.15 <code-name-base>org.netbeans.modules.lexer</code-name-base>
54.16 <build-prerequisite/>
54.17 <compile-dependency/>
54.18 @@ -175,6 +183,14 @@
54.19 </run-dependency>
54.20 </dependency>
54.21 <dependency>
54.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
54.23 + <build-prerequisite/>
54.24 + <compile-dependency/>
54.25 + <run-dependency>
54.26 + <implementation-version/>
54.27 + </run-dependency>
54.28 + </dependency>
54.29 + <dependency>
54.30 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
54.31 <build-prerequisite/>
54.32 <compile-dependency/>
54.33 @@ -201,6 +217,15 @@
54.34 </run-dependency>
54.35 </dependency>
54.36 <dependency>
54.37 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
54.38 + <build-prerequisite/>
54.39 + <compile-dependency/>
54.40 + <run-dependency>
54.41 + <release-version>1</release-version>
54.42 + <specification-version>1.79.0.9</specification-version>
54.43 + </run-dependency>
54.44 + </dependency>
54.45 + <dependency>
54.46 <code-name-base>org.netbeans.modules.queries</code-name-base>
54.47 <build-prerequisite/>
54.48 <compile-dependency/>
54.49 @@ -299,6 +324,14 @@
54.50 </run-dependency>
54.51 </dependency>
54.52 <dependency>
54.53 + <code-name-base>org.openide.util.ui</code-name-base>
54.54 + <build-prerequisite/>
54.55 + <compile-dependency/>
54.56 + <run-dependency>
54.57 + <specification-version>9.3</specification-version>
54.58 + </run-dependency>
54.59 + </dependency>
54.60 + <dependency>
54.61 <code-name-base>org.openide.windows</code-name-base>
54.62 <build-prerequisite/>
54.63 <compile-dependency/>
55.1 --- a/remoting/common/borrowedtests/src/org/netbeans/api/java/source/SourceUtilsTestUtil.java Fri May 01 19:13:18 2015 +0200
55.2 +++ b/remoting/common/borrowedtests/src/org/netbeans/api/java/source/SourceUtilsTestUtil.java Sun May 31 15:17:24 2015 +0200
55.3 @@ -185,7 +185,7 @@
55.4 lookupContent[0] = new TestProxyClassPathProvider(sourceRoot, buildRoot, classPathElements);
55.5 lookupContent[1] = new TestSourceForBinaryQuery(sourceRoot, buildRoot);
55.6 lookupContent[2] = new TestSourceLevelQueryImplementation();
55.7 - lookupContent[3] = JavaDataLoader.findObject(JavaDataLoader.class, true);
55.8 + lookupContent[3] = JavaDataLoader.getLoader(JavaDataLoader.class);
55.9
55.10 setLookup(lookupContent, SourceUtilsTestUtil.class.getClassLoader());
55.11
56.1 --- a/remoting/common/test/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
56.2 +++ b/remoting/common/test/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
56.3 @@ -3,6 +3,6 @@
56.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
56.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
56.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
56.7 -nbproject/build-impl.xml.data.CRC32=4735325c
56.8 +nbproject/build-impl.xml.data.CRC32=fac33e2d
56.9 nbproject/build-impl.xml.script.CRC32=4e8c4baf
56.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
56.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
57.1 --- a/remoting/common/test/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
57.2 +++ b/remoting/common/test/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
57.3 @@ -164,6 +164,14 @@
57.4 </run-dependency>
57.5 </dependency>
57.6 <dependency>
57.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
57.8 + <build-prerequisite/>
57.9 + <compile-dependency/>
57.10 + <run-dependency>
57.11 + <implementation-version/>
57.12 + </run-dependency>
57.13 + </dependency>
57.14 + <dependency>
57.15 <code-name-base>org.netbeans.modules.lexer</code-name-base>
57.16 <build-prerequisite/>
57.17 <compile-dependency/>
57.18 @@ -200,6 +208,14 @@
57.19 </run-dependency>
57.20 </dependency>
57.21 <dependency>
57.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
57.23 + <build-prerequisite/>
57.24 + <compile-dependency/>
57.25 + <run-dependency>
57.26 + <implementation-version/>
57.27 + </run-dependency>
57.28 + </dependency>
57.29 + <dependency>
57.30 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
57.31 <build-prerequisite/>
57.32 <compile-dependency/>
57.33 @@ -226,6 +242,15 @@
57.34 </run-dependency>
57.35 </dependency>
57.36 <dependency>
57.37 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
57.38 + <build-prerequisite/>
57.39 + <compile-dependency/>
57.40 + <run-dependency>
57.41 + <release-version>1</release-version>
57.42 + <specification-version>1.79.0.9</specification-version>
57.43 + </run-dependency>
57.44 + </dependency>
57.45 + <dependency>
57.46 <code-name-base>org.netbeans.modules.queries</code-name-base>
57.47 <build-prerequisite/>
57.48 <compile-dependency/>
58.1 --- a/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/IndexTestBase.java Fri May 01 19:13:18 2015 +0200
58.2 +++ b/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/IndexTestBase.java Sun May 31 15:17:24 2015 +0200
58.3 @@ -49,15 +49,9 @@
58.4 import org.netbeans.api.java.source.TestUtilities;
58.5 import org.netbeans.core.startup.Main;
58.6 import org.netbeans.junit.NbTestCase;
58.7 -import org.netbeans.modules.java.preprocessorbridge.spi.JavaIndexerPlugin;
58.8 import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
58.9 -import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
58.10 import org.netbeans.modules.parsing.impl.indexing.MimeTypes;
58.11 import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
58.12 -import org.netbeans.modules.parsing.spi.indexing.Context;
58.13 -import org.netbeans.modules.parsing.spi.indexing.CustomIndexer;
58.14 -import org.netbeans.modules.parsing.spi.indexing.CustomIndexerFactory;
58.15 -import org.netbeans.modules.parsing.spi.indexing.Indexable;
58.16 import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
58.17 import org.netbeans.spi.java.classpath.ClassPathProvider;
58.18 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
59.1 --- a/remoting/ide/api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
59.2 +++ b/remoting/ide/api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
59.3 @@ -3,6 +3,6 @@
59.4 build.xml.stylesheet.CRC32=a56c6a5b@1.47
59.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
59.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
59.7 -nbproject/build-impl.xml.data.CRC32=3d6d68eb
59.8 +nbproject/build-impl.xml.data.CRC32=40c9b5ac
59.9 nbproject/build-impl.xml.script.CRC32=33cac223
59.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.63
59.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
60.1 --- a/remoting/ide/api/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
60.2 +++ b/remoting/ide/api/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
60.3 @@ -67,6 +67,14 @@
60.4 </run-dependency>
60.5 </dependency>
60.6 <dependency>
60.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
60.8 + <build-prerequisite/>
60.9 + <compile-dependency/>
60.10 + <run-dependency>
60.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
60.12 + </run-dependency>
60.13 + </dependency>
60.14 + <dependency>
60.15 <code-name-base>org.netbeans.modules.options.api</code-name-base>
60.16 <build-prerequisite/>
60.17 <compile-dependency/>
61.1 --- a/remoting/ide/browsing/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
61.2 +++ b/remoting/ide/browsing/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
61.3 @@ -3,6 +3,6 @@
61.4 build.xml.stylesheet.CRC32=a56c6a5b@2.61
61.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
61.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
61.7 -nbproject/build-impl.xml.data.CRC32=d895a237
61.8 +nbproject/build-impl.xml.data.CRC32=7c98b9cd
61.9 nbproject/build-impl.xml.script.CRC32=3911055f
61.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.61
61.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
62.1 --- a/remoting/ide/browsing/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
62.2 +++ b/remoting/ide/browsing/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
62.3 @@ -132,6 +132,14 @@
62.4 </run-dependency>
62.5 </dependency>
62.6 <dependency>
62.7 + <code-name-base>org.openide.util.ui</code-name-base>
62.8 + <build-prerequisite/>
62.9 + <compile-dependency/>
62.10 + <run-dependency>
62.11 + <specification-version>9.3</specification-version>
62.12 + </run-dependency>
62.13 + </dependency>
62.14 + <dependency>
62.15 <code-name-base>org.openide.windows</code-name-base>
62.16 <build-prerequisite/>
62.17 <compile-dependency/>
63.1 --- a/remoting/ide/downloadable/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
63.2 +++ b/remoting/ide/downloadable/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
63.3 @@ -3,6 +3,6 @@
63.4 build.xml.stylesheet.CRC32=a56c6a5b@2.46
63.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
63.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
63.7 -nbproject/build-impl.xml.data.CRC32=c2cda89c
63.8 +nbproject/build-impl.xml.data.CRC32=2deda824
63.9 nbproject/build-impl.xml.script.CRC32=0059d78a
63.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.46
63.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
64.1 --- a/remoting/ide/downloadable/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
64.2 +++ b/remoting/ide/downloadable/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
64.3 @@ -41,11 +41,10 @@
64.4 </run-dependency>
64.5 </dependency>
64.6 <dependency>
64.7 - <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
64.8 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
64.9 <build-prerequisite/>
64.10 <compile-dependency/>
64.11 <run-dependency>
64.12 - <release-version>1</release-version>
64.13 <implementation-version/>
64.14 </run-dependency>
64.15 </dependency>
65.1 --- a/remoting/ide/jumpto/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
65.2 +++ b/remoting/ide/jumpto/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
65.3 @@ -3,6 +3,6 @@
65.4 build.xml.stylesheet.CRC32=a56c6a5b@1.45
65.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
65.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
65.7 -nbproject/build-impl.xml.data.CRC32=cec2663c
65.8 +nbproject/build-impl.xml.data.CRC32=6bbb6d22
65.9 nbproject/build-impl.xml.script.CRC32=3404573f
65.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
65.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
66.1 --- a/remoting/ide/jumpto/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
66.2 +++ b/remoting/ide/jumpto/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
66.3 @@ -40,6 +40,14 @@
66.4 </run-dependency>
66.5 </dependency>
66.6 <dependency>
66.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
66.8 + <build-prerequisite/>
66.9 + <compile-dependency/>
66.10 + <run-dependency>
66.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
66.12 + </run-dependency>
66.13 + </dependency>
66.14 + <dependency>
66.15 <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
66.16 <build-prerequisite/>
66.17 <compile-dependency/>
67.1 --- a/remoting/ide/local/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
67.2 +++ b/remoting/ide/local/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
67.3 @@ -3,6 +3,6 @@
67.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
67.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
67.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
67.7 -nbproject/build-impl.xml.data.CRC32=c99d6905
67.8 +nbproject/build-impl.xml.data.CRC32=5e05216e
67.9 nbproject/build-impl.xml.script.CRC32=bec8c0f7
67.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
67.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
68.1 --- a/remoting/ide/usages/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
68.2 +++ b/remoting/ide/usages/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
68.3 @@ -3,6 +3,6 @@
68.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
68.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
68.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
68.7 -nbproject/build-impl.xml.data.CRC32=7d3b2deb
68.8 +nbproject/build-impl.xml.data.CRC32=497e264a
68.9 nbproject/build-impl.xml.script.CRC32=583fd407
68.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.61
68.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
69.1 --- a/remoting/ide/usages/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
69.2 +++ b/remoting/ide/usages/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
69.3 @@ -75,6 +75,14 @@
69.4 </run-dependency>
69.5 </dependency>
69.6 <dependency>
69.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
69.8 + <build-prerequisite/>
69.9 + <compile-dependency/>
69.10 + <run-dependency>
69.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
69.12 + </run-dependency>
69.13 + </dependency>
69.14 + <dependency>
69.15 <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
69.16 <build-prerequisite/>
69.17 <compile-dependency/>
69.18 @@ -208,6 +216,14 @@
69.19 </run-dependency>
69.20 </dependency>
69.21 <dependency>
69.22 + <code-name-base>org.openide.util.ui</code-name-base>
69.23 + <build-prerequisite/>
69.24 + <compile-dependency/>
69.25 + <run-dependency>
69.26 + <specification-version>9.3</specification-version>
69.27 + </run-dependency>
69.28 + </dependency>
69.29 + <dependency>
69.30 <code-name-base>org.openide.windows</code-name-base>
69.31 <build-prerequisite/>
69.32 <compile-dependency/>
70.1 --- a/remoting/server/indexer/impl/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
70.2 +++ b/remoting/server/indexer/impl/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
70.3 @@ -3,6 +3,6 @@
70.4 build.xml.stylesheet.CRC32=a56c6a5b@1.47
70.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
70.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
70.7 -nbproject/build-impl.xml.data.CRC32=38fc9eee
70.8 +nbproject/build-impl.xml.data.CRC32=0c07a668
70.9 nbproject/build-impl.xml.script.CRC32=87e6e497
70.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.58
70.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
71.1 --- a/remoting/server/indexer/impl/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
71.2 +++ b/remoting/server/indexer/impl/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
71.3 @@ -85,6 +85,14 @@
71.4 </run-dependency>
71.5 </dependency>
71.6 <dependency>
71.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
71.8 + <build-prerequisite/>
71.9 + <compile-dependency/>
71.10 + <run-dependency>
71.11 + <specification-version>2.4.1.2.25.8.1</specification-version>
71.12 + </run-dependency>
71.13 + </dependency>
71.14 + <dependency>
71.15 <code-name-base>org.netbeans.modules.jumpto</code-name-base>
71.16 <build-prerequisite/>
71.17 <compile-dependency/>
71.18 @@ -103,6 +111,14 @@
71.19 </run-dependency>
71.20 </dependency>
71.21 <dependency>
71.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
71.23 + <build-prerequisite/>
71.24 + <compile-dependency/>
71.25 + <run-dependency>
71.26 + <implementation-version/>
71.27 + </run-dependency>
71.28 + </dependency>
71.29 + <dependency>
71.30 <code-name-base>org.netbeans.modules.project.ant</code-name-base>
71.31 <build-prerequisite/>
71.32 <compile-dependency/>
71.33 @@ -130,6 +146,15 @@
71.34 </run-dependency>
71.35 </dependency>
71.36 <dependency>
71.37 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
71.38 + <build-prerequisite/>
71.39 + <compile-dependency/>
71.40 + <run-dependency>
71.41 + <release-version>1</release-version>
71.42 + <specification-version>1.79.0.9</specification-version>
71.43 + </run-dependency>
71.44 + </dependency>
71.45 + <dependency>
71.46 <code-name-base>org.netbeans.modules.queries</code-name-base>
71.47 <build-prerequisite/>
71.48 <compile-dependency/>
71.49 @@ -214,6 +239,14 @@
71.50 <specification-version>8.5</specification-version>
71.51 </run-dependency>
71.52 </dependency>
71.53 + <dependency>
71.54 + <code-name-base>org.openide.util.ui</code-name-base>
71.55 + <build-prerequisite/>
71.56 + <compile-dependency/>
71.57 + <run-dependency>
71.58 + <specification-version>9.3</specification-version>
71.59 + </run-dependency>
71.60 + </dependency>
71.61 </module-dependencies>
71.62 <test-dependencies>
71.63 <test-type>
72.1 --- a/remoting/server/indexer/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
72.2 +++ b/remoting/server/indexer/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
72.3 @@ -7,5 +7,5 @@
72.4 nbproject/build-impl.xml.script.CRC32=5e004a39
72.5 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
72.6 nbproject/platform.xml.data.CRC32=7bd55f34
72.7 -nbproject/platform.xml.script.CRC32=db9e1f43
72.8 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
72.9 +nbproject/platform.xml.script.CRC32=6dcbd131
72.10 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70
73.1 --- a/remoting/server/indexer/nbproject/platform.xml Fri May 01 19:13:18 2015 +0200
73.2 +++ b/remoting/server/indexer/nbproject/platform.xml Sun May 31 15:17:24 2015 +0200
73.3 @@ -17,7 +17,7 @@
73.4 </pathconvert>
73.5 <property name="disabled.modules" value=""/>
73.6 <pathconvert property="module.includes" pathsep="">
73.7 - <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
73.8 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
73.9 <path>
73.10 <filelist files="${disabled.modules}" dir="."/>
73.11 </path>
74.1 --- a/remoting/server/indexer/usages/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
74.2 +++ b/remoting/server/indexer/usages/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
74.3 @@ -3,6 +3,6 @@
74.4 build.xml.stylesheet.CRC32=a56c6a5b@2.47
74.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
74.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
74.7 -nbproject/build-impl.xml.data.CRC32=fe444955
74.8 +nbproject/build-impl.xml.data.CRC32=75ee014b
74.9 nbproject/build-impl.xml.script.CRC32=16d3b827
74.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.58
74.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70
75.1 --- a/remoting/server/indexer/usages/nbproject/project.xml Fri May 01 19:13:18 2015 +0200
75.2 +++ b/remoting/server/indexer/usages/nbproject/project.xml Sun May 31 15:17:24 2015 +0200
75.3 @@ -66,6 +66,14 @@
75.4 </run-dependency>
75.5 </dependency>
75.6 <dependency>
75.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
75.8 + <build-prerequisite/>
75.9 + <compile-dependency/>
75.10 + <run-dependency>
75.11 + <implementation-version/>
75.12 + </run-dependency>
75.13 + </dependency>
75.14 + <dependency>
75.15 <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
75.16 <build-prerequisite/>
75.17 <compile-dependency/>
75.18 @@ -75,6 +83,14 @@
75.19 </run-dependency>
75.20 </dependency>
75.21 <dependency>
75.22 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
75.23 + <build-prerequisite/>
75.24 + <compile-dependency/>
75.25 + <run-dependency>
75.26 + <specification-version>9.6.0.1.1.8</specification-version>
75.27 + </run-dependency>
75.28 + </dependency>
75.29 + <dependency>
75.30 <code-name-base>org.openide.filesystems</code-name-base>
75.31 <build-prerequisite/>
75.32 <compile-dependency/>
76.1 --- a/remoting/server/tests/data/group1/prj1/build.xml Fri May 01 19:13:18 2015 +0200
76.2 +++ b/remoting/server/tests/data/group1/prj1/build.xml Sun May 31 15:17:24 2015 +0200
76.3 @@ -51,8 +51,7 @@
76.4 -init-macrodef-junit: defines macro for junit execution
76.5 -init-macrodef-debug: defines macro for class debugging
76.6 -init-macrodef-java: defines macro for class execution
76.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
76.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
76.9 + -do-jar: JAR building
76.10 run: execution of project
76.11 -javadoc-build: Javadoc generation
76.12 test-report: JUnit report generation
77.1 --- a/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
77.2 +++ b/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
77.3 @@ -54,6 +54,7 @@
77.4 <property file="nbproject/project.properties"/>
77.5 </target>
77.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
77.7 + <property name="platform.java" value="${java.home}/bin/java"/>
77.8 <available file="${manifest.file}" property="manifest.available"/>
77.9 <condition property="splashscreen.available">
77.10 <and>
77.11 @@ -71,16 +72,20 @@
77.12 </not>
77.13 </and>
77.14 </condition>
77.15 - <condition property="manifest.available+main.class">
77.16 + <condition property="profile.available">
77.17 <and>
77.18 - <isset property="manifest.available"/>
77.19 - <isset property="main.class.available"/>
77.20 + <isset property="javac.profile"/>
77.21 + <length length="0" string="${javac.profile}" when="greater"/>
77.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
77.23 </and>
77.24 </condition>
77.25 <condition property="do.archive">
77.26 - <not>
77.27 - <istrue value="${jar.archive.disabled}"/>
77.28 - </not>
77.29 + <or>
77.30 + <not>
77.31 + <istrue value="${jar.archive.disabled}"/>
77.32 + </not>
77.33 + <istrue value="${not.archive.disabled}"/>
77.34 + </or>
77.35 </condition>
77.36 <condition property="do.mkdist">
77.37 <and>
77.38 @@ -91,12 +96,6 @@
77.39 </not>
77.40 </and>
77.41 </condition>
77.42 - <condition property="manifest.available+main.class+mkdist.available">
77.43 - <and>
77.44 - <istrue value="${manifest.available+main.class}"/>
77.45 - <isset property="do.mkdist"/>
77.46 - </and>
77.47 - </condition>
77.48 <condition property="do.archive+manifest.available">
77.49 <and>
77.50 <isset property="manifest.available"/>
77.51 @@ -115,24 +114,12 @@
77.52 <istrue value="${do.archive}"/>
77.53 </and>
77.54 </condition>
77.55 - <condition property="do.archive+manifest.available+main.class">
77.56 + <condition property="do.archive+profile.available">
77.57 <and>
77.58 - <istrue value="${manifest.available+main.class}"/>
77.59 + <isset property="profile.available"/>
77.60 <istrue value="${do.archive}"/>
77.61 </and>
77.62 </condition>
77.63 - <condition property="manifest.available-mkdist.available">
77.64 - <or>
77.65 - <istrue value="${manifest.available}"/>
77.66 - <isset property="do.mkdist"/>
77.67 - </or>
77.68 - </condition>
77.69 - <condition property="manifest.available+main.class-mkdist.available">
77.70 - <or>
77.71 - <istrue value="${manifest.available+main.class}"/>
77.72 - <isset property="do.mkdist"/>
77.73 - </or>
77.74 - </condition>
77.75 <condition property="have.tests">
77.76 <or>
77.77 <available file="${test.src.dir}"/>
77.78 @@ -186,7 +173,15 @@
77.79 </condition>
77.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
77.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
77.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
77.83 + <and>
77.84 + <isset property="endorsed.classpath"/>
77.85 + <not>
77.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
77.87 + </not>
77.88 + </and>
77.89 + </condition>
77.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
77.91 + <isset property="profile.available"/>
77.92 </condition>
77.93 <condition else="false" property="jdkBug6558476">
77.94 <and>
77.95 @@ -196,7 +191,12 @@
77.96 </not>
77.97 </and>
77.98 </condition>
77.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
77.100 + <condition else="false" property="javac.fork">
77.101 + <or>
77.102 + <istrue value="${jdkBug6558476}"/>
77.103 + <istrue value="${javac.external.vm}"/>
77.104 + </or>
77.105 + </condition>
77.106 <property name="jar.index" value="false"/>
77.107 <property name="jar.index.metainf" value="${jar.index}"/>
77.108 <property name="copylibs.rebase" value="true"/>
77.109 @@ -275,6 +275,7 @@
77.110 <path path="@{classpath}"/>
77.111 </classpath>
77.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
77.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
77.114 <compilerarg line="${javac.compilerargs}"/>
77.115 <compilerarg value="-processorpath"/>
77.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
77.117 @@ -314,6 +315,7 @@
77.118 <path path="@{classpath}"/>
77.119 </classpath>
77.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
77.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
77.122 <compilerarg line="${javac.compilerargs}"/>
77.123 <customize/>
77.124 </javac>
77.125 @@ -370,6 +372,11 @@
77.126 </and>
77.127 </condition>
77.128 </target>
77.129 + <target name="-init-test-properties">
77.130 + <property name="test.binaryincludes" value="<nothing>"/>
77.131 + <property name="test.binarytestincludes" value=""/>
77.132 + <property name="test.binaryexcludes" value=""/>
77.133 + </target>
77.134 <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
77.135 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
77.136 <attribute default="${includes}" name="includes"/>
77.137 @@ -393,7 +400,7 @@
77.138 </sequential>
77.139 </macrodef>
77.140 </target>
77.141 - <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
77.142 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
77.143 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
77.144 <attribute default="${includes}" name="includes"/>
77.145 <attribute default="${excludes}" name="excludes"/>
77.146 @@ -407,6 +414,9 @@
77.147 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
77.148 <filename name="@{testincludes}"/>
77.149 </fileset>
77.150 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
77.151 + <filename name="${test.binarytestincludes}"/>
77.152 + </fileset>
77.153 </batchtest>
77.154 <syspropertyset>
77.155 <propertyref prefix="test-sys-prop."/>
77.156 @@ -429,42 +439,16 @@
77.157 <attribute default="" name="testmethods"/>
77.158 <element name="customize" optional="true"/>
77.159 <sequential>
77.160 - <pathconvert pathsep="${line.separator}" property="testng.testincludes">
77.161 - <path>
77.162 - <filelist dir="${build.test.classes.dir}" files="@{testincludes}"/>
77.163 - </path>
77.164 - <chainedmapper>
77.165 - <globmapper from="*.java" to="*.class"/>
77.166 - <globmapper from="${basedir}/${build.test.classes.dir}/*" to="*"/>
77.167 - </chainedmapper>
77.168 - </pathconvert>
77.169 - <pathconvert pathsep="${line.separator}" property="testng.excludes">
77.170 - <path>
77.171 - <filelist dir="${build.test.classes.dir}" files="@{excludes}"/>
77.172 - <filelist dir="${build.test.classes.dir}" files="${excludes}"/>
77.173 - </path>
77.174 - <chainedmapper>
77.175 - <globmapper from="*.java" to="*.class"/>
77.176 - <globmapper from="${basedir}/${build.test.classes.dir}/*" to="*"/>
77.177 - </chainedmapper>
77.178 - </pathconvert>
77.179 - <pathconvert pathsep="${line.separator}" property="testng.includes">
77.180 - <path>
77.181 - <filelist dir="${build.test.classes.dir}" files="@{includes}"/>
77.182 - </path>
77.183 - <chainedmapper>
77.184 - <globmapper from="*.java" to="*.class"/>
77.185 - <globmapper from="${basedir}/${build.test.classes.dir}/*" to="*"/>
77.186 - </chainedmapper>
77.187 - </pathconvert>
77.188 <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
77.189 <isset property="test.method"/>
77.190 </condition>
77.191 + <union id="test.set">
77.192 + <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
77.193 + <filename name="@{testincludes}"/>
77.194 + </fileset>
77.195 + </union>
77.196 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
77.197 - <testng enableAssert="true" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="prj1" testname="TestNG tests" workingDir="${work.dir}">
77.198 - <classfileset dir="${build.test.classes.dir}" excludes="${testng.excludes}" includes="${testng.includes}">
77.199 - <filename name="${testng.testincludes}"/>
77.200 - </classfileset>
77.201 + <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="prj1" testname="TestNG tests" workingDir="${work.dir}">
77.202 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
77.203 <propertyset>
77.204 <propertyref prefix="test-sys-prop."/>
77.205 @@ -535,39 +519,73 @@
77.206 </sequential>
77.207 </macrodef>
77.208 </target>
77.209 - <target if="${junit.available}" name="-init-macrodef-junit-debug">
77.210 + <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
77.211 <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
77.212 - <attribute default="${main.class}" name="testClass"/>
77.213 - <attribute default="" name="testMethod"/>
77.214 - <element name="customize2" optional="true"/>
77.215 + <attribute default="${includes}" name="includes"/>
77.216 + <attribute default="${excludes}" name="excludes"/>
77.217 + <attribute default="**" name="testincludes"/>
77.218 + <attribute default="" name="testmethods"/>
77.219 + <element name="customize" optional="true"/>
77.220 <sequential>
77.221 - <property location="${build.test.results.dir}/TEST-@{testClass}.xml" name="test.report.file"/>
77.222 - <delete file="${test.report.file}"/>
77.223 - <mkdir dir="${build.test.results.dir}"/>
77.224 - <condition else="" property="junit.methods.arg" value="methods=@{testMethod}">
77.225 - <isset property="test.method"/>
77.226 - </condition>
77.227 - <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}">
77.228 - <customize>
77.229 - <arg value="@{testClass}"/>
77.230 - <arg value="${junit.methods.arg}"/>
77.231 - <arg value="showoutput=true"/>
77.232 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
77.233 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
77.234 - <customize2/>
77.235 - </customize>
77.236 - </j2seproject3:debug>
77.237 + <property name="junit.forkmode" value="perTest"/>
77.238 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
77.239 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
77.240 + <syspropertyset>
77.241 + <propertyref prefix="test-sys-prop."/>
77.242 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
77.243 + </syspropertyset>
77.244 + <formatter type="brief" usefile="false"/>
77.245 + <formatter type="xml"/>
77.246 + <jvmarg value="-ea"/>
77.247 + <jvmarg line="${debug-args-line}"/>
77.248 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
77.249 + <customize/>
77.250 + </junit>
77.251 </sequential>
77.252 </macrodef>
77.253 </target>
77.254 - <target depends="-init-macrodef-junit-debug" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
77.255 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
77.256 + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
77.257 + <attribute default="${includes}" name="includes"/>
77.258 + <attribute default="${excludes}" name="excludes"/>
77.259 + <attribute default="**" name="testincludes"/>
77.260 + <attribute default="" name="testmethods"/>
77.261 + <element name="customize" optional="true"/>
77.262 + <sequential>
77.263 + <property name="junit.forkmode" value="perTest"/>
77.264 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
77.265 + <batchtest todir="${build.test.results.dir}">
77.266 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
77.267 + <filename name="@{testincludes}"/>
77.268 + </fileset>
77.269 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
77.270 + <filename name="${test.binarytestincludes}"/>
77.271 + </fileset>
77.272 + </batchtest>
77.273 + <syspropertyset>
77.274 + <propertyref prefix="test-sys-prop."/>
77.275 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
77.276 + </syspropertyset>
77.277 + <formatter type="brief" usefile="false"/>
77.278 + <formatter type="xml"/>
77.279 + <jvmarg value="-ea"/>
77.280 + <jvmarg line="${debug-args-line}"/>
77.281 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
77.282 + <customize/>
77.283 + </junit>
77.284 + </sequential>
77.285 + </macrodef>
77.286 + </target>
77.287 + <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
77.288 <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
77.289 - <attribute default="${main.class}" name="testClass"/>
77.290 - <attribute default="" name="testMethod"/>
77.291 - <element implicit="true" name="customize2" optional="true"/>
77.292 + <attribute default="${includes}" name="includes"/>
77.293 + <attribute default="${excludes}" name="excludes"/>
77.294 + <attribute default="**" name="testincludes"/>
77.295 + <attribute default="" name="testmethods"/>
77.296 + <element implicit="true" name="customize" optional="true"/>
77.297 <sequential>
77.298 - <j2seproject3:junit-debug testClass="@{testClass}" testMethod="@{testMethod}">
77.299 - <customize2/>
77.300 + <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
77.301 + <customize/>
77.302 </j2seproject3:junit-debug>
77.303 </sequential>
77.304 </macrodef>
77.305 @@ -600,7 +618,7 @@
77.306 </macrodef>
77.307 </target>
77.308 <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
77.309 - <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
77.310 + <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
77.311 <attribute default="${main.class}" name="testClass"/>
77.312 <attribute default="" name="testMethod"/>
77.313 <element implicit="true" name="customize2" optional="true"/>
77.314 @@ -611,32 +629,62 @@
77.315 </sequential>
77.316 </macrodef>
77.317 </target>
77.318 - <target depends="-init-macrodef-junit-debug-impl,-init-macrodef-testng-debug-impl" name="-init-macrodef-test-debug">
77.319 + <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
77.320 <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
77.321 + <attribute default="${includes}" name="includes"/>
77.322 + <attribute default="${excludes}" name="excludes"/>
77.323 + <attribute default="**" name="testincludes"/>
77.324 + <attribute default="" name="testmethods"/>
77.325 <attribute default="${main.class}" name="testClass"/>
77.326 <attribute default="" name="testMethod"/>
77.327 <sequential>
77.328 - <j2seproject3:test-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
77.329 + <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
77.330 + <customize>
77.331 + <classpath>
77.332 + <path path="${run.test.classpath}"/>
77.333 + </classpath>
77.334 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
77.335 + <jvmarg line="${run.jvmargs}"/>
77.336 + <jvmarg line="${run.jvmargs.ide}"/>
77.337 + </customize>
77.338 + </j2seproject3:test-debug-impl>
77.339 + </sequential>
77.340 + </macrodef>
77.341 + </target>
77.342 + <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
77.343 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
77.344 + <attribute default="${includes}" name="includes"/>
77.345 + <attribute default="${excludes}" name="excludes"/>
77.346 + <attribute default="**" name="testincludes"/>
77.347 + <attribute default="" name="testmethods"/>
77.348 + <attribute default="${main.class}" name="testClass"/>
77.349 + <attribute default="" name="testMethod"/>
77.350 + <sequential>
77.351 + <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
77.352 <customize2>
77.353 <syspropertyset>
77.354 <propertyref prefix="test-sys-prop."/>
77.355 <mapper from="test-sys-prop.*" to="*" type="glob"/>
77.356 </syspropertyset>
77.357 </customize2>
77.358 - </j2seproject3:test-debug-impl>
77.359 + </j2seproject3:testng-debug-impl>
77.360 </sequential>
77.361 </macrodef>
77.362 </target>
77.363 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
77.364 - <target name="-profile-pre-init">
77.365 + <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
77.366 + <!--
77.367 + pre NB7.2 profiling section; consider it deprecated
77.368 + -->
77.369 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
77.370 + <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
77.371 <!-- Empty placeholder for easier customization. -->
77.372 <!-- You can override this target in the ../build.xml file. -->
77.373 </target>
77.374 - <target name="-profile-post-init">
77.375 + <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
77.376 <!-- Empty placeholder for easier customization. -->
77.377 <!-- You can override this target in the ../build.xml file. -->
77.378 </target>
77.379 - <target name="-profile-init-macrodef-profile">
77.380 + <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
77.381 <macrodef name="resolve">
77.382 <attribute name="name"/>
77.383 <attribute name="value"/>
77.384 @@ -668,10 +716,13 @@
77.385 </sequential>
77.386 </macrodef>
77.387 </target>
77.388 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
77.389 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
77.390 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
77.391 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
77.392 </target>
77.393 + <!--
77.394 + end of pre NB7.2 profiling section
77.395 + -->
77.396 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
77.397 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
77.398 <attribute default="${main.class}" name="name"/>
77.399 @@ -746,6 +797,7 @@
77.400 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
77.401 <attribute default="${main.class}" name="classname"/>
77.402 <attribute default="${run.classpath}" name="classpath"/>
77.403 + <attribute default="jvm" name="jvm"/>
77.404 <element name="customize" optional="true"/>
77.405 <sequential>
77.406 <java classname="@{classname}" dir="${work.dir}" fork="true">
77.407 @@ -780,12 +832,15 @@
77.408 <path path="${run.classpath.without.build.classes.dir}"/>
77.409 <chainedmapper>
77.410 <flattenmapper/>
77.411 + <filtermapper>
77.412 + <replacestring from=" " to="%20"/>
77.413 + </filtermapper>
77.414 <globmapper from="*" to="lib/*"/>
77.415 </chainedmapper>
77.416 </pathconvert>
77.417 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
77.418 - <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}">
77.419 - <fileset dir="${build.classes.dir}"/>
77.420 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
77.421 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
77.422 <manifest>
77.423 <attribute name="Class-Path" value="${jar.classpath}"/>
77.424 <customize/>
77.425 @@ -797,7 +852,7 @@
77.426 <target name="-init-presetdef-jar">
77.427 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
77.428 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
77.429 - <j2seproject1:fileset dir="${build.classes.dir}"/>
77.430 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
77.431 </jar>
77.432 </presetdef>
77.433 </target>
77.434 @@ -878,7 +933,7 @@
77.435 <target if="has.persistence.xml" name="-copy-persistence-xml">
77.436 <mkdir dir="${build.classes.dir}/META-INF"/>
77.437 <copy todir="${build.classes.dir}/META-INF">
77.438 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
77.439 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
77.440 </copy>
77.441 </target>
77.442 <target name="-post-compile">
77.443 @@ -913,41 +968,25 @@
77.444 <!-- Empty placeholder for easier customization. -->
77.445 <!-- You can override this target in the ../build.xml file. -->
77.446 </target>
77.447 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
77.448 - <j2seproject1:jar/>
77.449 - </target>
77.450 - <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">
77.451 - <j2seproject1:jar manifest="${manifest.file}"/>
77.452 - </target>
77.453 - <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">
77.454 - <j2seproject1:jar manifest="${manifest.file}">
77.455 - <j2seproject1:manifest>
77.456 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
77.457 - </j2seproject1:manifest>
77.458 - </j2seproject1:jar>
77.459 - <echo level="info">To run this application from the command line without Ant, try:</echo>
77.460 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
77.461 - <property location="${dist.jar}" name="dist.jar.resolved"/>
77.462 - <pathconvert property="run.classpath.with.dist.jar">
77.463 - <path path="${run.classpath}"/>
77.464 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
77.465 - </pathconvert>
77.466 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
77.467 - </target>
77.468 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
77.469 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
77.470 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
77.471 <touch file="${tmp.manifest.file}" verbose="false"/>
77.472 </target>
77.473 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
77.474 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
77.475 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
77.476 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
77.477 </target>
77.478 - <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">
77.479 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
77.480 <manifest file="${tmp.manifest.file}" mode="update">
77.481 <attribute name="Main-Class" value="${main.class}"/>
77.482 </manifest>
77.483 </target>
77.484 - <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">
77.485 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
77.486 + <manifest file="${tmp.manifest.file}" mode="update">
77.487 + <attribute name="Profile" value="${javac.profile}"/>
77.488 + </manifest>
77.489 + </target>
77.490 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
77.491 <basename file="${application.splash}" property="splashscreen.basename"/>
77.492 <mkdir dir="${build.classes.dir}/META-INF"/>
77.493 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
77.494 @@ -955,23 +994,41 @@
77.495 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
77.496 </manifest>
77.497 </target>
77.498 - <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">
77.499 + <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" if="do.mkdist" name="-do-jar-copylibs">
77.500 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
77.501 <echo level="info">To run this application from the command line without Ant, try:</echo>
77.502 <property location="${dist.jar}" name="dist.jar.resolved"/>
77.503 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
77.504 </target>
77.505 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
77.506 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
77.507 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
77.508 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
77.509 + <property location="${dist.jar}" name="dist.jar.resolved"/>
77.510 + <pathconvert property="run.classpath.with.dist.jar">
77.511 + <path path="${run.classpath}"/>
77.512 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
77.513 + </pathconvert>
77.514 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
77.515 + <isset property="main.class.available"/>
77.516 + </condition>
77.517 + <condition else="debug" property="jar.usage.level" value="info">
77.518 + <isset property="main.class.available"/>
77.519 + </condition>
77.520 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
77.521 + </target>
77.522 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
77.523 <delete>
77.524 <fileset file="${tmp.manifest.file}"/>
77.525 </delete>
77.526 </target>
77.527 - <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"/>
77.528 + <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"/>
77.529 + <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"/>
77.530 <target name="-post-jar">
77.531 <!-- Empty placeholder for easier customization. -->
77.532 <!-- You can override this target in the ../build.xml file. -->
77.533 </target>
77.534 - <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"/>
77.535 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
77.536 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
77.537 <!--
77.538 =================
77.539 EXECUTION SECTION
77.540 @@ -1041,7 +1098,11 @@
77.541 PROFILING SECTION
77.542 =================
77.543 -->
77.544 - <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
77.545 + <!--
77.546 + pre NB7.2 profiler integration
77.547 + -->
77.548 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
77.549 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
77.550 <nbprofiledirect>
77.551 <classpath>
77.552 <path path="${run.classpath}"/>
77.553 @@ -1049,8 +1110,9 @@
77.554 </nbprofiledirect>
77.555 <profile/>
77.556 </target>
77.557 - <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
77.558 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
77.559 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
77.560 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
77.561 <nbprofiledirect>
77.562 <classpath>
77.563 <path path="${run.classpath}"/>
77.564 @@ -1058,12 +1120,8 @@
77.565 </nbprofiledirect>
77.566 <profile classname="${profile.class}"/>
77.567 </target>
77.568 - <!--
77.569 - =========================
77.570 - APPLET PROFILING SECTION
77.571 - =========================
77.572 - -->
77.573 - <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
77.574 + <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
77.575 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
77.576 <nbprofiledirect>
77.577 <classpath>
77.578 <path path="${run.classpath}"/>
77.579 @@ -1075,12 +1133,8 @@
77.580 </customize>
77.581 </profile>
77.582 </target>
77.583 - <!--
77.584 - =========================
77.585 - TESTS PROFILING SECTION
77.586 - =========================
77.587 - -->
77.588 - <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
77.589 + <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
77.590 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
77.591 <nbprofiledirect>
77.592 <classpath>
77.593 <path path="${run.test.classpath}"/>
77.594 @@ -1103,6 +1157,42 @@
77.595 </junit>
77.596 </target>
77.597 <!--
77.598 + end of pre NB72 profiling section
77.599 + -->
77.600 + <target if="netbeans.home" name="-profile-check">
77.601 + <condition property="profiler.configured">
77.602 + <or>
77.603 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
77.604 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
77.605 + </or>
77.606 + </condition>
77.607 + </target>
77.608 + <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
77.609 + <startprofiler/>
77.610 + <antcall target="run"/>
77.611 + </target>
77.612 + <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">
77.613 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
77.614 + <startprofiler/>
77.615 + <antcall target="run-single"/>
77.616 + </target>
77.617 + <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
77.618 + <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
77.619 + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
77.620 + <startprofiler/>
77.621 + <antcall target="test-single"/>
77.622 + </target>
77.623 + <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
77.624 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
77.625 + <startprofiler/>
77.626 + <antcal target="run-test-with-main"/>
77.627 + </target>
77.628 + <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
77.629 + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
77.630 + <startprofiler/>
77.631 + <antcall target="run-applet"/>
77.632 + </target>
77.633 + <!--
77.634 ===============
77.635 JAVADOC SECTION
77.636 ===============
77.637 @@ -1117,11 +1207,14 @@
77.638 </not>
77.639 </and>
77.640 </condition>
77.641 - <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}">
77.642 + <condition else="" property="bug5101868workaround" value="*.java">
77.643 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
77.644 + </condition>
77.645 + <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}">
77.646 <classpath>
77.647 <path path="${javac.classpath}"/>
77.648 </classpath>
77.649 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
77.650 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
77.651 <filename name="**/*.java"/>
77.652 </fileset>
77.653 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
77.654 @@ -1195,7 +1288,7 @@
77.655 <mkdir dir="${build.test.results.dir}"/>
77.656 </target>
77.657 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
77.658 - <j2seproject3:test testincludes="**/*Test.java"/>
77.659 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
77.660 </target>
77.661 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
77.662 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
77.663 @@ -1228,13 +1321,14 @@
77.664 TEST DEBUGGING SECTION
77.665 =======================
77.666 -->
77.667 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
77.668 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
77.669 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
77.670 - <j2seproject3:test-debug testClass="${test.class}"/>
77.671 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
77.672 </target>
77.673 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test-method">
77.674 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
77.675 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
77.676 - <j2seproject3:test-debug testClass="${test.class}" testMethod="${test.method}"/>
77.677 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
77.678 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
77.679 </target>
77.680 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
77.681 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
78.1 --- a/remoting/server/tests/data/group1/prj1/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
78.2 +++ b/remoting/server/tests/data/group1/prj1/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
78.3 @@ -1,8 +1,8 @@
78.4 build.xml.data.CRC32=9fba8b40
78.5 -build.xml.script.CRC32=4f50f25f
78.6 -build.xml.stylesheet.CRC32=28e38971@1.45.0.45
78.7 +build.xml.script.CRC32=a2a6ce1b
78.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
78.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
78.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
78.11 nbproject/build-impl.xml.data.CRC32=9fba8b40
78.12 -nbproject/build-impl.xml.script.CRC32=19ad3a01
78.13 -nbproject/build-impl.xml.stylesheet.CRC32=b222b120@1.51.0.46
78.14 +nbproject/build-impl.xml.script.CRC32=2ed1cc28
78.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
79.1 --- a/remoting/server/tests/integration-data/example/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
79.2 +++ b/remoting/server/tests/integration-data/example/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
79.3 @@ -54,6 +54,7 @@
79.4 <property file="nbproject/project.properties"/>
79.5 </target>
79.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
79.7 + <property name="platform.java" value="${java.home}/bin/java"/>
79.8 <available file="${manifest.file}" property="manifest.available"/>
79.9 <condition property="splashscreen.available">
79.10 <and>
79.11 @@ -79,9 +80,12 @@
79.12 </and>
79.13 </condition>
79.14 <condition property="do.archive">
79.15 - <not>
79.16 - <istrue value="${jar.archive.disabled}"/>
79.17 - </not>
79.18 + <or>
79.19 + <not>
79.20 + <istrue value="${jar.archive.disabled}"/>
79.21 + </not>
79.22 + <istrue value="${not.archive.disabled}"/>
79.23 + </or>
79.24 </condition>
79.25 <condition property="do.mkdist">
79.26 <and>
79.27 @@ -169,7 +173,12 @@
79.28 </condition>
79.29 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
79.30 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
79.31 - <length length="0" string="${endorsed.classpath}" when="greater"/>
79.32 + <and>
79.33 + <isset property="endorsed.classpath"/>
79.34 + <not>
79.35 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
79.36 + </not>
79.37 + </and>
79.38 </condition>
79.39 <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
79.40 <isset property="profile.available"/>
79.41 @@ -182,7 +191,12 @@
79.42 </not>
79.43 </and>
79.44 </condition>
79.45 - <property name="javac.fork" value="${jdkBug6558476}"/>
79.46 + <condition else="false" property="javac.fork">
79.47 + <or>
79.48 + <istrue value="${jdkBug6558476}"/>
79.49 + <istrue value="${javac.external.vm}"/>
79.50 + </or>
79.51 + </condition>
79.52 <property name="jar.index" value="false"/>
79.53 <property name="jar.index.metainf" value="${jar.index}"/>
79.54 <property name="copylibs.rebase" value="true"/>
79.55 @@ -434,7 +448,7 @@
79.56 </fileset>
79.57 </union>
79.58 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
79.59 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="example" testname="TestNG tests" workingDir="${work.dir}">
79.60 + <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="example" testname="TestNG tests" workingDir="${work.dir}">
79.61 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
79.62 <propertyset>
79.63 <propertyref prefix="test-sys-prop."/>
79.64 @@ -825,8 +839,8 @@
79.65 </chainedmapper>
79.66 </pathconvert>
79.67 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
79.68 - <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}">
79.69 - <fileset dir="${build.classes.dir}"/>
79.70 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
79.71 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
79.72 <manifest>
79.73 <attribute name="Class-Path" value="${jar.classpath}"/>
79.74 <customize/>
79.75 @@ -838,7 +852,7 @@
79.76 <target name="-init-presetdef-jar">
79.77 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
79.78 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
79.79 - <j2seproject1:fileset dir="${build.classes.dir}"/>
79.80 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
79.81 </jar>
79.82 </presetdef>
79.83 </target>
79.84 @@ -1193,11 +1207,14 @@
79.85 </not>
79.86 </and>
79.87 </condition>
79.88 - <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}">
79.89 + <condition else="" property="bug5101868workaround" value="*.java">
79.90 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
79.91 + </condition>
79.92 + <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}">
79.93 <classpath>
79.94 <path path="${javac.classpath}"/>
79.95 </classpath>
79.96 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
79.97 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
79.98 <filename name="**/*.java"/>
79.99 </fileset>
79.100 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
79.101 @@ -1271,7 +1288,7 @@
79.102 <mkdir dir="${build.test.results.dir}"/>
79.103 </target>
79.104 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
79.105 - <j2seproject3:test testincludes="**/*Test.java"/>
79.106 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
79.107 </target>
79.108 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
79.109 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
80.1 --- a/remoting/server/tests/integration-data/example/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
80.2 +++ b/remoting/server/tests/integration-data/example/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
80.3 @@ -4,5 +4,5 @@
80.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
80.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
80.6 nbproject/build-impl.xml.data.CRC32=e1bb0e2b
80.7 -nbproject/build-impl.xml.script.CRC32=9957d528
80.8 -nbproject/build-impl.xml.stylesheet.CRC32=c4a38350@1.61.0.46
80.9 +nbproject/build-impl.xml.script.CRC32=527ac792
80.10 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
81.1 --- a/remoting/server/web/base.web.api/build.xml Fri May 01 19:13:18 2015 +0200
81.2 +++ b/remoting/server/web/base.web.api/build.xml Sun May 31 15:17:24 2015 +0200
81.3 @@ -51,8 +51,7 @@
81.4 -init-macrodef-junit: defines macro for junit execution
81.5 -init-macrodef-debug: defines macro for class debugging
81.6 -init-macrodef-java: defines macro for class execution
81.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
81.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
81.9 + -do-jar: JAR building
81.10 run: execution of project
81.11 -javadoc-build: Javadoc generation
81.12 test-report: JUnit report generation
82.1 --- a/remoting/server/web/base.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
82.2 +++ b/remoting/server/web/base.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
82.3 @@ -79,6 +79,7 @@
82.4 <property file="nbproject/project.properties"/>
82.5 </target>
82.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
82.7 + <property name="platform.java" value="${java.home}/bin/java"/>
82.8 <available file="${manifest.file}" property="manifest.available"/>
82.9 <condition property="splashscreen.available">
82.10 <and>
82.11 @@ -96,16 +97,20 @@
82.12 </not>
82.13 </and>
82.14 </condition>
82.15 - <condition property="manifest.available+main.class">
82.16 + <condition property="profile.available">
82.17 <and>
82.18 - <isset property="manifest.available"/>
82.19 - <isset property="main.class.available"/>
82.20 + <isset property="javac.profile"/>
82.21 + <length length="0" string="${javac.profile}" when="greater"/>
82.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
82.23 </and>
82.24 </condition>
82.25 <condition property="do.archive">
82.26 - <not>
82.27 - <istrue value="${jar.archive.disabled}"/>
82.28 - </not>
82.29 + <or>
82.30 + <not>
82.31 + <istrue value="${jar.archive.disabled}"/>
82.32 + </not>
82.33 + <istrue value="${not.archive.disabled}"/>
82.34 + </or>
82.35 </condition>
82.36 <condition property="do.mkdist">
82.37 <and>
82.38 @@ -116,12 +121,6 @@
82.39 </not>
82.40 </and>
82.41 </condition>
82.42 - <condition property="manifest.available+main.class+mkdist.available">
82.43 - <and>
82.44 - <istrue value="${manifest.available+main.class}"/>
82.45 - <isset property="do.mkdist"/>
82.46 - </and>
82.47 - </condition>
82.48 <condition property="do.archive+manifest.available">
82.49 <and>
82.50 <isset property="manifest.available"/>
82.51 @@ -140,24 +139,12 @@
82.52 <istrue value="${do.archive}"/>
82.53 </and>
82.54 </condition>
82.55 - <condition property="do.archive+manifest.available+main.class">
82.56 + <condition property="do.archive+profile.available">
82.57 <and>
82.58 - <istrue value="${manifest.available+main.class}"/>
82.59 + <isset property="profile.available"/>
82.60 <istrue value="${do.archive}"/>
82.61 </and>
82.62 </condition>
82.63 - <condition property="manifest.available-mkdist.available">
82.64 - <or>
82.65 - <istrue value="${manifest.available}"/>
82.66 - <isset property="do.mkdist"/>
82.67 - </or>
82.68 - </condition>
82.69 - <condition property="manifest.available+main.class-mkdist.available">
82.70 - <or>
82.71 - <istrue value="${manifest.available+main.class}"/>
82.72 - <isset property="do.mkdist"/>
82.73 - </or>
82.74 - </condition>
82.75 <condition property="have.tests">
82.76 <or>
82.77 <available file="${test.src.dir}"/>
82.78 @@ -211,7 +198,15 @@
82.79 </condition>
82.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
82.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
82.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
82.83 + <and>
82.84 + <isset property="endorsed.classpath"/>
82.85 + <not>
82.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
82.87 + </not>
82.88 + </and>
82.89 + </condition>
82.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
82.91 + <isset property="profile.available"/>
82.92 </condition>
82.93 <condition else="false" property="jdkBug6558476">
82.94 <and>
82.95 @@ -221,7 +216,12 @@
82.96 </not>
82.97 </and>
82.98 </condition>
82.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
82.100 + <condition else="false" property="javac.fork">
82.101 + <or>
82.102 + <istrue value="${jdkBug6558476}"/>
82.103 + <istrue value="${javac.external.vm}"/>
82.104 + </or>
82.105 + </condition>
82.106 <property name="jar.index" value="false"/>
82.107 <property name="jar.index.metainf" value="${jar.index}"/>
82.108 <property name="copylibs.rebase" value="true"/>
82.109 @@ -300,6 +300,7 @@
82.110 <path path="@{classpath}"/>
82.111 </classpath>
82.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
82.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
82.114 <compilerarg line="${javac.compilerargs}"/>
82.115 <compilerarg value="-processorpath"/>
82.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
82.117 @@ -339,6 +340,7 @@
82.118 <path path="@{classpath}"/>
82.119 </classpath>
82.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
82.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
82.122 <compilerarg line="${javac.compilerargs}"/>
82.123 <customize/>
82.124 </javac>
82.125 @@ -471,7 +473,7 @@
82.126 </fileset>
82.127 </union>
82.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
82.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="base.web.api" testname="TestNG tests" workingDir="${work.dir}">
82.130 + <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="base.web.api" testname="TestNG tests" workingDir="${work.dir}">
82.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
82.132 <propertyset>
82.133 <propertyref prefix="test-sys-prop."/>
82.134 @@ -862,8 +864,8 @@
82.135 </chainedmapper>
82.136 </pathconvert>
82.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
82.138 - <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}">
82.139 - <fileset dir="${build.classes.dir}"/>
82.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
82.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
82.142 <manifest>
82.143 <attribute name="Class-Path" value="${jar.classpath}"/>
82.144 <customize/>
82.145 @@ -875,7 +877,7 @@
82.146 <target name="-init-presetdef-jar">
82.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
82.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
82.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
82.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
82.151 </jar>
82.152 </presetdef>
82.153 </target>
82.154 @@ -991,41 +993,25 @@
82.155 <!-- Empty placeholder for easier customization. -->
82.156 <!-- You can override this target in the ../build.xml file. -->
82.157 </target>
82.158 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
82.159 - <j2seproject1:jar/>
82.160 - </target>
82.161 - <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">
82.162 - <j2seproject1:jar manifest="${manifest.file}"/>
82.163 - </target>
82.164 - <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">
82.165 - <j2seproject1:jar manifest="${manifest.file}">
82.166 - <j2seproject1:manifest>
82.167 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
82.168 - </j2seproject1:manifest>
82.169 - </j2seproject1:jar>
82.170 - <echo level="info">To run this application from the command line without Ant, try:</echo>
82.171 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
82.172 - <property location="${dist.jar}" name="dist.jar.resolved"/>
82.173 - <pathconvert property="run.classpath.with.dist.jar">
82.174 - <path path="${run.classpath}"/>
82.175 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
82.176 - </pathconvert>
82.177 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
82.178 - </target>
82.179 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
82.180 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
82.181 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
82.182 <touch file="${tmp.manifest.file}" verbose="false"/>
82.183 </target>
82.184 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
82.185 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
82.186 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
82.187 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
82.188 </target>
82.189 - <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">
82.190 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
82.191 <manifest file="${tmp.manifest.file}" mode="update">
82.192 <attribute name="Main-Class" value="${main.class}"/>
82.193 </manifest>
82.194 </target>
82.195 - <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">
82.196 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
82.197 + <manifest file="${tmp.manifest.file}" mode="update">
82.198 + <attribute name="Profile" value="${javac.profile}"/>
82.199 + </manifest>
82.200 + </target>
82.201 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
82.202 <basename file="${application.splash}" property="splashscreen.basename"/>
82.203 <mkdir dir="${build.classes.dir}/META-INF"/>
82.204 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
82.205 @@ -1033,23 +1019,41 @@
82.206 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
82.207 </manifest>
82.208 </target>
82.209 - <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">
82.210 + <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" if="do.mkdist" name="-do-jar-copylibs">
82.211 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
82.212 <echo level="info">To run this application from the command line without Ant, try:</echo>
82.213 <property location="${dist.jar}" name="dist.jar.resolved"/>
82.214 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
82.215 </target>
82.216 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
82.217 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
82.218 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
82.219 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
82.220 + <property location="${dist.jar}" name="dist.jar.resolved"/>
82.221 + <pathconvert property="run.classpath.with.dist.jar">
82.222 + <path path="${run.classpath}"/>
82.223 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
82.224 + </pathconvert>
82.225 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
82.226 + <isset property="main.class.available"/>
82.227 + </condition>
82.228 + <condition else="debug" property="jar.usage.level" value="info">
82.229 + <isset property="main.class.available"/>
82.230 + </condition>
82.231 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
82.232 + </target>
82.233 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
82.234 <delete>
82.235 <fileset file="${tmp.manifest.file}"/>
82.236 </delete>
82.237 </target>
82.238 - <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"/>
82.239 + <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"/>
82.240 + <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"/>
82.241 <target name="-post-jar">
82.242 <!-- Empty placeholder for easier customization. -->
82.243 <!-- You can override this target in the ../build.xml file. -->
82.244 </target>
82.245 - <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"/>
82.246 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
82.247 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
82.248 <!--
82.249 =================
82.250 EXECUTION SECTION
82.251 @@ -1228,11 +1232,14 @@
82.252 </not>
82.253 </and>
82.254 </condition>
82.255 - <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}">
82.256 + <condition else="" property="bug5101868workaround" value="*.java">
82.257 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
82.258 + </condition>
82.259 + <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}">
82.260 <classpath>
82.261 <path path="${javac.classpath}"/>
82.262 </classpath>
82.263 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
82.264 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
82.265 <filename name="**/*.java"/>
82.266 </fileset>
82.267 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
82.268 @@ -1306,7 +1313,7 @@
82.269 <mkdir dir="${build.test.results.dir}"/>
82.270 </target>
82.271 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
82.272 - <j2seproject3:test testincludes="**/*Test.java"/>
82.273 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
82.274 </target>
82.275 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
82.276 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
83.1 --- a/remoting/server/web/base.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
83.2 +++ b/remoting/server/web/base.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
83.3 @@ -1,8 +1,8 @@
83.4 build.xml.data.CRC32=8d18f2d6
83.5 -build.xml.script.CRC32=f51e627e
83.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
83.7 +build.xml.script.CRC32=bbda5dd1
83.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
83.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
83.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
83.11 nbproject/build-impl.xml.data.CRC32=8d18f2d6
83.12 -nbproject/build-impl.xml.script.CRC32=5f2c273b
83.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.54.0.46
83.14 +nbproject/build-impl.xml.script.CRC32=2367fbe7
83.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
84.1 --- a/remoting/server/web/nbindex.web.api/build.xml Fri May 01 19:13:18 2015 +0200
84.2 +++ b/remoting/server/web/nbindex.web.api/build.xml Sun May 31 15:17:24 2015 +0200
84.3 @@ -51,8 +51,7 @@
84.4 -init-macrodef-junit: defines macro for junit execution
84.5 -init-macrodef-debug: defines macro for class debugging
84.6 -init-macrodef-java: defines macro for class execution
84.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
84.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
84.9 + -do-jar: JAR building
84.10 run: execution of project
84.11 -javadoc-build: Javadoc generation
84.12 test-report: JUnit report generation
85.1 --- a/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
85.2 +++ b/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
85.3 @@ -79,6 +79,7 @@
85.4 <property file="nbproject/project.properties"/>
85.5 </target>
85.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
85.7 + <property name="platform.java" value="${java.home}/bin/java"/>
85.8 <available file="${manifest.file}" property="manifest.available"/>
85.9 <condition property="splashscreen.available">
85.10 <and>
85.11 @@ -96,16 +97,20 @@
85.12 </not>
85.13 </and>
85.14 </condition>
85.15 - <condition property="manifest.available+main.class">
85.16 + <condition property="profile.available">
85.17 <and>
85.18 - <isset property="manifest.available"/>
85.19 - <isset property="main.class.available"/>
85.20 + <isset property="javac.profile"/>
85.21 + <length length="0" string="${javac.profile}" when="greater"/>
85.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
85.23 </and>
85.24 </condition>
85.25 <condition property="do.archive">
85.26 - <not>
85.27 - <istrue value="${jar.archive.disabled}"/>
85.28 - </not>
85.29 + <or>
85.30 + <not>
85.31 + <istrue value="${jar.archive.disabled}"/>
85.32 + </not>
85.33 + <istrue value="${not.archive.disabled}"/>
85.34 + </or>
85.35 </condition>
85.36 <condition property="do.mkdist">
85.37 <and>
85.38 @@ -116,12 +121,6 @@
85.39 </not>
85.40 </and>
85.41 </condition>
85.42 - <condition property="manifest.available+main.class+mkdist.available">
85.43 - <and>
85.44 - <istrue value="${manifest.available+main.class}"/>
85.45 - <isset property="do.mkdist"/>
85.46 - </and>
85.47 - </condition>
85.48 <condition property="do.archive+manifest.available">
85.49 <and>
85.50 <isset property="manifest.available"/>
85.51 @@ -140,24 +139,12 @@
85.52 <istrue value="${do.archive}"/>
85.53 </and>
85.54 </condition>
85.55 - <condition property="do.archive+manifest.available+main.class">
85.56 + <condition property="do.archive+profile.available">
85.57 <and>
85.58 - <istrue value="${manifest.available+main.class}"/>
85.59 + <isset property="profile.available"/>
85.60 <istrue value="${do.archive}"/>
85.61 </and>
85.62 </condition>
85.63 - <condition property="manifest.available-mkdist.available">
85.64 - <or>
85.65 - <istrue value="${manifest.available}"/>
85.66 - <isset property="do.mkdist"/>
85.67 - </or>
85.68 - </condition>
85.69 - <condition property="manifest.available+main.class-mkdist.available">
85.70 - <or>
85.71 - <istrue value="${manifest.available+main.class}"/>
85.72 - <isset property="do.mkdist"/>
85.73 - </or>
85.74 - </condition>
85.75 <condition property="have.tests">
85.76 <or>
85.77 <available file="${test.src.dir}"/>
85.78 @@ -211,7 +198,15 @@
85.79 </condition>
85.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
85.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
85.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
85.83 + <and>
85.84 + <isset property="endorsed.classpath"/>
85.85 + <not>
85.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
85.87 + </not>
85.88 + </and>
85.89 + </condition>
85.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
85.91 + <isset property="profile.available"/>
85.92 </condition>
85.93 <condition else="false" property="jdkBug6558476">
85.94 <and>
85.95 @@ -221,7 +216,12 @@
85.96 </not>
85.97 </and>
85.98 </condition>
85.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
85.100 + <condition else="false" property="javac.fork">
85.101 + <or>
85.102 + <istrue value="${jdkBug6558476}"/>
85.103 + <istrue value="${javac.external.vm}"/>
85.104 + </or>
85.105 + </condition>
85.106 <property name="jar.index" value="false"/>
85.107 <property name="jar.index.metainf" value="${jar.index}"/>
85.108 <property name="copylibs.rebase" value="true"/>
85.109 @@ -300,6 +300,7 @@
85.110 <path path="@{classpath}"/>
85.111 </classpath>
85.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
85.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
85.114 <compilerarg line="${javac.compilerargs}"/>
85.115 <compilerarg value="-processorpath"/>
85.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
85.117 @@ -339,6 +340,7 @@
85.118 <path path="@{classpath}"/>
85.119 </classpath>
85.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
85.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
85.122 <compilerarg line="${javac.compilerargs}"/>
85.123 <customize/>
85.124 </javac>
85.125 @@ -471,7 +473,7 @@
85.126 </fileset>
85.127 </union>
85.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
85.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="nbindex.web.api" testname="TestNG tests" workingDir="${work.dir}">
85.130 + <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="nbindex.web.api" testname="TestNG tests" workingDir="${work.dir}">
85.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
85.132 <propertyset>
85.133 <propertyref prefix="test-sys-prop."/>
85.134 @@ -862,8 +864,8 @@
85.135 </chainedmapper>
85.136 </pathconvert>
85.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
85.138 - <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}">
85.139 - <fileset dir="${build.classes.dir}"/>
85.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
85.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
85.142 <manifest>
85.143 <attribute name="Class-Path" value="${jar.classpath}"/>
85.144 <customize/>
85.145 @@ -875,7 +877,7 @@
85.146 <target name="-init-presetdef-jar">
85.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
85.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
85.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
85.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
85.151 </jar>
85.152 </presetdef>
85.153 </target>
85.154 @@ -930,6 +932,7 @@
85.155 <param location="${project.base_web_api}/build.xml" name="call.script"/>
85.156 <param name="call.target" value="jar"/>
85.157 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
85.158 + <param name="transfer.not.archive.disabled" value="true"/>
85.159 </antcall>
85.160 </target>
85.161 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
85.162 @@ -998,41 +1001,25 @@
85.163 <!-- Empty placeholder for easier customization. -->
85.164 <!-- You can override this target in the ../build.xml file. -->
85.165 </target>
85.166 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
85.167 - <j2seproject1:jar/>
85.168 - </target>
85.169 - <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">
85.170 - <j2seproject1:jar manifest="${manifest.file}"/>
85.171 - </target>
85.172 - <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">
85.173 - <j2seproject1:jar manifest="${manifest.file}">
85.174 - <j2seproject1:manifest>
85.175 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
85.176 - </j2seproject1:manifest>
85.177 - </j2seproject1:jar>
85.178 - <echo level="info">To run this application from the command line without Ant, try:</echo>
85.179 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
85.180 - <property location="${dist.jar}" name="dist.jar.resolved"/>
85.181 - <pathconvert property="run.classpath.with.dist.jar">
85.182 - <path path="${run.classpath}"/>
85.183 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
85.184 - </pathconvert>
85.185 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
85.186 - </target>
85.187 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
85.188 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
85.189 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
85.190 <touch file="${tmp.manifest.file}" verbose="false"/>
85.191 </target>
85.192 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
85.193 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
85.194 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
85.195 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
85.196 </target>
85.197 - <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">
85.198 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
85.199 <manifest file="${tmp.manifest.file}" mode="update">
85.200 <attribute name="Main-Class" value="${main.class}"/>
85.201 </manifest>
85.202 </target>
85.203 - <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">
85.204 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
85.205 + <manifest file="${tmp.manifest.file}" mode="update">
85.206 + <attribute name="Profile" value="${javac.profile}"/>
85.207 + </manifest>
85.208 + </target>
85.209 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
85.210 <basename file="${application.splash}" property="splashscreen.basename"/>
85.211 <mkdir dir="${build.classes.dir}/META-INF"/>
85.212 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
85.213 @@ -1040,23 +1027,41 @@
85.214 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
85.215 </manifest>
85.216 </target>
85.217 - <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">
85.218 + <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" if="do.mkdist" name="-do-jar-copylibs">
85.219 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
85.220 <echo level="info">To run this application from the command line without Ant, try:</echo>
85.221 <property location="${dist.jar}" name="dist.jar.resolved"/>
85.222 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
85.223 </target>
85.224 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
85.225 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
85.226 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
85.227 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
85.228 + <property location="${dist.jar}" name="dist.jar.resolved"/>
85.229 + <pathconvert property="run.classpath.with.dist.jar">
85.230 + <path path="${run.classpath}"/>
85.231 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
85.232 + </pathconvert>
85.233 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
85.234 + <isset property="main.class.available"/>
85.235 + </condition>
85.236 + <condition else="debug" property="jar.usage.level" value="info">
85.237 + <isset property="main.class.available"/>
85.238 + </condition>
85.239 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
85.240 + </target>
85.241 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
85.242 <delete>
85.243 <fileset file="${tmp.manifest.file}"/>
85.244 </delete>
85.245 </target>
85.246 - <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"/>
85.247 + <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"/>
85.248 + <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"/>
85.249 <target name="-post-jar">
85.250 <!-- Empty placeholder for easier customization. -->
85.251 <!-- You can override this target in the ../build.xml file. -->
85.252 </target>
85.253 - <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"/>
85.254 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
85.255 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
85.256 <!--
85.257 =================
85.258 EXECUTION SECTION
85.259 @@ -1235,11 +1240,14 @@
85.260 </not>
85.261 </and>
85.262 </condition>
85.263 - <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}">
85.264 + <condition else="" property="bug5101868workaround" value="*.java">
85.265 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
85.266 + </condition>
85.267 + <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}">
85.268 <classpath>
85.269 <path path="${javac.classpath}"/>
85.270 </classpath>
85.271 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
85.272 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
85.273 <filename name="**/*.java"/>
85.274 </fileset>
85.275 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
85.276 @@ -1313,7 +1321,7 @@
85.277 <mkdir dir="${build.test.results.dir}"/>
85.278 </target>
85.279 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
85.280 - <j2seproject3:test testincludes="**/*Test.java"/>
85.281 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
85.282 </target>
85.283 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
85.284 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
85.285 @@ -1417,6 +1425,7 @@
85.286 <param location="${project.base_web_api}/build.xml" name="call.script"/>
85.287 <param name="call.target" value="clean"/>
85.288 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
85.289 + <param name="transfer.not.archive.disabled" value="true"/>
85.290 </antcall>
85.291 </target>
85.292 <target depends="init" name="-do-clean">
86.1 --- a/remoting/server/web/nbindex.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
86.2 +++ b/remoting/server/web/nbindex.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
86.3 @@ -1,8 +1,8 @@
86.4 build.xml.data.CRC32=0e5c43eb
86.5 -build.xml.script.CRC32=db0f33ed
86.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
86.7 +build.xml.script.CRC32=340d1c88
86.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
86.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
86.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
86.11 nbproject/build-impl.xml.data.CRC32=0e5c43eb
86.12 -nbproject/build-impl.xml.script.CRC32=851e01f3
86.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.54.0.46
86.14 +nbproject/build-impl.xml.script.CRC32=38318215
86.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
87.1 --- a/remoting/server/web/resolve.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
87.2 +++ b/remoting/server/web/resolve.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
87.3 @@ -216,7 +216,12 @@
87.4 </not>
87.5 </and>
87.6 </condition>
87.7 - <property name="javac.fork" value="${jdkBug6558476}"/>
87.8 + <condition else="false" property="javac.fork">
87.9 + <or>
87.10 + <istrue value="${jdkBug6558476}"/>
87.11 + <istrue value="${javac.external.vm}"/>
87.12 + </or>
87.13 + </condition>
87.14 <property name="jar.index" value="false"/>
87.15 <property name="jar.index.metainf" value="${jar.index}"/>
87.16 <property name="copylibs.rebase" value="true"/>
88.1 --- a/remoting/server/web/resolve.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
88.2 +++ b/remoting/server/web/resolve.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
88.3 @@ -4,5 +4,5 @@
88.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
88.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
88.6 nbproject/build-impl.xml.data.CRC32=6b9c67e4
88.7 -nbproject/build-impl.xml.script.CRC32=caeda2af
88.8 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.0.48
88.9 +nbproject/build-impl.xml.script.CRC32=ead38235
88.10 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
89.1 --- a/remoting/server/web/resolve.web.api/nbproject/project.properties Fri May 01 19:13:18 2015 +0200
89.2 +++ b/remoting/server/web/resolve.web.api/nbproject/project.properties Sun May 31 15:17:24 2015 +0200
89.3 @@ -28,6 +28,7 @@
89.4 endorsed.classpath=
89.5 excludes=
89.6 file.reference.org-netbeans-modules-java-lexer.jar=../../../../lib/org-netbeans-modules-java-lexer.jar
89.7 +file.reference.org-netbeans-modules-java-source-base.jar=../../../../lib/org-netbeans-modules-java-source-base.jar
89.8 file.reference.org-netbeans-modules-java-source.jar=../../../../lib/org-netbeans-modules-java-source.jar
89.9 file.reference.org-netbeans-modules-lexer.jar=../../../../lib/org-netbeans-modules-lexer.jar
89.10 file.reference.org-netbeans-modules-parsing-api.jar=../../../../lib/org-netbeans-modules-parsing-api.jar
89.11 @@ -52,7 +53,8 @@
89.12 ${file.reference.util-pojson.jar}:\
89.13 ${file.reference.org-netbeans-modules-lexer.jar}:\
89.14 ${file.reference.org-netbeans-modules-java-lexer.jar}:\
89.15 - ${file.reference.org-openide-util-lookup.jar}
89.16 + ${file.reference.org-openide-util-lookup.jar}:\
89.17 + ${file.reference.org-netbeans-modules-java-source-base.jar}
89.18 # Space-separated list of extra javac options
89.19 javac.compilerargs=-Xbootclasspath/p:${libs.javac.classpath}
89.20 javac.deprecation=false
90.1 --- a/remoting/server/web/source.web.api/build.xml Fri May 01 19:13:18 2015 +0200
90.2 +++ b/remoting/server/web/source.web.api/build.xml Sun May 31 15:17:24 2015 +0200
90.3 @@ -51,8 +51,7 @@
90.4 -init-macrodef-junit: defines macro for junit execution
90.5 -init-macrodef-debug: defines macro for class debugging
90.6 -init-macrodef-java: defines macro for class execution
90.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
90.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
90.9 + -do-jar: JAR building
90.10 run: execution of project
90.11 -javadoc-build: Javadoc generation
90.12 test-report: JUnit report generation
91.1 --- a/remoting/server/web/source.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
91.2 +++ b/remoting/server/web/source.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
91.3 @@ -79,6 +79,7 @@
91.4 <property file="nbproject/project.properties"/>
91.5 </target>
91.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
91.7 + <property name="platform.java" value="${java.home}/bin/java"/>
91.8 <available file="${manifest.file}" property="manifest.available"/>
91.9 <condition property="splashscreen.available">
91.10 <and>
91.11 @@ -96,16 +97,20 @@
91.12 </not>
91.13 </and>
91.14 </condition>
91.15 - <condition property="manifest.available+main.class">
91.16 + <condition property="profile.available">
91.17 <and>
91.18 - <isset property="manifest.available"/>
91.19 - <isset property="main.class.available"/>
91.20 + <isset property="javac.profile"/>
91.21 + <length length="0" string="${javac.profile}" when="greater"/>
91.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
91.23 </and>
91.24 </condition>
91.25 <condition property="do.archive">
91.26 - <not>
91.27 - <istrue value="${jar.archive.disabled}"/>
91.28 - </not>
91.29 + <or>
91.30 + <not>
91.31 + <istrue value="${jar.archive.disabled}"/>
91.32 + </not>
91.33 + <istrue value="${not.archive.disabled}"/>
91.34 + </or>
91.35 </condition>
91.36 <condition property="do.mkdist">
91.37 <and>
91.38 @@ -116,12 +121,6 @@
91.39 </not>
91.40 </and>
91.41 </condition>
91.42 - <condition property="manifest.available+main.class+mkdist.available">
91.43 - <and>
91.44 - <istrue value="${manifest.available+main.class}"/>
91.45 - <isset property="do.mkdist"/>
91.46 - </and>
91.47 - </condition>
91.48 <condition property="do.archive+manifest.available">
91.49 <and>
91.50 <isset property="manifest.available"/>
91.51 @@ -140,24 +139,12 @@
91.52 <istrue value="${do.archive}"/>
91.53 </and>
91.54 </condition>
91.55 - <condition property="do.archive+manifest.available+main.class">
91.56 + <condition property="do.archive+profile.available">
91.57 <and>
91.58 - <istrue value="${manifest.available+main.class}"/>
91.59 + <isset property="profile.available"/>
91.60 <istrue value="${do.archive}"/>
91.61 </and>
91.62 </condition>
91.63 - <condition property="manifest.available-mkdist.available">
91.64 - <or>
91.65 - <istrue value="${manifest.available}"/>
91.66 - <isset property="do.mkdist"/>
91.67 - </or>
91.68 - </condition>
91.69 - <condition property="manifest.available+main.class-mkdist.available">
91.70 - <or>
91.71 - <istrue value="${manifest.available+main.class}"/>
91.72 - <isset property="do.mkdist"/>
91.73 - </or>
91.74 - </condition>
91.75 <condition property="have.tests">
91.76 <or>
91.77 <available file="${test.src.dir}"/>
91.78 @@ -211,7 +198,15 @@
91.79 </condition>
91.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
91.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
91.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
91.83 + <and>
91.84 + <isset property="endorsed.classpath"/>
91.85 + <not>
91.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
91.87 + </not>
91.88 + </and>
91.89 + </condition>
91.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
91.91 + <isset property="profile.available"/>
91.92 </condition>
91.93 <condition else="false" property="jdkBug6558476">
91.94 <and>
91.95 @@ -221,7 +216,12 @@
91.96 </not>
91.97 </and>
91.98 </condition>
91.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
91.100 + <condition else="false" property="javac.fork">
91.101 + <or>
91.102 + <istrue value="${jdkBug6558476}"/>
91.103 + <istrue value="${javac.external.vm}"/>
91.104 + </or>
91.105 + </condition>
91.106 <property name="jar.index" value="false"/>
91.107 <property name="jar.index.metainf" value="${jar.index}"/>
91.108 <property name="copylibs.rebase" value="true"/>
91.109 @@ -300,6 +300,7 @@
91.110 <path path="@{classpath}"/>
91.111 </classpath>
91.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
91.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
91.114 <compilerarg line="${javac.compilerargs}"/>
91.115 <compilerarg value="-processorpath"/>
91.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
91.117 @@ -339,6 +340,7 @@
91.118 <path path="@{classpath}"/>
91.119 </classpath>
91.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
91.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
91.122 <compilerarg line="${javac.compilerargs}"/>
91.123 <customize/>
91.124 </javac>
91.125 @@ -471,7 +473,7 @@
91.126 </fileset>
91.127 </union>
91.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
91.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="source.web.api" testname="TestNG tests" workingDir="${work.dir}">
91.130 + <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="source.web.api" testname="TestNG tests" workingDir="${work.dir}">
91.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
91.132 <propertyset>
91.133 <propertyref prefix="test-sys-prop."/>
91.134 @@ -862,8 +864,8 @@
91.135 </chainedmapper>
91.136 </pathconvert>
91.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
91.138 - <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}">
91.139 - <fileset dir="${build.classes.dir}"/>
91.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
91.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
91.142 <manifest>
91.143 <attribute name="Class-Path" value="${jar.classpath}"/>
91.144 <customize/>
91.145 @@ -875,7 +877,7 @@
91.146 <target name="-init-presetdef-jar">
91.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
91.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
91.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
91.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
91.151 </jar>
91.152 </presetdef>
91.153 </target>
91.154 @@ -930,6 +932,7 @@
91.155 <param location="${project.base_web_api}/build.xml" name="call.script"/>
91.156 <param name="call.target" value="jar"/>
91.157 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
91.158 + <param name="transfer.not.archive.disabled" value="true"/>
91.159 </antcall>
91.160 </target>
91.161 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
91.162 @@ -998,41 +1001,25 @@
91.163 <!-- Empty placeholder for easier customization. -->
91.164 <!-- You can override this target in the ../build.xml file. -->
91.165 </target>
91.166 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
91.167 - <j2seproject1:jar/>
91.168 - </target>
91.169 - <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">
91.170 - <j2seproject1:jar manifest="${manifest.file}"/>
91.171 - </target>
91.172 - <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">
91.173 - <j2seproject1:jar manifest="${manifest.file}">
91.174 - <j2seproject1:manifest>
91.175 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
91.176 - </j2seproject1:manifest>
91.177 - </j2seproject1:jar>
91.178 - <echo level="info">To run this application from the command line without Ant, try:</echo>
91.179 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
91.180 - <property location="${dist.jar}" name="dist.jar.resolved"/>
91.181 - <pathconvert property="run.classpath.with.dist.jar">
91.182 - <path path="${run.classpath}"/>
91.183 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
91.184 - </pathconvert>
91.185 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
91.186 - </target>
91.187 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
91.188 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
91.189 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
91.190 <touch file="${tmp.manifest.file}" verbose="false"/>
91.191 </target>
91.192 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
91.193 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
91.194 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
91.195 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
91.196 </target>
91.197 - <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">
91.198 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
91.199 <manifest file="${tmp.manifest.file}" mode="update">
91.200 <attribute name="Main-Class" value="${main.class}"/>
91.201 </manifest>
91.202 </target>
91.203 - <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">
91.204 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
91.205 + <manifest file="${tmp.manifest.file}" mode="update">
91.206 + <attribute name="Profile" value="${javac.profile}"/>
91.207 + </manifest>
91.208 + </target>
91.209 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
91.210 <basename file="${application.splash}" property="splashscreen.basename"/>
91.211 <mkdir dir="${build.classes.dir}/META-INF"/>
91.212 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
91.213 @@ -1040,23 +1027,41 @@
91.214 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
91.215 </manifest>
91.216 </target>
91.217 - <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">
91.218 + <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" if="do.mkdist" name="-do-jar-copylibs">
91.219 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
91.220 <echo level="info">To run this application from the command line without Ant, try:</echo>
91.221 <property location="${dist.jar}" name="dist.jar.resolved"/>
91.222 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
91.223 </target>
91.224 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
91.225 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
91.226 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
91.227 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
91.228 + <property location="${dist.jar}" name="dist.jar.resolved"/>
91.229 + <pathconvert property="run.classpath.with.dist.jar">
91.230 + <path path="${run.classpath}"/>
91.231 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
91.232 + </pathconvert>
91.233 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
91.234 + <isset property="main.class.available"/>
91.235 + </condition>
91.236 + <condition else="debug" property="jar.usage.level" value="info">
91.237 + <isset property="main.class.available"/>
91.238 + </condition>
91.239 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
91.240 + </target>
91.241 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
91.242 <delete>
91.243 <fileset file="${tmp.manifest.file}"/>
91.244 </delete>
91.245 </target>
91.246 - <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"/>
91.247 + <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"/>
91.248 + <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"/>
91.249 <target name="-post-jar">
91.250 <!-- Empty placeholder for easier customization. -->
91.251 <!-- You can override this target in the ../build.xml file. -->
91.252 </target>
91.253 - <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"/>
91.254 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
91.255 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
91.256 <!--
91.257 =================
91.258 EXECUTION SECTION
91.259 @@ -1235,11 +1240,14 @@
91.260 </not>
91.261 </and>
91.262 </condition>
91.263 - <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}">
91.264 + <condition else="" property="bug5101868workaround" value="*.java">
91.265 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
91.266 + </condition>
91.267 + <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}">
91.268 <classpath>
91.269 <path path="${javac.classpath}"/>
91.270 </classpath>
91.271 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
91.272 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
91.273 <filename name="**/*.java"/>
91.274 </fileset>
91.275 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
91.276 @@ -1313,7 +1321,7 @@
91.277 <mkdir dir="${build.test.results.dir}"/>
91.278 </target>
91.279 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
91.280 - <j2seproject3:test testincludes="**/*Test.java"/>
91.281 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
91.282 </target>
91.283 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
91.284 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
91.285 @@ -1417,6 +1425,7 @@
91.286 <param location="${project.base_web_api}/build.xml" name="call.script"/>
91.287 <param name="call.target" value="clean"/>
91.288 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
91.289 + <param name="transfer.not.archive.disabled" value="true"/>
91.290 </antcall>
91.291 </target>
91.292 <target depends="init" name="-do-clean">
92.1 --- a/remoting/server/web/source.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
92.2 +++ b/remoting/server/web/source.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
92.3 @@ -1,8 +1,8 @@
92.4 build.xml.data.CRC32=52865c72
92.5 -build.xml.script.CRC32=d7df2170
92.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
92.7 +build.xml.script.CRC32=56f83b52
92.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
92.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
92.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
92.11 nbproject/build-impl.xml.data.CRC32=52865c72
92.12 -nbproject/build-impl.xml.script.CRC32=ad481bda
92.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.0.46
92.14 +nbproject/build-impl.xml.script.CRC32=82fce9ca
92.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
93.1 --- a/remoting/server/web/type.web.api/build.xml Fri May 01 19:13:18 2015 +0200
93.2 +++ b/remoting/server/web/type.web.api/build.xml Sun May 31 15:17:24 2015 +0200
93.3 @@ -51,8 +51,7 @@
93.4 -init-macrodef-junit: defines macro for junit execution
93.5 -init-macrodef-debug: defines macro for class debugging
93.6 -init-macrodef-java: defines macro for class execution
93.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
93.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
93.9 + -do-jar: JAR building
93.10 run: execution of project
93.11 -javadoc-build: Javadoc generation
93.12 test-report: JUnit report generation
94.1 --- a/remoting/server/web/type.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
94.2 +++ b/remoting/server/web/type.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
94.3 @@ -79,6 +79,7 @@
94.4 <property file="nbproject/project.properties"/>
94.5 </target>
94.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
94.7 + <property name="platform.java" value="${java.home}/bin/java"/>
94.8 <available file="${manifest.file}" property="manifest.available"/>
94.9 <condition property="splashscreen.available">
94.10 <and>
94.11 @@ -96,16 +97,20 @@
94.12 </not>
94.13 </and>
94.14 </condition>
94.15 - <condition property="manifest.available+main.class">
94.16 + <condition property="profile.available">
94.17 <and>
94.18 - <isset property="manifest.available"/>
94.19 - <isset property="main.class.available"/>
94.20 + <isset property="javac.profile"/>
94.21 + <length length="0" string="${javac.profile}" when="greater"/>
94.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
94.23 </and>
94.24 </condition>
94.25 <condition property="do.archive">
94.26 - <not>
94.27 - <istrue value="${jar.archive.disabled}"/>
94.28 - </not>
94.29 + <or>
94.30 + <not>
94.31 + <istrue value="${jar.archive.disabled}"/>
94.32 + </not>
94.33 + <istrue value="${not.archive.disabled}"/>
94.34 + </or>
94.35 </condition>
94.36 <condition property="do.mkdist">
94.37 <and>
94.38 @@ -116,12 +121,6 @@
94.39 </not>
94.40 </and>
94.41 </condition>
94.42 - <condition property="manifest.available+main.class+mkdist.available">
94.43 - <and>
94.44 - <istrue value="${manifest.available+main.class}"/>
94.45 - <isset property="do.mkdist"/>
94.46 - </and>
94.47 - </condition>
94.48 <condition property="do.archive+manifest.available">
94.49 <and>
94.50 <isset property="manifest.available"/>
94.51 @@ -140,24 +139,12 @@
94.52 <istrue value="${do.archive}"/>
94.53 </and>
94.54 </condition>
94.55 - <condition property="do.archive+manifest.available+main.class">
94.56 + <condition property="do.archive+profile.available">
94.57 <and>
94.58 - <istrue value="${manifest.available+main.class}"/>
94.59 + <isset property="profile.available"/>
94.60 <istrue value="${do.archive}"/>
94.61 </and>
94.62 </condition>
94.63 - <condition property="manifest.available-mkdist.available">
94.64 - <or>
94.65 - <istrue value="${manifest.available}"/>
94.66 - <isset property="do.mkdist"/>
94.67 - </or>
94.68 - </condition>
94.69 - <condition property="manifest.available+main.class-mkdist.available">
94.70 - <or>
94.71 - <istrue value="${manifest.available+main.class}"/>
94.72 - <isset property="do.mkdist"/>
94.73 - </or>
94.74 - </condition>
94.75 <condition property="have.tests">
94.76 <or>
94.77 <available file="${test.src.dir}"/>
94.78 @@ -211,7 +198,15 @@
94.79 </condition>
94.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
94.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
94.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
94.83 + <and>
94.84 + <isset property="endorsed.classpath"/>
94.85 + <not>
94.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
94.87 + </not>
94.88 + </and>
94.89 + </condition>
94.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
94.91 + <isset property="profile.available"/>
94.92 </condition>
94.93 <condition else="false" property="jdkBug6558476">
94.94 <and>
94.95 @@ -221,7 +216,12 @@
94.96 </not>
94.97 </and>
94.98 </condition>
94.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
94.100 + <condition else="false" property="javac.fork">
94.101 + <or>
94.102 + <istrue value="${jdkBug6558476}"/>
94.103 + <istrue value="${javac.external.vm}"/>
94.104 + </or>
94.105 + </condition>
94.106 <property name="jar.index" value="false"/>
94.107 <property name="jar.index.metainf" value="${jar.index}"/>
94.108 <property name="copylibs.rebase" value="true"/>
94.109 @@ -300,6 +300,7 @@
94.110 <path path="@{classpath}"/>
94.111 </classpath>
94.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
94.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
94.114 <compilerarg line="${javac.compilerargs}"/>
94.115 <compilerarg value="-processorpath"/>
94.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
94.117 @@ -339,6 +340,7 @@
94.118 <path path="@{classpath}"/>
94.119 </classpath>
94.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
94.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
94.122 <compilerarg line="${javac.compilerargs}"/>
94.123 <customize/>
94.124 </javac>
94.125 @@ -471,7 +473,7 @@
94.126 </fileset>
94.127 </union>
94.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
94.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="type.web.api" testname="TestNG tests" workingDir="${work.dir}">
94.130 + <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="type.web.api" testname="TestNG tests" workingDir="${work.dir}">
94.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
94.132 <propertyset>
94.133 <propertyref prefix="test-sys-prop."/>
94.134 @@ -862,8 +864,8 @@
94.135 </chainedmapper>
94.136 </pathconvert>
94.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
94.138 - <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}">
94.139 - <fileset dir="${build.classes.dir}"/>
94.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
94.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
94.142 <manifest>
94.143 <attribute name="Class-Path" value="${jar.classpath}"/>
94.144 <customize/>
94.145 @@ -875,7 +877,7 @@
94.146 <target name="-init-presetdef-jar">
94.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
94.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
94.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
94.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
94.151 </jar>
94.152 </presetdef>
94.153 </target>
94.154 @@ -930,6 +932,7 @@
94.155 <param location="${project.base_web_api}/build.xml" name="call.script"/>
94.156 <param name="call.target" value="jar"/>
94.157 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
94.158 + <param name="transfer.not.archive.disabled" value="true"/>
94.159 </antcall>
94.160 </target>
94.161 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
94.162 @@ -998,41 +1001,25 @@
94.163 <!-- Empty placeholder for easier customization. -->
94.164 <!-- You can override this target in the ../build.xml file. -->
94.165 </target>
94.166 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
94.167 - <j2seproject1:jar/>
94.168 - </target>
94.169 - <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">
94.170 - <j2seproject1:jar manifest="${manifest.file}"/>
94.171 - </target>
94.172 - <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">
94.173 - <j2seproject1:jar manifest="${manifest.file}">
94.174 - <j2seproject1:manifest>
94.175 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
94.176 - </j2seproject1:manifest>
94.177 - </j2seproject1:jar>
94.178 - <echo level="info">To run this application from the command line without Ant, try:</echo>
94.179 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
94.180 - <property location="${dist.jar}" name="dist.jar.resolved"/>
94.181 - <pathconvert property="run.classpath.with.dist.jar">
94.182 - <path path="${run.classpath}"/>
94.183 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
94.184 - </pathconvert>
94.185 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
94.186 - </target>
94.187 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
94.188 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
94.189 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
94.190 <touch file="${tmp.manifest.file}" verbose="false"/>
94.191 </target>
94.192 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
94.193 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
94.194 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
94.195 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
94.196 </target>
94.197 - <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">
94.198 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
94.199 <manifest file="${tmp.manifest.file}" mode="update">
94.200 <attribute name="Main-Class" value="${main.class}"/>
94.201 </manifest>
94.202 </target>
94.203 - <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">
94.204 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
94.205 + <manifest file="${tmp.manifest.file}" mode="update">
94.206 + <attribute name="Profile" value="${javac.profile}"/>
94.207 + </manifest>
94.208 + </target>
94.209 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
94.210 <basename file="${application.splash}" property="splashscreen.basename"/>
94.211 <mkdir dir="${build.classes.dir}/META-INF"/>
94.212 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
94.213 @@ -1040,23 +1027,41 @@
94.214 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
94.215 </manifest>
94.216 </target>
94.217 - <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">
94.218 + <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" if="do.mkdist" name="-do-jar-copylibs">
94.219 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
94.220 <echo level="info">To run this application from the command line without Ant, try:</echo>
94.221 <property location="${dist.jar}" name="dist.jar.resolved"/>
94.222 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
94.223 </target>
94.224 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
94.225 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
94.226 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
94.227 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
94.228 + <property location="${dist.jar}" name="dist.jar.resolved"/>
94.229 + <pathconvert property="run.classpath.with.dist.jar">
94.230 + <path path="${run.classpath}"/>
94.231 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
94.232 + </pathconvert>
94.233 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
94.234 + <isset property="main.class.available"/>
94.235 + </condition>
94.236 + <condition else="debug" property="jar.usage.level" value="info">
94.237 + <isset property="main.class.available"/>
94.238 + </condition>
94.239 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
94.240 + </target>
94.241 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
94.242 <delete>
94.243 <fileset file="${tmp.manifest.file}"/>
94.244 </delete>
94.245 </target>
94.246 - <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"/>
94.247 + <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"/>
94.248 + <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"/>
94.249 <target name="-post-jar">
94.250 <!-- Empty placeholder for easier customization. -->
94.251 <!-- You can override this target in the ../build.xml file. -->
94.252 </target>
94.253 - <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"/>
94.254 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
94.255 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
94.256 <!--
94.257 =================
94.258 EXECUTION SECTION
94.259 @@ -1235,11 +1240,14 @@
94.260 </not>
94.261 </and>
94.262 </condition>
94.263 - <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}">
94.264 + <condition else="" property="bug5101868workaround" value="*.java">
94.265 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
94.266 + </condition>
94.267 + <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}">
94.268 <classpath>
94.269 <path path="${javac.classpath}"/>
94.270 </classpath>
94.271 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
94.272 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
94.273 <filename name="**/*.java"/>
94.274 </fileset>
94.275 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
94.276 @@ -1313,7 +1321,7 @@
94.277 <mkdir dir="${build.test.results.dir}"/>
94.278 </target>
94.279 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
94.280 - <j2seproject3:test testincludes="**/*Test.java"/>
94.281 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
94.282 </target>
94.283 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
94.284 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
94.285 @@ -1417,6 +1425,7 @@
94.286 <param location="${project.base_web_api}/build.xml" name="call.script"/>
94.287 <param name="call.target" value="clean"/>
94.288 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
94.289 + <param name="transfer.not.archive.disabled" value="true"/>
94.290 </antcall>
94.291 </target>
94.292 <target depends="init" name="-do-clean">
95.1 --- a/remoting/server/web/type.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
95.2 +++ b/remoting/server/web/type.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
95.3 @@ -1,8 +1,8 @@
95.4 build.xml.data.CRC32=7d71200f
95.5 -build.xml.script.CRC32=583d72ad
95.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
95.7 +build.xml.script.CRC32=abaf86a6
95.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
95.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
95.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
95.11 nbproject/build-impl.xml.data.CRC32=7d71200f
95.12 -nbproject/build-impl.xml.script.CRC32=32e3cf59
95.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.54.0.46
95.14 +nbproject/build-impl.xml.script.CRC32=0368e456
95.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
96.1 --- a/remoting/server/web/type.web.api/src/org/netbeans/modules/jackpot30/backend/type/api/Base.java Fri May 01 19:13:18 2015 +0200
96.2 +++ b/remoting/server/web/type.web.api/src/org/netbeans/modules/jackpot30/backend/type/api/Base.java Sun May 31 15:17:24 2015 +0200
96.3 @@ -92,7 +92,7 @@
96.4 //nameKind = panel.isCaseSensitive() ? SearchType.EXACT_NAME : SearchType.CASE_INSENSITIVE_EXACT_NAME;
96.5 queryKind = QueryKind.EXACT;
96.6 }
96.7 - else if ((Utils.isAllUpper(prefix) && prefix.length() > 1) || Utils.isCamelCase(prefix)) {
96.8 + else if ((Utils.isAllUpper(prefix) && prefix.length() > 1) || Queries.isCamelCase(prefix, null, null)) {
96.9 queryKind = QueryKind.CAMEL_CASE;
96.10 }
96.11 else if (wildcard != -1) {
97.1 --- a/remoting/server/web/usages.web.api/build.xml Fri May 01 19:13:18 2015 +0200
97.2 +++ b/remoting/server/web/usages.web.api/build.xml Sun May 31 15:17:24 2015 +0200
97.3 @@ -51,8 +51,7 @@
97.4 -init-macrodef-junit: defines macro for junit execution
97.5 -init-macrodef-debug: defines macro for class debugging
97.6 -init-macrodef-java: defines macro for class execution
97.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
97.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
97.9 + -do-jar: JAR building
97.10 run: execution of project
97.11 -javadoc-build: Javadoc generation
97.12 test-report: JUnit report generation
98.1 --- a/remoting/server/web/usages.web.api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
98.2 +++ b/remoting/server/web/usages.web.api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
98.3 @@ -79,6 +79,7 @@
98.4 <property file="nbproject/project.properties"/>
98.5 </target>
98.6 <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
98.7 + <property name="platform.java" value="${java.home}/bin/java"/>
98.8 <available file="${manifest.file}" property="manifest.available"/>
98.9 <condition property="splashscreen.available">
98.10 <and>
98.11 @@ -96,16 +97,20 @@
98.12 </not>
98.13 </and>
98.14 </condition>
98.15 - <condition property="manifest.available+main.class">
98.16 + <condition property="profile.available">
98.17 <and>
98.18 - <isset property="manifest.available"/>
98.19 - <isset property="main.class.available"/>
98.20 + <isset property="javac.profile"/>
98.21 + <length length="0" string="${javac.profile}" when="greater"/>
98.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
98.23 </and>
98.24 </condition>
98.25 <condition property="do.archive">
98.26 - <not>
98.27 - <istrue value="${jar.archive.disabled}"/>
98.28 - </not>
98.29 + <or>
98.30 + <not>
98.31 + <istrue value="${jar.archive.disabled}"/>
98.32 + </not>
98.33 + <istrue value="${not.archive.disabled}"/>
98.34 + </or>
98.35 </condition>
98.36 <condition property="do.mkdist">
98.37 <and>
98.38 @@ -116,12 +121,6 @@
98.39 </not>
98.40 </and>
98.41 </condition>
98.42 - <condition property="manifest.available+main.class+mkdist.available">
98.43 - <and>
98.44 - <istrue value="${manifest.available+main.class}"/>
98.45 - <isset property="do.mkdist"/>
98.46 - </and>
98.47 - </condition>
98.48 <condition property="do.archive+manifest.available">
98.49 <and>
98.50 <isset property="manifest.available"/>
98.51 @@ -140,24 +139,12 @@
98.52 <istrue value="${do.archive}"/>
98.53 </and>
98.54 </condition>
98.55 - <condition property="do.archive+manifest.available+main.class">
98.56 + <condition property="do.archive+profile.available">
98.57 <and>
98.58 - <istrue value="${manifest.available+main.class}"/>
98.59 + <isset property="profile.available"/>
98.60 <istrue value="${do.archive}"/>
98.61 </and>
98.62 </condition>
98.63 - <condition property="manifest.available-mkdist.available">
98.64 - <or>
98.65 - <istrue value="${manifest.available}"/>
98.66 - <isset property="do.mkdist"/>
98.67 - </or>
98.68 - </condition>
98.69 - <condition property="manifest.available+main.class-mkdist.available">
98.70 - <or>
98.71 - <istrue value="${manifest.available+main.class}"/>
98.72 - <isset property="do.mkdist"/>
98.73 - </or>
98.74 - </condition>
98.75 <condition property="have.tests">
98.76 <or>
98.77 <available file="${test.src.dir}"/>
98.78 @@ -211,7 +198,15 @@
98.79 </condition>
98.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
98.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
98.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
98.83 + <and>
98.84 + <isset property="endorsed.classpath"/>
98.85 + <not>
98.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
98.87 + </not>
98.88 + </and>
98.89 + </condition>
98.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
98.91 + <isset property="profile.available"/>
98.92 </condition>
98.93 <condition else="false" property="jdkBug6558476">
98.94 <and>
98.95 @@ -221,7 +216,12 @@
98.96 </not>
98.97 </and>
98.98 </condition>
98.99 - <property name="javac.fork" value="${jdkBug6558476}"/>
98.100 + <condition else="false" property="javac.fork">
98.101 + <or>
98.102 + <istrue value="${jdkBug6558476}"/>
98.103 + <istrue value="${javac.external.vm}"/>
98.104 + </or>
98.105 + </condition>
98.106 <property name="jar.index" value="false"/>
98.107 <property name="jar.index.metainf" value="${jar.index}"/>
98.108 <property name="copylibs.rebase" value="true"/>
98.109 @@ -300,6 +300,7 @@
98.110 <path path="@{classpath}"/>
98.111 </classpath>
98.112 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
98.113 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
98.114 <compilerarg line="${javac.compilerargs}"/>
98.115 <compilerarg value="-processorpath"/>
98.116 <compilerarg path="@{processorpath}:${empty.dir}"/>
98.117 @@ -339,6 +340,7 @@
98.118 <path path="@{classpath}"/>
98.119 </classpath>
98.120 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
98.121 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
98.122 <compilerarg line="${javac.compilerargs}"/>
98.123 <customize/>
98.124 </javac>
98.125 @@ -471,7 +473,7 @@
98.126 </fileset>
98.127 </union>
98.128 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
98.129 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="usages.web.api" testname="TestNG tests" workingDir="${work.dir}">
98.130 + <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="usages.web.api" testname="TestNG tests" workingDir="${work.dir}">
98.131 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
98.132 <propertyset>
98.133 <propertyref prefix="test-sys-prop."/>
98.134 @@ -862,8 +864,8 @@
98.135 </chainedmapper>
98.136 </pathconvert>
98.137 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
98.138 - <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}">
98.139 - <fileset dir="${build.classes.dir}"/>
98.140 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
98.141 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
98.142 <manifest>
98.143 <attribute name="Class-Path" value="${jar.classpath}"/>
98.144 <customize/>
98.145 @@ -875,7 +877,7 @@
98.146 <target name="-init-presetdef-jar">
98.147 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
98.148 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
98.149 - <j2seproject1:fileset dir="${build.classes.dir}"/>
98.150 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
98.151 </jar>
98.152 </presetdef>
98.153 </target>
98.154 @@ -930,6 +932,7 @@
98.155 <param location="${project.base_web_api}/build.xml" name="call.script"/>
98.156 <param name="call.target" value="jar"/>
98.157 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
98.158 + <param name="transfer.not.archive.disabled" value="true"/>
98.159 </antcall>
98.160 </target>
98.161 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
98.162 @@ -998,41 +1001,25 @@
98.163 <!-- Empty placeholder for easier customization. -->
98.164 <!-- You can override this target in the ../build.xml file. -->
98.165 </target>
98.166 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
98.167 - <j2seproject1:jar/>
98.168 - </target>
98.169 - <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">
98.170 - <j2seproject1:jar manifest="${manifest.file}"/>
98.171 - </target>
98.172 - <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">
98.173 - <j2seproject1:jar manifest="${manifest.file}">
98.174 - <j2seproject1:manifest>
98.175 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
98.176 - </j2seproject1:manifest>
98.177 - </j2seproject1:jar>
98.178 - <echo level="info">To run this application from the command line without Ant, try:</echo>
98.179 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
98.180 - <property location="${dist.jar}" name="dist.jar.resolved"/>
98.181 - <pathconvert property="run.classpath.with.dist.jar">
98.182 - <path path="${run.classpath}"/>
98.183 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
98.184 - </pathconvert>
98.185 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
98.186 - </target>
98.187 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
98.188 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
98.189 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
98.190 <touch file="${tmp.manifest.file}" verbose="false"/>
98.191 </target>
98.192 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
98.193 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
98.194 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
98.195 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
98.196 </target>
98.197 - <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">
98.198 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
98.199 <manifest file="${tmp.manifest.file}" mode="update">
98.200 <attribute name="Main-Class" value="${main.class}"/>
98.201 </manifest>
98.202 </target>
98.203 - <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">
98.204 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
98.205 + <manifest file="${tmp.manifest.file}" mode="update">
98.206 + <attribute name="Profile" value="${javac.profile}"/>
98.207 + </manifest>
98.208 + </target>
98.209 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
98.210 <basename file="${application.splash}" property="splashscreen.basename"/>
98.211 <mkdir dir="${build.classes.dir}/META-INF"/>
98.212 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
98.213 @@ -1040,23 +1027,41 @@
98.214 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
98.215 </manifest>
98.216 </target>
98.217 - <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">
98.218 + <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" if="do.mkdist" name="-do-jar-copylibs">
98.219 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
98.220 <echo level="info">To run this application from the command line without Ant, try:</echo>
98.221 <property location="${dist.jar}" name="dist.jar.resolved"/>
98.222 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
98.223 </target>
98.224 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
98.225 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
98.226 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
98.227 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
98.228 + <property location="${dist.jar}" name="dist.jar.resolved"/>
98.229 + <pathconvert property="run.classpath.with.dist.jar">
98.230 + <path path="${run.classpath}"/>
98.231 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
98.232 + </pathconvert>
98.233 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
98.234 + <isset property="main.class.available"/>
98.235 + </condition>
98.236 + <condition else="debug" property="jar.usage.level" value="info">
98.237 + <isset property="main.class.available"/>
98.238 + </condition>
98.239 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
98.240 + </target>
98.241 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
98.242 <delete>
98.243 <fileset file="${tmp.manifest.file}"/>
98.244 </delete>
98.245 </target>
98.246 - <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"/>
98.247 + <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"/>
98.248 + <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"/>
98.249 <target name="-post-jar">
98.250 <!-- Empty placeholder for easier customization. -->
98.251 <!-- You can override this target in the ../build.xml file. -->
98.252 </target>
98.253 - <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"/>
98.254 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
98.255 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
98.256 <!--
98.257 =================
98.258 EXECUTION SECTION
98.259 @@ -1235,11 +1240,14 @@
98.260 </not>
98.261 </and>
98.262 </condition>
98.263 - <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}">
98.264 + <condition else="" property="bug5101868workaround" value="*.java">
98.265 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
98.266 + </condition>
98.267 + <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}">
98.268 <classpath>
98.269 <path path="${javac.classpath}"/>
98.270 </classpath>
98.271 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
98.272 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
98.273 <filename name="**/*.java"/>
98.274 </fileset>
98.275 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
98.276 @@ -1313,7 +1321,7 @@
98.277 <mkdir dir="${build.test.results.dir}"/>
98.278 </target>
98.279 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
98.280 - <j2seproject3:test testincludes="**/*Test.java"/>
98.281 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
98.282 </target>
98.283 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
98.284 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
98.285 @@ -1417,6 +1425,7 @@
98.286 <param location="${project.base_web_api}/build.xml" name="call.script"/>
98.287 <param name="call.target" value="clean"/>
98.288 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
98.289 + <param name="transfer.not.archive.disabled" value="true"/>
98.290 </antcall>
98.291 </target>
98.292 <target depends="init" name="-do-clean">
99.1 --- a/remoting/server/web/usages.web.api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
99.2 +++ b/remoting/server/web/usages.web.api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
99.3 @@ -1,8 +1,8 @@
99.4 build.xml.data.CRC32=0ab46c18
99.5 -build.xml.script.CRC32=3bd67ab1
99.6 -build.xml.stylesheet.CRC32=28e38971@1.51.0.46
99.7 +build.xml.script.CRC32=c2f0069e
99.8 +build.xml.stylesheet.CRC32=8064a381@1.78.0.48
99.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
99.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
99.11 nbproject/build-impl.xml.data.CRC32=0ab46c18
99.12 -nbproject/build-impl.xml.script.CRC32=abf847c9
99.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.54.0.46
99.14 +nbproject/build-impl.xml.script.CRC32=4f2a5892
99.15 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
100.1 --- a/remoting/server/web/web.main/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
100.2 +++ b/remoting/server/web/web.main/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
100.3 @@ -216,7 +216,12 @@
100.4 </not>
100.5 </and>
100.6 </condition>
100.7 - <property name="javac.fork" value="${jdkBug6558476}"/>
100.8 + <condition else="false" property="javac.fork">
100.9 + <or>
100.10 + <istrue value="${jdkBug6558476}"/>
100.11 + <istrue value="${javac.external.vm}"/>
100.12 + </or>
100.13 + </condition>
100.14 <property name="jar.index" value="false"/>
100.15 <property name="jar.index.metainf" value="${jar.index}"/>
100.16 <property name="copylibs.rebase" value="true"/>
101.1 --- a/remoting/server/web/web.main/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
101.2 +++ b/remoting/server/web/web.main/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
101.3 @@ -4,5 +4,5 @@
101.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
101.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
101.6 nbproject/build-impl.xml.data.CRC32=5c807d62
101.7 -nbproject/build-impl.xml.script.CRC32=4f66efc1
101.8 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.0.48
101.9 +nbproject/build-impl.xml.script.CRC32=f96e4dae
101.10 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
102.1 --- a/remoting/server/web/web.ui/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
102.2 +++ b/remoting/server/web/web.ui/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
102.3 @@ -216,7 +216,12 @@
102.4 </not>
102.5 </and>
102.6 </condition>
102.7 - <property name="javac.fork" value="${jdkBug6558476}"/>
102.8 + <condition else="false" property="javac.fork">
102.9 + <or>
102.10 + <istrue value="${jdkBug6558476}"/>
102.11 + <istrue value="${javac.external.vm}"/>
102.12 + </or>
102.13 + </condition>
102.14 <property name="jar.index" value="false"/>
102.15 <property name="jar.index.metainf" value="${jar.index}"/>
102.16 <property name="copylibs.rebase" value="true"/>
103.1 --- a/remoting/server/web/web.ui/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
103.2 +++ b/remoting/server/web/web.ui/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
103.3 @@ -8,6 +8,6 @@
103.4 nbproject/build-impl.xml.script.CRC32=d8965d3c
103.5 =======
103.6 nbproject/build-impl.xml.data.CRC32=ea2551e2
103.7 -nbproject/build-impl.xml.script.CRC32=f71a106f
103.8 +nbproject/build-impl.xml.script.CRC32=d40716fd
103.9 >>>>>>> other
103.10 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.0.48
103.11 +nbproject/build-impl.xml.stylesheet.CRC32=2d327b5d@1.78.0.48
104.1 --- a/sandbox/old-modules/api/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
104.2 +++ b/sandbox/old-modules/api/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
104.3 @@ -4,13 +4,6 @@
104.4 *** EDIT ../build.xml INSTEAD ***
104.5 -->
104.6 <project name="org.netbeans.modules.jackpot30.api-impl" basedir="..">
104.7 - <fail message="Please build using Ant 1.7.1 or higher.">
104.8 - <condition>
104.9 - <not>
104.10 - <antversion atleast="1.7.1"/>
104.11 - </not>
104.12 - </condition>
104.13 - </fail>
104.14 <property file="nbproject/private/suite-private.properties"/>
104.15 <property file="nbproject/suite.properties"/>
104.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
104.17 @@ -23,21 +16,13 @@
104.18 <property name="@{name}" value="${@{value}}"/>
104.19 </sequential>
104.20 </macrodef>
104.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
104.22 - <attribute name="property"/>
104.23 - <attribute name="value"/>
104.24 - <sequential>
104.25 - <property name="@{property}" value="@{value}"/>
104.26 - </sequential>
104.27 - </macrodef>
104.28 <property file="${user.properties.file}"/>
104.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
104.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
104.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
104.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
104.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
104.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
104.35 <condition>
104.36 <not>
104.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
104.38 + <available file="${harness.dir}" type="dir"/>
104.39 </not>
104.40 </condition>
104.41 </fail>
105.1 --- a/sandbox/old-modules/api/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
105.2 +++ b/sandbox/old-modules/api/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
105.3 @@ -4,5 +4,5 @@
105.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
105.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
105.6 nbproject/build-impl.xml.data.CRC32=6500fcd0
105.7 -nbproject/build-impl.xml.script.CRC32=c4574e66
105.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
105.9 +nbproject/build-impl.xml.script.CRC32=ff50c613
105.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70
106.1 --- a/sandbox/old-modules/bridges/refactoring/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
106.2 +++ b/sandbox/old-modules/bridges/refactoring/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
106.3 @@ -4,13 +4,6 @@
106.4 *** EDIT ../build.xml INSTEAD ***
106.5 -->
106.6 <project name="org.netbeans.modules.jackpot30.refactoring-impl" basedir="..">
106.7 - <fail message="Please build using Ant 1.7.1 or higher.">
106.8 - <condition>
106.9 - <not>
106.10 - <antversion atleast="1.7.1"/>
106.11 - </not>
106.12 - </condition>
106.13 - </fail>
106.14 <property file="nbproject/private/suite-private.properties"/>
106.15 <property file="nbproject/suite.properties"/>
106.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
106.17 @@ -23,21 +16,13 @@
106.18 <property name="@{name}" value="${@{value}}"/>
106.19 </sequential>
106.20 </macrodef>
106.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
106.22 - <attribute name="property"/>
106.23 - <attribute name="value"/>
106.24 - <sequential>
106.25 - <property name="@{property}" value="@{value}"/>
106.26 - </sequential>
106.27 - </macrodef>
106.28 <property file="${user.properties.file}"/>
106.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
106.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
106.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
106.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
106.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
106.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
106.35 <condition>
106.36 <not>
106.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
106.38 + <available file="${harness.dir}" type="dir"/>
106.39 </not>
106.40 </condition>
106.41 </fail>
107.1 --- a/sandbox/old-modules/bridges/refactoring/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
107.2 +++ b/sandbox/old-modules/bridges/refactoring/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
107.3 @@ -4,5 +4,5 @@
107.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
107.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
107.6 nbproject/build-impl.xml.data.CRC32=2e452477
107.7 -nbproject/build-impl.xml.script.CRC32=fd9920c9
107.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
107.9 +nbproject/build-impl.xml.script.CRC32=9d1345ba
107.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70
108.1 --- a/sandbox/old-modules/help/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
108.2 +++ b/sandbox/old-modules/help/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
108.3 @@ -4,13 +4,6 @@
108.4 *** EDIT ../build.xml INSTEAD ***
108.5 -->
108.6 <project name="org.netbeans.modules.jackpot30.help-impl" basedir="..">
108.7 - <fail message="Please build using Ant 1.7.1 or higher.">
108.8 - <condition>
108.9 - <not>
108.10 - <antversion atleast="1.7.1"/>
108.11 - </not>
108.12 - </condition>
108.13 - </fail>
108.14 <property file="nbproject/private/suite-private.properties"/>
108.15 <property file="nbproject/suite.properties"/>
108.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
108.17 @@ -23,21 +16,13 @@
108.18 <property name="@{name}" value="${@{value}}"/>
108.19 </sequential>
108.20 </macrodef>
108.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
108.22 - <attribute name="property"/>
108.23 - <attribute name="value"/>
108.24 - <sequential>
108.25 - <property name="@{property}" value="@{value}"/>
108.26 - </sequential>
108.27 - </macrodef>
108.28 <property file="${user.properties.file}"/>
108.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
108.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
108.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
108.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
108.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
108.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
108.35 <condition>
108.36 <not>
108.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
108.38 + <available file="${harness.dir}" type="dir"/>
108.39 </not>
108.40 </condition>
108.41 </fail>
109.1 --- a/sandbox/old-modules/help/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
109.2 +++ b/sandbox/old-modules/help/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
109.3 @@ -4,5 +4,5 @@
109.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
109.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
109.6 nbproject/build-impl.xml.data.CRC32=ffaf56d3
109.7 -nbproject/build-impl.xml.script.CRC32=68ad079b
109.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.43
109.9 +nbproject/build-impl.xml.script.CRC32=4673e324
109.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70
110.1 --- a/sandbox/old-modules/hintsimpl/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
110.2 +++ b/sandbox/old-modules/hintsimpl/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
110.3 @@ -4,13 +4,6 @@
110.4 *** EDIT ../build.xml INSTEAD ***
110.5 -->
110.6 <project name="org.netbeans.modules.jackpot30.hintsimpl-impl" basedir="..">
110.7 - <fail message="Please build using Ant 1.7.1 or higher.">
110.8 - <condition>
110.9 - <not>
110.10 - <antversion atleast="1.7.1"/>
110.11 - </not>
110.12 - </condition>
110.13 - </fail>
110.14 <property file="nbproject/private/suite-private.properties"/>
110.15 <property file="nbproject/suite.properties"/>
110.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
110.17 @@ -23,21 +16,13 @@
110.18 <property name="@{name}" value="${@{value}}"/>
110.19 </sequential>
110.20 </macrodef>
110.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
110.22 - <attribute name="property"/>
110.23 - <attribute name="value"/>
110.24 - <sequential>
110.25 - <property name="@{property}" value="@{value}"/>
110.26 - </sequential>
110.27 - </macrodef>
110.28 <property file="${user.properties.file}"/>
110.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
110.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
110.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
110.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
110.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
110.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
110.35 <condition>
110.36 <not>
110.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
110.38 + <available file="${harness.dir}" type="dir"/>
110.39 </not>
110.40 </condition>
110.41 </fail>
111.1 --- a/sandbox/old-modules/hintsimpl/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
111.2 +++ b/sandbox/old-modules/hintsimpl/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
111.3 @@ -4,5 +4,5 @@
111.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
111.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
111.6 nbproject/build-impl.xml.data.CRC32=2dfd5d11
111.7 -nbproject/build-impl.xml.script.CRC32=9204f652
111.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47
111.9 +nbproject/build-impl.xml.script.CRC32=af5d3c32
111.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70
112.1 --- a/sandbox/old-modules/kit/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
112.2 +++ b/sandbox/old-modules/kit/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
112.3 @@ -4,13 +4,6 @@
112.4 *** EDIT ../build.xml INSTEAD ***
112.5 -->
112.6 <project name="org.netbeans.modules.jackpot30.kit-impl" basedir="..">
112.7 - <fail message="Please build using Ant 1.7.1 or higher.">
112.8 - <condition>
112.9 - <not>
112.10 - <antversion atleast="1.7.1"/>
112.11 - </not>
112.12 - </condition>
112.13 - </fail>
112.14 <property file="nbproject/private/suite-private.properties"/>
112.15 <property file="nbproject/suite.properties"/>
112.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
112.17 @@ -23,21 +16,13 @@
112.18 <property name="@{name}" value="${@{value}}"/>
112.19 </sequential>
112.20 </macrodef>
112.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
112.22 - <attribute name="property"/>
112.23 - <attribute name="value"/>
112.24 - <sequential>
112.25 - <property name="@{property}" value="@{value}"/>
112.26 - </sequential>
112.27 - </macrodef>
112.28 <property file="${user.properties.file}"/>
112.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
112.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
112.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
112.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
112.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
112.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
112.35 <condition>
112.36 <not>
112.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
112.38 + <available file="${harness.dir}" type="dir"/>
112.39 </not>
112.40 </condition>
112.41 </fail>
113.1 --- a/sandbox/old-modules/kit/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
113.2 +++ b/sandbox/old-modules/kit/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
113.3 @@ -4,5 +4,5 @@
113.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
113.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
113.6 nbproject/build-impl.xml.data.CRC32=ff5fa2e9
113.7 -nbproject/build-impl.xml.script.CRC32=c129207c
113.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47
113.9 +nbproject/build-impl.xml.script.CRC32=e68b5d3e
113.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70
114.1 --- a/sandbox/old-modules/transformer/nbproject/build-impl.xml Fri May 01 19:13:18 2015 +0200
114.2 +++ b/sandbox/old-modules/transformer/nbproject/build-impl.xml Sun May 31 15:17:24 2015 +0200
114.3 @@ -4,13 +4,6 @@
114.4 *** EDIT ../build.xml INSTEAD ***
114.5 -->
114.6 <project name="org.netbeans.modules.jackpot30.transformers-impl" basedir="..">
114.7 - <fail message="Please build using Ant 1.7.1 or higher.">
114.8 - <condition>
114.9 - <not>
114.10 - <antversion atleast="1.7.1"/>
114.11 - </not>
114.12 - </condition>
114.13 - </fail>
114.14 <property file="nbproject/private/suite-private.properties"/>
114.15 <property file="nbproject/suite.properties"/>
114.16 <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
114.17 @@ -23,21 +16,13 @@
114.18 <property name="@{name}" value="${@{value}}"/>
114.19 </sequential>
114.20 </macrodef>
114.21 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
114.22 - <attribute name="property"/>
114.23 - <attribute name="value"/>
114.24 - <sequential>
114.25 - <property name="@{property}" value="@{value}"/>
114.26 - </sequential>
114.27 - </macrodef>
114.28 <property file="${user.properties.file}"/>
114.29 <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
114.30 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
114.31 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
114.32 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
114.33 + <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
114.34 + <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
114.35 <condition>
114.36 <not>
114.37 - <contains string="${cluster.path.evaluated}" substring="platform"/>
114.38 + <available file="${harness.dir}" type="dir"/>
114.39 </not>
114.40 </condition>
114.41 </fail>
115.1 --- a/sandbox/old-modules/transformer/nbproject/genfiles.properties Fri May 01 19:13:18 2015 +0200
115.2 +++ b/sandbox/old-modules/transformer/nbproject/genfiles.properties Sun May 31 15:17:24 2015 +0200
115.3 @@ -4,5 +4,5 @@
115.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
115.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
115.6 nbproject/build-impl.xml.data.CRC32=9e6fb388
115.7 -nbproject/build-impl.xml.script.CRC32=07a96417
115.8 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
115.9 +nbproject/build-impl.xml.script.CRC32=99a123ad
115.10 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70