This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 215967
Collapse All | Expand All

(-)modules/SignServer-Test-System/nbproject/build-impl.xml (-59 / +431 lines)
Lines 12-30 Link Here
12
  - execution
12
  - execution
13
  - debugging
13
  - debugging
14
  - javadoc
14
  - javadoc
15
  - junit compilation
15
  - test compilation
16
  - junit execution
16
  - test execution
17
  - junit debugging
17
  - test debugging
18
  - applet
18
  - applet
19
  - cleanup
19
  - cleanup
20
20
21
        -->
21
        -->
22
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SignServer-Test-System-impl">
22
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SignServer-Test-System-impl">
23
    <import file="jaxws-build.xml"/>
23
    <import file="jaxws-build.xml"/>
24
    <fail message="Please build using Ant 1.7.1 or higher.">
24
    <fail message="Please build using Ant 1.8.0 or higher.">
25
        <condition>
25
        <condition>
26
            <not>
26
            <not>
27
                <antversion atleast="1.7.1"/>
27
                <antversion atleast="1.8.0"/>
28
            </not>
28
            </not>
29
        </condition>
29
        </condition>
30
    </fail>
30
    </fail>
Lines 182-187 Link Here
182
            </and>
182
            </and>
183
        </condition>
183
        </condition>
184
        <property name="run.jvmargs" value=""/>
184
        <property name="run.jvmargs" value=""/>
185
        <property name="run.jvmargs.ide" value=""/>
185
        <property name="javac.compilerargs" value=""/>
186
        <property name="javac.compilerargs" value=""/>
186
        <property name="work.dir" value="${basedir}"/>
187
        <property name="work.dir" value="${basedir}"/>
187
        <condition property="no.deps">
188
        <condition property="no.deps">
Lines 224-230 Link Here
224
        <property name="javac.fork" value="${jdkBug6558476}"/>
225
        <property name="javac.fork" value="${jdkBug6558476}"/>
225
        <property name="jar.index" value="false"/>
226
        <property name="jar.index" value="false"/>
226
        <property name="jar.index.metainf" value="${jar.index}"/>
227
        <property name="jar.index.metainf" value="${jar.index}"/>
228
        <property name="copylibs.rebase" value="true"/>
227
        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
229
        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
230
        <condition property="junit.available">
231
            <or>
232
                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
233
                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
234
            </or>
235
        </condition>
236
        <condition property="testng.available">
237
            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
238
        </condition>
239
        <condition property="junit+testng.available">
240
            <and>
241
                <istrue value="${junit.available}"/>
242
                <istrue value="${testng.available}"/>
243
            </and>
244
        </condition>
245
        <condition else="testng" property="testng.mode" value="mixed">
246
            <istrue value="${junit+testng.available}"/>
247
        </condition>
248
        <condition else="" property="testng.debug.mode" value="-mixed">
249
            <istrue value="${junit+testng.available}"/>
250
        </condition>
228
    </target>
251
    </target>
229
    <target name="-post-init">
252
    <target name="-post-init">
230
        <!-- Empty placeholder for easier customization. -->
253
        <!-- Empty placeholder for easier customization. -->
Lines 357-401 Link Here
357
            </sequential>
380
            </sequential>
358
        </macrodef>
381
        </macrodef>
359
    </target>
382
    </target>
360
    <target name="-init-macrodef-junit">
383
    <target if="${junit.available}" name="-init-macrodef-junit-init">
384
        <condition else="false" property="nb.junit.batch" value="true">
385
            <and>
386
                <istrue value="${junit.available}"/>
387
                <not>
388
                    <isset property="test.method"/>
389
                </not>
390
            </and>
391
        </condition>
392
        <condition else="false" property="nb.junit.single" value="true">
393
            <and>
394
                <istrue value="${junit.available}"/>
395
                <isset property="test.method"/>
396
            </and>
397
        </condition>
398
    </target>
399
    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
361
        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
400
        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
362
            <attribute default="${includes}" name="includes"/>
401
            <attribute default="${includes}" name="includes"/>
363
            <attribute default="${excludes}" name="excludes"/>
402
            <attribute default="${excludes}" name="excludes"/>
364
            <attribute default="**" name="testincludes"/>
403
            <attribute default="**" name="testincludes"/>
404
            <attribute default="" name="testmethods"/>
405
            <element name="customize" optional="true"/>
365
            <sequential>
406
            <sequential>
366
                <property name="junit.forkmode" value="perTest"/>
407
                <property name="junit.forkmode" value="perTest"/>
367
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
408
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
409
                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
410
                    <syspropertyset>
411
                        <propertyref prefix="test-sys-prop."/>
412
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
413
                    </syspropertyset>
414
                    <formatter type="brief" usefile="false"/>
415
                    <formatter type="xml"/>
416
                    <jvmarg value="-ea"/>
417
                    <customize/>
418
                </junit>
419
            </sequential>
420
        </macrodef>
421
    </target>
422
    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
423
        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
424
            <attribute default="${includes}" name="includes"/>
425
            <attribute default="${excludes}" name="excludes"/>
426
            <attribute default="**" name="testincludes"/>
427
            <attribute default="" name="testmethods"/>
428
            <element name="customize" optional="true"/>
429
            <sequential>
430
                <property name="junit.forkmode" value="perTest"/>
431
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
368
                    <batchtest todir="${build.test.results.dir}">
432
                    <batchtest todir="${build.test.results.dir}">
369
                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
433
                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
