1.1 --- a/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
1.2 +++ b/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
1.3 @@ -156,6 +156,7 @@
1.4 </and>
1.5 </condition>
1.6 <property name="run.jvmargs" value=""/>
1.7 + <property name="run.jvmargs.ide" value=""/>
1.8 <property name="javac.compilerargs" value=""/>
1.9 <property name="work.dir" value="${basedir}"/>
1.10 <condition property="no.deps">
1.11 @@ -357,6 +358,7 @@
1.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.13 <jvmarg value="-ea"/>
1.14 <jvmarg line="${run.jvmargs}"/>
1.15 + <jvmarg line="${run.jvmargs.ide}"/>
1.16 </junit>
1.17 </sequential>
1.18 </macrodef>
1.19 @@ -385,6 +387,7 @@
1.20 <property environment="env"/>
1.21 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.22 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
1.23 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.24 <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.25 <jvmarg line="${profiler.info.jvmargs}"/>
1.26 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.27 @@ -462,6 +465,7 @@
1.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.30 <jvmarg line="${run.jvmargs}"/>
1.31 + <jvmarg line="${run.jvmargs.ide}"/>
1.32 <classpath>
1.33 <path path="@{classpath}"/>
1.34 </classpath>
1.35 @@ -485,6 +489,7 @@
1.36 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.37 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.38 <jvmarg line="${run.jvmargs}"/>
1.39 + <jvmarg line="${run.jvmargs.ide}"/>
1.40 <classpath>
1.41 <path path="@{classpath}"/>
1.42 </classpath>
1.43 @@ -840,6 +845,14 @@
1.44 -->
1.45 <target depends="init" if="have.sources" name="-javadoc-build">
1.46 <mkdir dir="${dist.javadoc.dir}"/>
1.47 + <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
1.48 + <and>
1.49 + <isset property="endorsed.classpath.cmd.line.arg"/>
1.50 + <not>
1.51 + <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
1.52 + </not>
1.53 + </and>
1.54 + </condition>
1.55 <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
1.56 <classpath>
1.57 <path path="${javac.classpath}"/>
1.58 @@ -851,6 +864,7 @@
1.59 <include name="**/*.java"/>
1.60 <exclude name="*.java"/>
1.61 </fileset>
1.62 + <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1.63 </javadoc>
1.64 <copy todir="${dist.javadoc.dir}">
1.65 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.66 @@ -1027,9 +1041,12 @@
1.67 <target name="-check-call-dep">
1.68 <property file="${call.built.properties}" prefix="already.built."/>
1.69 <condition property="should.call.dep">
1.70 - <not>
1.71 - <isset property="already.built.${call.subproject}"/>
1.72 - </not>
1.73 + <and>
1.74 + <not>
1.75 + <isset property="already.built.${call.subproject}"/>
1.76 + </not>
1.77 + <available file="${call.script}"/>
1.78 + </and>
1.79 </condition>
1.80 </target>
1.81 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
2.1 --- a/remoting/server/tests/data/group1/prj1/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
2.2 +++ b/remoting/server/tests/data/group1/prj1/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
2.3 @@ -4,5 +4,5 @@
2.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.6 nbproject/build-impl.xml.data.CRC32=9fba8b40
2.7 -nbproject/build-impl.xml.script.CRC32=e9af8aba
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
2.9 +nbproject/build-impl.xml.script.CRC32=cbf5f41e
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
3.1 --- a/remoting/server/web/base.web.api/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
3.2 +++ b/remoting/server/web/base.web.api/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
3.3 @@ -181,6 +181,7 @@
3.4 </and>
3.5 </condition>
3.6 <property name="run.jvmargs" value=""/>
3.7 + <property name="run.jvmargs.ide" value=""/>
3.8 <property name="javac.compilerargs" value=""/>
3.9 <property name="work.dir" value="${basedir}"/>
3.10 <condition property="no.deps">
3.11 @@ -382,6 +383,7 @@
3.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
3.13 <jvmarg value="-ea"/>
3.14 <jvmarg line="${run.jvmargs}"/>
3.15 + <jvmarg line="${run.jvmargs.ide}"/>
3.16 </junit>
3.17 </sequential>
3.18 </macrodef>
3.19 @@ -488,6 +490,7 @@
3.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
3.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
3.22 <jvmarg line="${run.jvmargs}"/>
3.23 + <jvmarg line="${run.jvmargs.ide}"/>
3.24 <classpath>
3.25 <path path="@{classpath}"/>
3.26 </classpath>
3.27 @@ -511,6 +514,7 @@
3.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
3.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
3.30 <jvmarg line="${run.jvmargs}"/>
3.31 + <jvmarg line="${run.jvmargs.ide}"/>
3.32 <classpath>
3.33 <path path="@{classpath}"/>
3.34 </classpath>
3.35 @@ -1062,9 +1066,12 @@
3.36 <target name="-check-call-dep">
3.37 <property file="${call.built.properties}" prefix="already.built."/>
3.38 <condition property="should.call.dep">
3.39 - <not>
3.40 - <isset property="already.built.${call.subproject}"/>
3.41 - </not>
3.42 + <and>
3.43 + <not>
3.44 + <isset property="already.built.${call.subproject}"/>
3.45 + </not>
3.46 + <available file="${call.script}"/>
3.47 + </and>
3.48 </condition>
3.49 </target>
3.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
4.1 --- a/remoting/server/web/base.web.api/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
4.2 +++ b/remoting/server/web/base.web.api/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
4.3 @@ -4,5 +4,5 @@
4.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.6 nbproject/build-impl.xml.data.CRC32=274e0636
4.7 -nbproject/build-impl.xml.script.CRC32=bea47b1c
4.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
4.9 +nbproject/build-impl.xml.script.CRC32=09b2e35a
4.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
5.1 --- a/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
5.2 +++ b/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
5.3 @@ -181,6 +181,7 @@
5.4 </and>
5.5 </condition>
5.6 <property name="run.jvmargs" value=""/>
5.7 + <property name="run.jvmargs.ide" value=""/>
5.8 <property name="javac.compilerargs" value=""/>
5.9 <property name="work.dir" value="${basedir}"/>
5.10 <condition property="no.deps">
5.11 @@ -382,6 +383,7 @@
5.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
5.13 <jvmarg value="-ea"/>
5.14 <jvmarg line="${run.jvmargs}"/>
5.15 + <jvmarg line="${run.jvmargs.ide}"/>
5.16 </junit>
5.17 </sequential>
5.18 </macrodef>
5.19 @@ -488,6 +490,7 @@
5.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
5.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
5.22 <jvmarg line="${run.jvmargs}"/>
5.23 + <jvmarg line="${run.jvmargs.ide}"/>
5.24 <classpath>
5.25 <path path="@{classpath}"/>
5.26 </classpath>
5.27 @@ -511,6 +514,7 @@
5.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
5.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
5.30 <jvmarg line="${run.jvmargs}"/>
5.31 + <jvmarg line="${run.jvmargs.ide}"/>
5.32 <classpath>
5.33 <path path="@{classpath}"/>
5.34 </classpath>
5.35 @@ -1076,9 +1080,12 @@
5.36 <target name="-check-call-dep">
5.37 <property file="${call.built.properties}" prefix="already.built."/>
5.38 <condition property="should.call.dep">
5.39 - <not>
5.40 - <isset property="already.built.${call.subproject}"/>
5.41 - </not>
5.42 + <and>
5.43 + <not>
5.44 + <isset property="already.built.${call.subproject}"/>
5.45 + </not>
5.46 + <available file="${call.script}"/>
5.47 + </and>
5.48 </condition>
5.49 </target>
5.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
6.1 --- a/remoting/server/web/nbindex.web.api/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
6.2 +++ b/remoting/server/web/nbindex.web.api/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
6.3 @@ -4,5 +4,5 @@
6.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
6.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6.6 nbproject/build-impl.xml.data.CRC32=a5bf9572
6.7 -nbproject/build-impl.xml.script.CRC32=112a5b9c
6.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
6.9 +nbproject/build-impl.xml.script.CRC32=d24bbf32
6.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
7.1 --- a/remoting/server/web/source.web.api/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
7.2 +++ b/remoting/server/web/source.web.api/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
7.3 @@ -181,6 +181,7 @@
7.4 </and>
7.5 </condition>
7.6 <property name="run.jvmargs" value=""/>
7.7 + <property name="run.jvmargs.ide" value=""/>
7.8 <property name="javac.compilerargs" value=""/>
7.9 <property name="work.dir" value="${basedir}"/>
7.10 <condition property="no.deps">
7.11 @@ -382,6 +383,7 @@
7.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
7.13 <jvmarg value="-ea"/>
7.14 <jvmarg line="${run.jvmargs}"/>
7.15 + <jvmarg line="${run.jvmargs.ide}"/>
7.16 </junit>
7.17 </sequential>
7.18 </macrodef>
7.19 @@ -488,6 +490,7 @@
7.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
7.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
7.22 <jvmarg line="${run.jvmargs}"/>
7.23 + <jvmarg line="${run.jvmargs.ide}"/>
7.24 <classpath>
7.25 <path path="@{classpath}"/>
7.26 </classpath>
7.27 @@ -511,6 +514,7 @@
7.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
7.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
7.30 <jvmarg line="${run.jvmargs}"/>
7.31 + <jvmarg line="${run.jvmargs.ide}"/>
7.32 <classpath>
7.33 <path path="@{classpath}"/>
7.34 </classpath>
7.35 @@ -1076,9 +1080,12 @@
7.36 <target name="-check-call-dep">
7.37 <property file="${call.built.properties}" prefix="already.built."/>
7.38 <condition property="should.call.dep">
7.39 - <not>
7.40 - <isset property="already.built.${call.subproject}"/>
7.41 - </not>
7.42 + <and>
7.43 + <not>
7.44 + <isset property="already.built.${call.subproject}"/>
7.45 + </not>
7.46 + <available file="${call.script}"/>
7.47 + </and>
7.48 </condition>
7.49 </target>
7.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
8.1 --- a/remoting/server/web/source.web.api/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
8.2 +++ b/remoting/server/web/source.web.api/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
8.3 @@ -4,5 +4,5 @@
8.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
8.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
8.6 nbproject/build-impl.xml.data.CRC32=6ff1c131
8.7 -nbproject/build-impl.xml.script.CRC32=e8b2cee9
8.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
8.9 +nbproject/build-impl.xml.script.CRC32=903707b8
8.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
9.1 --- a/remoting/server/web/type.web.api/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
9.2 +++ b/remoting/server/web/type.web.api/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
9.3 @@ -181,6 +181,7 @@
9.4 </and>
9.5 </condition>
9.6 <property name="run.jvmargs" value=""/>
9.7 + <property name="run.jvmargs.ide" value=""/>
9.8 <property name="javac.compilerargs" value=""/>
9.9 <property name="work.dir" value="${basedir}"/>
9.10 <condition property="no.deps">
9.11 @@ -382,6 +383,7 @@
9.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
9.13 <jvmarg value="-ea"/>
9.14 <jvmarg line="${run.jvmargs}"/>
9.15 + <jvmarg line="${run.jvmargs.ide}"/>
9.16 </junit>
9.17 </sequential>
9.18 </macrodef>
9.19 @@ -488,6 +490,7 @@
9.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
9.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
9.22 <jvmarg line="${run.jvmargs}"/>
9.23 + <jvmarg line="${run.jvmargs.ide}"/>
9.24 <classpath>
9.25 <path path="@{classpath}"/>
9.26 </classpath>
9.27 @@ -511,6 +514,7 @@
9.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
9.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
9.30 <jvmarg line="${run.jvmargs}"/>
9.31 + <jvmarg line="${run.jvmargs.ide}"/>
9.32 <classpath>
9.33 <path path="@{classpath}"/>
9.34 </classpath>
9.35 @@ -1076,9 +1080,12 @@
9.36 <target name="-check-call-dep">
9.37 <property file="${call.built.properties}" prefix="already.built."/>
9.38 <condition property="should.call.dep">
9.39 - <not>
9.40 - <isset property="already.built.${call.subproject}"/>
9.41 - </not>
9.42 + <and>
9.43 + <not>
9.44 + <isset property="already.built.${call.subproject}"/>
9.45 + </not>
9.46 + <available file="${call.script}"/>
9.47 + </and>
9.48 </condition>
9.49 </target>
9.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
10.1 --- a/remoting/server/web/type.web.api/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
10.2 +++ b/remoting/server/web/type.web.api/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
10.3 @@ -4,5 +4,5 @@
10.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
10.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
10.6 nbproject/build-impl.xml.data.CRC32=9ceb8e45
10.7 -nbproject/build-impl.xml.script.CRC32=c2ece9fb
10.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
10.9 +nbproject/build-impl.xml.script.CRC32=d8965d3c
10.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
11.1 --- a/remoting/server/web/usages.web.api/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
11.2 +++ b/remoting/server/web/usages.web.api/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
11.3 @@ -181,6 +181,7 @@
11.4 </and>
11.5 </condition>
11.6 <property name="run.jvmargs" value=""/>
11.7 + <property name="run.jvmargs.ide" value=""/>
11.8 <property name="javac.compilerargs" value=""/>
11.9 <property name="work.dir" value="${basedir}"/>
11.10 <condition property="no.deps">
11.11 @@ -382,6 +383,7 @@
11.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
11.13 <jvmarg value="-ea"/>
11.14 <jvmarg line="${run.jvmargs}"/>
11.15 + <jvmarg line="${run.jvmargs.ide}"/>
11.16 </junit>
11.17 </sequential>
11.18 </macrodef>
11.19 @@ -488,6 +490,7 @@
11.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
11.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
11.22 <jvmarg line="${run.jvmargs}"/>
11.23 + <jvmarg line="${run.jvmargs.ide}"/>
11.24 <classpath>
11.25 <path path="@{classpath}"/>
11.26 </classpath>
11.27 @@ -511,6 +514,7 @@
11.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
11.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
11.30 <jvmarg line="${run.jvmargs}"/>
11.31 + <jvmarg line="${run.jvmargs.ide}"/>
11.32 <classpath>
11.33 <path path="@{classpath}"/>
11.34 </classpath>
11.35 @@ -1076,9 +1080,12 @@
11.36 <target name="-check-call-dep">
11.37 <property file="${call.built.properties}" prefix="already.built."/>
11.38 <condition property="should.call.dep">
11.39 - <not>
11.40 - <isset property="already.built.${call.subproject}"/>
11.41 - </not>
11.42 + <and>
11.43 + <not>
11.44 + <isset property="already.built.${call.subproject}"/>
11.45 + </not>
11.46 + <available file="${call.script}"/>
11.47 + </and>
11.48 </condition>
11.49 </target>
11.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
12.1 --- a/remoting/server/web/usages.web.api/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
12.2 +++ b/remoting/server/web/usages.web.api/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
12.3 @@ -4,5 +4,5 @@
12.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.6 nbproject/build-impl.xml.data.CRC32=9115199c
12.7 -nbproject/build-impl.xml.script.CRC32=1420fc13
12.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
12.9 +nbproject/build-impl.xml.script.CRC32=9892c5ea
12.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46
13.1 --- a/remoting/server/web/web.main/nbproject/build-impl.xml Sat Feb 11 18:35:10 2012 +0100
13.2 +++ b/remoting/server/web/web.main/nbproject/build-impl.xml Fri Feb 17 19:23:00 2012 +0100
13.3 @@ -181,6 +181,7 @@
13.4 </and>
13.5 </condition>
13.6 <property name="run.jvmargs" value=""/>
13.7 + <property name="run.jvmargs.ide" value=""/>
13.8 <property name="javac.compilerargs" value=""/>
13.9 <property name="work.dir" value="${basedir}"/>
13.10 <condition property="no.deps">
13.11 @@ -382,6 +383,7 @@
13.12 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
13.13 <jvmarg value="-ea"/>
13.14 <jvmarg line="${run.jvmargs}"/>
13.15 + <jvmarg line="${run.jvmargs.ide}"/>
13.16 </junit>
13.17 </sequential>
13.18 </macrodef>
13.19 @@ -488,6 +490,7 @@
13.20 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
13.21 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
13.22 <jvmarg line="${run.jvmargs}"/>
13.23 + <jvmarg line="${run.jvmargs.ide}"/>
13.24 <classpath>
13.25 <path path="@{classpath}"/>
13.26 </classpath>
13.27 @@ -511,6 +514,7 @@
13.28 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
13.29 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
13.30 <jvmarg line="${run.jvmargs}"/>
13.31 + <jvmarg line="${run.jvmargs.ide}"/>
13.32 <classpath>
13.33 <path path="@{classpath}"/>
13.34 </classpath>
13.35 @@ -1132,9 +1136,12 @@
13.36 <target name="-check-call-dep">
13.37 <property file="${call.built.properties}" prefix="already.built."/>
13.38 <condition property="should.call.dep">
13.39 - <not>
13.40 - <isset property="already.built.${call.subproject}"/>
13.41 - </not>
13.42 + <and>
13.43 + <not>
13.44 + <isset property="already.built.${call.subproject}"/>
13.45 + </not>
13.46 + <available file="${call.script}"/>
13.47 + </and>
13.48 </condition>
13.49 </target>
13.50 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
14.1 --- a/remoting/server/web/web.main/nbproject/genfiles.properties Sat Feb 11 18:35:10 2012 +0100
14.2 +++ b/remoting/server/web/web.main/nbproject/genfiles.properties Fri Feb 17 19:23:00 2012 +0100
14.3 @@ -4,5 +4,5 @@
14.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
14.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
14.6 nbproject/build-impl.xml.data.CRC32=f536def6
14.7 -nbproject/build-impl.xml.script.CRC32=49b6ec04
14.8 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.48.0.46
14.9 +nbproject/build-impl.xml.script.CRC32=690bede7
14.10 +nbproject/build-impl.xml.stylesheet.CRC32=96b566c0@1.51.0.46