You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by jr...@apache.org on 2003/01/10 15:52:24 UTC

cvs commit: jakarta-cactus/Eclipse-Plugin/ant/build build-weblogic-61.xml build-resin-20.xml build-orion-14.xml build-orion-16.xml build-tomcat-40.xml build-weblogic-70.xml build-orion-15.xml build-resin-13.xml build.xml build-share.xml build-tests-resin-20.xml build-tests-orion-14.xml build-tests-weblogic-61.xml build-tests-orion-16.xml build-tests-orion-15.xml build-tests-weblogic-70.xml build-tests-resin-13.xml build-tests-tomcat-40.xml

jruaux      2003/01/10 06:52:24

  Modified:    Eclipse-Plugin/ant/build build.xml build-share.xml
  Added:       Eclipse-Plugin/ant/build build-weblogic-61.xml
                        build-resin-20.xml build-orion-14.xml
                        build-orion-16.xml build-tomcat-40.xml
                        build-weblogic-70.xml build-orion-15.xml
                        build-resin-13.xml
  Removed:     Eclipse-Plugin/ant/build build-tests-resin-20.xml
                        build-tests-orion-14.xml
                        build-tests-weblogic-61.xml
                        build-tests-orion-16.xml build-tests-orion-15.xml
                        build-tests-weblogic-70.xml
                        build-tests-resin-13.xml build-tests-tomcat-40.xml
  Log:
  Removed useless parts of Ant scripts
  
  Revision  Changes    Path
  1.4       +21 -74    jakarta-cactus/Eclipse-Plugin/ant/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	30 Oct 2002 15:58:10 -0000	1.3
  +++ build.xml	10 Jan 2003 14:52:23 -0000	1.4
  @@ -2,51 +2,23 @@
   
   <!DOCTYPE project [
       <!ENTITY build-share SYSTEM "file:./build-share.xml">
  -    <!ENTITY build-tests-resin-20 SYSTEM "file:./build-tests-resin-20.xml">
  -    <!ENTITY build-tests-resin-13 SYSTEM "file:./build-tests-resin-13.xml">
  -    <!ENTITY build-tests-orion-14 SYSTEM "file:./build-tests-orion-14.xml">
  -    <!ENTITY build-tests-orion-15 SYSTEM "file:./build-tests-orion-15.xml">
  -    <!ENTITY build-tests-orion-16 SYSTEM "file:./build-tests-orion-16.xml">
  -    <!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
  -    <!ENTITY build-tests-weblogic-61 SYSTEM "file:./build-tests-weblogic-61.xml">
  -    <!ENTITY build-tests-weblogic-70 SYSTEM "file:./build-tests-weblogic-70.xml">
  +    <!ENTITY build-resin-20 SYSTEM "file:./build-resin-20.xml">
  +    <!ENTITY build-resin-13 SYSTEM "file:./build-resin-13.xml">
  +    <!ENTITY build-orion-14 SYSTEM "file:./build-orion-14.xml">
  +    <!ENTITY build-orion-15 SYSTEM "file:./build-orion-15.xml">
  +    <!ENTITY build-orion-16 SYSTEM "file:./build-orion-16.xml">
  +    <!ENTITY build-tomcat-40 SYSTEM "file:./build-tomcat-40.xml">
  +    <!ENTITY build-weblogic-61 SYSTEM "file:./build-weblogic-61.xml">
  +    <!ENTITY build-weblogic-70 SYSTEM "file:./build-weblogic-70.xml">
   ]>
   
   <!--
     =============================================================================
  -    Build file for the Cactus Servlet Sample subproject (it shows how to use
  -    Cactus for unit testing the Servlet API : Servlets, Fitlers, Taglibs).
  +    Build file for container management : deploy, start-up, and stop.
   
  -    The following Ant tasks need to be available in your ant installation (i.e.
  -    the Ant task themselves and their dependent jars need to be put in
  -    ANT_HOME/lib) :
  -
  -        junit                  [REQUIRED] JUnit Ant task
  -
  -    The following properties need to be set in either a ./build.properties or
  -    a ${user.home}/build.properties one or in a calling Ant script :
  -
  -        cactus.framework.jar   [REQUIRED] Cactus framework jar
  -
  -        cactus.ant.jar         [REQUIRED] Cactus custom Ant tasks jar
  -
  -        cactus.framework.web   [REQUIRED] Cactus framework web files location
  -                               (JSP Redirector)
  -
  -        servlet.jar            [REQUIRED] The location of the Servlet API 2.3
  -                               jar.
  -
  -        aspectjrt.jar          [REQUIRED] The location of the AspectJ runtime
  -                               jar.
  -
  -        junit.jar              [REQUIRED] The location of the JUnit jar
  -
  -        commons.httpclient.jar [REQUIRED] The location of the Commons
  -                               Httpclient jar.
  -
  -        httpunit.jar           [REQUIRED] The location of the HttpUnit jar.
  -
  -        log4j.jar              [OPTIONAL] The location of the Log4j jar.
  +    The following property needs to be set in either :
  +        - a ${user.home}/build.properties
  +        - a calling Ant script
   
           test.port              [OPTIONAL] The port that should be used for
                                  starting the servers during unit testing. This
  @@ -71,43 +43,18 @@
       target is "dist"
     =============================================================================
   -->
  -<project name="Cactus Servlet Sample for Servlet API 2.3" default="init"
  +<project name="Cactus container management" default="init"
       basedir="..">
   
       &build-share;
  -
  -    <!--
  -       ========================================================================
  -         Run all Cactus tests for Servlet API 2.3
  -       ========================================================================
  -    -->
  -    <target name="test.all"
  -        depends="test.resin.20,test.resin.13,test.tomcat.40,test.orion.14,test.orion.15,test.orion.16,test.weblogic.61,test.weblogic.70"
  -        description="Run tests on all defined containers">
  -    </target>
  -    
  -    <target name="prepare.all"
  -        depends="init, prepare.tomcat.40"
  -        description="Prepare tests on all defined containers">
  -    </target>
  -
  -    <target name="start.all"
  -        depends="start.tomcat.40"
  -        description="Start all defined containers">
  -    </target>
  -
  -    <target name="stop.all"
  -        depends="stop.tomcat.40"
  -        description="Start all defined containers">
  -    </target>
       
  -    &build-tests-resin-20;
  -    &build-tests-resin-13;
  -    &build-tests-orion-14;
  -    &build-tests-orion-15;
  -    &build-tests-orion-16;
  -    &build-tests-tomcat-40;
  -    &build-tests-weblogic-61;
  -    &build-tests-weblogic-70;
  +    &build-resin-20;
  +    &build-resin-13;
  +    &build-orion-14;
  +    &build-orion-15;
  +    &build-orion-16;
  +    &build-tomcat-40;
  +    &build-weblogic-61;
  +    &build-weblogic-70;
   
   </project>
  
  
  
  1.6       +20 -23    jakarta-cactus/Eclipse-Plugin/ant/build/build-share.xml
  
  Index: build-share.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-share.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-share.xml	10 Jan 2003 13:18:09 -0000	1.5
  +++ build-share.xml	10 Jan 2003 14:52:23 -0000	1.6
  @@ -1,5 +1,24 @@
       <!--
          ========================================================================
  +         Initialize the build. Must be called by all targets
  +       ========================================================================
  +    -->
  +    <target name="init">
  +
  +        <tstamp/>
  +
  +        <!-- Filters -->
  +        <filter token="version" value="${project.version}"/>
  +        <filter token="project.name.text" value="${project.name.text}"/>
  +        <filter token="project.name.file" value="${project.name.file}"/>
  +        <filter token="year" value="${year}"/>
  +        <filter token="test.port" value="${test.port}"/>
  +
  +    </target>
  +
  +
  +    <!--
  +       ========================================================================
            Base directory for all file related operations
          ========================================================================
       -->
  @@ -42,32 +61,10 @@
   
       <!--
          ========================================================================
  -         Useful patterns for targets
  -       ========================================================================
  -    -->
  -    <path id="project.class.path">
  -
  -        <pathelement location="${cactus.framework.jar}"/>
  -        <pathelement location="${cactus.ant.jar}"/>
  -        <pathelement location="${servlet.jar}"/>
  -        <pathelement location="${log4j.jar}"/>
  -        <pathelement location="${commons.logging.jar}"/>
  -        <pathelement location="${commons.httpclient.jar}"/>
  -        <pathelement location="${httpunit.jar}"/>
  -        <pathelement location="${junit.jar}"/>
  -        <pathelement location="${aspectjrt.jar}"/>
  -
  -        <!-- Includes system classpath for jars that are in ANT_HOME/lib such
  -             as aspectrt.jar, etc -->
  -        <pathelement path="${java.class.path}"/>
  -    </path>
  -
  -    <!--
  -       ========================================================================
            Clean generated files (including distributables)
          ========================================================================
       -->
  -    <target name="clean" description="Clean target directory">
  +    <target name="clean" depends="init" description="Clean target directory">
   	    <delete includeEmptyDirs="true">
   		    <fileset dir="${target.dir}">
   		    </fileset>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-weblogic-61.xml
  
  Index: build-weblogic-61.xml
  ===================================================================
      <!--
         ========================================================================
           Run WebLogic 6.1 tests
         ========================================================================
      -->
      <target name="test.weblogic.61" depends="prepare.weblogic.61"
          if="home.weblogic.61" description="Run tests on WebLogic 6.1">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests 
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.weblogic.61"
              stopTarget="stop.weblogic.61"
              testTarget="test"/>
  
      </target>
  
      <!--
         ========================================================================
           Start WebLogic 6.1
         ========================================================================
      -->
      <target name="start.weblogic.61">
  
          <java classname="weblogic.Server" fork="yes"
              dir="${target.weblogic61.dir}">
  
              <classpath>
                  <pathelement location="${home.weblogic.61}/wlserver6.1/lib/weblogic.sp.jar"/>
                  <pathelement location="${home.weblogic.61}/wlserver6.1/lib/weblogic.jar"/>
  
                  <!-- Some hack: I still don't understand why I need these jars
                       to make the cactus clovered jar work. It needs to be
                       removed as we don't want the mention of these jars in the
                       sample script that are packaged in the Cactus
                       distribution ! You can safely remove this if you don't use
                       Clover -->
                  <pathelement location="${clover.jar}"/>
                  <pathelement location="${junit.jar}"/>
              </classpath>
  
              <jvmarg value="-hotspot"/>
              <jvmarg value="-ms64m"/>
              <jvmarg value="-mx64m"/>
              <jvmarg value="-Djava.library.path=${java.library.path};${home.weblogic.61}/wlserver6.1/bin"/>
              <jvmarg value="-Dweblogic.RootDirectory=."/>
              <jvmarg value="-Dweblogic.Domain=testdomain"/>
              <jvmarg value="-Dweblogic.Name=testserver"/>
              <jvmarg value="-Dbea.home=${home.weblogic.61}"/>
              <jvmarg value="-Dweblogic.management.password=password"/>
              <jvmarg value="-Djava.security.policy==./lib/weblogic.policy"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop WebLogic 6.1
         ========================================================================
      -->
      <target name="stop.weblogic.61">
  
          <java classname="weblogic.Admin" fork="yes">
  
              <classpath>
                  <pathelement location="${home.weblogic.61}/wlserver6.1/lib/weblogic.sp.jar"/>
                  <pathelement location="${home.weblogic.61}/wlserver6.1/lib/weblogic.jar"/>
              </classpath>
  
              <arg line="-url t3://localhost:${test.port}"/>
              <arg line="-username system"/>
              <arg line="-password password"/>
              <arg value="SHUTDOWN"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.weblogic.61" unless="home.weblogic.61">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.weblogic.61' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.weblogic.61"
          depends="check.test.weblogic.61" if="home.weblogic.61">
  
          <echo message="home.weblogic.61 = ${home.weblogic.61}"/>
  
          <property name="target.weblogic61.dir"
              value="${target.test.dir}/weblogic61"/>
          <property name="conf.weblogic61.dir"
              value="${conf.test.dir}/weblogic61"/>
  
          <mkdir dir="${target.weblogic61.dir}/config/testdomain/applications"/>
  
          <!-- Copy WL 6.1 configuration files -->
          <copy file="${conf.weblogic61.dir}/config.xml"
              todir="${target.weblogic61.dir}/config/testdomain" filtering="on"/>
          <copy file="${conf.weblogic61.dir}/fileRealm.properties"
              todir="${target.weblogic61.dir}/config/testdomain"/>
          <copy file="${conf.weblogic61.dir}/SerializedSystemIni.dat"
              todir="${target.weblogic61.dir}/config/testdomain"/>
  
          <!-- Copy the war file -->
          <copy file="${target.test.dir}/test.war"
              todir="${target.weblogic61.dir}/config/testdomain/applications"/>
  
          <!-- Update the war to include the proprietary weblogic.xml config
               file. -->
  
          <!-- Hack: Make sure weblogic.xml is always newer than the war so that
               the later is always updated. Waiting for an Ant bug fix -->
          <touch file="${target.weblogic61.dir}/config/testdomain/applications/test.war"
              datetime="06/28/2000 2:02 pm"/>
  
          <war update="true"
              warfile="${target.weblogic61.dir}/config/testdomain/applications/test.war">
  
              <webinf dir="${conf.weblogic61.dir}">
                  <include name="weblogic.xml"/>
              </webinf>
          </war>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-resin-20.xml
  
  Index: build-resin-20.xml
  ===================================================================
      <!--
         ========================================================================
           Run Resin 2.0 tests
         ========================================================================
      -->
      <target name="test.resin.20" depends="prepare.resin.20"
          if="home.resin.20" description="Run tests on Resin 2.0">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.resin.20"
              stopTarget="stop.resin.20"
              testTarget="test"/>
  
      </target>
  
      <!-- 
         ========================================================================
           Start Resin 2.0
         ========================================================================
      -->
      <target name="start.resin.20">
  
          <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-start"/>
  
              <arg value="-conf"/>
              <arg value="resin.conf"/>
  
              <!-- Needed so that Resin use the home.resin.20 variable as it's
                   root directory for resolving file paths -->
              <jvmarg value="-Dresin.home=${target.resin20.dir}"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${home.resin.20}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Stop Resin 2.0
         ========================================================================
      -->
      <target name="stop.resin.20">
  
          <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-stop"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${home.resin.20}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.resin.20" unless="home.resin.20">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.resin.20' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!-- 
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.resin.20"
          depends="check.test.resin.20" if="home.resin.20">
  
          <echo message="home.resin.20 = ${home.resin.20}"/>
  
          <property name="target.resin20.dir" value="${target.test.dir}/resin20"/>
          <property name="conf.resin20.dir" value="${conf.test.dir}/resin20"/>
  
          <mkdir dir="${target.resin20.dir}"/>
  
          <!-- Copy resin configuration files -->
          <copy file="${conf.resin20.dir}/resin.conf" 
              tofile="${target.resin20.dir}/resin.conf" filtering="on"/>
  
          <!-- Create the war file -->
          <copy file="${war.path}"
              tofile="${target.resin20.dir}/${context.path}.war"/>
  
      </target>
  
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-orion-14.xml
  
  Index: build-orion-14.xml
  ===================================================================
      <!-- 
         ========================================================================
           Run Orion 1.4 tests
         ========================================================================
      -->
      <target name="test.orion.14" depends="prepare.orion.14"
          if="home.orion.14" description="Run tests on Orion 1.4">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.orion.14"
              stopTarget="stop.orion.14"
              testTarget="test"/>
  
      </target>
  
      <!-- 
         ========================================================================
           Start Orion 1.4
         ========================================================================
      -->
      <target name="start.orion.14">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${target.orion14.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${home.orion.14}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Stop Orion 1.4
         ========================================================================
      -->
      <target name="stop.orion.14">
  
          <java classname="com.evermind.client.orion.OrionConsoleAdmin" fork="yes">
              <arg value="ormi://localhost:23791/"/>
              <arg value="admin"/>
              <arg value="password"/>
              <arg value="-shutdown"/>
              <classpath>
                <fileset dir="${home.orion.14}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.orion.14" unless="home.orion.14">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.orion.14' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!-- 
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.orion.14"
          depends="check.test.orion.14" if="home.orion.14">
  
          <echo message="home.orion.14 = ${home.orion.14}"/>
  
          <property name="target.orion14.dir" value="${target.test.dir}/orion14"/>
          <property name="conf.orion14.dir" value="${conf.test.dir}/orion14"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${target.orion14.dir}"/>
          <mkdir dir="${target.orion14.dir}/conf"/>
  
          <!-- Orion need to have a /persistence directory created, otherwise
               it throws an error -->
          <mkdir dir="${target.orion14.dir}/persistence"/>
  
          <copy todir="${target.orion14.dir}/conf" filtering="on">
              <fileset dir="${conf.orion14.dir}"/>
          </copy>
  
          <!-- Copy the war file -->
          <copy file="${target.test.dir}/test.war"
              tofile="${target.orion14.dir}/test.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-orion-16.xml
  
  Index: build-orion-16.xml
  ===================================================================
      <!--
         ========================================================================
           Run Orion 1.6 tests
         ========================================================================
      -->
      <target name="test.orion.16" depends="prepare.orion.16"
          if="home.orion.16" description="Run tests on Orion 1.6">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.orion.16"
              stopTarget="stop.orion.16"
              testTarget="test"/>
  
      </target>
  
      <!--
         ========================================================================
           Start Orion 1.6
         ========================================================================
      -->
      <target name="start.orion.16">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${target.orion16.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${home.orion.16}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop Orion 1.6
         ========================================================================
      -->
      <target name="stop.orion.16">
  
          <java classname="com.evermind.client.orion.OrionConsoleAdmin"
              fork="yes">
              <arg value="ormi://localhost:23791/"/>
              <arg value="admin"/>
              <arg value="password"/>
              <arg value="-shutdown"/>
              <classpath>
                <fileset dir="${home.orion.16}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.orion.16" unless="home.orion.16">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.orion.16' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.orion.16"
          depends="check.test.orion.16" if="home.orion.16">
  
          <echo message="home.orion.16 = ${home.orion.16}"/>
  
          <property name="target.orion16.dir" value="${target.test.dir}/orion16"/>
          <property name="conf.orion16.dir" value="${conf.test.dir}/orion16"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${target.orion16.dir}"/>
          <mkdir dir="${target.orion16.dir}/conf"/>
  
          <!-- Orion need to have a /persistence directory created, otherwise
               it throws an error -->
          <mkdir dir="${target.orion16.dir}/persistence"/>
  
          <copy todir="${target.orion16.dir}/conf" filtering="on">
              <fileset dir="${conf.orion16.dir}"/>
          </copy>
  
          <!-- Copy the war file -->
          <copy file="${target.test.dir}/test.war"
              tofile="${target.orion16.dir}/test.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-tomcat-40.xml
  
  Index: build-tomcat-40.xml
  ===================================================================
      <!--
         ========================================================================
           Start Tomcat 4.0
         ========================================================================
      -->
      <target name="start.tomcat.40" depends="checkwindows, windows.start.tomcat.40, other.start.tomcat.40"/>
      
      <target name="windows.start.tomcat.40" if="isWindows">
          <property name="target.tomcat40.dir"
              value="${target.test.dir}/tomcat40"/>
          <java jvm='javaw' classname="org.apache.catalina.startup.Bootstrap" fork="yes">
  
              <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
              <jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
              <arg value="start"/>
              
              <classpath>
  
                <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
                <pathelement path="${java.home}/../lib/tools.jar"/>
                <fileset dir="${home.tomcat.40}">
                    <include name="bin/bootstrap.jar"/>
                </fileset>
  
                <!-- This is to allow the use of -Dbuild.sysclasspath=only when
                     starting Ant - Meaning that all jars need to be on the
                     initial classpath. -->
                <pathelement path="${java.class.path}"/>
  
              </classpath>
          </java>
  
      </target>
  
      <target name="other.start.tomcat.40" unless="isWindows">
          <property name="target.tomcat40.dir"
              value="${target.test.dir}/tomcat40"/>
          <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
  
              <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
              <jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
              <arg value="start"/>
              
              <classpath>
  
                <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
                <pathelement path="${java.home}/../lib/tools.jar"/>
                <fileset dir="${home.tomcat.40}">
                    <include name="bin/bootstrap.jar"/>
                </fileset>
  
                <!-- This is to allow the use of -Dbuild.sysclasspath=only when
                     starting Ant - Meaning that all jars need to be on the
                     initial classpath. -->
                <pathelement path="${java.class.path}"/>
  
              </classpath>
          </java>
  
      </target>
     
      <!--
         ========================================================================
           Stop Tomcat 4.0
         ========================================================================
      -->
      <target name="stop.tomcat.40" depends="checkwindows, windows.stop.tomcat.40, other.stop.tomcat.40"/>
  
      <target name="windows.stop.tomcat.40" if="isWindows">
          <property name="target.tomcat40.dir"
              value="${target.test.dir}/tomcat40"/>
          <java jvm='javaw' classname="org.apache.catalina.startup.Bootstrap" fork="yes">
              <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
              <jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
              <arg value="stop"/>
              <classpath>
  
                <!-- This is to allow the use of -Dbuild.sysclasspath=only when
                     starting Ant - Meaning that all jars need to be on the
                     initial classpath -->
                <pathelement path="${java.class.path}"/>
  
                <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
                <fileset dir="${home.tomcat.40}">
                    <include name="bin/bootstrap.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <target name="other.stop.tomcat.40" unless="isWindows">
          <property name="target.tomcat40.dir"
              value="${target.test.dir}/tomcat40"/>
          <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
              <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
              <jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
              <arg value="stop"/>
              <classpath>
  
                <!-- This is to allow the use of -Dbuild.sysclasspath=only when
                     starting Ant - Meaning that all jars need to be on the
                     initial classpath -->
                <pathelement path="${java.class.path}"/>
  
                <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
                <fileset dir="${home.tomcat.40}">
                    <include name="bin/bootstrap.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.tomcat.40"
          depends="init" if="home.tomcat.40">
  
          <echo message="home.tomcat.40 = ${home.tomcat.40}"/>
  
          <property name="target.tomcat40.dir"
              value="${target.test.dir}/tomcat40"/>
          <property name="conf.tomcat40.dir" value="${conf.test.dir}/tomcat40"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${target.tomcat40.dir}/conf"/>
          <mkdir dir="${target.tomcat40.dir}/work"/>
          <mkdir dir="${target.tomcat40.dir}/webapps"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${target.tomcat40.dir}/conf/server.xml"/>
  
          <!-- Remove the auto deployed webapp so that it is redeployed every
               time -->
          <delete dir="${target.tomcat40.dir}/webapps/${context.path}"/>
  
          <copy todir="${target.tomcat40.dir}/conf" filtering="on">
              <fileset dir="${conf.tomcat40.dir}"/>
          </copy>
  
          <!-- Copy the Tomcat web.xml - We need to copy this file as it has
               changed between Tomcat 4.x versions and one version of it doesn't
               work with another version of Tomcat 4 -->
          <copy file="${home.tomcat.40}/conf/web.xml"
              todir="${target.tomcat40.dir}/conf"/>
  
          <!-- Copy the war file -->
          <copy file="${war.path}"
              tofile="${target.tomcat40.dir}/webapps/${context.path}.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-weblogic-70.xml
  
  Index: build-weblogic-70.xml
  ===================================================================
      <!--
         ========================================================================
           Run WebLogic 7.0 tests
         ========================================================================
      -->
      <target name="test.weblogic.70" depends="prepare.weblogic.70"
          if="home.weblogic.70" description="Run tests on WebLogic 7.0">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests 
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.weblogic.70"
              stopTarget="stop.weblogic.70"
              testTarget="test"/>
  
      </target>
  
      <!--
         ========================================================================
           Start WebLogic 7.0
         ========================================================================
      -->
      <target name="start.weblogic.70">
          <property name="target.weblogic70.dir"
              value="${target.test.dir}/weblogic70"/>
          <java classname="weblogic.Server" fork="yes"
              dir="${target.weblogic70.dir}/testdomain">
  
              <classpath>
                  <pathelement location="${home.weblogic.70}/weblogic700/server/lib/weblogic.sp.jar"/>
                  <pathelement location="${home.weblogic.70}/weblogic700/server/lib/weblogic.jar"/>
              </classpath>
  
              <jvmarg value="-hotspot"/>
              <jvmarg value="-ms64m"/>
              <jvmarg value="-mx64m"/>
              <jvmarg value="-Djava.library.path=${java.library.path};${home.weblogic.70}/weblogic700/server/bin"/>
              <jvmarg value="-Dweblogic.Name=testserver"/>
              <jvmarg value="-Dbea.home=${home.weblogic.70}"/>
              <jvmarg value="-Dweblogic.management.username=system"/>
              <jvmarg value="-Dweblogic.management.password=password"/>
              <jvmarg value="-Djava.security.policy==./server/lib/weblogic.policy"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop WebLogic 7.0
         ========================================================================
      -->
      <target name="stop.weblogic.70">
  
          <java classname="weblogic.Admin" fork="yes">
  
              <classpath>
                  <pathelement location="${home.weblogic.70}/weblogic700/server/lib/weblogic.sp.jar"/>
                  <pathelement location="${home.weblogic.70}/weblogic700/server/lib/weblogic.jar"/>
              </classpath>
  
              <arg line="-url t3://localhost:${test.port}"/>
              <arg line="-username system"/>
              <arg line="-password password"/>
              <arg value="SHUTDOWN"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.weblogic.70" unless="home.weblogic.70">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.weblogic.70' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.weblogic.70"
          depends="check.test.weblogic.70" if="home.weblogic.70">
  
          <echo message="home.weblogic.70 = ${home.weblogic.70}"/>
  
          <property name="target.weblogic70.dir"
              value="${target.test.dir}/weblogic70"/>
          <property name="conf.weblogic70.dir"
              value="${conf.test.dir}/weblogic70"/>
  
          <mkdir dir="${target.weblogic70.dir}/testdomain/applications"/>
          <mkdir dir="${target.weblogic70.dir}/testdomain/testserver"/>
  
          <!-- Copy WL 7.0 configuration files -->
          <copy file="${conf.weblogic70.dir}/config.xml"
              todir="${target.weblogic70.dir}/testdomain" filtering="on"/>
          <copy file="${conf.weblogic70.dir}/fileRealm.properties"
              todir="${target.weblogic70.dir}/testdomain"/>
          <copy file="${conf.weblogic70.dir}/SerializedSystemIni.dat"
              todir="${target.weblogic70.dir}/testdomain"/>
          <copy file="${conf.weblogic70.dir}/DefaultAuthenticatorInit.ldift"
              todir="${target.weblogic70.dir}/testdomain"/>
  
          <!-- Copy security configuration files -->
          <copy todir="${target.weblogic70.dir}/testdomain/testserver">
              <fileset dir="${conf.weblogic70.dir}/testserver"/>
          </copy>
  
          <!-- Copy the war file -->
          <copy file="${war.path}"
              tofile="${target.weblogic70.dir}/testdomain/applications/${context.path}.war"/>
  
          <!-- Update the war to include the proprietary weblogic.xml config
               file. -->
  
          <!-- Hack: Make sure weblogic.xml is always newer than the war so that
               the later is always updated. Waiting for an Ant bug fix -->
          <touch file="${target.weblogic70.dir}/testdomain/applications/${context.path}.war"
              datetime="06/28/2000 2:02 pm"/>
  
          <war update="true"
              warfile="${target.weblogic70.dir}/testdomain/applications/${context.path}.war">
  
              <webinf dir="${conf.weblogic70.dir}">
                  <include name="weblogic.xml"/>
              </webinf>
          </war>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-orion-15.xml
  
  Index: build-orion-15.xml
  ===================================================================
      <!--
         ========================================================================
           Run Orion 1.5 tests
         ========================================================================
      -->
      <target name="test.orion.15" depends="prepare.orion.15"
          if="home.orion.15" description="Run tests on Orion 1.5">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.orion.15"
              stopTarget="stop.orion.15"
              testTarget="test"/>
  
      </target>
  
      <!--
         ========================================================================
           Start Orion 1.5
         ========================================================================
      -->
      <target name="start.orion.15">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${target.orion15.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${home.orion.15}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop Orion 1.5
         ========================================================================
      -->
      <target name="stop.orion.15">
  
          <java classname="com.evermind.client.orion.OrionConsoleAdmin"
              fork="yes">
              <arg value="ormi://localhost:23791/"/>
              <arg value="admin"/>
              <arg value="password"/>
              <arg value="-shutdown"/>
              <classpath>
                <fileset dir="${home.orion.15}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.orion.15" unless="home.orion.15">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.orion.15' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.orion.15"
          depends="check.test.orion.15" if="home.orion.15">
  
          <echo message="home.orion.15 = ${home.orion.15}"/>
  
          <property name="target.orion15.dir" value="${target.test.dir}/orion15"/>
          <property name="conf.orion15.dir" value="${conf.test.dir}/orion15"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${target.orion15.dir}"/>
          <mkdir dir="${target.orion15.dir}/conf"/>
  
          <!-- Orion need to have a /persistence directory created, otherwise
               it throws an error -->
          <mkdir dir="${target.orion15.dir}/persistence"/>
  
          <copy todir="${target.orion15.dir}/conf" filtering="on">
              <fileset dir="${conf.orion15.dir}"/>
          </copy>
  
          <!-- Copy the war file -->
          <copy file="${target.test.dir}/test.war"
              tofile="${target.orion15.dir}/test.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/Eclipse-Plugin/ant/build/build-resin-13.xml
  
  Index: build-resin-13.xml
  ===================================================================
      <!-- 
         ========================================================================
           Run Resin 1.3 tests
         ========================================================================
      -->
      <target name="test.resin.13" depends="prepare.resin.13"
          if="home.resin.13" description="Run tests on Resin 1.3">
  
          <!-- 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 stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.resin.13"
              stopTarget="stop.resin.13"
              testTarget="test"/>
  
      </target>
  
      <!-- 
         ========================================================================
           Start Resin 1.3
         ========================================================================
      -->
      <target name="start.resin.13">
  
          <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-start"/>
  
              <arg value="-conf"/>
              <arg value="resin.conf"/>
  
              <!-- Needed so that Resin use the home.resin.13 variable as it's
                   root directory for resolving file paths -->
              <jvmarg value="-Dresin.home=${target.resin13.dir}"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${home.resin.13}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Stop Resin 1.3
         ========================================================================
      -->
      <target name="stop.resin.13">
  
          <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-stop"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${home.resin.13}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- 
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.resin.13" unless="home.resin.13">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'home.resin.13' property has not been "/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!-- 
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.resin.13"
          depends="check.test.resin.13" if="home.resin.13">
  
          <echo message="home.resin.13 = ${home.resin.13}"/>
  
          <property name="target.resin13.dir" value="${target.test.dir}/resin13"/>
          <property name="conf.resin13.dir" value="${conf.test.dir}/resin13"/>
  
          <mkdir dir="${target.resin13.dir}"/>
  
          <!-- Copy resin configuration files -->
          <copy file="${conf.resin13.dir}/resin.conf"
              tofile="${target.resin13.dir}/resin.conf" filtering="on"/>
  
          <!-- Create the war file -->
          <copy file="${target.test.dir}/test.war"
              tofile="${target.resin13.dir}/test.war"/>
  
      </target>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>