Changeset 417


Ignore:
Timestamp:
14-09-12 12:32:15 (7 years ago)
Author:
matthijsln
Message:

netbeans project update

Location:
klic-test-stub/trunk/nbproject
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • klic-test-stub/trunk/nbproject/ant-deploy.xml

    r180 r417  
    1010        <delete dir="${temp.module.folder}"/> 
    1111    </target> 
    12     <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init"> 
     12    <target name="-check-credentials" if="deploy.ant.enabled" depends="-init"> 
     13        <fail message="Tomcat password has to be passed as tomcat.password property."> 
     14            <condition> 
     15                <not> 
     16                    <isset property="tomcat.password"/> 
     17                </not> 
     18            </condition> 
     19        </fail>     
     20    </target> 
     21    <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> 
    1322        <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/> 
    14         <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" 
    15                  classpath="${tomcat.home}/lib/catalina-ant.jar"/> 
    16         <deploy url="${tomcat.url}/manager" username="${tomcat.username}" 
     23        <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"> 
     24            <classpath> 
     25                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> 
     26                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> 
     27                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> 
     28                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> 
     29            </classpath> 
     30        </taskdef> 
     31        <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}" 
    1732                password="${tomcat.password}" path="${Context(path)}" 
    1833                war="${deploy.ant.archive}"/> 
    1934        <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/> 
    2035    </target> 
    21     <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init"> 
     36    <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> 
    2237        <echo message="Undeploying ${Context(path)}"/> 
    23         <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask" 
    24                 classpath="${tomcat.home}/lib/catalina-ant.jar"/> 
    25         <undeploy url="${tomcat.url}/manager" username="${tomcat.username}"  
     38        <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"> 
     39            <classpath> 
     40                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> 
     41                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> 
     42                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> 
     43                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> 
     44            </classpath> 
     45        </taskdef> 
     46        <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}"  
    2647                  password="${tomcat.password}" path="${Context(path)}"/> 
    2748    </target> 
  • klic-test-stub/trunk/nbproject/build-impl.xml

    r181 r417  
    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 
     
    199199        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> 
    200200        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> 
    201             <length length="0" string="${endorsed.classpath}" when="greater"/> 
     201            <and> 
     202                <isset property="endorsed.classpath"/> 
     203                <length length="0" string="${endorsed.classpath}" when="greater"/> 
     204            </and> 
     205        </condition> 
     206        <condition else="false" property="jdkBug6558476"> 
     207            <and> 
     208                <matches pattern="1\.[56]" string="${java.specification.version}"/> 
     209                <not> 
     210                    <os family="unix"/> 
     211                </not> 
     212            </and> 
     213        </condition> 
     214        <property name="javac.fork" value="${jdkBug6558476}"/> 
     215        <condition property="junit.available"> 
     216            <or> 
     217                <available classname="org.junit.Test" classpath="${run.test.classpath}"/> 
     218                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/> 
     219            </or> 
     220        </condition> 
     221        <condition property="testng.available"> 
     222            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/> 
     223        </condition> 
     224        <condition property="junit+testng.available"> 
     225            <and> 
     226                <istrue value="${junit.available}"/> 
     227                <istrue value="${testng.available}"/> 
     228            </and> 
     229        </condition> 
     230        <condition else="testng" property="testng.mode" value="mixed"> 
     231            <istrue value="${junit+testng.available}"/> 
     232        </condition> 
     233        <condition else="" property="testng.debug.mode" value="-mixed"> 
     234            <istrue value="${junit+testng.available}"/> 
    202235        </condition> 
    203236    </target> 
    204237    <target depends="init" name="-init-cos" unless="deploy.on.save"> 
    205238        <condition property="deploy.on.save" value="true"> 
    206             <istrue value="${j2ee.deploy.on.save}"/> 
     239            <or> 
     240                <istrue value="${j2ee.deploy.on.save}"/> 
     241                <istrue value="${j2ee.compile.on.save}"/> 
     242            </or> 
    207243        </condition> 
    208244    </target> 
     
    224260        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> 
    225261        <fail unless="dist.war">Must set dist.war</fail> 
     262        <condition property="missing.j2ee.server.home"> 
     263            <and> 
     264                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/> 
     265                <not> 
     266                    <isset property="j2ee.server.home"/> 
     267                </not> 
     268            </and> 
     269        </condition> 
     270        <fail if="missing.j2ee.server.home"> 
     271The Java EE server classpath is not correctly set up - server home directory is missing. 
     272Either open the project in the IDE and assign the server or setup the server classpath manually. 
     273For example like this: 
     274   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt; 
     275                </fail> 
    226276        <fail unless="j2ee.platform.classpath"> 
    227277The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. 
     
    241291        </macrodef> 
    242292    </target> 
    243     <target name="-init-macrodef-javac"> 
     293    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> 
    244294        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2"> 
    245295            <attribute default="${src.dir}" name="srcdir"/> 
    246296            <attribute default="${build.classes.dir}" name="destdir"/> 
    247297            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     298            <attribute default="${javac.processorpath}" name="processorpath"/> 
     299            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
     300            <attribute default="${includes}" name="includes"/> 
     301            <attribute default="${excludes}" name="excludes"/> 
     302            <attribute default="${javac.debug}" name="debug"/> 
     303            <attribute default="${empty.dir}" name="gensrcdir"/> 
     304            <element name="customize" optional="true"/> 
     305            <sequential> 
     306                <property location="${build.dir}/empty" name="empty.dir"/> 
     307                <mkdir dir="${empty.dir}"/> 
     308                <mkdir dir="@{apgeneratedsrcdir}"/> 
     309                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> 
     310                    <src> 
     311                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
     312                            <include name="*"/> 
     313                        </dirset> 
     314                    </src> 
     315                    <classpath> 
     316                        <path path="@{classpath}"/> 
     317                    </classpath> 
     318                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> 
     319                    <compilerarg line="${javac.compilerargs}"/> 
     320                    <compilerarg value="-processorpath"/> 
     321                    <compilerarg path="@{processorpath}:${empty.dir}"/> 
     322                    <compilerarg line="${ap.processors.internal}"/> 
     323                    <compilerarg value="-s"/> 
     324                    <compilerarg path="@{apgeneratedsrcdir}"/> 
     325                    <compilerarg line="${ap.proc.none.internal}"/> 
     326                    <customize/> 
     327                </javac> 
     328            </sequential> 
     329        </macrodef> 
     330    </target> 
     331    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> 
     332        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2"> 
     333            <attribute default="${src.dir}" name="srcdir"/> 
     334            <attribute default="${build.classes.dir}" name="destdir"/> 
     335            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     336            <attribute default="${javac.processorpath}" name="processorpath"/> 
     337            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
    248338            <attribute default="${includes}" name="includes"/> 
    249339            <attribute default="${excludes}" name="excludes"/> 
     
    270360        </macrodef> 
    271361    </target> 
    272     <target name="-init-macrodef-junit"> 
     362    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> 
     363        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2"> 
     364            <attribute default="${src.dir}" name="srcdir"/> 
     365            <attribute default="${build.classes.dir}" name="destdir"/> 
     366            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     367            <sequential> 
     368                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}"> 
     369                    <classpath> 
     370                        <path path="@{classpath}"/> 
     371                    </classpath> 
     372                </depend> 
     373            </sequential> 
     374        </macrodef> 
     375        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2"> 
     376            <attribute default="${build.classes.dir}" name="destdir"/> 
     377            <sequential> 
     378                <fail unless="javac.includes">Must set javac.includes</fail> 
     379                <pathconvert pathsep="${line.separator}" property="javac.includes.binary"> 
     380                    <path> 
     381                        <filelist dir="@{destdir}" files="${javac.includes}"/> 
     382                    </path> 
     383                    <globmapper from="*.java" to="*.class"/> 
     384                </pathconvert> 
     385                <tempfile deleteonexit="true" property="javac.includesfile.binary"/> 
     386                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/> 
     387                <delete> 
     388                    <files includesfile="${javac.includesfile.binary}"/> 
     389                </delete> 
     390                <delete file="${javac.includesfile.binary}"/> 
     391            </sequential> 
     392        </macrodef> 
     393    </target> 
     394    <target if="${junit.available}" name="-init-macrodef-junit-init"> 
     395        <condition else="false" property="nb.junit.batch" value="true"> 
     396            <and> 
     397                <istrue value="${junit.available}"/> 
     398                <not> 
     399                    <isset property="test.method"/> 
     400                </not> 
     401            </and> 
     402        </condition> 
     403        <condition else="false" property="nb.junit.single" value="true"> 
     404            <and> 
     405                <istrue value="${junit.available}"/> 
     406                <isset property="test.method"/> 
     407            </and> 
     408        </condition> 
     409    </target> 
     410    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> 
    273411        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 
    274412            <attribute default="${includes}" name="includes"/> 
    275413            <attribute default="${excludes}" name="excludes"/> 
    276414            <attribute default="**" name="testincludes"/> 
     415            <attribute default="" name="testmethods"/> 
     416            <element name="customize" optional="true"/> 
    277417            <sequential> 
    278418                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 
    279                     <batchtest todir="${build.test.results.dir}"> 
    280                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    281                             <filename name="@{testincludes}"/> 
    282                         </fileset> 
    283                     </batchtest> 
    284                     <classpath> 
    285                         <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
    286                     </classpath> 
     419                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
    287420                    <syspropertyset> 
    288421                        <propertyref prefix="test-sys-prop."/> 
     
    291424                    <formatter type="brief" usefile="false"/> 
    292425                    <formatter type="xml"/> 
    293                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    294                     <jvmarg line="${runmain.jvmargs}"/> 
     426                    <jvmarg value="-ea"/> 
     427                    <customize/> 
    295428                </junit> 
    296429            </sequential> 
    297430        </macrodef> 
    298431    </target> 
     432    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> 
     433        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 
     434            <attribute default="${includes}" name="includes"/> 
     435            <attribute default="${excludes}" name="excludes"/> 
     436            <attribute default="**" name="testincludes"/> 
     437            <attribute default="" name="testmethods"/> 
     438            <element name="customize" optional="true"/> 
     439            <sequential> 
     440                <property name="run.jvmargs.ide" value=""/> 
     441                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 
     442                    <batchtest todir="${build.test.results.dir}"> 
     443                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
     444                            <filename name="@{testincludes}"/> 
     445                        </fileset> 
     446                    </batchtest> 
     447                    <syspropertyset> 
     448                        <propertyref prefix="test-sys-prop."/> 
     449                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     450                    </syspropertyset> 
     451                    <formatter type="brief" usefile="false"/> 
     452                    <formatter type="xml"/> 
     453                    <jvmarg value="-ea"/> 
     454                    <jvmarg line="${run.jvmargs.ide}"/> 
     455                    <customize/> 
     456                </junit> 
     457            </sequential> 
     458        </macrodef> 
     459    </target> 
     460    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/> 
     461    <target if="${testng.available}" name="-init-macrodef-testng"> 
     462        <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2"> 
     463            <attribute default="${includes}" name="includes"/> 
     464            <attribute default="${excludes}" name="excludes"/> 
     465            <attribute default="**" name="testincludes"/> 
     466            <attribute default="" name="testmethods"/> 
     467            <element name="customize" optional="true"/> 
     468            <sequential> 
     469                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}"> 
     470                    <isset property="test.method"/> 
     471                </condition> 
     472                <union id="test.set"> 
     473                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> 
     474                        <filename name="@{testincludes}"/> 
     475                    </fileset> 
     476                </union> 
     477                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
     478                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="klic-test-stub" testname="TestNG tests" workingDir="${basedir}"> 
     479                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
     480                    <propertyset> 
     481                        <propertyref prefix="test-sys-prop."/> 
     482                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     483                    </propertyset> 
     484                    <customize/> 
     485                </testng> 
     486            </sequential> 
     487        </macrodef> 
     488    </target> 
     489    <target name="-init-macrodef-test-impl"> 
     490        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     491            <attribute default="${includes}" name="includes"/> 
     492            <attribute default="${excludes}" name="excludes"/> 
     493            <attribute default="**" name="testincludes"/> 
     494            <attribute default="" name="testmethods"/> 
     495            <element implicit="true" name="customize" optional="true"/> 
     496            <sequential> 
     497                <echo>No tests executed.</echo> 
     498            </sequential> 
     499        </macrodef> 
     500    </target> 
     501    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl"> 
     502        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     503            <attribute default="${includes}" name="includes"/> 
     504            <attribute default="${excludes}" name="excludes"/> 
     505            <attribute default="**" name="testincludes"/> 
     506            <attribute default="" name="testmethods"/> 
     507            <element implicit="true" name="customize" optional="true"/> 
     508            <sequential> 
     509                <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     510                    <customize/> 
     511                </webproject2:junit> 
     512            </sequential> 
     513        </macrodef> 
     514    </target> 
     515    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl"> 
     516        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     517            <attribute default="${includes}" name="includes"/> 
     518            <attribute default="${excludes}" name="excludes"/> 
     519            <attribute default="**" name="testincludes"/> 
     520            <attribute default="" name="testmethods"/> 
     521            <element implicit="true" name="customize" optional="true"/> 
     522            <sequential> 
     523                <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     524                    <customize/> 
     525                </webproject2:testng> 
     526            </sequential> 
     527        </macrodef> 
     528    </target> 
     529    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test"> 
     530        <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2"> 
     531            <attribute default="${includes}" name="includes"/> 
     532            <attribute default="${excludes}" name="excludes"/> 
     533            <attribute default="**" name="testincludes"/> 
     534            <attribute default="" name="testmethods"/> 
     535            <sequential> 
     536                <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     537                    <customize> 
     538                        <classpath> 
     539                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
     540                        </classpath> 
     541                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     542                        <jvmarg line="${runmain.jvmargs}"/> 
     543                    </customize> 
     544                </webproject2:test-impl> 
     545            </sequential> 
     546        </macrodef> 
     547    </target> 
     548    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}"> 
     549        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     550            <attribute default="${includes}" name="includes"/> 
     551            <attribute default="${excludes}" name="excludes"/> 
     552            <attribute default="**" name="testincludes"/> 
     553            <attribute default="" name="testmethods"/> 
     554            <element name="customize" optional="true"/> 
     555            <sequential> 
     556                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 
     557                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
     558                    <syspropertyset> 
     559                        <propertyref prefix="test-sys-prop."/> 
     560                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     561                    </syspropertyset> 
     562                    <formatter type="brief" usefile="false"/> 
     563                    <formatter type="xml"/> 
     564                    <jvmarg value="-ea"/> 
     565                    <jvmarg line="${debug-args-line}"/> 
     566                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 
     567                    <customize/> 
     568                </junit> 
     569            </sequential> 
     570        </macrodef> 
     571    </target> 
     572    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> 
     573        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     574            <attribute default="${includes}" name="includes"/> 
     575            <attribute default="${excludes}" name="excludes"/> 
     576            <attribute default="**" name="testincludes"/> 
     577            <attribute default="" name="testmethods"/> 
     578            <element name="customize" optional="true"/> 
     579            <sequential> 
     580                <property name="run.jvmargs.ide" value=""/> 
     581                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 
     582                    <batchtest todir="${build.test.results.dir}"> 
     583                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
     584                            <filename name="@{testincludes}"/> 
     585                        </fileset> 
     586                    </batchtest> 
     587                    <syspropertyset> 
     588                        <propertyref prefix="test-sys-prop."/> 
     589                        <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     590                    </syspropertyset> 
     591                    <formatter type="brief" usefile="false"/> 
     592                    <formatter type="xml"/> 
     593                    <jvmarg value="-ea"/> 
     594                    <jvmarg line="${run.jvmargs.ide}"/> 
     595                    <jvmarg line="${debug-args-line}"/> 
     596                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 
     597                    <customize/> 
     598                </junit> 
     599            </sequential> 
     600        </macrodef> 
     601    </target> 
     602    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> 
     603        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     604            <attribute default="${includes}" name="includes"/> 
     605            <attribute default="${excludes}" name="excludes"/> 
     606            <attribute default="**" name="testincludes"/> 
     607            <attribute default="" name="testmethods"/> 
     608            <element implicit="true" name="customize" optional="true"/> 
     609            <sequential> 
     610                <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     611                    <customize/> 
     612                </webproject2:junit-debug> 
     613            </sequential> 
     614        </macrodef> 
     615    </target> 
     616    <target if="${testng.available}" name="-init-macrodef-testng-debug"> 
     617        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     618            <attribute default="${main.class}" name="testClass"/> 
     619            <attribute default="" name="testMethod"/> 
     620            <element name="customize2" optional="true"/> 
     621            <sequential> 
     622                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> 
     623                    <isset property="test.method"/> 
     624                </condition> 
     625                <condition else="-suitename klic-test-stub -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
     626                    <matches pattern=".*\.xml" string="@{testClass}"/> 
     627                </condition> 
     628                <delete dir="${build.test.results.dir}" quiet="true"/> 
     629                <mkdir dir="${build.test.results.dir}"/> 
     630                <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}"> 
     631                    <customize> 
     632                        <customize2/> 
     633                        <jvmarg value="-ea"/> 
     634                        <arg line="${testng.debug.mode}"/> 
     635                        <arg line="-d ${build.test.results.dir}"/> 
     636                        <arg line="-listener org.testng.reporters.VerboseReporter"/> 
     637                    </customize> 
     638                </webproject1:debug> 
     639            </sequential> 
     640        </macrodef> 
     641    </target> 
     642    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl"> 
     643        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 
     644            <attribute default="${main.class}" name="testClass"/> 
     645            <attribute default="" name="testMethod"/> 
     646            <element implicit="true" name="customize2" optional="true"/> 
     647            <sequential> 
     648                <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}"> 
     649                    <customize2/> 
     650                </webproject2:testng-debug> 
     651            </sequential> 
     652        </macrodef> 
     653    </target> 
     654    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit"> 
     655        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     656            <attribute default="${includes}" name="includes"/> 
     657            <attribute default="${excludes}" name="excludes"/> 
     658            <attribute default="**" name="testincludes"/> 
     659            <attribute default="" name="testmethods"/> 
     660            <attribute default="${main.class}" name="testClass"/> 
     661            <attribute default="" name="testMethod"/> 
     662            <sequential> 
     663                <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 
     664                    <customize> 
     665                        <classpath> 
     666                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 
     667                        </classpath> 
     668                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     669                        <jvmarg line="${runmain.jvmargs}"/> 
     670                    </customize> 
     671                </webproject2:test-debug-impl> 
     672            </sequential> 
     673        </macrodef> 
     674    </target> 
     675    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng"> 
     676        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 
     677            <attribute default="${includes}" name="includes"/> 
     678            <attribute default="${excludes}" name="excludes"/> 
     679            <attribute default="**" name="testincludes"/> 
     680            <attribute default="" name="testmethods"/> 
     681            <attribute default="${main.class}" name="testClass"/> 
     682            <attribute default="" name="testMethod"/> 
     683            <sequential> 
     684                <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}"> 
     685                    <customize2> 
     686                        <syspropertyset> 
     687                            <propertyref prefix="test-sys-prop."/> 
     688                            <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     689                        </syspropertyset> 
     690                    </customize2> 
     691                </webproject2:testng-debug-impl> 
     692            </sequential> 
     693        </macrodef> 
     694    </target> 
     695    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/> 
    299696    <target name="-init-macrodef-java"> 
    300697        <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1"> 
     
    412809        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/> 
    413810    </target> 
    414     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/> 
     811    <target name="-init-ap-cmdline-properties"> 
     812        <property name="annotation.processing.enabled" value="true"/> 
     813        <property name="annotation.processing.processors.list" value=""/> 
     814        <property name="annotation.processing.run.all.processors" value="true"/> 
     815        <property name="javac.processorpath" value="${javac.classpath}"/> 
     816        <property name="javac.test.processorpath" value="${javac.test.classpath}"/> 
     817        <condition property="ap.supported.internal" value="true"> 
     818            <not> 
     819                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> 
     820            </not> 
     821        </condition> 
     822    </target> 
     823    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> 
     824        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> 
     825            <isfalse value="${annotation.processing.run.all.processors}"/> 
     826        </condition> 
     827        <condition else="" property="ap.proc.none.internal" value="-proc:none"> 
     828            <isfalse value="${annotation.processing.enabled}"/> 
     829        </condition> 
     830    </target> 
     831    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> 
     832        <property name="ap.cmd.line.internal" value=""/> 
     833    </target> 
     834    <!-- 
     835                pre NB7.2 profiling section; consider it deprecated 
     836            --> 
     837    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/> 
     838    <target name="-profile-pre-init"> 
     839        <!-- Empty placeholder for easier customization. --> 
     840        <!-- You can override this target in the ../build.xml file. --> 
     841    </target> 
     842    <target name="-profile-post-init"> 
     843        <!-- Empty placeholder for easier customization. --> 
     844        <!-- You can override this target in the ../build.xml file. --> 
     845    </target> 
     846    <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check"> 
     847        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 
     848        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 
     849    </target> 
     850    <!-- 
     851                end of pre NB7.2 profiling section 
     852            --> 
     853    <target depends="-pre-init,-init-private,-init-libraries,-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"/> 
    415854    <!-- 
    416855                COMPILATION SECTION 
     
    473912    </target> 
    474913    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> 
     914    <property name="jspc.schemas" value="/resources/schemas/"/> 
     915    <property name="jspc.dtds" value="/resources/dtds/"/> 
    475916    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps"> 
    476917        <mkdir dir="${build.generated.dir}/src"/> 
     
    481922            <arg file="${basedir}/${build.generated.dir}/src"/> 
    482923            <arg value="-die1"/> 
     924            <arg value="-schemas ${jspc.schemas}"/> 
     925            <arg value="-dtds ${jspc.dtds}"/> 
    483926            <arg value="-compilerSourceVM ${javac.source}"/> 
    484927            <arg value="-compilerTargetVM ${javac.target}"/> 
    485928            <arg value="-javaEncoding ${source.encoding}"/> 
    486             <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/> 
     929            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/> 
     930            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/> 
    487931        </java> 
    488932        <mkdir dir="${build.generated.dir}/classes"/> 
    489         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/> 
     933        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/> 
    490934    </target> 
    491935    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp"> 
     
    498942            <arg file="${basedir}/${build.generated.dir}/src"/> 
    499943            <arg value="-die1"/> 
     944            <arg value="-schemas ${jspc.schemas}"/> 
     945            <arg value="-dtds ${jspc.dtds}"/> 
     946            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/> 
    500947            <arg value="-jspc.files"/> 
    501948            <arg path="${jsp.includes}"/> 
     
    503950            <arg value="-compilerTargetVM ${javac.target}"/> 
    504951            <arg value="-javaEncoding ${source.encoding}"/> 
    505             <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/> 
     952            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/> 
    506953        </java> 
    507954        <mkdir dir="${build.generated.dir}/classes"/> 
    508         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"> 
     955        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"> 
    509956            <customize> 
    510957                <patternset includes="${javac.jsp.includes}"/> 
     
    527974        <mkdir dir="${dist.jar.dir}"/> 
    528975        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    529             <fileset dir="${build.web.dir}"/> 
     976            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    530977        </jar> 
    531978    </target> 
     
    534981        <mkdir dir="${dist.jar.dir}"/> 
    535982        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    536             <fileset dir="${build.web.dir}"/> 
     983            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    537984        </jar> 
    538985    </target> 
     
    541988        <mkdir dir="${dist.jar.dir}"/> 
    542989        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    543             <fileset dir="${build.web.dir}"/> 
     990            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    544991        </jar> 
    545992    </target> 
     
    548995        <mkdir dir="${dist.jar.dir}"/> 
    549996        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    550             <fileset dir="${build.web.dir}"/> 
     997            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    551998        </jar> 
    552999    </target> 
     
    5641011        <mkdir dir="${dist.jar.dir}"/> 
    5651012        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF"> 
    566             <fileset dir="${build.web.dir}"/> 
     1013            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    5671014        </jar> 
    5681015    </target> 
     
    5961043        <!-- Task to deploy to the Access Manager runtime. --> 
    5971044    </target> 
    598     <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy"> 
    599         <nbjpdaappreloaded/> 
    600     </target> 
     1045    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy,-do-update-breakpoints" name="run-deploy"/> 
    6011046    <target if="netbeans.home" name="-run-deploy-nb"> 
    6021047        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/> 
     
    6841129        <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> 
    6851130    </target> 
     1131    <target depends="init" if="netbeans.home" name="-do-update-breakpoints"> 
     1132        <webproject1:nbjpdaappreloaded/> 
     1133    </target> 
    6861134    <!-- 
    6871135                DEBUGGING SECTION 
     
    6951143    </target> 
    6961144    <target if="do.debug.server" name="connect-debugger" unless="is.debugged"> 
    697         <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}"> 
     1145        <condition property="listeningcp" value="sourcepath"> 
     1146            <istrue value="${j2ee.compile.on.save}"/> 
     1147        </condition> 
     1148        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}"> 
    6981149            <classpath> 
    6991150                <path path="${debug.classpath}:${j2ee.platform.classpath}"/> 
     
    7361187    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> 
    7371188    <!-- 
     1189            ================= 
     1190            PROFILING SECTION 
     1191            ================= 
     1192            --> 
     1193    <!-- 
     1194                pre NB7.2 profiling section; consider it deprecated 
     1195            --> 
     1196    <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72"> 
     1197        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs"> 
     1198            <isset property="profiler.info.jvmargs.extra"/> 
     1199        </condition> 
     1200        <antcall target="${profiler.startserver.target}"/> 
     1201        <antcall target="run"/> 
     1202        <antcall target="-profile-start-loadgen"/> 
     1203    </target> 
     1204    <target if="profiler.info.jvmargs.agent" name="start-profiled-server"> 
     1205        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
     1206            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     1207            <jvmarg value="${profiler.j2ee.agentID}"/> 
     1208        </nbstartprofiledserver> 
     1209    </target> 
     1210    <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs"> 
     1211        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
     1212            <jvmarg value="${profiler.info.jvmargs.extra}"/> 
     1213            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     1214            <jvmarg value="${profiler.j2ee.agentID}"/> 
     1215        </nbstartprofiledserver> 
     1216    </target> 
     1217    <target if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> 
     1218        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail> 
     1219        <nbprofiledirect> 
     1220            <classpath> 
     1221                <path path="${run.test.classpath}"/> 
     1222                <path path="${j2ee.platform.classpath}"/> 
     1223            </classpath> 
     1224        </nbprofiledirect> 
     1225        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 
     1226            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 
     1227            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     1228            <jvmarg line="${profiler.info.jvmargs}"/> 
     1229            <test name="${profile.class}"/> 
     1230            <classpath> 
     1231                <path path="${run.test.classpath}"/> 
     1232                <path path="${j2ee.platform.classpath}"/> 
     1233            </classpath> 
     1234            <syspropertyset> 
     1235                <propertyref prefix="test-sys-prop."/> 
     1236                <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     1237            </syspropertyset> 
     1238            <formatter type="brief" usefile="false"/> 
     1239            <formatter type="xml"/> 
     1240        </junit> 
     1241    </target> 
     1242    <target if="netbeans.home" name="-profile-check"> 
     1243        <condition property="profiler.configured"> 
     1244            <or> 
     1245                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/> 
     1246                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/> 
     1247            </or> 
     1248        </condition> 
     1249    </target> 
     1250    <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"> 
     1251        <startprofiler/> 
     1252        <nbstartserver profilemode="true"/> 
     1253        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 
     1254        <antcall target="debug-display-browser"/> 
     1255        <antcall target="-profile-start-loadgen"/> 
     1256    </target> 
     1257    <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent"> 
     1258        <antcall target="-do-profile"/> 
     1259    </target> 
     1260    <target depends="-profile-test-single-pre72" name="profile-test-single"/> 
     1261    <target depends="-profile-check" if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs.agent"> 
     1262        <startprofiler/> 
     1263        <antcall target="test-single"/> 
     1264    </target> 
     1265    <target if="profiler.loadgen.path" name="-profile-start-loadgen"> 
     1266        <loadgenstart path="${profiler.loadgen.path}"/> 
     1267    </target> 
     1268    <!-- 
    7381269                JAVADOC SECTION 
    7391270            --> 
    740     <target depends="init" name="javadoc-build"> 
     1271    <target depends="init" if="have.sources" name="javadoc-build"> 
    7411272        <mkdir dir="${dist.javadoc.dir}"/> 
    7421273        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
     
    7511282            </fileset> 
    7521283        </javadoc> 
     1284        <copy todir="${dist.javadoc.dir}"> 
     1285            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> 
     1286                <filename name="**/doc-files/**"/> 
     1287            </fileset> 
     1288            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 
     1289                <include name="**/doc-files/**"/> 
     1290            </fileset> 
     1291        </copy> 
    7531292    </target> 
    7541293    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview"> 
     
    7581297    <!-- 
    7591298                 
    760                 JUNIT COMPILATION SECTION 
     1299                TEST COMPILATION SECTION 
    7611300            --> 
    7621301    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> 
     
    7971336    <!-- 
    7981337                 
    799                 JUNIT EXECUTION SECTION 
     1338                TEST EXECUTION SECTION 
    8001339            --> 
    8011340    <target depends="init" if="have.tests" name="-pre-test-run"> 
     
    8031342    </target> 
    8041343    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    805         <webproject2:junit testincludes="**/*Test.java"/> 
     1344        <webproject2:test testincludes="**/*Test.java"/> 
    8061345    </target> 
    8071346    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
     
    8161355    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> 
    8171356        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> 
    818         <webproject2:junit excludes="" includes="${test.includes}"/> 
     1357        <webproject2:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/> 
    8191358    </target> 
    8201359    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> 
     
    8221361    </target> 
    8231362    <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"/> 
     1363    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method"> 
     1364        <fail unless="test.class">Must select some files in the IDE or set test.class</fail> 
     1365        <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 
     1366        <webproject2:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/> 
     1367    </target> 
     1368    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method"> 
     1369        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> 
     1370    </target> 
     1371    <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"/> 
    8241372    <!-- 
    8251373                 
    826                 JUNIT DEBUGGING SECTION 
     1374                TEST DEBUGGING SECTION 
    8271375            --> 
    828     <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> 
     1376    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test"> 
    8291377        <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 
    830         <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> 
    831         <delete file="${test.report.file}"/> 
    832         <!-- must exist, otherwise the XML formatter would fail --> 
    833         <mkdir dir="${build.test.results.dir}"/> 
    834         <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}"> 
    835             <customize> 
    836                 <arg value="showoutput=true"/> 
    837                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> 
    838                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> 
    839             </customize> 
    840         </webproject1:debug> 
     1378        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/> 
     1379    </target> 
     1380    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method"> 
     1381        <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 
     1382        <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 
     1383        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/> 
    8411384    </target> 
    8421385    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> 
     
    8441387    </target> 
    8451388    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
     1389    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> 
    8461390    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> 
    8471391        <webproject1:nbjpdareload dir="${build.test.classes.dir}"/> 
     
    8521396                CLEANUP SECTION 
    8531397            --> 
    854     <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/> 
     1398    <target depends="init" name="deps-clean" unless="no.deps"/> 
    8551399    <target depends="init" name="do-clean"> 
    8561400        <condition property="build.dir.to.clean" value="${build.web.dir}"> 
  • klic-test-stub/trunk/nbproject/genfiles.properties

    r180 r417  
    1 build.xml.data.CRC32=62ab323d 
     1build.xml.data.CRC32=a46ff0d3 
    22build.xml.script.CRC32=a3fad3a0 
    3 build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1 
     3build.xml.stylesheet.CRC32=651128d4@1.36.1.1 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=62ab323d 
    7 nbproject/build-impl.xml.script.CRC32=00aa090d 
    8 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1 
     6nbproject/build-impl.xml.data.CRC32=a46ff0d3 
     7nbproject/build-impl.xml.script.CRC32=c7456062 
     8nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1 
    99nbproject/jaxws-build.xml.stylesheet.CRC32=83928735 
  • klic-test-stub/trunk/nbproject/project.properties

    r180 r417  
     1annotation.processing.enabled=true 
     2annotation.processing.enabled.in.editor=true 
     3annotation.processing.processors.list= 
     4annotation.processing.run.all.processors=true 
     5annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output 
    16build.classes.dir=${build.web.dir}/WEB-INF/classes 
    27build.classes.excludes=**/*.java,**/*.form 
     
    1924dist.javadoc.dir=${dist.dir}/javadoc 
    2025dist.war=${dist.dir}/${war.name} 
     26endorsed.classpath= 
    2127excludes= 
    2228includes=** 
     29j2ee.compile.on.save=true 
     30j2ee.copy.static.files.on.save=true 
    2331j2ee.deploy.on.save=true 
    2432j2ee.platform=1.5 
    25 j2ee.server.type=Tomcat60 
     33j2ee.platform.classpath=${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/ojdbc5.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/postgresql-9.0-801.jdbc4.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/ecj-3.7.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/mail.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar 
     34j2ee.server.type=Tomcat 
    2635jar.compress=false 
    2736javac.classpath=\ 
    28     ${libs.JAX-WS-2.2.classpath} 
     37    ${libs.metro-2.2.-20120220.classpath} 
    2938# Space-separated list of extra javac options 
    3039javac.compilerargs= 
    3140javac.debug=true 
    3241javac.deprecation=false 
     42javac.processorpath=\ 
     43    ${javac.classpath} 
    3344javac.source=1.5 
    3445javac.target=1.5 
     
    3647    ${javac.classpath}:\ 
    3748    ${build.classes.dir} 
     49javac.test.processorpath=${javac.test.classpath} 
    3850javadoc.additionalparam= 
    3951javadoc.author=false 
  • klic-test-stub/trunk/nbproject/project.xml

    r180 r417  
    1010            <minimum-ant-version>1.6.5</minimum-ant-version> 
    1111            <web-module-libraries> 
    12                 <library> 
    13                     <file>${libs.JAX-WS-2.2.classpath}</file> 
     12                <library dirs="200"> 
     13                    <file>${libs.metro-2.2.-20120220.classpath}</file> 
    1414                </library> 
    1515            </web-module-libraries> 
Note: See TracChangeset for help on using the changeset viewer.