1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml Sun Apr 07 18:39:02 2013 +0200
1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml Mon Nov 09 19:00:45 2020 +0100
1.3 @@ -105,12 +105,24 @@
1.4 <condition property="do.display.browser">
1.5 <istrue value="${display.browser}"/>
1.6 </condition>
1.7 + <condition property="do.display.browser.debug.old">
1.8 + <and>
1.9 + <isset property="do.display.browser"/>
1.10 + <not>
1.11 + <isset property="do.debug.client"/>
1.12 + </not>
1.13 + <not>
1.14 + <isset property="browser.context"/>
1.15 + </not>
1.16 + </and>
1.17 + </condition>
1.18 <condition property="do.display.browser.debug">
1.19 <and>
1.20 <isset property="do.display.browser"/>
1.21 <not>
1.22 <isset property="do.debug.client"/>
1.23 </not>
1.24 + <isset property="browser.context"/>
1.25 </and>
1.26 </condition>
1.27 <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
1.28 @@ -458,7 +470,7 @@
1.29 </fileset>
1.30 </union>
1.31 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
1.32 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-vyuka" testname="TestNG tests" workingDir="${basedir}">
1.33 + <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="sql-vyuka" testname="TestNG tests" workingDir="${basedir}">
1.34 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
1.35 <propertyset>
1.36 <propertyref prefix="test-sys-prop."/>
1.37 @@ -967,28 +979,28 @@
1.38 <dirname file="${dist.war}" property="dist.jar.dir"/>
1.39 <mkdir dir="${dist.jar.dir}"/>
1.40 <jar compress="${jar.compress}" jarfile="${dist.war}">
1.41 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1.42 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
1.43 </jar>
1.44 </target>
1.45 <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
1.46 <dirname file="${dist.war}" property="dist.jar.dir"/>
1.47 <mkdir dir="${dist.jar.dir}"/>
1.48 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
1.49 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1.50 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
1.51 </jar>
1.52 </target>
1.53 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
1.54 <dirname file="${dist.war}" property="dist.jar.dir"/>
1.55 <mkdir dir="${dist.jar.dir}"/>
1.56 <jar compress="${jar.compress}" jarfile="${dist.war}">
1.57 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1.58 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
1.59 </jar>
1.60 </target>
1.61 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
1.62 <dirname file="${dist.war}" property="dist.jar.dir"/>
1.63 <mkdir dir="${dist.jar.dir}"/>
1.64 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
1.65 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1.66 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
1.67 </jar>
1.68 </target>
1.69 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
1.70 @@ -1007,7 +1019,7 @@
1.71 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
1.72 <mkdir dir="${dist.jar.dir}"/>
1.73 <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
1.74 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1.75 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
1.76 </jar>
1.77 </target>
1.78 <target name="-post-dist">
1.79 @@ -1056,17 +1068,31 @@
1.80 <target depends="init,-pre-dist,dist,-post-dist" name="verify">
1.81 <nbverify file="${dist.war}"/>
1.82 </target>
1.83 - <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
1.84 + <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
1.85 <target if="do.display.browser" name="-init-display-browser">
1.86 + <condition property="do.display.browser.nb.old">
1.87 + <and>
1.88 + <isset property="netbeans.home"/>
1.89 + <not>
1.90 + <isset property="browser.context"/>
1.91 + </not>
1.92 + </and>
1.93 + </condition>
1.94 <condition property="do.display.browser.nb">
1.95 - <isset property="netbeans.home"/>
1.96 + <and>
1.97 + <isset property="netbeans.home"/>
1.98 + <isset property="browser.context"/>
1.99 + </and>
1.100 </condition>
1.101 <condition property="do.display.browser.cl">
1.102 <isset property="deploy.ant.enabled"/>
1.103 </condition>
1.104 </target>
1.105 + <target if="do.display.browser.nb.old" name="-display-browser-nb-old">
1.106 + <nbbrowse url="${client.url}"/>
1.107 + </target>
1.108 <target if="do.display.browser.nb" name="-display-browser-nb">
1.109 - <nbbrowse url="${client.url}"/>
1.110 + <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1.111 </target>
1.112 <target if="do.display.browser.cl" name="-get-browser" unless="browser">
1.113 <condition property="browser" value="rundll32">
1.114 @@ -1135,6 +1161,7 @@
1.115 <nbstartserver debugmode="true"/>
1.116 <antcall target="connect-debugger"/>
1.117 <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
1.118 + <antcall target="debug-display-browser-old"/>
1.119 <antcall target="debug-display-browser"/>
1.120 <antcall target="connect-client-debugger"/>
1.121 </target>
1.122 @@ -1151,8 +1178,11 @@
1.123 </sourcepath>
1.124 </nbjpdaconnect>
1.125 </target>
1.126 + <target if="do.display.browser.debug.old" name="debug-display-browser-old">
1.127 + <nbbrowse url="${client.url}"/>
1.128 + </target>
1.129 <target if="do.display.browser.debug" name="debug-display-browser">
1.130 - <nbbrowse url="${client.url}"/>
1.131 + <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1.132 </target>
1.133 <target if="do.debug.client" name="connect-client-debugger">
1.134 <webproject1:nbjsdebugstart webUrl="${client.url}"/>
1.135 @@ -1248,6 +1278,7 @@
1.136 <startprofiler/>
1.137 <nbstartserver profilemode="true"/>
1.138 <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
1.139 + <antcall target="debug-display-browser-old"/>
1.140 <antcall target="debug-display-browser"/>
1.141 <antcall target="-profile-start-loadgen"/>
1.142 </target>
1.143 @@ -1338,7 +1369,7 @@
1.144 <mkdir dir="${build.test.results.dir}"/>
1.145 </target>
1.146 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.147 - <webproject2:test testincludes="**/*Test.java"/>
1.148 + <webproject2:test includes="${includes}" testincludes="**/*Test.java"/>
1.149 </target>
1.150 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.151 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>