1.1 --- a/java/nekurak.net-web/nbproject/build-impl.xml Sun Aug 15 22:20:10 2010 +0200
1.2 +++ b/java/nekurak.net-web/nbproject/build-impl.xml Tue Jul 19 16:30:14 2011 +0200
1.3 @@ -174,8 +174,20 @@
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 @@ -246,7 +258,7 @@
1.26 <property location="${build.dir}/empty" name="empty.dir"/>
1.27 <mkdir dir="${empty.dir}"/>
1.28 <mkdir dir="@{apgeneratedsrcdir}"/>
1.29 - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
1.30 + <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.31 <src>
1.32 <dirset dir="@{gensrcdir}" erroronmissingdir="false">
1.33 <include name="*"/>
1.34 @@ -316,15 +328,18 @@
1.35 <attribute default="${build.classes.dir}" name="destdir"/>
1.36 <sequential>
1.37 <fail unless="javac.includes">Must set javac.includes</fail>
1.38 - <pathconvert pathsep="," property="javac.includes.binary">
1.39 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
1.40 <path>
1.41 <filelist dir="@{destdir}" files="${javac.includes}"/>
1.42 </path>
1.43 <globmapper from="*.java" to="*.class"/>
1.44 </pathconvert>
1.45 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
1.46 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
1.47 <delete>
1.48 - <files includes="${javac.includes.binary}"/>
1.49 + <files includesfile="${javac.includesfile.binary}"/>
1.50 </delete>
1.51 + <delete file="${javac.includesfile.binary}"/>
1.52 </sequential>
1.53 </macrodef>
1.54 </target>
1.55 @@ -350,6 +365,7 @@
1.56 <formatter type="brief" usefile="false"/>
1.57 <formatter type="xml"/>
1.58 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.59 + <jvmarg value="-ea"/>
1.60 <jvmarg line="${runmain.jvmargs}"/>
1.61 </junit>
1.62 </sequential>
1.63 @@ -493,6 +509,19 @@
1.64 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
1.65 <property name="ap.cmd.line.internal" value=""/>
1.66 </target>
1.67 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
1.68 + <target name="-profile-pre-init">
1.69 + <!-- Empty placeholder for easier customization. -->
1.70 + <!-- You can override this target in the ../build.xml file. -->
1.71 + </target>
1.72 + <target name="-profile-post-init">
1.73 + <!-- Empty placeholder for easier customization. -->
1.74 + <!-- You can override this target in the ../build.xml file. -->
1.75 + </target>
1.76 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
1.77 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
1.78 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
1.79 + </target>
1.80 <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.81 <!--
1.82 COMPILATION SECTION
1.83 @@ -562,6 +591,8 @@
1.84 <!-- You can override this target in the ../build.xml file. -->
1.85 </target>
1.86 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
1.87 + <property name="jspc.schemas" value="/resources/schemas/"/>
1.88 + <property name="jspc.dtds" value="/resources/dtds/"/>
1.89 <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
1.90 <mkdir dir="${build.generated.dir}/src"/>
1.91 <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
1.92 @@ -570,9 +601,12 @@
1.93 <arg value="-d"/>
1.94 <arg file="${basedir}/${build.generated.dir}/src"/>
1.95 <arg value="-die1"/>
1.96 + <arg value="-schemas ${jspc.schemas}"/>
1.97 + <arg value="-dtds ${jspc.dtds}"/>
1.98 <arg value="-compilerSourceVM ${javac.source}"/>
1.99 <arg value="-compilerTargetVM ${javac.target}"/>
1.100 <arg value="-javaEncoding ${source.encoding}"/>
1.101 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
1.102 <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
1.103 </java>
1.104 <mkdir dir="${build.generated.dir}/classes"/>
1.105 @@ -587,6 +621,9 @@
1.106 <arg value="-d"/>
1.107 <arg file="${basedir}/${build.generated.dir}/src"/>
1.108 <arg value="-die1"/>
1.109 + <arg value="-schemas ${jspc.schemas}"/>
1.110 + <arg value="-dtds ${jspc.dtds}"/>
1.111 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
1.112 <arg value="-jspc.files"/>
1.113 <arg path="${jsp.includes}"/>
1.114 <arg value="-compilerSourceVM ${javac.source}"/>
1.115 @@ -830,6 +867,35 @@
1.116 </target>
1.117 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
1.118 <!--
1.119 + =================
1.120 + PROFILING SECTION
1.121 + =================
1.122 + -->
1.123 + <target description="Profile a J2EE project in the IDE." name="profile">
1.124 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
1.125 + <isset property="profiler.info.jvmargs.extra"/>
1.126 + </condition>
1.127 + <antcall target="${profiler.startserver.target}"/>
1.128 + <antcall target="run"/>
1.129 + <antcall target="start-loadgen"/>
1.130 + </target>
1.131 + <target name="start-profiled-server">
1.132 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
1.133 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.134 + <jvmarg value="${profiler.j2ee.agentID}"/>
1.135 + </nbstartprofiledserver>
1.136 + </target>
1.137 + <target name="start-profiled-server-extraargs">
1.138 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
1.139 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
1.140 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.141 + <jvmarg value="${profiler.j2ee.agentID}"/>
1.142 + </nbstartprofiledserver>
1.143 + </target>
1.144 + <target if="profiler.loadgen.path" name="start-loadgen">
1.145 + <loadgenstart path="${profiler.loadgen.path}"/>
1.146 + </target>
1.147 + <!--
1.148 JAVADOC SECTION
1.149 -->
1.150 <target depends="init" if="have.sources" name="javadoc-build">
1.151 @@ -951,6 +1017,35 @@
1.152 </target>
1.153 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
1.154 <!--
1.155 + =========================
1.156 + TESTS PROFILING SECTION
1.157 + =========================
1.158 + -->
1.159 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
1.160 + <nbprofiledirect>
1.161 + <classpath>
1.162 + <path path="${run.test.classpath}"/>
1.163 + <path path="${j2ee.platform.classpath}"/>
1.164 + </classpath>
1.165 + </nbprofiledirect>
1.166 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
1.167 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
1.168 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.169 + <jvmarg line="${profiler.info.jvmargs}"/>
1.170 + <test name="${profile.class}"/>
1.171 + <classpath>
1.172 + <path path="${run.test.classpath}"/>
1.173 + <path path="${j2ee.platform.classpath}"/>
1.174 + </classpath>
1.175 + <syspropertyset>
1.176 + <propertyref prefix="test-sys-prop."/>
1.177 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.178 + </syspropertyset>
1.179 + <formatter type="brief" usefile="false"/>
1.180 + <formatter type="xml"/>
1.181 + </junit>
1.182 + </target>
1.183 + <!--
1.184
1.185 CLEANUP SECTION
1.186 -->