nbproject
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sun, 07 Apr 2013 18:39:02 +0200
changeset 82956501cb9ec8
parent 81 6fb319847482
child 83 6569976087aa
nbproject
java/sql-vyuka/nbproject/build-impl.xml
java/sql-vyuka/nbproject/genfiles.properties
java/sql-vyuka/nbproject/project.properties
     1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml	Sun Apr 07 18:38:36 2013 +0200
     1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml	Sun Apr 07 18:39:02 2013 +0200
     1.3 @@ -11,9 +11,9 @@
     1.4          - execution
     1.5          - debugging
     1.6          - javadoc
     1.7 -        - junit compilation
     1.8 -        - junit execution
     1.9 -        - junit debugging
    1.10 +        - test compilation
    1.11 +        - test execution
    1.12 +        - test debugging
    1.13          - cleanup
    1.14  
    1.15          -->
    1.16 @@ -187,6 +187,27 @@
    1.17              </and>
    1.18          </condition>
    1.19          <property name="javac.fork" value="${jdkBug6558476}"/>
    1.20 +        <condition property="junit.available">
    1.21 +            <or>
    1.22 +                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
    1.23 +                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
    1.24 +            </or>
    1.25 +        </condition>
    1.26 +        <condition property="testng.available">
    1.27 +            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
    1.28 +        </condition>
    1.29 +        <condition property="junit+testng.available">
    1.30 +            <and>
    1.31 +                <istrue value="${junit.available}"/>
    1.32 +                <istrue value="${testng.available}"/>
    1.33 +            </and>
    1.34 +        </condition>
    1.35 +        <condition else="testng" property="testng.mode" value="mixed">
    1.36 +            <istrue value="${junit+testng.available}"/>
    1.37 +        </condition>
    1.38 +        <condition else="" property="testng.debug.mode" value="-mixed">
    1.39 +            <istrue value="${junit+testng.available}"/>
    1.40 +        </condition>
    1.41      </target>
    1.42      <target depends="init" name="-init-cos" unless="deploy.on.save">
    1.43          <condition property="deploy.on.save" value="true">
    1.44 @@ -345,34 +366,319 @@
    1.45              </sequential>
    1.46          </macrodef>
    1.47      </target>
    1.48 -    <target name="-init-macrodef-junit">
    1.49 +    <target if="${junit.available}" name="-init-macrodef-junit-init">
    1.50 +        <condition else="false" property="nb.junit.batch" value="true">
    1.51 +            <and>
    1.52 +                <istrue value="${junit.available}"/>
    1.53 +                <not>
    1.54 +                    <isset property="test.method"/>
    1.55 +                </not>
    1.56 +            </and>
    1.57 +        </condition>
    1.58 +        <condition else="false" property="nb.junit.single" value="true">
    1.59 +            <and>
    1.60 +                <istrue value="${junit.available}"/>
    1.61 +                <isset property="test.method"/>
    1.62 +            </and>
    1.63 +        </condition>
    1.64 +    </target>
    1.65 +    <target name="-init-test-properties">
    1.66 +        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
    1.67 +        <property name="test.binarytestincludes" value=""/>
    1.68 +        <property name="test.binaryexcludes" value=""/>
    1.69 +    </target>
    1.70 +    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
    1.71          <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
    1.72              <attribute default="${includes}" name="includes"/>
    1.73              <attribute default="${excludes}" name="excludes"/>
    1.74              <attribute default="**" name="testincludes"/>
    1.75 +            <attribute default="" name="testmethods"/>
    1.76 +            <element name="customize" optional="true"/>
    1.77              <sequential>
    1.78                  <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
    1.79 -                    <batchtest todir="${build.test.results.dir}">
    1.80 -                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    1.81 -                            <filename name="@{testincludes}"/>
    1.82 -                        </fileset>
    1.83 -                    </batchtest>
    1.84 -                    <classpath>
    1.85 -                        <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
    1.86 -                    </classpath>
    1.87 +                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
    1.88                      <syspropertyset>
    1.89                          <propertyref prefix="test-sys-prop."/>
    1.90                          <mapper from="test-sys-prop.*" to="*" type="glob"/>
    1.91                      </syspropertyset>
    1.92                      <formatter type="brief" usefile="false"/>
    1.93                      <formatter type="xml"/>
    1.94 -                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.95                      <jvmarg value="-ea"/>
    1.96 -                    <jvmarg line="${runmain.jvmargs}"/>
    1.97 +                    <customize/>
    1.98                  </junit>
    1.99              </sequential>
   1.100          </macrodef>
   1.101      </target>
   1.102 +    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
   1.103 +        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
   1.104 +            <attribute default="${includes}" name="includes"/>
   1.105 +            <attribute default="${excludes}" name="excludes"/>
   1.106 +            <attribute default="**" name="testincludes"/>
   1.107 +            <attribute default="" name="testmethods"/>
   1.108 +            <element name="customize" optional="true"/>
   1.109 +            <sequential>
   1.110 +                <property name="run.jvmargs.ide" value=""/>
   1.111 +                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
   1.112 +                    <batchtest todir="${build.test.results.dir}">
   1.113 +                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.114 +                            <filename name="@{testincludes}"/>
   1.115 +                        </fileset>
   1.116 +                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
   1.117 +                            <filename name="${test.binarytestincludes}"/>
   1.118 +                        </fileset>
   1.119 +                    </batchtest>
   1.120 +                    <syspropertyset>
   1.121 +                        <propertyref prefix="test-sys-prop."/>
   1.122 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.123 +                    </syspropertyset>
   1.124 +                    <formatter type="brief" usefile="false"/>
   1.125 +                    <formatter type="xml"/>
   1.126 +                    <jvmarg value="-ea"/>
   1.127 +                    <jvmarg line="${run.jvmargs.ide}"/>
   1.128 +                    <customize/>
   1.129 +                </junit>
   1.130 +            </sequential>
   1.131 +        </macrodef>
   1.132 +    </target>
   1.133 +    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
   1.134 +    <target if="${testng.available}" name="-init-macrodef-testng">
   1.135 +        <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2">
   1.136 +            <attribute default="${includes}" name="includes"/>
   1.137 +            <attribute default="${excludes}" name="excludes"/>
   1.138 +            <attribute default="**" name="testincludes"/>
   1.139 +            <attribute default="" name="testmethods"/>
   1.140 +            <element name="customize" optional="true"/>
   1.141 +            <sequential>
   1.142 +                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
   1.143 +                    <isset property="test.method"/>
   1.144 +                </condition>
   1.145 +                <union id="test.set">
   1.146 +                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
   1.147 +                        <filename name="@{testincludes}"/>
   1.148 +                    </fileset>
   1.149 +                </union>
   1.150 +                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
   1.151 +                <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.152 +                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
   1.153 +                    <propertyset>
   1.154 +                        <propertyref prefix="test-sys-prop."/>
   1.155 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.156 +                    </propertyset>
   1.157 +                    <customize/>
   1.158 +                </testng>
   1.159 +            </sequential>
   1.160 +        </macrodef>
   1.161 +    </target>
   1.162 +    <target name="-init-macrodef-test-impl">
   1.163 +        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
   1.164 +            <attribute default="${includes}" name="includes"/>
   1.165 +            <attribute default="${excludes}" name="excludes"/>
   1.166 +            <attribute default="**" name="testincludes"/>
   1.167 +            <attribute default="" name="testmethods"/>
   1.168 +            <element implicit="true" name="customize" optional="true"/>
   1.169 +            <sequential>
   1.170 +                <echo>No tests executed.</echo>
   1.171 +            </sequential>
   1.172 +        </macrodef>
   1.173 +    </target>
   1.174 +    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
   1.175 +        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
   1.176 +            <attribute default="${includes}" name="includes"/>
   1.177 +            <attribute default="${excludes}" name="excludes"/>
   1.178 +            <attribute default="**" name="testincludes"/>
   1.179 +            <attribute default="" name="testmethods"/>
   1.180 +            <element implicit="true" name="customize" optional="true"/>
   1.181 +            <sequential>
   1.182 +                <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.183 +                    <customize/>
   1.184 +                </webproject2:junit>
   1.185 +            </sequential>
   1.186 +        </macrodef>
   1.187 +    </target>
   1.188 +    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
   1.189 +        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
   1.190 +            <attribute default="${includes}" name="includes"/>
   1.191 +            <attribute default="${excludes}" name="excludes"/>
   1.192 +            <attribute default="**" name="testincludes"/>
   1.193 +            <attribute default="" name="testmethods"/>
   1.194 +            <element implicit="true" name="customize" optional="true"/>
   1.195 +            <sequential>
   1.196 +                <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.197 +                    <customize/>
   1.198 +                </webproject2:testng>
   1.199 +            </sequential>
   1.200 +        </macrodef>
   1.201 +    </target>
   1.202 +    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
   1.203 +        <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2">
   1.204 +            <attribute default="${includes}" name="includes"/>
   1.205 +            <attribute default="${excludes}" name="excludes"/>
   1.206 +            <attribute default="**" name="testincludes"/>
   1.207 +            <attribute default="" name="testmethods"/>
   1.208 +            <sequential>
   1.209 +                <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.210 +                    <customize>
   1.211 +                        <classpath>
   1.212 +                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
   1.213 +                        </classpath>
   1.214 +                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.215 +                        <jvmarg line="${runmain.jvmargs}"/>
   1.216 +                    </customize>
   1.217 +                </webproject2:test-impl>
   1.218 +            </sequential>
   1.219 +        </macrodef>
   1.220 +    </target>
   1.221 +    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
   1.222 +        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
   1.223 +            <attribute default="${includes}" name="includes"/>
   1.224 +            <attribute default="${excludes}" name="excludes"/>
   1.225 +            <attribute default="**" name="testincludes"/>
   1.226 +            <attribute default="" name="testmethods"/>
   1.227 +            <element name="customize" optional="true"/>
   1.228 +            <sequential>
   1.229 +                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
   1.230 +                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
   1.231 +                    <syspropertyset>
   1.232 +                        <propertyref prefix="test-sys-prop."/>
   1.233 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.234 +                    </syspropertyset>
   1.235 +                    <formatter type="brief" usefile="false"/>
   1.236 +                    <formatter type="xml"/>
   1.237 +                    <jvmarg value="-ea"/>
   1.238 +                    <jvmarg line="${debug-args-line}"/>
   1.239 +                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.240 +                    <customize/>
   1.241 +                </junit>
   1.242 +            </sequential>
   1.243 +        </macrodef>
   1.244 +    </target>
   1.245 +    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
   1.246 +        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
   1.247 +            <attribute default="${includes}" name="includes"/>
   1.248 +            <attribute default="${excludes}" name="excludes"/>
   1.249 +            <attribute default="**" name="testincludes"/>
   1.250 +            <attribute default="" name="testmethods"/>
   1.251 +            <element name="customize" optional="true"/>
   1.252 +            <sequential>
   1.253 +                <property name="run.jvmargs.ide" value=""/>
   1.254 +                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
   1.255 +                    <batchtest todir="${build.test.results.dir}">
   1.256 +                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.257 +                            <filename name="@{testincludes}"/>
   1.258 +                        </fileset>
   1.259 +                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
   1.260 +                            <filename name="${test.binarytestincludes}"/>
   1.261 +                        </fileset>
   1.262 +                    </batchtest>
   1.263 +                    <syspropertyset>
   1.264 +                        <propertyref prefix="test-sys-prop."/>
   1.265 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.266 +                    </syspropertyset>
   1.267 +                    <formatter type="brief" usefile="false"/>
   1.268 +                    <formatter type="xml"/>
   1.269 +                    <jvmarg value="-ea"/>
   1.270 +                    <jvmarg line="${run.jvmargs.ide}"/>
   1.271 +                    <jvmarg line="${debug-args-line}"/>
   1.272 +                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.273 +                    <customize/>
   1.274 +                </junit>
   1.275 +            </sequential>
   1.276 +        </macrodef>
   1.277 +    </target>
   1.278 +    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
   1.279 +        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
   1.280 +            <attribute default="${includes}" name="includes"/>
   1.281 +            <attribute default="${excludes}" name="excludes"/>
   1.282 +            <attribute default="**" name="testincludes"/>
   1.283 +            <attribute default="" name="testmethods"/>
   1.284 +            <element implicit="true" name="customize" optional="true"/>
   1.285 +            <sequential>
   1.286 +                <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.287 +                    <customize/>
   1.288 +                </webproject2:junit-debug>
   1.289 +            </sequential>
   1.290 +        </macrodef>
   1.291 +    </target>
   1.292 +    <target if="${testng.available}" name="-init-macrodef-testng-debug">
   1.293 +        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2">
   1.294 +            <attribute default="${main.class}" name="testClass"/>
   1.295 +            <attribute default="" name="testMethod"/>
   1.296 +            <element name="customize2" optional="true"/>
   1.297 +            <sequential>
   1.298 +                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
   1.299 +                    <isset property="test.method"/>
   1.300 +                </condition>
   1.301 +                <condition else="-suitename sql-vyuka -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
   1.302 +                    <matches pattern=".*\.xml" string="@{testClass}"/>
   1.303 +                </condition>
   1.304 +                <delete dir="${build.test.results.dir}" quiet="true"/>
   1.305 +                <mkdir dir="${build.test.results.dir}"/>
   1.306 +                <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
   1.307 +                    <customize>
   1.308 +                        <customize2/>
   1.309 +                        <jvmarg value="-ea"/>
   1.310 +                        <arg line="${testng.debug.mode}"/>
   1.311 +                        <arg line="-d ${build.test.results.dir}"/>
   1.312 +                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
   1.313 +                    </customize>
   1.314 +                </webproject1:debug>
   1.315 +            </sequential>
   1.316 +        </macrodef>
   1.317 +    </target>
   1.318 +    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
   1.319 +        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
   1.320 +            <attribute default="${main.class}" name="testClass"/>
   1.321 +            <attribute default="" name="testMethod"/>
   1.322 +            <element implicit="true" name="customize2" optional="true"/>
   1.323 +            <sequential>
   1.324 +                <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
   1.325 +                    <customize2/>
   1.326 +                </webproject2:testng-debug>
   1.327 +            </sequential>
   1.328 +        </macrodef>
   1.329 +    </target>
   1.330 +    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
   1.331 +        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
   1.332 +            <attribute default="${includes}" name="includes"/>
   1.333 +            <attribute default="${excludes}" name="excludes"/>
   1.334 +            <attribute default="**" name="testincludes"/>
   1.335 +            <attribute default="" name="testmethods"/>
   1.336 +            <attribute default="${main.class}" name="testClass"/>
   1.337 +            <attribute default="" name="testMethod"/>
   1.338 +            <sequential>
   1.339 +                <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.340 +                    <customize>
   1.341 +                        <classpath>
   1.342 +                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
   1.343 +                        </classpath>
   1.344 +                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.345 +                        <jvmarg line="${runmain.jvmargs}"/>
   1.346 +                    </customize>
   1.347 +                </webproject2:test-debug-impl>
   1.348 +            </sequential>
   1.349 +        </macrodef>
   1.350 +    </target>
   1.351 +    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
   1.352 +        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
   1.353 +            <attribute default="${includes}" name="includes"/>
   1.354 +            <attribute default="${excludes}" name="excludes"/>
   1.355 +            <attribute default="**" name="testincludes"/>
   1.356 +            <attribute default="" name="testmethods"/>
   1.357 +            <attribute default="${main.class}" name="testClass"/>
   1.358 +            <attribute default="" name="testMethod"/>
   1.359 +            <sequential>
   1.360 +                <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
   1.361 +                    <customize2>
   1.362 +                        <syspropertyset>
   1.363 +                            <propertyref prefix="test-sys-prop."/>
   1.364 +                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.365 +                        </syspropertyset>
   1.366 +                    </customize2>
   1.367 +                </webproject2:testng-debug-impl>
   1.368 +            </sequential>
   1.369 +        </macrodef>
   1.370 +    </target>
   1.371 +    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
   1.372      <target name="-init-macrodef-java">
   1.373          <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
   1.374              <attribute default="${main.class}" name="classname"/>
   1.375 @@ -511,20 +817,26 @@
   1.376      <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   1.377          <property name="ap.cmd.line.internal" value=""/>
   1.378      </target>
   1.379 -    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
   1.380 -    <target name="-profile-pre-init">
   1.381 +    <!--
   1.382 +                pre NB7.2 profiling section; consider it deprecated
   1.383 +            -->
   1.384 +    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
   1.385 +    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
   1.386          <!-- Empty placeholder for easier customization. -->
   1.387          <!-- You can override this target in the ../build.xml file. -->
   1.388      </target>
   1.389 -    <target name="-profile-post-init">
   1.390 +    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
   1.391          <!-- Empty placeholder for easier customization. -->
   1.392          <!-- You can override this target in the ../build.xml file. -->
   1.393      </target>
   1.394 -    <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
   1.395 +    <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check">
   1.396          <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
   1.397          <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
   1.398      </target>
   1.399 -    <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.400 +    <!--
   1.401 +                end of pre NB7.2 profiling section
   1.402 +            -->
   1.403 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
   1.404      <!--
   1.405                  COMPILATION SECTION
   1.406              -->
   1.407 @@ -569,7 +881,7 @@
   1.408      <target if="has.persistence.xml" name="-copy-persistence-xml">
   1.409          <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
   1.410          <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
   1.411 -            <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
   1.412 +            <fileset dir="${persistence.xml.dir}" includes="persistence.xml orm.xml"/>
   1.413          </copy>
   1.414      </target>
   1.415      <target name="-post-compile">
   1.416 @@ -827,7 +1139,10 @@
   1.417          <antcall target="connect-client-debugger"/>
   1.418      </target>
   1.419      <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
   1.420 -        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
   1.421 +        <condition property="listeningcp" value="sourcepath">
   1.422 +            <istrue value="${j2ee.compile.on.save}"/>
   1.423 +        </condition>
   1.424 +        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}">
   1.425              <classpath>
   1.426                  <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
   1.427              </classpath>
   1.428 @@ -872,28 +1187,79 @@
   1.429              PROFILING SECTION
   1.430              =================
   1.431              -->
   1.432 -    <target description="Profile a J2EE project in the IDE." name="profile">
   1.433 +    <!--
   1.434 +                pre NB7.2 profiling section; consider it deprecated
   1.435 +            -->
   1.436 +    <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
   1.437          <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
   1.438              <isset property="profiler.info.jvmargs.extra"/>
   1.439          </condition>
   1.440          <antcall target="${profiler.startserver.target}"/>
   1.441          <antcall target="run"/>
   1.442 -        <antcall target="start-loadgen"/>
   1.443 +        <antcall target="-profile-start-loadgen"/>
   1.444      </target>
   1.445 -    <target name="start-profiled-server">
   1.446 +    <target if="profiler.info.jvmargs.agent" name="start-profiled-server">
   1.447          <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
   1.448              <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.449              <jvmarg value="${profiler.j2ee.agentID}"/>
   1.450          </nbstartprofiledserver>
   1.451      </target>
   1.452 -    <target name="start-profiled-server-extraargs">
   1.453 +    <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs">
   1.454          <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
   1.455              <jvmarg value="${profiler.info.jvmargs.extra}"/>
   1.456              <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.457              <jvmarg value="${profiler.j2ee.agentID}"/>
   1.458          </nbstartprofiledserver>
   1.459      </target>
   1.460 -    <target if="profiler.loadgen.path" name="start-loadgen">
   1.461 +    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
   1.462 +        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
   1.463 +        <nbprofiledirect>
   1.464 +            <classpath>
   1.465 +                <path path="${run.test.classpath}"/>
   1.466 +                <path path="${j2ee.platform.classpath}"/>
   1.467 +            </classpath>
   1.468 +        </nbprofiledirect>
   1.469 +        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
   1.470 +            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
   1.471 +            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.472 +            <jvmarg line="${profiler.info.jvmargs}"/>
   1.473 +            <test name="${profile.class}"/>
   1.474 +            <classpath>
   1.475 +                <path path="${run.test.classpath}"/>
   1.476 +                <path path="${j2ee.platform.classpath}"/>
   1.477 +            </classpath>
   1.478 +            <syspropertyset>
   1.479 +                <propertyref prefix="test-sys-prop."/>
   1.480 +                <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.481 +            </syspropertyset>
   1.482 +            <formatter type="brief" usefile="false"/>
   1.483 +            <formatter type="xml"/>
   1.484 +        </junit>
   1.485 +    </target>
   1.486 +    <target if="netbeans.home" name="-profile-check">
   1.487 +        <condition property="profiler.configured">
   1.488 +            <or>
   1.489 +                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
   1.490 +                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
   1.491 +            </or>
   1.492 +        </condition>
   1.493 +    </target>
   1.494 +    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" name="-do-profile">
   1.495 +        <startprofiler/>
   1.496 +        <nbstartserver profilemode="true"/>
   1.497 +        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
   1.498 +        <antcall target="debug-display-browser"/>
   1.499 +        <antcall target="-profile-start-loadgen"/>
   1.500 +    </target>
   1.501 +    <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
   1.502 +        <antcall target="-do-profile"/>
   1.503 +    </target>
   1.504 +    <target depends="-profile-test-single-pre72" name="profile-test-single"/>
   1.505 +    <target depends="-profile-check" if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs.agent">
   1.506 +        <startprofiler/>
   1.507 +        <antcall target="test-single"/>
   1.508 +    </target>
   1.509 +    <target if="profiler.loadgen.path" name="-profile-start-loadgen">
   1.510          <loadgenstart path="${profiler.loadgen.path}"/>
   1.511      </target>
   1.512      <!--
   1.513 @@ -927,7 +1293,7 @@
   1.514      <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
   1.515      <!--
   1.516                  
   1.517 -                JUNIT COMPILATION SECTION
   1.518 +                TEST COMPILATION SECTION
   1.519              -->
   1.520      <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
   1.521          <mkdir dir="${build.test.classes.dir}"/>
   1.522 @@ -966,13 +1332,13 @@
   1.523      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
   1.524      <!--
   1.525                  
   1.526 -                JUNIT EXECUTION SECTION
   1.527 +                TEST EXECUTION SECTION
   1.528              -->
   1.529      <target depends="init" if="have.tests" name="-pre-test-run">
   1.530          <mkdir dir="${build.test.results.dir}"/>
   1.531      </target>
   1.532      <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
   1.533 -        <webproject2:junit testincludes="**/*Test.java"/>
   1.534 +        <webproject2:test testincludes="**/*Test.java"/>
   1.535      </target>
   1.536      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.537          <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.538 @@ -985,68 +1351,44 @@
   1.539      </target>
   1.540      <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
   1.541          <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
   1.542 -        <webproject2:junit excludes="" includes="${test.includes}"/>
   1.543 +        <webproject2:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
   1.544      </target>
   1.545      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   1.546          <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.547      </target>
   1.548      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   1.549 +    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
   1.550 +        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
   1.551 +        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
   1.552 +        <webproject2:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
   1.553 +    </target>
   1.554 +    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
   1.555 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.556 +    </target>
   1.557 +    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
   1.558      <!--
   1.559                  
   1.560 -                JUNIT DEBUGGING SECTION
   1.561 +                TEST DEBUGGING SECTION
   1.562              -->
   1.563 -    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
   1.564 +    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
   1.565          <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
   1.566 -        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
   1.567 -        <delete file="${test.report.file}"/>
   1.568 -        <!-- must exist, otherwise the XML formatter would fail -->
   1.569 -        <mkdir dir="${build.test.results.dir}"/>
   1.570 -        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
   1.571 -            <customize>
   1.572 -                <arg value="showoutput=true"/>
   1.573 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
   1.574 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
   1.575 -            </customize>
   1.576 -        </webproject1:debug>
   1.577 +        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
   1.578 +    </target>
   1.579 +    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
   1.580 +        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
   1.581 +        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
   1.582 +        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
   1.583      </target>
   1.584      <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
   1.585          <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
   1.586      </target>
   1.587      <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   1.588 +    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
   1.589      <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
   1.590          <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
   1.591      </target>
   1.592      <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
   1.593      <!--
   1.594 -        =========================
   1.595 -        TESTS PROFILING  SECTION
   1.596 -        =========================
   1.597 -        -->
   1.598 -    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
   1.599 -        <nbprofiledirect>
   1.600 -            <classpath>
   1.601 -                <path path="${run.test.classpath}"/>
   1.602 -                <path path="${j2ee.platform.classpath}"/>
   1.603 -            </classpath>
   1.604 -        </nbprofiledirect>
   1.605 -        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
   1.606 -            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
   1.607 -            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.608 -            <jvmarg line="${profiler.info.jvmargs}"/>
   1.609 -            <test name="${profile.class}"/>
   1.610 -            <classpath>
   1.611 -                <path path="${run.test.classpath}"/>
   1.612 -                <path path="${j2ee.platform.classpath}"/>
   1.613 -            </classpath>
   1.614 -            <syspropertyset>
   1.615 -                <propertyref prefix="test-sys-prop."/>
   1.616 -                <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.617 -            </syspropertyset>
   1.618 -            <formatter type="brief" usefile="false"/>
   1.619 -            <formatter type="xml"/>
   1.620 -        </junit>
   1.621 -    </target>
   1.622 -    <!--
   1.623                  
   1.624                  CLEANUP SECTION
   1.625              -->
     2.1 --- a/java/sql-vyuka/nbproject/genfiles.properties	Sun Apr 07 18:38:36 2013 +0200
     2.2 +++ b/java/sql-vyuka/nbproject/genfiles.properties	Sun Apr 07 18:39:02 2013 +0200
     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=3f9299bb
     2.7 -nbproject/build-impl.xml.script.CRC32=6d1d7d3b
     2.8 -nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1
     2.9 +nbproject/build-impl.xml.script.CRC32=7e55c0e0
    2.10 +nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.41.1.1
     3.1 --- a/java/sql-vyuka/nbproject/project.properties	Sun Apr 07 18:38:36 2013 +0200
     3.2 +++ b/java/sql-vyuka/nbproject/project.properties	Sun Apr 07 18:39:02 2013 +0200
     3.3 @@ -27,9 +27,10 @@
     3.4  excludes=
     3.5  includes=**
     3.6  j2ee.compile.on.save=false
     3.7 +j2ee.copy.static.files.on.save=false
     3.8  j2ee.deploy.on.save=false
     3.9  j2ee.platform=1.5
    3.10 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar
    3.11 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar
    3.12  j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
    3.13  j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
    3.14  j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar