~ubuntu-branches/ubuntu/precise/libstruts1.2-java/precise-updates

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
<project name="Struts Unit Tests" default="test.tomcat.32" basedir=".">

<!--
        This is a generic build.xml file for Ant that is used to run the
        Struts unit tests. This build file *must* be called from the
        build.xml file in order to inherit most of it's needed properties
        (See below for the list of these properties).
-->

<!-- ========== Prerequisite Properties =================================== -->


<!--
        These properties MUST be set on the "ant" command line, the "antrc"
        properties file in your home directory, or from settings in a superior
        build.xml script.

        build.home                    Base directory into which we are building
                                      the Struts components.

        servlet.jar                   The servlet jar (either 2.2 or 2.3)

        cactus.home                   The home directory of your Cactus
                                      installation (version 1.3+ required)

        cactus.contextScheme         The scheme used for testing, ie https, http


        cactus.contextHost           The hostname used for testing, ie localhost, www.apache.org, etc.


        cactus.contextPort           The Port used for testing


        cactus.contextApp             The application(context) being tested, ie test


        aspectjrt.jar                 The AspectJ runtime jar that is
                                      included with Cactus 1.3

        cactus.jar                    The Cactus jar (either for Servlet API
                                      2.2 or 2.3).

        cactus.ant.jar                The Cactus custom Ant tasks jar

        junit.jar                     The JUnit jar

        tomcat.home.32                The home directory of where Tomcat 3.2
                                      is installed

        tomcat.home.40                The home directory of where Tomcat 4.0
                                      is installed

        tomcat.home.41                The home directory of where Tomcat 4.1
                                      is installed

        compile.debug                 The debug mode for compilation

        compile.deprecation           The deprecation mode for compilation

        compile.optimize              The optimization mode for compilation

        src.dir                       The location of the source directory

        app.name                      The name of the Struts jar (without the
                                      '.jar' suffix

-->

<!-- ========== Initialization Properties ================================= -->

<!--
        These property values may optionally be overridden with property
        settings from an "ant" command line, the "build.properties" file
        in this directory, the "build.properties" file in your home
        directory, or from settings in a superior build.xml script.
-->


<!-- ========== Derived Properties ======================================== -->

<!--
        These property values are derived from values defined above, and
        generally should NOT be overridden by command line settings
-->

    <!-- Source directory for tests -->
    <property name="src.test.dir" value="${src.dir}/test"/>

    <!-- Configuration directory for tests -->
    <property name="conf.test.dir" value="conf/test"/>

    <!-- Output directory for tests -->
    <property name="out.test.dir" value="${build.home}/test"/>

    <!-- cactus lib -->
    <property name="cactus.lib" value="${cactus.home}/lib"/>

    <!-- Default Cactus Context Scheme -->
    <property name="cactus.contextScheme" value="http" />

    <!-- Default Cactus Context Host -->
    <property name="cactus.contextHost"   value="localhost" />

    <!-- Default Cactus Context Port -->
    <property name="cactus.contextPort"   value="8080" />

    <!-- Default Cactus Context Application -->
    <property name="cactus.contextApp"    value="test" />

    <!-- Context test is taking place on -->
    <property name="cactus.contextURL" value="${cactus.contextScheme}://${cactus.contextHost}:${cactus.contextPort}/${cactus.contextApp}"/>

	<!-- This is only used if you execute "ant download-dependencies" -->
    <property name="libdir" value="lib" />

    <!-- Cactus Test Runner -->
    <property name="cactus.servertest.class" value="org.apache.cactus.integration.ant.RunServerTestsTask" />

    <!-- Cactus jspRedirector.jsp -->
    <!-- N.B. The one in cactus home works except for cactus 1.3 (because session="false") -->
    <property name="cactus.jspRedirector" value="${cactus.home}/web/jspRedirector.jsp" />
    	
    <path id="downloaded.lib.classpath">
      <fileset dir="${libdir}">
        <include name="*.jar"/>
      </fileset>
    </path>

    <path id="cactus.ant.classpath">
      <fileset dir="${cactus.lib}">
        <include name="cactus-ant*.jar"/>
      </fileset>
    </path>


    <path id="cactus.lib.classpath">
      <fileset dir="${cactus.lib}">
        <include name="cactus*.jar"/>
        <exclude name="cactus-ant*.jar"/>
        <include name="aspectjrt*.jar"/>
        <include name="httpunit*.jar"/>
        <include name="commons-httpclient*.jar"/>
      </fileset>
    </path>

    <!-- Compilation Classpath -->
    <path id="compile.classpath">
      <pathelement location="${build.home}/library/${app.name}.jar"/>
      <pathelement location="${build.home}/test/classes"/>
      <pathelement location="${commons-beanutils.jar}"/>
      <pathelement location="${commons-digester.jar}"/>
      <pathelement location="${commons-fileupload.jar}"/>
      <pathelement location="${commons-logging.jar}"/>
      <pathelement location="${commons-validator.jar}"/>
      <pathelement location="${jakarta-oro.jar}"/>
      <pathelement location="${junit.jar}"/>
      <pathelement location="${servlet.jar}"/>
      <pathelement location="${struts.jar}"/>
      <pathelement location="${antlr.jar}"/>
      <pathelement location="${xerces.jar}"/>

      <!-- cactus lib jars -->
      <path refid="cactus.lib.classpath"/>
      
		<!-- this is harmless if not used -->
		<path refid="downloaded.lib.classpath"/>
		
    </path>

<!-- ========== Executable Targets ======================================== -->


<!--
        Initialization of custom Ant tasks
-->
    <target name="init">

        <taskdef name="runservertests"
            classname="${cactus.servertest.class}">

            <classpath>
                <path refid="cactus.ant.classpath"/>
                <pathelement path="${java.class.path}"/>
            </classpath>
        </taskdef>

    </target>

<!--
        Create directories and copy files for the struts tests
-->
    <target name="prepare.test" depends="init">

        <!-- Create target directories for classes -->
        <mkdir dir="${out.test.dir}/classes"/>

        <!-- Create directory where servlet engines will run -->
        <mkdir dir="${out.test.dir}/servers"/>

        <!-- Create directory where servlet engines will run -->
        <mkdir dir="${out.test.dir}/WEB-INF"/>

        <!-- Create a lib directory where needed libs for the test war will
             be put -->
        <mkdir dir="${out.test.dir}/lib"/>

    </target>

<!--
        Compile unit tests
-->
    <target name="compile.test" depends="prepare.test">

        <javac srcdir="${src.test.dir}"
            destdir="${out.test.dir}/classes"
            debug="${compile.debug}"
            optimize="${compile.optimize}"
            deprecation="${compile.deprecation}">

            <classpath refid="compile.classpath"/>
        </javac>
        <copy todir="${out.test.dir}/classes">
            <fileset dir="${src.test.dir}" excludes="**/*.java"/>
        </copy>
        <filter token="cactus.contextURL" value="${cactus.contextURL}"/>
        <copy todir="${out.test.dir}/classes" filtering="on">
            <fileset dir="${conf.test.dir}" includes="*.properties"/>
        </copy>
        <copy todir="${out.test.dir}/WEB-INF">
            <fileset dir="${build.home}/library" includes="struts-*.tld"/>
        </copy>
        <copy todir="${out.test.dir}/WEB-INF">
            <fileset dir="${conf.test.dir}" includes="struts-config.xml"/>
        </copy>

    </target>

<!--
        Prepare test war (for all servlet engines)
-->
    <target name="prepare.test.war" depends="compile.test">

        <!-- Copy needed libs in /lib -->
        <copy file="${build.home}/library/${app.name}.jar"
            todir="${out.test.dir}/lib"/>
        <copy file="${junit.jar}"     todir="${out.test.dir}/lib"/>
        <copy file="${jakarta-oro.jar}"     todir="${out.test.dir}/lib"/>
        <copy file="${commons-beanutils.jar}"
                                      todir="${out.test.dir}/lib"/>
        <copy file="${commons-digester.jar}"
                                      todir="${out.test.dir}/lib"/>
        <copy file="${commons-logging.jar}"
                                      todir="${out.test.dir}/lib"/>
        <copy file="${commons-validator.jar}"
                                      todir="${out.test.dir}/lib"/>

        <!-- copy cactus jars -->
        <copy todir="${out.test.dir}/lib">
            <fileset dir="${cactus.lib}">
                <include name="cactus*.jar"/>
                <exclude name="cactus-ant*.jar"/>
                <include name="aspectjrt*.jar"/>
                <include name="httpunit*.jar"/>
                <include name="log4j*.jar"/>
            </fileset>
        </copy>

        <war warfile="${out.test.dir}/test.war"
             webxml="${conf.test.dir}/web.xml">

            <!-- copy JspRedirector.jsp  -->
            <fileset file="${cactus.jspRedirector}"/>

            <!-- copy jsps (except JspRedirector.jsp) -->
            <fileset dir="${web.dir}/test" >
               <exclude name="jspRedirector.jsp" />
            </fileset>

            <classes dir="${out.test.dir}/classes"/>

            <!-- We need to copy the Cactus, JUnit and Struts jars in the war.
                 This is because if we just put these jars in the global
                 classpath for the Servlet engine, the Cactus jar might not be
                 able to load the test case class as the test classes are loaded
                 by the war classloader. This will depend on servlet engines -->

            <lib dir="${out.test.dir}/lib"/>

            <webinf dir="${out.test.dir}/WEB-INF" includes="**/*.*"/>

        </war>

    </target>

<!--
        Start the Cactus test using JUnit test runner.
-->
    <target name="run.test">

        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">

            <classpath>
                <pathelement path="${java.class.path}"/>
                <pathelement location="${commons-httpclient.jar}"/>
                <pathelement location="${out.test.dir}/classes"/>
                <!-- For cactus.properties -->
                <pathelement location="${conf.test.dir}"/>
            </classpath>
            <classpath refid="compile.classpath"/>

            <formatter type="plain" usefile="false"/>

            <!-- org.apache.struts.action package Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/action/Test*.class" />
              </fileset>
            </batchtest>

            <!-- Logic Taglib Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/taglib/logic/Test*.class" />
              </fileset>
            </batchtest>

            <!-- Bean Taglib Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/taglib/bean/Test*.class" />
              </fileset>
            </batchtest>

            <!-- Html Taglib Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/taglib/html/Test*.class" />
              </fileset>
            </batchtest>

            <!-- org.apache.struts.util package Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/util/Test*.class" />
              </fileset>
            </batchtest>

            <!-- org.apache.struts.util package Tests -->
            <batchtest fork="yes">
              <fileset dir="${out.test.dir}/classes">
                <include name="org/apache/struts/tiles/Test*.class" />
              </fileset>
            </batchtest>

        </junit>

    </target>

<!--
        Prepare test directory structure for Tomcat 3.2 servlet engine
-->
    <target name="prepare.test.tomcat.32" depends="prepare.test.war" if="tomcat.home.32">

        <property name="out.tomcat.32.dir" value="${out.test.dir}/servers/tomcat32"/>
        <filter token="out.tomcat.32.dir" value="${out.tomcat.32.dir}"/>
        <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>

        <mkdir dir="${out.tomcat.32.dir}/webapps"/>
        <mkdir dir="${out.tomcat.32.dir}/conf"/>

	<!-- Delete old directory so new war is unzipped -->
        <delete dir="${out.tomcat.32.dir}/webapps/test"/>

        <!-- Copy war file -->
        <copy file="${out.test.dir}/test.war" todir="${out.tomcat.32.dir}/webapps"/>

        <!-- Copy configuration files -->
        <copy file="${conf.test.dir}/tomcat32/server.xml"
            todir="${out.tomcat.32.dir}/conf" filtering="on"/>

    </target>

<!--
        Run unit tests on Tomcat 3.2 servlet engine
-->
    <target name="test.tomcat.32" depends="prepare.test.tomcat.32">

        <!-- Start the servlet engine, wait for it to be started, run the
             unit tests, stop the servlet engine, wait for it to be stopped.
             The servlet engine is automatically stopped if the tests fail for
             any reason.-->

        <runservertests testURL="${cactus.contextURL}"
            startTarget="start.tomcat.32"
            stopTarget="stop.tomcat.32"
            testTarget="run.test"/>

    </target>

<!--
        Start Tomcat 3.2 servlet engine
-->
    <target name="start.tomcat.32">

        <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
            <arg value="-config"/>
            <arg value="${out.tomcat.32.dir}/conf/server.xml"/>
            <classpath>
                <pathelement location="${java.home}/../lib/tools.jar"/>
                <fileset dir="${tomcat.home.32}/lib">
                    <include name="*.jar"/>
                </fileset>
            </classpath>
        </java>

    </target>

<!--
        Stop Tomcat 3.2 servlet engine
-->
    <target name="stop.tomcat.32">

        <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
            <jvmarg value="-Dtomcat.home=${tomcat.home.32}"/>
            <arg value="-stop"/>
            <classpath>
                <pathelement location="${java.home}/../lib/tools.jar"/>
                <fileset dir="${tomcat.home.32}/lib">
                    <include name="*.jar"/>
                </fileset>
            </classpath>
        </java>

    </target>

<!--
        Prepare test directory structure for Tomcat 3.3 servlet engine
-->
    <target name="prepare.test.tomcat.33" depends="prepare.test.war" if="tomcat.home.33">

        <property name="out.tomcat.33.dir" value="${out.test.dir}/servers/tomcat33"/>
        <filter token="out.tomcat.33.dir" value="${out.tomcat.33.dir}"/>
        <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>

        <mkdir dir="${out.tomcat.33.dir}/webapps"/>
        <mkdir dir="${out.tomcat.33.dir}/conf"/>

       <!-- Delete old directory so new war is unzipped -->
        <delete dir="${out.tomcat.33.dir}/webapps/test"/>

        <!-- Copy war file -->
        <copy file="${out.test.dir}/test.war" todir="${out.tomcat.33.dir}/webapps"/>

        <!-- Copy configuration files -->
        <copy file="${conf.test.dir}/tomcat33/server.xml"
            todir="${out.tomcat.33.dir}/conf" filtering="on"/>
        <copy file="${conf.test.dir}/tomcat33/modules.xml"
            todir="${out.tomcat.33.dir}/conf" filtering="on"/>

    </target>

<!--
        Run unit tests on Tomcat 3.3 servlet engine
-->
    <target name="test.tomcat.33" depends="prepare.test.tomcat.33">

        <!-- Start the servlet engine, wait for it to be started, run the
             unit tests, stop the servlet engine, wait for it to be stopped.
             The servlet engine is automatically stopped if the tests fail for
             any reason.-->

        <runservertests testURL="${cactus.contextURL}"
            startTarget="start.tomcat.33"
            stopTarget="stop.tomcat.33"
            testTarget="run.test"/>

    </target>

<!--
        Start Tomcat 3.3 servlet engine
-->
    <target name="start.tomcat.33">

        <java classname="org.apache.tomcat.startup.Main" fork="yes">
            <arg value="-home"/>
            <arg value="${out.tomcat.33.dir}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.33.dir}/conf/server.xml"/>
            <arg value="run"/>
            <classpath>
                <pathelement location="${java.home}/../lib/tools.jar"/>
                <fileset dir="${tomcat.home.33}/lib">
                    <include name="*.jar"/>
                </fileset>
                <fileset dir="${tomcat.home.33}/lib/common">
                    <include name="*.jar"/>
                </fileset>
                <fileset dir="${tomcat.home.33}/lib/container">
                    <include name="*.jar"/>
                </fileset>
            </classpath>
        </java>

    </target>

<!--
        Stop Tomcat 3.3 servlet engine
-->
    <target name="stop.tomcat.33">

        <java classname="org.apache.tomcat.startup.Main" fork="yes">
            <jvmarg value="-Dtomcat.home=${out.tomcat.33.dir}"/>
            <arg value="stop"/>
            <classpath>
                <pathelement location="${java.home}/../lib/tools.jar"/>
                <fileset dir="${tomcat.home.33}/lib">
                    <include name="*.jar"/>
                </fileset>
                <fileset dir="${tomcat.home.33}/lib/common">
                    <include name="*.jar"/>
                </fileset>
                <fileset dir="${tomcat.home.33}/lib/container">
                    <include name="*.jar"/>
                </fileset>
            </classpath>
        </java>

    </target>

<!--
        Prepare test directory structure for Tomcat 4.0 servlet engine
-->
    <target name="prepare.test.tomcat.40" depends="prepare.test.war" if="tomcat.home.40">

        <property name="out.tomcat.40.dir" value="${out.test.dir}/servers/tomcat40"/>
        <filter token="out.tomcat.40.full.dir" value="${out.tomcat.40.dir}"/>
        <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>

        <mkdir dir="${out.tomcat.40.dir}/webapps"/>
        <mkdir dir="${out.tomcat.40.dir}/conf"/>

	<!-- Delete old directory so new war is unzipped -->
        <delete dir="${out.tomcat.40.dir}/webapps/test"/>

        <!-- Copy war file -->
        <copy file="${out.test.dir}/test.war" todir="${out.tomcat.40.dir}/webapps"/>

        <!-- Copy configuration files -->
        <copy file="${conf.test.dir}/tomcat40/server.xml"
            todir="${out.tomcat.40.dir}/conf" filtering="on"/>

    </target>

<!--
        Run unit tests on Tomcat 4.0 servlet engine
-->
    <target name="test.tomcat.40" depends="prepare.test.tomcat.40">

        <!-- Start the servlet engine, wait for it to be started, run the
             unit tests, stop the servlet engine, wait for it to be stopped.
             The servlet engine is automatically stopped if the tests fail for
             any reason.-->

        <runservertests testURL="${cactus.contextURL}"
            startTarget="start.tomcat.40"
            stopTarget="stop.tomcat.40"
            testTarget="run.test"/>

    </target>

<!--
        Start Tomcat 4.0 servlet engine
-->
    <target name="start.tomcat.40">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.40}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.40.dir}/conf/server.xml"/>
            <arg value="start"/>
            <classpath>
              <pathelement location="${java.home}/../lib/tools.jar"/>
              <fileset dir="${tomcat.home.40}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!--
        Stop Tomcat 4.0 servlet engine