370
                            <filename name="@{testincludes}"/>
434
                            <filename name="@{testincludes}"/>
371
                        </fileset>
435
                        </fileset>
372
                    </batchtest>
436
                    </batchtest>
437
                    <syspropertyset>
438
                        <propertyref prefix="test-sys-prop."/>
439
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
440
                    </syspropertyset>
441
                    <formatter type="brief" usefile="false"/>
442
                    <formatter type="xml"/>
443
                    <jvmarg value="-ea"/>
444
                    <customize/>
445
                </junit>
446
            </sequential>
447
        </macrodef>
448
    </target>
449
    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
450
    <target if="${testng.available}" name="-init-macrodef-testng">
451
        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
452
            <attribute default="${includes}" name="includes"/>
453
            <attribute default="${excludes}" name="excludes"/>
454
            <attribute default="**" name="testincludes"/>
455
            <attribute default="" name="testmethods"/>
456
            <element name="customize" optional="true"/>
457
            <sequential>
458
                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
459
                    <isset property="test.method"/>
460
                </condition>
461
                <union id="test.set">
462
                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
463
                        <filename name="@{testincludes}"/>
464
                    </fileset>
465
                </union>
466
                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
467
                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="SignServer-Test-System" testname="TestNG tests" workingDir="${work.dir}">
468
                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
469
                    <propertyset>
470
                        <propertyref prefix="test-sys-prop."/>
471
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
472
                    </propertyset>
473
                    <customize/>
474
                </testng>
475
            </sequential>
476
        </macrodef>
477
    </target>
478
    <target name="-init-macrodef-test-impl">
479
        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
480
            <attribute default="${includes}" name="includes"/>
481
            <attribute default="${excludes}" name="excludes"/>
482
            <attribute default="**" name="testincludes"/>
483
            <attribute default="" name="testmethods"/>
484
            <element implicit="true" name="customize" optional="true"/>
485
            <sequential>
486
                <echo>No tests executed.</echo>
487
            </sequential>
488
        </macrodef>
489
    </target>
490
    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
491
        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
492
            <attribute default="${includes}" name="includes"/>
493
            <attribute default="${excludes}" name="excludes"/>
494
            <attribute default="**" name="testincludes"/>
495
            <attribute default="" name="testmethods"/>
496
            <element implicit="true" name="customize" optional="true"/>
497
            <sequential>
498
                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
499
                    <customize/>
500
                </j2seproject3:junit>
501
            </sequential>
502
        </macrodef>
503
    </target>
504
    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
505
        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
506
            <attribute default="${includes}" name="includes"/>
507
            <attribute default="${excludes}" name="excludes"/>
508
            <attribute default="**" name="testincludes"/>
509
            <attribute default="" name="testmethods"/>
510
            <element implicit="true" name="customize" optional="true"/>
511
            <sequential>
512
                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
513
                    <customize/>
514
                </j2seproject3:testng>
515
            </sequential>
516
        </macrodef>
517
    </target>
518
    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
519
        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
520
            <attribute default="${includes}" name="includes"/>
521
            <attribute default="${excludes}" name="excludes"/>
522
            <attribute default="**" name="testincludes"/>
523
            <attribute default="" name="testmethods"/>
524
            <sequential>
525
                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
526
                    <customize>
373
                    <classpath>
527
                    <classpath>
374
                        <path path="${run.test.classpath}"/>
528
                        <path path="${run.test.classpath}"/>
375
                    </classpath>
529
                    </classpath>
530
                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
531
                        <jvmarg line="${run.jvmargs}"/>
532
                        <jvmarg line="${run.jvmargs.ide}"/>
533
                    </customize>
534
                </j2seproject3:test-impl>
535
            </sequential>
536
        </macrodef>
537
    </target>
538
    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
539
        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
540
            <attribute default="${includes}" name="includes"/>
541
            <attribute default="${excludes}" name="excludes"/>
542
            <attribute default="**" name="testincludes"/>
543
            <attribute default="" name="testmethods"/>
544
            <element name="customize" optional="true"/>
545
            <sequential>
546
                <property name="junit.forkmode" value="perTest"/>
547
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
548
                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
376
                    <syspropertyset>
549
                    <syspropertyset>
377
                        <propertyref prefix="test-sys-prop."/>
550
                        <propertyref prefix="test-sys-prop."/>
378
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
551
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
379
                    </syspropertyset>
552
                    </syspropertyset>
380
                    <formatter type="brief" usefile="false"/>
553
                    <formatter type="brief" usefile="false"/>
381
                    <formatter type="xml"/>
554
                    <formatter type="xml"/>
382
                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
383
                    <jvmarg value="-ea"/>
555
                    <jvmarg value="-ea"/>
384
                    <jvmarg line="${run.jvmargs}"/>
556
                    <jvmarg line="${debug-args-line}"/>
557
                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
558
                    <customize/>
385
                </junit>
559
                </junit>
386
            </sequential>
560
            </sequential>
387
        </macrodef>
561
        </macrodef>
388
    </target>
562
    </target>
389
    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
563
    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
390
    <target name="-profile-pre-init">
564
        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
565
            <attribute default="${includes}" name="includes"/>
566
            <attribute default="${excludes}" name="excludes"/>
567
            <attribute default="**" name="testincludes"/>
568
            <attribute default="" name="testmethods"/>
569
            <element name="customize" optional="true"/>
570
            <sequential>
571
                <property name="junit.forkmode" value="perTest"/>
