Changeset 82:956501cb9ec8

Show
Ignore:
Timestamp:
04/07/13 18:39:02 (12 years ago)
Author:
František Kučera <franta-hg@…>
Branch:
default
Message:

nbproject

Location:
java/sql-vyuka/nbproject
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • java/sql-vyuka/nbproject/build-impl.xml

    r79 r82  
    1212        - debugging 
    1313        - javadoc 
    14         - junit compilation 
    15         - junit execution 
    16         - junit debugging 
     14        - test compilation 
     15        - test execution 
     16        - test debugging 
    1717        - cleanup 
    1818 
    … …  
    188188        </condition> 
    189189        <property name="javac.fork" value="${jdkBug6558476}"/> 
     190        <condition property="junit.available"> 
     191            <or> 
     192                <available classname="org.junit.Test" classpath="${run.test.classpath}"/> 
     193                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/> 
     194            </or> 
     195        </condition> 
     196        <condition property="testng.available"> 
     197            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/> 
     198        </condition> 
     199        <condition property="junit+testng.available"> 
     200            <and> 
     201                <istrue value="${junit.available}"/> 
     202                <istrue value="${testng.available}"/> 
     203            </and> 
     204        </condition> 
     205        <condition else="testng" property="testng.mode" value="mixed"> 
     206            <istrue value="${junit+testng.available}"/> 
     207        </condition> 
     208        <condition else="" property="testng.debug.mode" value="-mixed"> 
     209            <istrue value="${junit+testng.available}"/> 
     210        </condition> 
    190211    </target> 
    191212    <target depends="init" name="-init-cos" unless="deploy.on.save"> 
    … …  
    346367        </macrodef> 
    347368    </target> 
    348     <target name="-init-macrodef-junit"> 
     369    <target if="${junit.available}" name="-init-macrodef-junit-init"> 
     370        <condition else="false" property="nb.junit.batch" value="true"> 
     371            <and> 
     372                <istrue value="${junit.available}"/> 
     373                <not> 
     374                    <isset property="test.method"/> 
     375                </not> 
     376            </and> 
     377        </condition> 
     378        <condition else="false" property="nb.junit.single" value="true"> 
     379            <and> 
     380                <istrue value="${junit.available}"/> 
     381                <isset property="test.method"/> 
     382            </and> 
     383        </condition> 
     384    </target> 
     385    <target name="-init-test-properties"> 
     386        <property name="test.binaryincludes" value="&lt;nothing&gt;"/> 
     387        <property name="test.binarytestincludes" value=""/> 
     388        <property name="test.binaryexcludes" value=""/> 
     389    </target> 
     390    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> 
    349391        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 
    350392            <attribute default="${includes}" name="includes"/> 
    351393            <attribute default="${excludes}" name="excludes"/> 
    352394            <attribute default="**" name="testincludes"/> 
     395            <attribute default="" name="testmethods"/> 
     396            <element name="customize" optional="true"/> 
    353397            <sequential> 
    354398                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 
    355                     <batchtest todir="${build.test.results.dir}"> 
    356                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    357                             <filename name="@{testincludes}"/> 
    358                         </fileset> 
    359                     </batchtest> 
    360                     <classpath> 
    361                         <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
    362                     </classpath> 
     399                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
    363400                    <syspropertyset> 
    364401                        <propertyref prefix="test-sys-prop."/> 
    … …  
    367404                    <formatter type="brief" usefile="false"/> 
    368405                    <formatter type="xml"/> 
    369                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    370406                    <jvmarg value="-ea"/> 
    371                     <jvmarg line="${runmain.jvmargs}"/> 
     407                    <customize/> 
    372408                </junit> 
    373409            </sequential> 
    374410        </macrodef> 
    375411    </target> 
     412    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> 
     413        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 
     414            <attribute default="${includes}" name="includes"/> 
     415            <attribute default="${excludes}" name="excludes"/> 
     416            <attribute default="**" name="testincludes"/> 
     417            <attribute default="" name="testmethods"/> 
     418            <element name="customize" optional="true"/> 
     419            <sequential> 
     420                <property name="run.jvmargs.ide" value=""/> 
     421                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 
     422                    <batchtest todir="${build.test.results.dir}"> 
     423                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
     424                            <filename name="@{testincludes}"/> 
     425                        </fileset> 
     426                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> 
     427                            <filename name="${test.binarytestincludes}"/> 
     428                        </fileset> 
     429                    </batchtest> 
     430                    <syspropertyset> 
     431                        <propertyref prefix="test-sys-prop."/> 
     432                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     433                    </syspropertyset> 
     434                    <formatter type="brief" usefile="false"/> 
     435                    <formatter type="xml"/> 
     436                    <jvmarg value="-ea"/> 
     437                    <jvmarg line="${run.jvmargs.ide}"/> 
     438                    <customize/> 
     439                </junit> 
     440            </sequential> 
     441        </macrodef> 
     442    </target> 
     443    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/> 
     444    <target if="${testng.available}" name="-init-macrodef-testng"> 
     445        <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2"> 
     446            <attribute default="${includes}" name="includes"/> 
     447            <attribute default="${excludes}" name="excludes"/> 
     448            <attribute default="**" name="testincludes"/> 
     449            <attribute default="" name="testmethods"/> 
     450            <element name="customize" optional="true"/> 
     451            <sequential> 
     452                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}"> 
     453                    <isset property="test.method"/> 
     454                </condition> 
     455                <union id="test.set"> 
     456                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> 
     457                        <filename name="@{testincludes}"/> 
     458                    </fileset> 
     459                </union> 
     460                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
     461                <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}"> 
     462                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
     463                    <propertyset> 
     464                        <propertyref prefix="test-sys-prop."/> 
     465                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     466                    </propertyset> 
     467                    <customize/> 
     468                </testng> 
     469            </sequential> 
     470        </macrodef> 
     471    </target> 
     472    <target name="-init-macrodef-test-impl"> 
     473        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     474            <attribute default="${includes}" name="includes"/> 
     475            <attribute default="${excludes}" name="excludes"/> 
     476            <attribute default="**" name="testincludes"/> 
     477            <attribute default="" name="testmethods"/> 
     478            <element implicit="true" name="customize" optional="true"/> 
     479            <sequential> 
     480                <echo>No tests executed.</echo> 
     481            </sequential> 
     482        </macrodef> 
     483    </target> 
     484    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl"> 
     485        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     486            <attribute default="${includes}" name="includes"/> 
     487            <attribute default="${excludes}" name="excludes"/> 
     488            <attribute default="**" name="testincludes"/> 
     489            <attribute default="" name="testmethods"/> 
     490            <element implicit="true" name="customize" optional="true"/> 
     491            <sequential> 
     492                <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     493                    <customize/> 
     494                </webproject2:junit> 
     495            </sequential> 
     496        </macrodef> 
     497    </target> 
     498    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl"> 
     499        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     500            <attribute default="${includes}" name="includes"/> 
     501            <attribute default="${excludes}" name="excludes"/> 
     502            <attribute default="**" name="testincludes"/> 
     503            <attribute default="" name="testmethods"/> 
     504            <element implicit="true" name="customize" optional="true"/> 
     505            <sequential> 
     506                <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     507                    <customize/> 
     508                </webproject2:testng> 
     509            </sequential> 
     510        </macrodef> 
     511    </target> 
     512    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test"> 
     513        <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2"> 
     514            <attribute default="${includes}" name="includes"/> 
     515            <attribute default="${excludes}" name="excludes"/> 
     516            <attribute default="**" name="testincludes"/> 
     517            <attribute default="" name="testmethods"/> 
     518            <sequential> 
     519                <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     520                    <customize> 
     521                        <classpath> 
     522                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
     523                        </classpath> 
     524                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     525                        <jvmarg line="${runmain.jvmargs}"/> 
     526                    </customize> 
     527                </webproject2:test-impl> 
     528            </sequential> 
     529        </macrodef> 
     530    </target> 
     531    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}"> 
     532        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     533            <attribute default="${includes}" name="includes"/> 
     534            <attribute default="${excludes}" name="excludes"/> 
     535            <attribute default="**" name="testincludes"/> 
     536            <attribute default="" name="testmethods"/> 
     537            <element name="customize" optional="true"/> 
     538            <sequential> 
     539                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 
     540                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
     541                    <syspropertyset> 
     542                        <propertyref prefix="test-sys-prop."/> 
     543                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     544                    </syspropertyset> 
     545                    <formatter type="brief" usefile="false"/> 
     546                    <formatter type="xml"/> 
     547                    <jvmarg value="-ea"/> 
     548                    <jvmarg line="${debug-args-line}"/> 
     549                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 
     550                    <customize/> 
     551                </junit> 
     552            </sequential> 
     553        </macrodef> 
     554    </target> 
     555    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> 
     556        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     557            <attribute default="${includes}" name="includes"/> 
     558            <attribute default="${excludes}" name="excludes"/> 
     559            <attribute default="**" name="testincludes"/> 
     560            <attribute default="" name="testmethods"/> 
     561            <element name="customize" optional="true"/> 
     562            <sequential> 
     563                <property name="run.jvmargs.ide" value=""/> 
     564                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 
     565                    <batchtest todir="${build.test.results.dir}"> 
     566                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
     567                            <filename name="@{testincludes}"/> 
     568                        </fileset> 
     569                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> 
     570                            <filename name="${test.binarytestincludes}"/> 
     571                        </fileset> 
     572                    </batchtest> 
     573                    <syspropertyset> 
     574                        <propertyref prefix="test-sys-prop."/> 
     575                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     576                    </syspropertyset> 
     577                    <formatter type="brief" usefile="false"/> 
     578                    <formatter type="xml"/> 
     579                    <jvmarg value="-ea"/> 
     580                    <jvmarg line="${run.jvmargs.ide}"/> 
     581                    <jvmarg line="${debug-args-line}"/> 
     582                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 
     583                    <customize/> 
     584                </junit> 
     585            </sequential> 
     586        </macrodef> 
     587    </target> 
     588    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> 
     589        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     590            <attribute default="${includes}" name="includes"/> 
     591            <attribute default="${excludes}" name="excludes"/> 
     592            <attribute default="**" name="testincludes"/> 
     593            <attribute default="" name="testmethods"/> 
     594            <element implicit="true" name="customize" optional="true"/> 
     595            <sequential> 
     596                <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     597                    <customize/> 
     598                </webproject2:junit-debug> 
     599            </sequential> 
     600        </macrodef> 
     601    </target> 
     602    <target if="${testng.available}" name="-init-macrodef-testng-debug"> 
     603        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     604            <attribute default="${main.class}" name="testClass"/> 
     605            <attribute default="" name="testMethod"/> 
     606            <element name="customize2" optional="true"/> 
     607            <sequential> 
     608                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> 
     609                    <isset property="test.method"/> 
     610                </condition> 
     611                <condition else="-suitename sql-vyuka -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
     612                    <matches pattern=".*\.xml" string="@{testClass}"/> 
     613                </condition> 
     614                <delete dir="${build.test.results.dir}" quiet="true"/> 
     615                <mkdir dir="${build.test.results.dir}"/> 
     616                <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}"> 
     617                    <customize> 
     618                        <customize2/> 
     619                        <jvmarg value="-ea"/> 
     620                        <arg line="${testng.debug.mode}"/> 
     621                        <arg line="-d ${build.test.results.dir}"/> 
     622                        <arg line="-listener org.testng.reporters.VerboseReporter"/> 
     623                    </customize> 
     624                </webproject1:debug> 
     625            </sequential> 
     626        </macrodef> 
     627    </target> 
     628    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl"> 
     629        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     630            <attribute default="${main.class}" name="testClass"/> 
     631            <attribute default="" name="testMethod"/> 
     632            <element implicit="true" name="customize2" optional="true"/> 
     633            <sequential> 
     634                <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}"> 
     635                    <customize2/> 
     636                </webproject2:testng-debug> 
     637            </sequential> 
     638        </macrodef> 
     639    </target> 
     640    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit"> 
     641        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     642            <attribute default="${includes}" name="includes"/> 
     643            <attribute default="${excludes}" name="excludes"/> 
     644            <attribute default="**" name="testincludes"/> 
     645            <attribute default="" name="testmethods"/> 
     646            <attribute default="${main.class}" name="testClass"/> 
     647            <attribute default="" name="testMethod"/> 
     648            <sequential> 
     649                <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     650                    <customize> 
     651                        <classpath> 
     652                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
     653                        </classpath> 
     654                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     655                        <jvmarg line="${runmain.jvmargs}"/> 
     656                    </customize> 
     657                </webproject2:test-debug-impl> 
     658            </sequential> 
     659        </macrodef> 
     660    </target> 
     661    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng"> 
     662        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     663            <attribute default="${includes}" name="includes"/> 
     664            <attribute default="${excludes}" name="excludes"/> 
     665            <attribute default="**" name="testincludes"/> 
     666            <attribute default="" name="testmethods"/> 
     667            <attribute default="${main.class}" name="testClass"/> 
     668            <attribute default="" name="testMethod"/> 
     669            <sequential> 
     670                <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}"> 
     671                    <customize2> 
     672                        <syspropertyset> 
     673                            <propertyref prefix="test-sys-prop."/> 
     674                            <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     675                        </syspropertyset> 
     676                    </customize2> 
     677                </webproject2:testng-debug-impl> 
     678            </sequential> 
     679        </macrodef> 
     680    </target> 
     681    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/> 
    376682    <target name="-init-macrodef-java"> 
    377683        <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1"> 
    … …  
    512818        <property name="ap.cmd.line.internal" value=""/> 
    513819    </target> 
    514     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/> 
    515     <target name="-profile-pre-init"> 
    516         <!-- Empty placeholder for easier customization. --> 
    517         <!-- You can override this target in the ../build.xml file. --> 
    518     </target> 
    519     <target name="-profile-post-init"> 
    520         <!-- Empty placeholder for easier customization. --> 
    521         <!-- You can override this target in the ../build.xml file. --> 
    522     </target> 
    523     <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check"> 
     820    <!-- 
     821                pre NB7.2 profiling section; consider it deprecated 
     822            --> 
     823    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/> 
     824    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init"> 
     825        <!-- Empty placeholder for easier customization. --> 
     826        <!-- You can override this target in the ../build.xml file. --> 
     827    </target> 
     828    <target if="profiler.info.jvmargs.agent" name="-profile-post-init"> 
     829        <!-- Empty placeholder for easier customization. --> 
     830        <!-- You can override this target in the ../build.xml file. --> 
     831    </target> 
     832    <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check"> 
    524833        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 
    525834        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 
    526835    </target> 
    527     <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"/> 
     836    <!-- 
     837                end of pre NB7.2 profiling section 
     838            --> 
     839    <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"/> 
    528840    <!-- 
    529841                COMPILATION SECTION 
    … …  
    570882        <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/> 
    571883        <copy todir="${build.web.dir}/WEB-INF/classes/META-INF"> 
    572             <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/> 
     884            <fileset dir="${persistence.xml.dir}" includes="persistence.xml orm.xml"/> 
    573885        </copy> 
    574886    </target> 
    … …  
    8281140    </target> 
    8291141    <target if="do.debug.server" name="connect-debugger" unless="is.debugged"> 
    830         <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}"> 
     1142        <condition property="listeningcp" value="sourcepath"> 
     1143            <istrue value="${j2ee.compile.on.save}"/> 
     1144        </condition> 
     1145        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}"> 
    8311146            <classpath> 
    8321147                <path path="${debug.classpath}:${j2ee.platform.classpath}"/> 
    … …  
    8731188            ================= 
    8741189            --> 
    875     <target description="Profile a J2EE project in the IDE." name="profile"> 
     1190    <!-- 
     1191                pre NB7.2 profiling section; consider it deprecated 
     1192            --> 
     1193    <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72"> 
    8761194        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs"> 
    8771195            <isset property="profiler.info.jvmargs.extra"/> 
    … …  
    8791197        <antcall target="${profiler.startserver.target}"/> 
    8801198        <antcall target="run"/> 
    881         <antcall target="start-loadgen"/> 
    882     </target> 
    883     <target name="start-profiled-server"> 
     1199        <antcall target="-profile-start-loadgen"/> 
     1200    </target> 
     1201    <target if="profiler.info.jvmargs.agent" name="start-profiled-server"> 
    8841202        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
    8851203            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    8871205        </nbstartprofiledserver> 
    8881206    </target> 
    889     <target name="start-profiled-server-extraargs"> 
     1207    <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs"> 
    8901208        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
    8911209            <jvmarg value="${profiler.info.jvmargs.extra}"/> 
    … …  
    8941212        </nbstartprofiledserver> 
    8951213    </target> 
    896     <target if="profiler.loadgen.path" name="start-loadgen"> 
     1214    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> 
     1215        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail> 
     1216        <nbprofiledirect> 
     1217            <classpath> 
     1218                <path path="${run.test.classpath}"/> 
     1219                <path path="${j2ee.platform.classpath}"/> 
     1220            </classpath> 
     1221        </nbprofiledirect> 
     1222        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 
     1223            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 
     1224            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     1225            <jvmarg line="${profiler.info.jvmargs}"/> 
     1226            <test name="${profile.class}"/> 
     1227            <classpath> 
     1228                <path path="${run.test.classpath}"/> 
     1229                <path path="${j2ee.platform.classpath}"/> 
     1230            </classpath> 
     1231            <syspropertyset> 
     1232                <propertyref prefix="test-sys-prop."/> 
     1233                <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     1234            </syspropertyset> 
     1235            <formatter type="brief" usefile="false"/> 
     1236            <formatter type="xml"/> 
     1237        </junit> 
     1238    </target> 
     1239    <target if="netbeans.home" name="-profile-check"> 
     1240        <condition property="profiler.configured"> 
     1241            <or> 
     1242                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/> 
     1243                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/> 
     1244            </or> 
     1245        </condition> 
     1246    </target> 
     1247    <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"> 
     1248        <startprofiler/> 
     1249        <nbstartserver profilemode="true"/> 
     1250        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 
     1251        <antcall target="debug-display-browser"/> 
     1252        <antcall target="-profile-start-loadgen"/> 
     1253    </target> 
     1254    <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent"> 
     1255        <antcall target="-do-profile"/> 
     1256    </target> 
     1257    <target depends="-profile-test-single-pre72" name="profile-test-single"/> 
     1258    <target depends="-profile-check" if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs.agent"> 
     1259        <startprofiler/> 
     1260        <antcall target="test-single"/> 
     1261    </target> 
     1262    <target if="profiler.loadgen.path" name="-profile-start-loadgen"> 
    8971263        <loadgenstart path="${profiler.loadgen.path}"/> 
    8981264    </target> 
    … …  
    9281294    <!-- 
    9291295                 
    930                 JUNIT COMPILATION SECTION 
     1296                TEST COMPILATION SECTION 
    9311297            --> 
    9321298    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> 
    … …  
    9671333    <!-- 
    9681334                 
    969                 JUNIT EXECUTION SECTION 
     1335                TEST EXECUTION SECTION 
    9701336            --> 
    9711337    <target depends="init" if="have.tests" name="-pre-test-run"> 
    … …  
    9731339    </target> 
    9741340    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    975         <webproject2:junit testincludes="**/*Test.java"/> 
     1341        <webproject2:test testincludes="**/*Test.java"/> 
    9761342    </target> 
    9771343    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
    … …  
    9861352    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> 
    9871353        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> 
    988         <webproject2:junit excludes="" includes="${test.includes}"/> 
     1354        <webproject2:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/> 
    9891355    </target> 
    9901356    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> 
    … …  
    9921358    </target> 
    9931359    <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"/> 
     1360    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method"> 
     1361        <fail unless="test.class">Must select some files in the IDE or set test.class</fail> 
     1362        <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 
     1363        <webproject2:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/> 
     1364    </target> 
     1365    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method"> 
     1366        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> 
     1367    </target> 
     1368    <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"/> 
    9941369    <!-- 
    9951370                 
    996                 JUNIT DEBUGGING SECTION 
     1371                TEST DEBUGGING SECTION 
    9971372            --> 
    998     <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> 
     1373    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test"> 
    9991374        <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 
    1000         <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> 
    1001         <delete file="${test.report.file}"/> 
    1002         <!-- must exist, otherwise the XML formatter would fail --> 
    1003         <mkdir dir="${build.test.results.dir}"/> 
    1004         <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}"> 
    1005             <customize> 
    1006                 <arg value="showoutput=true"/> 
    1007                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> 
    1008                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> 
    1009             </customize> 
    1010         </webproject1:debug> 
     1375        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/> 
     1376    </target> 
     1377    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method"> 
     1378        <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 
     1379        <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 
     1380        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/> 
    10111381    </target> 
    10121382    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> 
    … …  
    10141384    </target> 
    10151385    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
     1386    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> 
    10161387    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> 
    10171388        <webproject1:nbjpdareload dir="${build.test.classes.dir}"/> 
    10181389    </target> 
    10191390    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> 
    1020     <!-- 
    1021         ========================= 
    1022         TESTS PROFILING  SECTION 
    1023         ========================= 
    1024         --> 
    1025     <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> 
    1026         <nbprofiledirect> 
    1027             <classpath> 
    1028                 <path path="${run.test.classpath}"/> 
    1029                 <path path="${j2ee.platform.classpath}"/> 
    1030             </classpath> 
    1031         </nbprofiledirect> 
    1032         <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 
    1033             <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 
    1034             <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    1035             <jvmarg line="${profiler.info.jvmargs}"/> 
    1036             <test name="${profile.class}"/> 
    1037             <classpath> 
    1038                 <path path="${run.test.classpath}"/> 
    1039                 <path path="${j2ee.platform.classpath}"/> 
    1040             </classpath> 
    1041             <syspropertyset> 
    1042                 <propertyref prefix="test-sys-prop."/> 
    1043                 <mapper from="test-sys-prop.*" to="*" type="glob"/> 
    1044             </syspropertyset> 
    1045             <formatter type="brief" usefile="false"/> 
    1046             <formatter type="xml"/> 
    1047         </junit> 
    1048     </target> 
    10491391    <!-- 
    10501392                 

  • java/sql-vyuka/nbproject/genfiles.properties

    r79 r82  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    66nbproject/build-impl.xml.data.CRC32=3f9299bb 
    7 nbproject/build-impl.xml.script.CRC32=6d1d7d3b 
    8 nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1 
     7nbproject/build-impl.xml.script.CRC32=7e55c0e0 
     8nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.41.1.1 

  • java/sql-vyuka/nbproject/project.properties

    r79 r82  
    2828includes=** 
    2929j2ee.compile.on.save=false 
     30j2ee.copy.static.files.on.save=false 
    3031j2ee.deploy.on.save=false 
    3132j2ee.platform=1.5 
    32 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 
     33j2ee.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 
    3334j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar 
    3435j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar