1.1 --- a/cmdline/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
1.2 +++ b/cmdline/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
1.3 @@ -38,10 +38,11 @@
1.4 </not>
1.5 </condition>
1.6 </fail>
1.7 - <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
1.8 + <ant antfile="nbproject/platform.xml"/>
1.9 + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml">
1.10 <condition>
1.11 <not>
1.12 - <available type="dir" file="${harness.dir}"/>
1.13 + <available file="${harness.dir}/suite.xml"/>
1.14 </not>
1.15 </condition>
1.16 </fail>
2.1 --- a/cmdline/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
2.2 +++ b/cmdline/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
2.3 @@ -4,5 +4,8 @@
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=56bbc279
2.7 -nbproject/build-impl.xml.script.CRC32=4d7fbbe7
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.44
2.9 +nbproject/build-impl.xml.script.CRC32=01a664f5
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
2.11 +nbproject/platform.xml.data.CRC32=56bbc279
2.12 +nbproject/platform.xml.script.CRC32=db9e1f43
2.13 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/cmdline/nbproject/platform.xml Fri Sep 02 21:55:07 2011 +0200
3.3 @@ -0,0 +1,34 @@
3.4 +<?xml version="1.0" encoding="UTF-8"?>
3.5 +<project name="platform" default="download" basedir="..">
3.6 + <condition property="download.required">
3.7 + <and>
3.8 + <not>
3.9 + <available file="${harness.dir}/suite.xml"/>
3.10 + </not>
3.11 + <isset property="bootstrap.url"/>
3.12 + <isset property="autoupdate.catalog.url"/>
3.13 + </and>
3.14 + </condition>
3.15 + <target name="download" if="download.required">
3.16 + <mkdir dir="${harness.dir}"/>
3.17 + <pathconvert pathsep="|" property="download.clusters">
3.18 + <mapper type="flatten"/>
3.19 + <path path="${cluster.path}"/>
3.20 + </pathconvert>
3.21 + <property name="disabled.modules" value=""/>
3.22 + <pathconvert property="module.includes" pathsep="">
3.23 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
3.24 + <path>
3.25 + <filelist files="${disabled.modules}" dir="."/>
3.26 + </path>
3.27 + </pathconvert>
3.28 + <echo message="Downloading clusters ${download.clusters}"/>
3.29 + <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
3.30 + <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
3.31 + <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
3.32 + <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
3.33 + <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
3.34 + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
3.35 + </autoupdate>
3.36 + </target>
3.37 +</project>
4.1 --- a/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
4.2 +++ b/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
4.3 @@ -6,3 +6,6 @@
4.4 nbproject/build-impl.xml.data.CRC32=89e14acc
4.5 nbproject/build-impl.xml.script.CRC32=8f595034
4.6 nbproject/build-impl.xml.stylesheet.CRC32=56de960a@1.38
4.7 +nbproject/platform.xml.data.CRC32=89e14acc
4.8 +nbproject/platform.xml.script.CRC32=db9e1f43
4.9 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/nbproject/platform.xml Fri Sep 02 21:55:07 2011 +0200
5.3 @@ -0,0 +1,34 @@
5.4 +<?xml version="1.0" encoding="UTF-8"?>
5.5 +<project name="platform" default="download" basedir="..">
5.6 + <condition property="download.required">
5.7 + <and>
5.8 + <not>
5.9 + <available file="${harness.dir}/suite.xml"/>
5.10 + </not>
5.11 + <isset property="bootstrap.url"/>
5.12 + <isset property="autoupdate.catalog.url"/>
5.13 + </and>
5.14 + </condition>
5.15 + <target name="download" if="download.required">
5.16 + <mkdir dir="${harness.dir}"/>
5.17 + <pathconvert pathsep="|" property="download.clusters">
5.18 + <mapper type="flatten"/>
5.19 + <path path="${cluster.path}"/>
5.20 + </pathconvert>
5.21 + <property name="disabled.modules" value=""/>
5.22 + <pathconvert property="module.includes" pathsep="">
5.23 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
5.24 + <path>
5.25 + <filelist files="${disabled.modules}" dir="."/>
5.26 + </path>
5.27 + </pathconvert>
5.28 + <echo message="Downloading clusters ${download.clusters}"/>
5.29 + <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
5.30 + <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
5.31 + <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
5.32 + <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
5.33 + <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
5.34 + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
5.35 + </autoupdate>
5.36 + </target>
5.37 +</project>
6.1 --- a/remoting/ide/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
6.2 +++ b/remoting/ide/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
6.3 @@ -38,10 +38,11 @@
6.4 </not>
6.5 </condition>
6.6 </fail>
6.7 - <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
6.8 + <ant antfile="nbproject/platform.xml"/>
6.9 + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml">
6.10 <condition>
6.11 <not>
6.12 - <available type="dir" file="${harness.dir}"/>
6.13 + <available file="${harness.dir}/suite.xml"/>
6.14 </not>
6.15 </condition>
6.16 </fail>
7.1 --- a/remoting/ide/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
7.2 +++ b/remoting/ide/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
7.3 @@ -4,5 +4,8 @@
7.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
7.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
7.6 nbproject/build-impl.xml.data.CRC32=891734f5
7.7 -nbproject/build-impl.xml.script.CRC32=9098eaa2
7.8 -nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.47
7.9 +nbproject/build-impl.xml.script.CRC32=f4643aa8
7.10 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
7.11 +nbproject/platform.xml.data.CRC32=891734f5
7.12 +nbproject/platform.xml.script.CRC32=db9e1f43
7.13 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/remoting/ide/nbproject/platform.xml Fri Sep 02 21:55:07 2011 +0200
8.3 @@ -0,0 +1,34 @@
8.4 +<?xml version="1.0" encoding="UTF-8"?>
8.5 +<project name="platform" default="download" basedir="..">
8.6 + <condition property="download.required">
8.7 + <and>
8.8 + <not>
8.9 + <available file="${harness.dir}/suite.xml"/>
8.10 + </not>
8.11 + <isset property="bootstrap.url"/>
8.12 + <isset property="autoupdate.catalog.url"/>
8.13 + </and>
8.14 + </condition>
8.15 + <target name="download" if="download.required">
8.16 + <mkdir dir="${harness.dir}"/>
8.17 + <pathconvert pathsep="|" property="download.clusters">
8.18 + <mapper type="flatten"/>
8.19 + <path path="${cluster.path}"/>
8.20 + </pathconvert>
8.21 + <property name="disabled.modules" value=""/>
8.22 + <pathconvert property="module.includes" pathsep="">
8.23 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
8.24 + <path>
8.25 + <filelist files="${disabled.modules}" dir="."/>
8.26 + </path>
8.27 + </pathconvert>
8.28 + <echo message="Downloading clusters ${download.clusters}"/>
8.29 + <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
8.30 + <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
8.31 + <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
8.32 + <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
8.33 + <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
8.34 + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
8.35 + </autoupdate>
8.36 + </target>
8.37 +</project>
9.1 --- a/remoting/ide/usages/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
9.2 +++ b/remoting/ide/usages/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
9.3 @@ -1,8 +1,8 @@
9.4 -build.xml.data.CRC32=7a938605
9.5 +build.xml.data.CRC32=46c67808
9.6 build.xml.script.CRC32=58a6b47a
9.7 -build.xml.stylesheet.CRC32=a56c6a5b@2.45
9.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.46
9.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
9.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
9.11 -nbproject/build-impl.xml.data.CRC32=7a938605
9.12 +nbproject/build-impl.xml.data.CRC32=46c67808
9.13 nbproject/build-impl.xml.script.CRC32=583fd407
9.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45
9.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.46
10.1 --- a/remoting/server/indexer/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
10.2 +++ b/remoting/server/indexer/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
10.3 @@ -38,10 +38,11 @@
10.4 </not>
10.5 </condition>
10.6 </fail>
10.7 - <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
10.8 + <ant antfile="nbproject/platform.xml"/>
10.9 + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml">
10.10 <condition>
10.11 <not>
10.12 - <available type="dir" file="${harness.dir}"/>
10.13 + <available file="${harness.dir}/suite.xml"/>
10.14 </not>
10.15 </condition>
10.16 </fail>
11.1 --- a/remoting/server/indexer/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
11.2 +++ b/remoting/server/indexer/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
11.3 @@ -4,5 +4,8 @@
11.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
11.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
11.6 nbproject/build-impl.xml.data.CRC32=7bd55f34
11.7 -nbproject/build-impl.xml.script.CRC32=fddaab7c
11.8 -nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.47
11.9 +nbproject/build-impl.xml.script.CRC32=5e004a39
11.10 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
11.11 +nbproject/platform.xml.data.CRC32=7bd55f34
11.12 +nbproject/platform.xml.script.CRC32=db9e1f43
11.13 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/remoting/server/indexer/nbproject/platform.xml Fri Sep 02 21:55:07 2011 +0200
12.3 @@ -0,0 +1,34 @@
12.4 +<?xml version="1.0" encoding="UTF-8"?>
12.5 +<project name="platform" default="download" basedir="..">
12.6 + <condition property="download.required">
12.7 + <and>
12.8 + <not>
12.9 + <available file="${harness.dir}/suite.xml"/>
12.10 + </not>
12.11 + <isset property="bootstrap.url"/>
12.12 + <isset property="autoupdate.catalog.url"/>
12.13 + </and>
12.14 + </condition>
12.15 + <target name="download" if="download.required">
12.16 + <mkdir dir="${harness.dir}"/>
12.17 + <pathconvert pathsep="|" property="download.clusters">
12.18 + <mapper type="flatten"/>
12.19 + <path path="${cluster.path}"/>
12.20 + </pathconvert>
12.21 + <property name="disabled.modules" value=""/>
12.22 + <pathconvert property="module.includes" pathsep="">
12.23 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
12.24 + <path>
12.25 + <filelist files="${disabled.modules}" dir="."/>
12.26 + </path>
12.27 + </pathconvert>
12.28 + <echo message="Downloading clusters ${download.clusters}"/>
12.29 + <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
12.30 + <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
12.31 + <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
12.32 + <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
12.33 + <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
12.34 + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
12.35 + </autoupdate>
12.36 + </target>
12.37 +</project>
13.1 --- a/remoting/server/web/base.web.api/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
13.2 +++ b/remoting/server/web/base.web.api/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
13.3 @@ -410,6 +410,7 @@
13.4 <property environment="env"/>
13.5 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
13.6 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
13.7 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
13.8 <jvmarg value="${profiler.info.jvmargs.agent}"/>
13.9 <jvmarg line="${profiler.info.jvmargs}"/>
13.10 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
14.1 --- a/remoting/server/web/base.web.api/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
14.2 +++ b/remoting/server/web/base.web.api/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
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=274e0636
14.7 -nbproject/build-impl.xml.script.CRC32=003c6683
14.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
14.9 +nbproject/build-impl.xml.script.CRC32=62281f6c
14.10 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.46.0.46
15.1 --- a/remoting/server/web/source.web.api/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
15.2 +++ b/remoting/server/web/source.web.api/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
15.3 @@ -410,6 +410,7 @@
15.4 <property environment="env"/>
15.5 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
15.6 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
15.7 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
15.8 <jvmarg value="${profiler.info.jvmargs.agent}"/>
15.9 <jvmarg line="${profiler.info.jvmargs}"/>
15.10 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
16.1 --- a/remoting/server/web/source.web.api/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
16.2 +++ b/remoting/server/web/source.web.api/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
16.3 @@ -4,5 +4,5 @@
16.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
16.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
16.6 nbproject/build-impl.xml.data.CRC32=6ff1c131
16.7 -nbproject/build-impl.xml.script.CRC32=6fadb345
16.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
16.9 +nbproject/build-impl.xml.script.CRC32=3530a4b5
16.10 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.46.0.46
17.1 --- a/remoting/server/web/type.web.api/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
17.2 +++ b/remoting/server/web/type.web.api/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
17.3 @@ -410,6 +410,7 @@
17.4 <property environment="env"/>
17.5 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
17.6 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
17.7 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
17.8 <jvmarg value="${profiler.info.jvmargs.agent}"/>
17.9 <jvmarg line="${profiler.info.jvmargs}"/>
17.10 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
18.1 --- a/remoting/server/web/type.web.api/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
18.2 +++ b/remoting/server/web/type.web.api/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
18.3 @@ -4,5 +4,5 @@
18.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
18.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
18.6 nbproject/build-impl.xml.data.CRC32=9ceb8e45
18.7 -nbproject/build-impl.xml.script.CRC32=1f8b6679
18.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
18.9 +nbproject/build-impl.xml.script.CRC32=c34f2a00
18.10 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.46.0.46
19.1 --- a/remoting/server/web/usages.web.api/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
19.2 +++ b/remoting/server/web/usages.web.api/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
19.3 @@ -410,6 +410,7 @@
19.4 <property environment="env"/>
19.5 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
19.6 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
19.7 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
19.8 <jvmarg value="${profiler.info.jvmargs.agent}"/>
19.9 <jvmarg line="${profiler.info.jvmargs}"/>
19.10 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
20.1 --- a/remoting/server/web/usages.web.api/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
20.2 +++ b/remoting/server/web/usages.web.api/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
20.3 @@ -4,5 +4,5 @@
20.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
20.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
20.6 nbproject/build-impl.xml.data.CRC32=9115199c
20.7 -nbproject/build-impl.xml.script.CRC32=9cf559ef
20.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
20.9 +nbproject/build-impl.xml.script.CRC32=948e5fd4
20.10 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.46.0.46
21.1 --- a/remoting/server/web/web.main/nbproject/build-impl.xml Fri Sep 02 21:14:06 2011 +0200
21.2 +++ b/remoting/server/web/web.main/nbproject/build-impl.xml Fri Sep 02 21:55:07 2011 +0200
21.3 @@ -410,6 +410,7 @@
21.4 <property environment="env"/>
21.5 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
21.6 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
21.7 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
21.8 <jvmarg value="${profiler.info.jvmargs.agent}"/>
21.9 <jvmarg line="${profiler.info.jvmargs}"/>
21.10 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
22.1 --- a/remoting/server/web/web.main/nbproject/genfiles.properties Fri Sep 02 21:14:06 2011 +0200
22.2 +++ b/remoting/server/web/web.main/nbproject/genfiles.properties Fri Sep 02 21:55:07 2011 +0200
22.3 @@ -4,5 +4,5 @@
22.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
22.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
22.6 nbproject/build-impl.xml.data.CRC32=770a9613
22.7 -nbproject/build-impl.xml.script.CRC32=15e99f57
22.8 -nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
22.9 +nbproject/build-impl.xml.script.CRC32=ad157b46
22.10 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.46.0.46