572
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
573
                    <batchtest todir="${build.test.results.dir}">
574
                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
575
                            <filename name="@{testincludes}"/>
576
                        </fileset>
577
                    </batchtest>
578
                    <syspropertyset>
579
                        <propertyref prefix="test-sys-prop."/>
580
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
581
                    </syspropertyset>
582
                    <formatter type="brief" usefile="false"/>
583
                    <formatter type="xml"/>
584
                    <jvmarg value="-ea"/>
585
                    <jvmarg line="${debug-args-line}"/>
586
                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
587
                    <customize/>
588
                </junit>
589
            </sequential>
590
        </macrodef>
591
    </target>
592
    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
593
        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
594
            <attribute default="${includes}" name="includes"/>
595
            <attribute default="${excludes}" name="excludes"/>
596
            <attribute default="**" name="testincludes"/>
597
            <attribute default="" name="testmethods"/>
598
            <element implicit="true" name="customize" optional="true"/>
599
            <sequential>
600
                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
601
                    <customize/>
602
                </j2seproject3:junit-debug>
603
            </sequential>
604
        </macrodef>
605
    </target>
606
    <target if="${testng.available}" name="-init-macrodef-testng-debug">
607
        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
608
            <attribute default="${main.class}" name="testClass"/>
609
            <attribute default="" name="testMethod"/>
610
            <element name="customize2" optional="true"/>
611
            <sequential>
612
                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
613
                    <isset property="test.method"/>
614
                </condition>
615
                <condition else="-suitename SignServer-Test-System -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
616
                    <matches pattern=".*\.xml" string="@{testClass}"/>
617
                </condition>
618
                <delete dir="${build.test.results.dir}" quiet="true"/>
619
                <mkdir dir="${build.test.results.dir}"/>
620
                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
621
                    <customize>
622
                        <customize2/>
623
                        <jvmarg value="-ea"/>
624
                        <arg line="${testng.debug.mode}"/>
625
                        <arg line="-d ${build.test.results.dir}"/>
626
                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
627
                        <arg line="${testng.cmd.args}"/>
628
                    </customize>
629
                </j2seproject3:debug>
630
            </sequential>
631
        </macrodef>
632
    </target>
633
    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
634
        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
635
            <attribute default="${main.class}" name="testClass"/>
636
            <attribute default="" name="testMethod"/>
637
            <element implicit="true" name="customize2" optional="true"/>
638
            <sequential>
639
                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
640
                    <customize2/>
641
                </j2seproject3:testng-debug>
642
            </sequential>
643
        </macrodef>
644
    </target>
645
    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
646
        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
647
            <attribute default="${includes}" name="includes"/>
648
            <attribute default="${excludes}" name="excludes"/>
649
            <attribute default="**" name="testincludes"/>
650
            <attribute default="" name="testmethods"/>
651
            <attribute default="${main.class}" name="testClass"/>
652
            <attribute default="" name="testMethod"/>
653
            <sequential>
654
                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
655
                    <customize>
656
                        <classpath>
657
                            <path path="${run.test.classpath}"/>
658
                        </classpath>
659
                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
660
                        <jvmarg line="${run.jvmargs}"/>
661
                        <jvmarg line="${run.jvmargs.ide}"/>
662
                    </customize>
663
                </j2seproject3:test-debug-impl>
664
            </sequential>
665
        </macrodef>
666
    </target>
667
    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
668
        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
669
            <attribute default="${includes}" name="includes"/>
670
            <attribute default="${excludes}" name="excludes"/>
671
            <attribute default="**" name="testincludes"/>
672
            <attribute default="" name="testmethods"/>
673
            <attribute default="${main.class}" name="testClass"/>
674
            <attribute default="" name="testMethod"/>
675
            <sequential>
676
                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
677
                    <customize2>
678
                        <syspropertyset>
679
                            <propertyref prefix="test-sys-prop."/>
680
                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
681
                        </syspropertyset>
682
                    </customize2>
683
                </j2seproject3:testng-debug-impl>
684
            </sequential>
685
        </macrodef>
686
    </target>
687
    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
688
    <!--
689
                pre NB7.2 profiling section; consider it deprecated
690
            -->
691
    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
692
    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
391
        <!-- Empty placeholder for easier customization. -->
693
        <!-- Empty placeholder for easier customization. -->
392
        <!-- You can override this target in the ../build.xml file. -->
694
        <!-- You can override this target in the ../build.xml file. -->
393
    </target>
695
    </target>
394
    <target name="-profile-post-init">
696
    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
395
        <!-- Empty placeholder for easier customization. -->
697
        <!-- Empty placeholder for easier customization. -->
396
        <!-- You can override this target in the ../build.xml file. -->
698
        <!-- You can override this target in the ../build.xml file. -->
397
    </target>
699
    </target>
398
    <target name="-profile-init-macrodef-profile">
700
    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
399
        <macrodef name="resolve">
701
        <macrodef name="resolve">
400
            <attribute name="name"/>
702
            <attribute name="name"/>
401
            <attribute name="value"/>
703
            <attribute name="value"/>
Lines 410-415 Link Here
410
                <property environment="env"/>
712
                <property environment="env"/>
411
                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
713
                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
412
                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
714
                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
715
                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
413
                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
716
                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
414
                    <jvmarg line="${profiler.info.jvmargs}"/>
717
                    <jvmarg line="${profiler.info.jvmargs}"/>
415
                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
718
                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
Lines 426-435 Link Here
426
            </sequential>