-->
    <target name="stop.tomcat.40">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.40}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.40.dir}/conf/server.xml"/>
            <arg value="stop"/>
            <classpath>
              <fileset dir="${tomcat.home.40}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!--
        Prepare test directory structure for Tomcat 4.1 servlet engine
-->
    <target name="prepare.test.tomcat.41" depends="prepare.test.war" if="tomcat.home.41">

        <property name="out.tomcat.41.dir" value="${out.test.dir}/servers/tomcat41"/>
        <filter token="out.tomcat.41.full.dir" value="${out.tomcat.41.dir}"/>
        <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>

        <mkdir dir="${out.tomcat.41.dir}/webapps"/>
        <mkdir dir="${out.tomcat.41.dir}/conf"/>

	<!-- Delete old directory so new war is unzipped -->
        <delete dir="${out.tomcat.41.dir}/webapps/test"/>

        <!-- Copy war file -->
        <copy file="${out.test.dir}/test.war" todir="${out.tomcat.41.dir}/webapps"/>

        <!-- Copy configuration files -->
        <copy file="${conf.test.dir}/tomcat41/server.xml"
            todir="${out.tomcat.41.dir}/conf" filtering="on"/>

    </target>

<!--
        Run unit tests on Tomcat 4.1 servlet engine
-->
    <target name="test.tomcat.41" depends="prepare.test.tomcat.41">

        <!-- Start the servlet engine, wait for it to be started, run the
             unit tests, stop the servlet engine, wait for it to be stopped.
             The servlet engine is automatically stopped if the tests fail for
             any reason.-->

        <runservertests testURL="${cactus.contextURL}"
            startTarget="start.tomcat.41"
            stopTarget="stop.tomcat.41"
            testTarget="run.test"/>

    </target>

