java/sql-vyuka/nbproject/build-impl.xml
changeset 79 aa8c8f51b0cc
parent 74 48066e753dd6
child 82 956501cb9ec8
     1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml	Wed Jan 27 21:24:33 2010 +0100
     1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml	Wed Feb 08 13:16:13 2012 +0100
     1.3 @@ -173,12 +173,27 @@
     1.4          <property name="runmain.jvmargs" value=""/>
     1.5          <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
     1.6          <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
     1.7 -            <length length="0" string="${endorsed.classpath}" when="greater"/>
     1.8 +            <and>
     1.9 +                <isset property="endorsed.classpath"/>
    1.10 +                <length length="0" string="${endorsed.classpath}" when="greater"/>
    1.11 +            </and>
    1.12          </condition>
    1.13 +        <condition else="false" property="jdkBug6558476">
    1.14 +            <and>
    1.15 +                <matches pattern="1\.[56]" string="${java.specification.version}"/>
    1.16 +                <not>
    1.17 +                    <os family="unix"/>
    1.18 +                </not>
    1.19 +            </and>
    1.20 +        </condition>
    1.21 +        <property name="javac.fork" value="${jdkBug6558476}"/>
    1.22      </target>
    1.23      <target depends="init" name="-init-cos" unless="deploy.on.save">
    1.24          <condition property="deploy.on.save" value="true">
    1.25 -            <istrue value="${j2ee.deploy.on.save}"/>
    1.26 +            <or>
    1.27 +                <istrue value="${j2ee.deploy.on.save}"/>
    1.28 +                <istrue value="${j2ee.compile.on.save}"/>
    1.29 +            </or>
    1.30          </condition>
    1.31      </target>
    1.32      <target name="-post-init">
    1.33 @@ -198,6 +213,20 @@
    1.34          <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
    1.35          <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
    1.36          <fail unless="dist.war">Must set dist.war</fail>
    1.37 +        <condition property="missing.j2ee.server.home">
    1.38 +            <and>
    1.39 +                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
    1.40 +                <not>
    1.41 +                    <isset property="j2ee.server.home"/>
    1.42 +                </not>
    1.43 +            </and>
    1.44 +        </condition>
    1.45 +        <fail if="missing.j2ee.server.home">
    1.46 +The Java EE server classpath is not correctly set up - server home directory is missing.
    1.47 +Either open the project in the IDE and assign the server or setup the server classpath manually.
    1.48 +For example like this:
    1.49 +   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
    1.50 +                </fail>
    1.51          <fail unless="j2ee.platform.classpath">
    1.52  The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
    1.53  Either open the project in the IDE and assign the server or setup the server classpath manually.
    1.54 @@ -215,11 +244,51 @@
    1.55              </sequential>
    1.56          </macrodef>
    1.57      </target>
    1.58 -    <target name="-init-macrodef-javac">
    1.59 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
    1.60          <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
    1.61              <attribute default="${src.dir}" name="srcdir"/>
    1.62              <attribute default="${build.classes.dir}" name="destdir"/>
    1.63              <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
    1.64 +            <attribute default="${javac.processorpath}" name="processorpath"/>
    1.65 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
    1.66 +            <attribute default="${includes}" name="includes"/>
    1.67 +            <attribute default="${excludes}" name="excludes"/>
    1.68 +            <attribute default="${javac.debug}" name="debug"/>
    1.69 +            <attribute default="${empty.dir}" name="gensrcdir"/>
    1.70 +            <element name="customize" optional="true"/>
    1.71 +            <sequential>
    1.72 +                <property location="${build.dir}/empty" name="empty.dir"/>
    1.73 +                <mkdir dir="${empty.dir}"/>
    1.74 +                <mkdir dir="@{apgeneratedsrcdir}"/>
    1.75 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
    1.76 +                    <src>
    1.77 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
    1.78 +                            <include name="*"/>
    1.79 +                        </dirset>
    1.80 +                    </src>
    1.81 +                    <classpath>
    1.82 +                        <path path="@{classpath}"/>
    1.83 +                    </classpath>
    1.84 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.85 +                    <compilerarg line="${javac.compilerargs}"/>
    1.86 +                    <compilerarg value="-processorpath"/>
    1.87 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
    1.88 +                    <compilerarg line="${ap.processors.internal}"/>
    1.89 +                    <compilerarg value="-s"/>
    1.90 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
    1.91 +                    <compilerarg line="${ap.proc.none.internal}"/>
    1.92 +                    <customize/>
    1.93 +                </javac>
    1.94 +            </sequential>
    1.95 +        </macrodef>
    1.96 +    </target>
    1.97 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
    1.98 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
    1.99 +            <attribute default="${src.dir}" name="srcdir"/>
   1.100 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.101 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   1.102 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   1.103 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.104              <attribute default="${includes}" name="includes"/>
   1.105              <attribute default="${excludes}" name="excludes"/>
   1.106              <attribute default="${javac.debug}" name="debug"/>
   1.107 @@ -244,6 +313,38 @@
   1.108              </sequential>
   1.109          </macrodef>
   1.110      </target>
   1.111 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   1.112 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
   1.113 +            <attribute default="${src.dir}" name="srcdir"/>
   1.114 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.115 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   1.116 +            <sequential>
   1.117 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   1.118 +                    <classpath>
   1.119 +                        <path path="@{classpath}"/>
   1.120 +                    </classpath>
   1.121 +                </depend>
   1.122 +            </sequential>
   1.123 +        </macrodef>
   1.124 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
   1.125 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.126 +            <sequential>
   1.127 +                <fail unless="javac.includes">Must set javac.includes</fail>
   1.128 +                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
   1.129 +                    <path>
   1.130 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   1.131 +                    </path>
   1.132 +                    <globmapper from="*.java" to="*.class"/>
   1.133 +                </pathconvert>
   1.134 +                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
   1.135 +                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
   1.136 +                <delete>
   1.137 +                    <files includesfile="${javac.includesfile.binary}"/>
   1.138 +                </delete>
   1.139 +                <delete file="${javac.includesfile.binary}"/>
   1.140 +            </sequential>
   1.141 +        </macrodef>
   1.142 +    </target>
   1.143      <target name="-init-macrodef-junit">
   1.144          <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
   1.145              <attribute default="${includes}" name="includes"/>
   1.146 @@ -266,6 +367,7 @@
   1.147                      <formatter type="brief" usefile="false"/>
   1.148                      <formatter type="xml"/>
   1.149                      <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.150 +                    <jvmarg value="-ea"/>
   1.151                      <jvmarg line="${runmain.jvmargs}"/>
   1.152                  </junit>
   1.153              </sequential>
   1.154 @@ -386,7 +488,43 @@
   1.155                  </fail>
   1.156          <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
   1.157      </target>
   1.158 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
   1.159 +    <target name="-init-ap-cmdline-properties">
   1.160 +        <property name="annotation.processing.enabled" value="true"/>
   1.161 +        <property name="annotation.processing.processors.list" value=""/>
   1.162 +        <property name="annotation.processing.run.all.processors" value="true"/>
   1.163 +        <property name="javac.processorpath" value="${javac.classpath}"/>
   1.164 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
   1.165 +        <condition property="ap.supported.internal" value="true">
   1.166 +            <not>
   1.167 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
   1.168 +            </not>
   1.169 +        </condition>
   1.170 +    </target>
   1.171 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
   1.172 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
   1.173 +            <isfalse value="${annotation.processing.run.all.processors}"/>
   1.174 +        </condition>
   1.175 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
   1.176 +            <isfalse value="${annotation.processing.enabled}"/>
   1.177 +        </condition>
   1.178 +    </target>
   1.179 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   1.180 +        <property name="ap.cmd.line.internal" value=""/>
   1.181 +    </target>
   1.182 +    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
   1.183 +    <target name="-profile-pre-init">
   1.184 +        <!-- Empty placeholder for easier customization. -->
   1.185 +        <!-- You can override this target in the ../build.xml file. -->
   1.186 +    </target>
   1.187 +    <target name="-profile-post-init">
   1.188 +        <!-- Empty placeholder for easier customization. -->
   1.189 +        <!-- You can override this target in the ../build.xml file. -->
   1.190 +    </target>
   1.191 +    <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
   1.192 +        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
   1.193 +        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
   1.194 +    </target>
   1.195 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
   1.196      <!--
   1.197                  COMPILATION SECTION
   1.198              -->
   1.199 @@ -455,6 +593,8 @@
   1.200          <!-- You can override this target in the ../build.xml file. -->
   1.201      </target>
   1.202      <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
   1.203 +    <property name="jspc.schemas" value="/resources/schemas/"/>
   1.204 +    <property name="jspc.dtds" value="/resources/dtds/"/>
   1.205      <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
   1.206          <mkdir dir="${build.generated.dir}/src"/>
   1.207          <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
   1.208 @@ -463,13 +603,16 @@
   1.209              <arg value="-d"/>
   1.210              <arg file="${basedir}/${build.generated.dir}/src"/>
   1.211              <arg value="-die1"/>
   1.212 +            <arg value="-schemas ${jspc.schemas}"/>
   1.213 +            <arg value="-dtds ${jspc.dtds}"/>
   1.214              <arg value="-compilerSourceVM ${javac.source}"/>
   1.215              <arg value="-compilerTargetVM ${javac.target}"/>
   1.216              <arg value="-javaEncoding ${source.encoding}"/>
   1.217 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
   1.218 +            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
   1.219 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
   1.220          </java>
   1.221          <mkdir dir="${build.generated.dir}/classes"/>
   1.222 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
   1.223 +        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
   1.224      </target>
   1.225      <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
   1.226          <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
   1.227 @@ -480,15 +623,18 @@
   1.228              <arg value="-d"/>
   1.229              <arg file="${basedir}/${build.generated.dir}/src"/>
   1.230              <arg value="-die1"/>
   1.231 +            <arg value="-schemas ${jspc.schemas}"/>
   1.232 +            <arg value="-dtds ${jspc.dtds}"/>
   1.233 +            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
   1.234              <arg value="-jspc.files"/>
   1.235              <arg path="${jsp.includes}"/>
   1.236              <arg value="-compilerSourceVM ${javac.source}"/>
   1.237              <arg value="-compilerTargetVM ${javac.target}"/>
   1.238              <arg value="-javaEncoding ${source.encoding}"/>
   1.239 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
   1.240 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
   1.241          </java>
   1.242          <mkdir dir="${build.generated.dir}/classes"/>
   1.243 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
   1.244 +        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
   1.245              <customize>
   1.246                  <patternset includes="${javac.jsp.includes}"/>
   1.247              </customize>
   1.248 @@ -509,28 +655,28 @@
   1.249          <dirname file="${dist.war}" property="dist.jar.dir"/>
   1.250          <mkdir dir="${dist.jar.dir}"/>
   1.251          <jar compress="${jar.compress}" jarfile="${dist.war}">
   1.252 -            <fileset dir="${build.web.dir}"/>
   1.253 +            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
   1.254          </jar>
   1.255      </target>
   1.256      <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
   1.257          <dirname file="${dist.war}" property="dist.jar.dir"/>
   1.258          <mkdir dir="${dist.jar.dir}"/>
   1.259          <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
   1.260 -            <fileset dir="${build.web.dir}"/>
   1.261 +            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
   1.262          </jar>
   1.263      </target>
   1.264      <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
   1.265          <dirname file="${dist.war}" property="dist.jar.dir"/>
   1.266          <mkdir dir="${dist.jar.dir}"/>
   1.267          <jar compress="${jar.compress}" jarfile="${dist.war}">
   1.268 -            <fileset dir="${build.web.dir}"/>
   1.269 +            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
   1.270          </jar>
   1.271      </target>
   1.272      <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
   1.273          <dirname file="${dist.war}" property="dist.jar.dir"/>
   1.274          <mkdir dir="${dist.jar.dir}"/>
   1.275          <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
   1.276 -            <fileset dir="${build.web.dir}"/>
   1.277 +            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
   1.278          </jar>
   1.279      </target>
   1.280      <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
   1.281 @@ -549,7 +695,7 @@
   1.282          <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
   1.283          <mkdir dir="${dist.jar.dir}"/>
   1.284          <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
   1.285 -            <fileset dir="${build.web.dir}"/>
   1.286 +            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
   1.287          </jar>
   1.288      </target>
   1.289      <target name="-post-dist">
   1.290 @@ -581,9 +727,7 @@
   1.291      <target name="-run-deploy-am">
   1.292          <!-- Task to deploy to the Access Manager runtime. -->
   1.293      </target>
   1.294 -    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
   1.295 -        <nbjpdaappreloaded/>
   1.296 -    </target>
   1.297 +    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy,-do-update-breakpoints" name="run-deploy"/>
   1.298      <target if="netbeans.home" name="-run-deploy-nb">
   1.299          <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
   1.300      </target>
   1.301 @@ -669,6 +813,9 @@
   1.302          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.303          <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   1.304      </target>
   1.305 +    <target depends="init" if="netbeans.home" name="-do-update-breakpoints">
   1.306 +        <webproject1:nbjpdaappreloaded/>
   1.307 +    </target>
   1.308      <!--
   1.309                  DEBUGGING SECTION
   1.310              -->
   1.311 @@ -721,9 +868,38 @@
   1.312      </target>
   1.313      <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
   1.314      <!--
   1.315 +            =================
   1.316 +            PROFILING SECTION
   1.317 +            =================
   1.318 +            -->
   1.319 +    <target description="Profile a J2EE project in the IDE." name="profile">
   1.320 +        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
   1.321 +            <isset property="profiler.info.jvmargs.extra"/>
   1.322 +        </condition>
   1.323 +        <antcall target="${profiler.startserver.target}"/>
   1.324 +        <antcall target="run"/>
   1.325 +        <antcall target="start-loadgen"/>
   1.326 +    </target>
   1.327 +    <target name="start-profiled-server">
   1.328 +        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
   1.329 +            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.330 +            <jvmarg value="${profiler.j2ee.agentID}"/>
   1.331 +        </nbstartprofiledserver>
   1.332 +    </target>
   1.333 +    <target name="start-profiled-server-extraargs">
   1.334 +        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
   1.335 +            <jvmarg value="${profiler.info.jvmargs.extra}"/>
   1.336 +            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.337 +            <jvmarg value="${profiler.j2ee.agentID}"/>
   1.338 +        </nbstartprofiledserver>
   1.339 +    </target>
   1.340 +    <target if="profiler.loadgen.path" name="start-loadgen">
   1.341 +        <loadgenstart path="${profiler.loadgen.path}"/>
   1.342 +    </target>
   1.343 +    <!--
   1.344                  JAVADOC SECTION
   1.345              -->
   1.346 -    <target depends="init" name="javadoc-build">
   1.347 +    <target depends="init" if="have.sources" name="javadoc-build">
   1.348          <mkdir dir="${dist.javadoc.dir}"/>
   1.349          <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.350              <classpath>
   1.351 @@ -736,6 +912,14 @@
   1.352                  <include name="**/*.java"/>
   1.353              </fileset>
   1.354          </javadoc>
   1.355 +        <copy todir="${dist.javadoc.dir}">
   1.356 +            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.357 +                <filename name="**/doc-files/**"/>
   1.358 +            </fileset>
   1.359 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.360 +                <include name="**/doc-files/**"/>
   1.361 +            </fileset>
   1.362 +        </copy>
   1.363      </target>
   1.364      <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
   1.365          <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   1.366 @@ -834,10 +1018,39 @@
   1.367      </target>
   1.368      <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
   1.369      <!--
   1.370 +        =========================
   1.371 +        TESTS PROFILING  SECTION
   1.372 +        =========================
   1.373 +        -->
   1.374 +    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
   1.375 +        <nbprofiledirect>
   1.376 +            <classpath>
   1.377 +                <path path="${run.test.classpath}"/>
   1.378 +                <path path="${j2ee.platform.classpath}"/>
   1.379 +            </classpath>
   1.380 +        </nbprofiledirect>
   1.381 +        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
   1.382 +            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
   1.383 +            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.384 +            <jvmarg line="${profiler.info.jvmargs}"/>
   1.385 +            <test name="${profile.class}"/>
   1.386 +            <classpath>
   1.387 +                <path path="${run.test.classpath}"/>
   1.388 +                <path path="${j2ee.platform.classpath}"/>
   1.389 +            </classpath>
   1.390 +            <syspropertyset>
   1.391 +                <propertyref prefix="test-sys-prop."/>
   1.392 +                <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.393 +            </syspropertyset>
   1.394 +            <formatter type="brief" usefile="false"/>
   1.395 +            <formatter type="xml"/>
   1.396 +        </junit>
   1.397 +    </target>
   1.398 +    <!--
   1.399                  
   1.400                  CLEANUP SECTION
   1.401              -->
   1.402 -    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
   1.403 +    <target depends="init" name="deps-clean" unless="no.deps">
   1.404          <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
   1.405      </target>
   1.406      <target depends="init" name="do-clean">