729
            </sequential>
427
        </macrodef>
730
        </macrodef>
428
    </target>
731
    </target>
429
    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
732
    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
430
        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
733
        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
431
        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
734
        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
432
    </target>
735
    </target>
736
    <!--
737
                end of pre NB7.2 profiling section
738
            -->
433
    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
739
    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
434
        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
740
        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
435
            <attribute default="${main.class}" name="name"/>
741
            <attribute default="${main.class}" name="name"/>
Lines 487-492 Link Here
487
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
793
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
488
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
794
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
489
                    <jvmarg line="${run.jvmargs}"/>
795
                    <jvmarg line="${run.jvmargs}"/>
796
                    <jvmarg line="${run.jvmargs.ide}"/>
490
                    <classpath>
797
                    <classpath>
491
                        <path path="@{classpath}"/>
798
                        <path path="@{classpath}"/>
492
                    </classpath>
799
                    </classpath>
Lines 503-508 Link Here
503
        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
810
        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
504
            <attribute default="${main.class}" name="classname"/>
811
            <attribute default="${main.class}" name="classname"/>
505
            <attribute default="${run.classpath}" name="classpath"/>
812
            <attribute default="${run.classpath}" name="classpath"/>
813
            <attribute default="jvm" name="jvm"/>
506
            <element name="customize" optional="true"/>
814
            <element name="customize" optional="true"/>
507
            <sequential>
815
            <sequential>
508
                <java classname="@{classname}" dir="${work.dir}" fork="true">
816
                <java classname="@{classname}" dir="${work.dir}" fork="true">
Lines 510-515 Link Here
510
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
818
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
511
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
819
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
512
                    <jvmarg line="${run.jvmargs}"/>
820
                    <jvmarg line="${run.jvmargs}"/>
821
                    <jvmarg line="${run.jvmargs.ide}"/>
513
                    <classpath>
822
                    <classpath>
514
                        <path path="@{classpath}"/>
823
                        <path path="@{classpath}"/>
515
                    </classpath>
824
                    </classpath>
Lines 536-546 Link Here
536
                    <path path="${run.classpath.without.build.classes.dir}"/>
845
                    <path path="${run.classpath.without.build.classes.dir}"/>
537
                    <chainedmapper>
846
                    <chainedmapper>
538
                        <flattenmapper/>
847
                        <flattenmapper/>
848
                        <filtermapper>
849
                            <replacestring from=" " to="%20"/>
850
                        </filtermapper>
539
                        <globmapper from="*" to="lib/*"/>
851
                        <globmapper from="*" to="lib/*"/>
540
                    </chainedmapper>
852
                    </chainedmapper>
541
                </pathconvert>
853
                </pathconvert>
542
                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
854
                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
543
                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
855
                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
544
                    <fileset dir="${build.classes.dir}"/>
856
                    <fileset dir="${build.classes.dir}"/>
545
                    <manifest>
857
                    <manifest>
546
                        <attribute name="Class-Path" value="${jar.classpath}"/>
858
                        <attribute name="Class-Path" value="${jar.classpath}"/>
Lines 581-587 Link Here
581
    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
893
    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
582
        <property name="ap.cmd.line.internal" value=""/>
894
        <property name="ap.cmd.line.internal" value=""/>
583
    </target>
895
    </target>
584
    <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-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
896
    <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-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
585
    <!--
897
    <!--
586
                ===================
898
                ===================
587
                COMPILATION SECTION
899
                COMPILATION SECTION
Lines 709-724 Link Here
709
        </antcall>
1021
        </antcall>
710
        <antcall target="-maybe-call-dep">
1022
        <antcall target="-maybe-call-dep">
711
            <param name="call.built.properties" value="${built-jar.properties}"/>
1023
            <param name="call.built.properties" value="${built-jar.properties}"/>
712
            <param location="${project.SignServer-Test-Utils}" name="call.subproject"/>
1024
            <param location="${project.SignServer-Server}" name="call.subproject"/>
713
            <param location="${project.SignServer-Test-Utils}/build.xml" name="call.script"/>
1025
            <param location="${project.SignServer-Server}/build.xml" name="call.script"/>
714
            <param name="call.target" value="jar"/>
1026
            <param name="call.target" value="jar"/>
715
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
1027
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
716
        </antcall>
1028
        </antcall>
717
        <antcall target="-maybe-call-dep">
1029
        <antcall target="-maybe-call-dep">
718
            <param name="call.built.properties" value="${built-jar.properties}"/>
1030
            <param name="call.built.properties" value="${built-jar.properties}"/>
719
            <param location="${project.SignServer-ejb}" name="call.subproject"/>
1031
            <param location="${project.SignServer-Test-Utils}" name="call.subproject"/>
720
            <param location="${project.SignServer-ejb}/build.xml" name="call.script"/>
1032
            <param location="${project.SignServer-Test-Utils}/build.xml" name="call.script"/>
721
            <param name="call.target" value="dist"/>
1033
            <param name="call.target" value="jar"/>
722
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
1034
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
723
        </antcall>
1035
        </antcall>
724
        <antcall target="-maybe-call-dep">
1036
        <antcall target="-maybe-call-dep">
Lines 735-740 Link Here
735
            <param name="call.target" value="dist"/>
1047
            <param name="call.target" value="dist"/>
736
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
1048
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
737
        </antcall>
1049
        </antcall>
1050
        <antcall target="-maybe-call-dep">
1051
            <param name="call.built.properties" value="${built-jar.properties}"/>
1052
            <param location="${project.SignServer-ejb-interfaces}" name="call.subproject"/>
1053
            <param location="${project.SignServer-ejb-interfaces}/build.xml" name="call.script"/>
1054
            <param name="call.target" value="jar"/>
1055
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
1056
        </antcall>
738
    </target>
1057
    </target>
739
    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
1058
    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
740
    <target depends="init" name="-check-automatic-build">
1059
    <target depends="init" name="-check-automatic-build">
Lines 930-936 Link Here
930
                PROFILING SECTION
1249
                PROFILING SECTION
931
                =================
1250
                =================
932
            -->
1251
            -->
933
    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
1252
    <!--
1253
                pre NB7.2 profiler integration
1254
            -->
1255
    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
1256
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
934
        <nbprofiledirect>
1257
        <nbprofiledirect>
935
            <classpath>
1258
            <classpath>
936
                <path path="${run.classpath}"/>
1259
                <path path="${run.classpath}"/>
Lines 938-945 Link Here
938
        </nbprofiledirect>
1261
        </nbprofiledirect>
939
        <profile/>
1262
        <profile/>
940
    </target>
1263
    </target>
941
    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
1264
    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
942
        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
1265
        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
1266
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
943
        <nbprofiledirect>
1267
        <nbprofiledirect>
944
            <classpath>
1268
            <classpath>
945
                <path path="${run.classpath}"/>
1269
                <path path="${run.classpath}"/>
Lines 947-958 Link Here
947
        </nbprofiledirect>
1271
        </nbprofiledirect>
948
        <profile classname="${profile.class}"/>
1272
        <profile classname="${profile.class}"/>
949
    </target>
1273
    </target>
950
    <!--
1274
    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
951
                =========================
1275
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
952
                APPLET PROFILING  SECTION
953
                =========================
954
            -->
955
    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
956
        <nbprofiledirect>
1276
        <nbprofiledirect>
957
            <classpath>
1277
            <classpath>
958
                <path path="${run.classpath}"/>
1278
                <path path="${run.classpath}"/>
Lines 964-975 Link Here
964
            </customize>
1284
            </customize>
965
        </profile>
1285
        </profile>
966
    </target>
1286
    </target>
967
    <!--
1287
    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
968
                =========================
1288
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
969
                TESTS PROFILING  SECTION
970
                =========================
971
            -->
972
    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
973
        <nbprofiledirect>
1289
        <nbprofiledirect>
974
            <classpath>
1290
            <classpath>
975
                <path path="${run.test.classpath}"/>
1291
                <path path="${run.test.classpath}"/>
Lines 992-1003 Link Here
992
        </junit>
1308
        </junit>
993
    </target>
1309
    </target>
994
    <!--
1310
    <!--
1311
                end of pre NB72 profiling section
1312
            -->
1313
    <target if="netbeans.home" name="-profile-check">
1314
        <condition property="profiler.configured">
1315
            <or>
1316
                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
1317
                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
1318
            </or>
1319
        </condition>
1320
    </target>
1321
    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
1322
        <startprofiler/>
1323
        <antcall target="run"/>
1324
    </target>
1325
    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
1326
        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1327
        <startprofiler/>
1328
        <antcall target="run-single"/>
1329
    </target>
1330
    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
1331
    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
1332
        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1333
        <startprofiler/>
1334
        <antcall target="test-single"/>
1335
    </target>
1336
    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1337
        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1338
        <startprofiler/>
1339
        <antcal target="run-test-with-main"/>
1340
    </target>
1341
    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1342
        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1343
        <startprofiler/>
1344
        <antcall target="run-applet"/>
1345
    </target>
1346
    <!--
995
                ===============
1347
                ===============
996
                JAVADOC SECTION
1348
                JAVADOC SECTION
997
                ===============
1349
                ===============
998
            -->
1350
            -->
999
    <target depends="init" if="have.sources" name="-javadoc-build">
1351
    <target depends="init" if="have.sources" name="-javadoc-build">
1000
        <mkdir dir="${dist.javadoc.dir}"/>
1352
        <mkdir dir="${dist.javadoc.dir}"/>
1353
        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
1354
            <and>
1355
                <isset property="endorsed.classpath.cmd.line.arg"/>
1356
                <not>
1357
                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
1358
                </not>
1359
            </and>
1360
        </condition>
1001
        <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}">
1361
        <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}">
1002
            <classpath>
1362
            <classpath>
1003
                <path path="${javac.classpath}"/>
1363
                <path path="${javac.classpath}"/>
Lines 1009-1014 Link Here
1009
                <include name="**/*.java"/>
1369
                <include name="**/*.java"/>
1010
                <exclude name="*.java"/>
1370
                <exclude name="*.java"/>
1011
            </fileset>
1371
            </fileset>
1372
            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1012
        </javadoc>
1373
        </javadoc>
1013
        <copy todir="${dist.javadoc.dir}">
1374
        <copy todir="${dist.javadoc.dir}">
1014
            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1375
            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
Lines 1025-1031 Link Here
1025
    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
1386
    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
1026
    <!--
1387
    <!--
1027
                =========================
1388
                =========================
1028
                JUNIT COMPILATION SECTION
1389
                TEST COMPILATION SECTION
1029
                =========================
1390
                =========================
1030
            -->
1391
            -->
1031
    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
1392
    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
Lines 1068-1081 Link Here
1068
    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
1429
    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
1069
    <!--
1430
    <!--
1070
                =======================
1431
                =======================
1071
                JUNIT EXECUTION SECTION
1432
                TEST EXECUTION SECTION
1072
                =======================
1433
                =======================
1073
            -->
1434
            -->
1074
    <target depends="init" if="have.tests" name="-pre-test-run">
1435
    <target depends="init" if="have.tests" name="-pre-test-run">
1075
        <mkdir dir="${build.test.results.dir}"/>
1436
        <mkdir dir="${build.test.results.dir}"/>
1076
    </target>
1437
    </target>
1077
    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1438
    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1078
        <j2seproject3:junit testincludes="**/*Test.java"/>
1439
        <j2seproject3:test testincludes="**/*Test.java"/>
1079
    </target>
1440
    </target>
1080
    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1441
    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1081
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1442
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
Lines 1088-1126 Link Here
1088
    </target>
1449
    </target>
1089
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1450
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1090
        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1451
        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1091
        <j2seproject3:junit excludes="" includes="${test.includes}"/>
1452
        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
1092
    </target>
1453
    </target>
1093
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1454
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1094
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1455
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1095
    </target>
1456
    </target>
1096
    <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"/>
1457
    <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"/>
1458
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
1459
        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
1460
        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1461
        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
1462
    </target>
1463
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
1464
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1465
    </target>
1466
    <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"/>
1097
    <!--
1467
    <!--
1098
                =======================
1468
                =======================
1099
                JUNIT DEBUGGING SECTION
1469
                TEST DEBUGGING SECTION
1100
                =======================
1470
                =======================
1101
            -->
1471
            -->
1102
    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
1472
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
1103
        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1473
        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1104
        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
1474
        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
1105
        <delete file="${test.report.file}"/>
1106
        <mkdir dir="${build.test.results.dir}"/>
1107
        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
1108
            <customize>
1109
                <syspropertyset>
1110
                    <propertyref prefix="test-sys-prop."/>
1111
                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
1112
                </syspropertyset>
1113
                <arg value="${test.class}"/>
1114
                <arg value="showoutput=true"/>
1115
                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
1116
                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
1117
            </customize>
1118
        </j2seproject3:debug>
1119
    </target>
1475
    </target>
1476
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
1477
        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1478
        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1479
        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
1480
    </target>
1120
    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1481
    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1121
        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1482
        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1122
    </target>
1483
    </target>
1123
    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1484
    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1485
    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
1124
    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1486
    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1125
        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1487
        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1126
    </target>
1488
    </target>
Lines 1279-1293 Link Here
1279
        </antcall>
1641
        </antcall>
1280
        <antcall target="-maybe-call-dep">
1642
        <antcall target="-maybe-call-dep">
1281
            <param name="call.built.properties" value="${built-clean.properties}"/>
1643
            <param name="call.built.properties" value="${built-clean.properties}"/>
1282
            <param location="${project.SignServer-Test-Utils}" name="call.subproject"/>
1644
            <param location="${project.SignServer-Server}" name="call.subproject"/>
1283
            <param location="${project.SignServer-Test-Utils}/build.xml" name="call.script"/>
1645
            <param location="${project.SignServer-Server}/build.xml" name="call.script"/>
1284
            <param name="call.target" value="clean"/>
1646
            <param name="call.target" value="clean"/>
1285
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1647
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1286
        </antcall>
1648
        </antcall>
1287
        <antcall target="-maybe-call-dep">
1649
        <antcall target="-maybe-call-dep">
1288
            <param name="call.built.properties" value="${built-clean.properties}"/>
1650
            <param name="call.built.properties" value="${built-clean.properties}"/>
1289
            <param location="${project.SignServer-ejb}" name="call.subproject"/>
1651
            <param location="${project.SignServer-Test-Utils}" name="call.subproject"/>
1290
            <param location="${project.SignServer-ejb}/build.xml" name="call.script"/>
1652
            <param location="${project.SignServer-Test-Utils}/build.xml" name="call.script"/>
1291
            <param name="call.target" value="clean"/>
1653
            <param name="call.target" value="clean"/>
1292
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1654
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1293
        </antcall>
1655
        </antcall>
Lines 1305-1310 Link Here
1305
            <param name="call.target" value="clean"/>
1667
            <param name="call.target" value="clean"/>
1306
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1668
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1307
        </antcall>
1669
        </antcall>
1670
        <antcall target="-maybe-call-dep">
1671
            <param name="call.built.properties" value="${built-clean.properties}"/>
1672
            <param location="${project.SignServer-ejb-interfaces}" name="call.subproject"/>
1673
            <param location="${project.SignServer-ejb-interfaces}/build.xml" name="call.script"/>
1674
            <param name="call.target" value="clean"/>
1675
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1676
        </antcall>
1308
    </target>
1677
    </target>
1309
    <target depends="init" name="-do-clean">
1678
    <target depends="init" name="-do-clean">
1310
        <delete dir="${build.dir}"/>
1679
        <delete dir="${build.dir}"/>
Lines 1318-1326 Link Here
1318
    <target name="-check-call-dep">
1687
    <target name="-check-call-dep">
1319
        <property file="${call.built.properties}" prefix="already.built."/>
1688
        <property file="${call.built.properties}" prefix="already.built."/>
1320
        <condition property="should.call.dep">
1689
        <condition property="should.call.dep">
1690
            <and>
1321
            <not>
1691
            <not>
1322
                <isset property="already.built.${call.subproject}"/>