<!--
        Start Tomcat 4.1 servlet engine
-->
    <target name="start.tomcat.41">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
            <arg value="start"/>
            <classpath>
              <pathelement location="${java.home}/../lib/tools.jar"/>
              <fileset dir="${tomcat.home.41}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!--
        Stop Tomcat 4.1 servlet engine
-->
    <target name="stop.tomcat.41">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
            <arg value="stop"/>
            <classpath>
              <fileset dir="${tomcat.home.41}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!--
        Prepare test directory structure for Tomcat 5.0 servlet engine
-->
    <target name="prepare.test.tomcat.50" depends="prepare.test.war" if="tomcat.home.50">

        <property name="out.tomcat.50.dir" value="${out.test.dir}/servers/tomcat50"/>
        <filter token="out.tomcat.50.full.dir" value="${out.tomcat.50.dir}"/>
        <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>

        <mkdir dir="${out.tomcat.50.dir}/webapps"/>
        <mkdir dir="${out.tomcat.50.dir}/conf"/>

	<!-- Delete old directory so new war is unzipped -->
        <delete dir="${out.tomcat.50.dir}/webapps/test"/>

        <!-- Copy war file -->
        <copy file="${out.test.dir}/test.war" todir="${out.tomcat.50.dir}/webapps"/>

        <!-- Copy configuration files -->
        <copy file="${conf.test.dir}/tomcat50/server.xml"
            todir="${out.tomcat.50.dir}/conf" filtering="on"/>

    </target>

<!--
        Run unit tests on Tomcat 5.0 servlet engine
-->
    <target name="test.tomcat.50" depends="prepare.test.tomcat.50">

        <!-- Start the servlet engine, wait for it to be started, run the
             unit tests, stop the servlet engine, wait for it to be stopped.
             The servlet engine is automatically stopped if the tests fail for
             any reason.-->

        <runservertests testURL="${cactus.contextURL}"
            startTarget="start.tomcat.50"
            stopTarget="stop.tomcat.50"
            testTarget="run.test"/>

    </target>

<!--
        Start Tomcat 5.0 servlet engine
-->
    <target name="start.tomcat.50">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
            <arg value="start"/>
            <classpath>
              <pathelement location="${java.home}/../lib/tools.jar"/>
              <fileset dir="${tomcat.home.50}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!--
        Stop Tomcat 5.0 servlet engine
-->
    <target name="stop.tomcat.50">

        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
            <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
            <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
            <arg value="-config"/>
            <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
            <arg value="stop"/>
            <classpath>
              <fileset dir="${tomcat.home.50}">
                  <include name="bin/bootstrap.jar"/>
<!--                  <include name="server/catalina.jar"/> -->
              </fileset>
            </classpath>
        </java>

    </target>

<!-- ================ Non-Cactus JUnit Based Tests ======================== -->


    <target name="test.junit" depends="compile.test"
     description="Run all non-Cactus based JUnit tests">

      <junit printsummary="yes" haltonfailure="no" haltonerror="no" fork="yes">

        <!-- JUnit Configuration Options -->
        <classpath refid="compile.classpath"/>
        <formatter  type="plain" usefile="false"/>

        <!-- Tests for org.apache.struts.action -->
        <test       name="org.apache.struts.action.TestDynaActionForm"/>
        <test       name="org.apache.struts.action.TestDynaActionFormClass"/>
        <test       name="org.apache.struts.config.TestModuleConfig"/>
        <test       name="org.apache.struts.config.TestActionConfigMatcher"/>
        <test       name="org.apache.struts.tiles.TestTilesPlugin"/>

        <!-- Tests for org.apache.struts.validator -->
        <test       name="org.apache.struts.validator.TestValidWhen"/>

        <!-- Tests for org.apache.struts.util -->
        <batchtest fork="yes">
          <fileset dir="${out.test.dir}/classes">
            <include name="org/apache/struts/util/Test*.class"/>
          </fileset>
        </batchtest>

        <!-- Tests for org.apache.struts.taglib.TagUtils -->
        <test       name="org.apache.struts.taglib.TestTagUtils"/>

      </junit>

    </target>


</project>