1692
                <isset property="already.built.${call.subproject}"/>
1323
            </not>
1693
            </not>
1694
                <available file="${call.script}"/>
1695
            </and>
1324
        </condition>
1696
        </condition>
1325
    </target>
1697
    </target>
1326
    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
1698
    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
(-)modules/SignServer-Test-System/nbproject/genfiles.properties (-3 / +3 lines)
Lines 3-8 Link Here
3
build.xml.stylesheet.CRC32=28e38971@1.38.3.45
3
build.xml.stylesheet.CRC32=28e38971@1.38.3.45
4
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
5
# 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=4d25fa02
6
nbproject/build-impl.xml.data.CRC32=a6400bf4
7
nbproject/build-impl.xml.script.CRC32=a2a51df4
7
nbproject/build-impl.xml.script.CRC32=95aadb10
8
nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
8
nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
(-)modules/SignServer-Test-System/nbproject/project.properties (-3 / +6 lines)
Lines 111-117 Link Here
111
    ${reference.SignServer-Client-ValidationCLI.jar}:\
111
    ${reference.SignServer-Client-ValidationCLI.jar}:\
112
    ${reference.SignServer-Module-WSRA.jar}:\
112
    ${reference.SignServer-Module-WSRA.jar}:\
113
    ${reference.SignServer-Client-SigningAndValidationAPI.jar}:\
113
    ${reference.SignServer-Client-SigningAndValidationAPI.jar}:\
114
    ${reference.SignServer-ejb.dist}:\
114
    ${reference.SignServer-Server.jar}:\
115
    ${reference.SignServer-ejb-interfaces.jar}:\
115
    ${file.reference.itext.jar}:\
116
    ${file.reference.itext.jar}:\
116
    ${file.reference.jboss-ejb3x.jar}:\
117
    ${file.reference.jboss-ejb3x.jar}:\
117
    ${file.reference.jboss-j2ee.jar}:\
118
    ${file.reference.jboss-j2ee.jar}:\
Lines 192-198 Link Here
192
project.SignServer-Client-SignServerWS=../SignServer-Client-SignServerWS
193
project.SignServer-Client-SignServerWS=../SignServer-Client-SignServerWS
193
project.SignServer-Client-ValidationCLI=../SignServer-Client-ValidationCLI
194
project.SignServer-Client-ValidationCLI=../SignServer-Client-ValidationCLI
194
project.SignServer-Common=../SignServer-Common
195
project.SignServer-Common=../SignServer-Common
195
project.SignServer-ejb=../SignServer-ejb
196
project.SignServer-ejb-interfaces=../../../../trunk-x4/signserver/modules/SignServer-ejb-interfaces
196
project.SignServer-ejb-SignServerWS=../SignServer-ejb-SignServerWS
197
project.SignServer-ejb-SignServerWS=../SignServer-ejb-SignServerWS
197
project.SignServer-ejb-ValidationWS=../SignServer-ejb-ValidationWS
198
project.SignServer-ejb-ValidationWS=../SignServer-ejb-ValidationWS
198
project.SignServer-Module-CMSSigner=../SignServer-Module-CMSSigner
199
project.SignServer-Module-CMSSigner=../SignServer-Module-CMSSigner
Lines 204-209 Link Here
204
project.SignServer-Module-TSA=../SignServer-Module-TSA
205
project.SignServer-Module-TSA=../SignServer-Module-TSA
205
project.SignServer-Module-WSRA=../SignServer-Module-WSRA
206
project.SignServer-Module-WSRA=../SignServer-Module-WSRA
206
project.SignServer-Module-XMLValidator=../SignServer-Module-XMLValidator
207
project.SignServer-Module-XMLValidator=../SignServer-Module-XMLValidator
208
project.SignServer-Server=../../../../trunk-x4/signserver/modules/SignServer-Server
207
project.SignServer-Test-Utils=../SignServer-Test-Utils
209
project.SignServer-Test-Utils=../SignServer-Test-Utils
208
reference.SignServer-AdminCLI.jar=${project.SignServer-AdminCLI}/dist/SignServer-AdminCLI.jar
210
reference.SignServer-AdminCLI.jar=${project.SignServer-AdminCLI}/dist/SignServer-AdminCLI.jar
209
reference.SignServer-Client-CLI.jar=${project.SignServer-Client-CLI}/dist/SignServer-Client-CLI.jar
211
reference.SignServer-Client-CLI.jar=${project.SignServer-Client-CLI}/dist/SignServer-Client-CLI.jar
Lines 211-219 Link Here
211
reference.SignServer-Client-SignServerWS.jar=${project.SignServer-Client-SignServerWS}/dist/SignServer-Client-SignServerWS.jar
213
reference.SignServer-Client-SignServerWS.jar=${project.SignServer-Client-SignServerWS}/dist/SignServer-Client-SignServerWS.jar
212
reference.SignServer-Client-ValidationCLI.jar=${project.SignServer-Client-ValidationCLI}/dist/SignServer-Client-ValidationCLI.jar
214
reference.SignServer-Client-ValidationCLI.jar=${project.SignServer-Client-ValidationCLI}/dist/SignServer-Client-ValidationCLI.jar
213
reference.SignServer-Common.jar=${project.SignServer-Common}/dist/SignServer-Common.jar
215
reference.SignServer-Common.jar=${project.SignServer-Common}/dist/SignServer-Common.jar
216
reference.SignServer-ejb-interfaces.jar=${project.SignServer-ejb-interfaces}/dist/SignServer-ejb-interfaces.jar
214
reference.SignServer-ejb-SignServerWS.dist=${project.SignServer-ejb-SignServerWS}/dist/SignServer-ejb-SignServerWS.jar
217
reference.SignServer-ejb-SignServerWS.dist=${project.SignServer-ejb-SignServerWS}/dist/SignServer-ejb-SignServerWS.jar
215
reference.SignServer-ejb-ValidationWS.dist=${project.SignServer-ejb-ValidationWS}/dist/SignServer-ejb-ValidationWS.jar
218
reference.SignServer-ejb-ValidationWS.dist=${project.SignServer-ejb-ValidationWS}/dist/SignServer-ejb-ValidationWS.jar
216
reference.SignServer-ejb.dist=${project.SignServer-ejb}/dist/SignServer-ejb.jar
217
reference.SignServer-Module-CMSSigner.jar=${project.SignServer-Module-CMSSigner}/dist/SignServer-Module-CMSSigner.jar
219
reference.SignServer-Module-CMSSigner.jar=${project.SignServer-Module-CMSSigner}/dist/SignServer-Module-CMSSigner.jar
218
reference.SignServer-Module-MRTDSigner.jar=${project.SignServer-Module-MRTDSigner}/dist/SignServer-Module-MRTDSigner.jar
220
reference.SignServer-Module-MRTDSigner.jar=${project.SignServer-Module-MRTDSigner}/dist/SignServer-Module-MRTDSigner.jar
219
reference.SignServer-Module-MRTDSODSigner.jar=${project.SignServer-Module-MRTDSODSigner}/dist/SignServer-Module-MRTDSODSigner.jar
221
reference.SignServer-Module-MRTDSODSigner.jar=${project.SignServer-Module-MRTDSODSigner}/dist/SignServer-Module-MRTDSODSigner.jar
Lines 223-228 Link Here
223
reference.SignServer-Module-TSA.jar=${project.SignServer-Module-TSA}/dist/SignServer-Module-TSA.jar
225
reference.SignServer-Module-TSA.jar=${project.SignServer-Module-TSA}/dist/SignServer-Module-TSA.jar
224
reference.SignServer-Module-WSRA.jar=${project.SignServer-Module-WSRA}/dist/SignServer-Module-WSRA.jar
226
reference.SignServer-Module-WSRA.jar=${project.SignServer-Module-WSRA}/dist/SignServer-Module-WSRA.jar
225
reference.SignServer-Module-XMLValidator.jar=${project.SignServer-Module-XMLValidator}/dist/SignServer-Module-XMLValidator.jar
227
reference.SignServer-Module-XMLValidator.jar=${project.SignServer-Module-XMLValidator}/dist/SignServer-Module-XMLValidator.jar
228
reference.SignServer-Server.jar=${project.SignServer-Server}/dist/SignServer-Server.jar
226
reference.SignServer-Test-Utils.jar=${project.SignServer-Test-Utils}/dist/SignServer-Test-Utils.jar
229
reference.SignServer-Test-Utils.jar=${project.SignServer-Test-Utils}/dist/SignServer-Test-Utils.jar
227
run.classpath=\
230
run.classpath=\
228
    ${javac.classpath}:\
231
    ${javac.classpath}:\
(-)modules/SignServer-Test-System/nbproject/project.xml (-4 / +12 lines)
Lines 141-147 Link Here
141
                <id>jar</id>
141
                <id>jar</id>
142
            </reference>
142
            </reference>
143
            <reference>
143
            <reference>
144
                <foreign-project>SignServer-Test-Utils</foreign-project>
144
                <foreign-project>SignServer-Server</foreign-project>
145
                <artifact-type>jar</artifact-type>
145
                <artifact-type>jar</artifact-type>
146
                <script>build.xml</script>
146
                <script>build.xml</script>
147
                <target>jar</target>
147
                <target>jar</target>
Lines 149-160 Link Here
149
                <id>jar</id>
149
                <id>jar</id>
150
            </reference>
150
            </reference>
151
            <reference>
151
            <reference>
152
                <foreign-project>SignServer-ejb</foreign-project>
152
                <foreign-project>SignServer-Test-Utils</foreign-project>
153
                <artifact-type>jar</artifact-type>
153
                <artifact-type>jar</artifact-type>
154
                <script>build.xml</script>
154
                <script>build.xml</script>
155
                <target>dist</target>
155
                <target>jar</target>
156
                <clean-target>clean</clean-target>
156
                <clean-target>clean</clean-target>
157
                <id>dist</id>
157
                <id>jar</id>
158
            </reference>
158
            </reference>
159
            <reference>
159
            <reference>
160
                <foreign-project>SignServer-ejb-SignServerWS</foreign-project>
160
                <foreign-project>SignServer-ejb-SignServerWS</foreign-project>
Lines 172-177 Link Here
172
                <clean-target>clean</clean-target>
172
                <clean-target>clean</clean-target>
173
                <id>dist</id>
173
                <id>dist</id>
174
            </reference>
174
            </reference>
175
            <reference>
176
                <foreign-project>SignServer-ejb-interfaces</foreign-project>
177
                <artifact-type>jar</artifact-type>
178
                <script>build.xml</script>
179
                <target>jar</target>
180
                <clean-target>clean</clean-target>
181
                <id>jar</id>
182
            </reference>
175
        </references>
183
        </references>
176
    </configuration>
184
    </configuration>
177
</project>
185
</project>

Return to bug 215967