portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed/build/lib ant-1.3-optional.jar ant-1.3.jar commons-cactus-22.jar commons-cactus-23.jar commons-cactus-ant.jar commons-cactus.jar junit.jar
Date Fri, 25 May 2001 20:04:05 GMT
raphael     01/05/25 13:04:05

  Modified:    build    build.bat build.sh build.xml
  Added:       build    build-tests-22.xml build-tests-23.xml
                        build-tests.xml build.properties
               build/cactus cactus.properties redirector.jsp web.xml
               build/cactus/orion14 application.xml default-web-site.xml
                        principals.xml rmi.xml server.xml
               build/cactus/resin12 resin.conf
               build/cactus/resin13 resin.conf
               build/cactus/tomcat32 server.xml
               build/cactus/tomcat40 server.xml
               build/cactus/weblogic51 weblogic.policy weblogic.properties
               build/lib ant-1.3-optional.jar ant-1.3.jar
                        commons-cactus-22.jar commons-cactus-23.jar
                        commons-cactus-ant.jar commons-cactus.jar junit.jar
  Removed:     build    ant-1.3-optional.jar ant-1.3.jar
               build/bin antRun
  Log:
  add cactus testing capability in build system
  
  Contributed by: Johnny Cass <johnny.cass@epiuse.com>
  
  Revision  Changes    Path
  1.10      +2 -25     jakarta-jetspeed/build/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.bat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.bat	2001/02/17 17:20:32	1.9
  +++ build.bat	2001/05/25 20:03:34	1.10
  @@ -22,16 +22,12 @@
   
   REM -- Directory containing jars required for compilation
   set _BUILDDIR=%BUILDDIR%
  -set BUILDDIR=%PROJECTDIR%\build
  +set BUILDDIR=%PROJECTDIR%\build\lib
   
   REM -- Name of the build file to use
   set _BUILDFILE=%BUILDFILE%
   set BUILDFILE=build.xml
   
  -REM -- Default compiler to use
  -set _JAVAC=%JAVAC%
  -set JAVAC=classic
  -
   REM -- External dependencies jar required for building this project
   set _JAR_DEPENDENCIES=%JAR_DEPENDENCIES%
   set JAR_DEPENDENCIES="%PROJECTDIR%\..\jakarta-site2\lib\jdom*.jar"
  @@ -44,14 +40,6 @@
   set _CLASSPATH=%CLASSPATH%
   set LOCALPATH=
   
  -:testant
  -if "%ANT_HOME" == "" goto setant
  -goto buildpath
  -
  -:setant
  -set ANT_HOME=%BUILDDIR%
  -goto buildpath
  -
   :buildpath
   for %%l IN (%LIBDIR%\*.jar) DO call setlocalpath %%l
   for %%l IN (%BUILDDIR%\*.jar) DO call setlocalpath %%l
  @@ -59,7 +47,6 @@
   
   :testjavahome
   if "%JAVA_HOME%" == "" goto setjavahome
  -goto testjikes
   
   :setjavahome
   if not "%OS%" == "Windows_NT" goto javahomeerror
  @@ -69,19 +56,10 @@
   if "%JAVABIN%" == "" goto javahomeerror
   for %%j IN (%JAVABIN%..\) DO set JAVA_HOME=%%~dpj
   
  -:testjikes
  -if not "%OS%" == "Windows_NT" goto setjikes
  -
  -:testjikesnt
  -for %%k IN (jikes.exe) DO set JIKES=%%~f$PATH:k
  -
  -:setjikes
  -if not "%JIKES%" == "" set JAVAC=jikes
  -
   :build
   if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
   
  -%JAVA_HOME%\bin\java.exe -classpath "%CLASSPATH%;%LOCALPATH%" -Dant.home=%ANT_HOME% -DJAVAC=%JAVAC% org.apache.tools.ant.Main -buildfile %BUILDFILE% %1
  +%JAVA_HOME%\bin\java.exe -classpath "%CLASSPATH%;%LOCALPATH%" org.apache.tools.ant.Main -buildfile %BUILDFILE% %1
   
   goto end
   
  @@ -97,7 +75,6 @@
   set LIBDIR=%_LIBDIR%
   set BUILDDIR=%_BUILDDIR%
   set BUILDFILE=%_BUILDFILE%
  -set JAVAC=%_JAVAC%
   set JAR_DEPENDENCIES=%_JAR_DEPENDENCIES%
   
   endlocal
  
  
  
  1.17      +2 -17     jakarta-jetspeed/build/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.sh,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.sh	2001/02/18 16:17:33	1.16
  +++ build.sh	2001/05/25 20:03:35	1.17
  @@ -7,9 +7,6 @@
   # The name of the build file to use
   BUILDFILE=build.xml
   
  -# The default compiler to use
  -JAVAC=classic
  -
   # Root directory for the project
   PROJECTDIR=..
   
  @@ -17,7 +14,7 @@
   LIBDIR=${PROJECTDIR}/lib
   
   # Directory where necessary build Java libraries are found
  -BUILDDIR=${PROJECTDIR}/build
  +BUILDDIR=${PROJECTDIR}/build/lib
   
   # External dependencies jar required for building this project
   JAR_DEPENDENCIES=`ls ${PROJECTDIR:-.}/../jakarta-site2/lib/jdom*.jar 2>/dev/null`
  @@ -26,11 +23,6 @@
   # No need to edit anything past here
   #--------------------------------------------
   
  -#Define ANT_HOME is necessary
  -if [ "$ANT_HOME" = "" ]; then
  -  ANT_HOME=${BUILDDIR}
  -fi
  -
   # Try to find Java Home directory, from JAVA_HOME environment 
   # or java executable found in PATH
   
  @@ -84,12 +76,6 @@
       CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
   fi
   
  -# If jikes is in PATH, use jikes
  -if type jikes >/dev/null 2>/dev/null
  -then
  -    JAVAC=jikes
  -fi
  -
   # convert the unix path to windows
   if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
      CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  @@ -97,6 +83,5 @@
   fi
   
   # Call Ant
  -${JAVABIN} -Dant.home=${ANT_HOME} -DJAVAC=${JAVAC} \
  -           -classpath "${CLASSPATH}" org.apache.tools.ant.Main \
  +${JAVABIN} -classpath "${CLASSPATH}" org.apache.tools.ant.Main \
              -buildfile "${BUILDFILE}" "$@"
  
  
  
  1.95      +527 -230  jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- build.xml	2001/03/26 07:25:40	1.94
  +++ build.xml	2001/05/25 20:03:35	1.95
  @@ -1,201 +1,298 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -<project name="Jetspeed" default="dist" basedir=".">
   
  -  <!-- =================================================================== -->
  -  <!-- Indentify Classpath                                                 -->
  -  <!-- =================================================================== -->
  -  <path id="classpath">
  -    <fileset dir="../lib">
  -      <include name="*.jar"/>
  -    </fileset>
  -  </path>
  -
  -    <property name="project" value="Jetspeed"/>
  -    <property name="name" value="jetspeed"/>
  -    <property name="version" value="1.3a1"/>
  -    <property name="build.compiler" value="${JAVAC}"/>
  -    <property name="build.dir" value="../bin"/>
  -    <property name="build.src" value="${build.dir}/src"/>
  -    <property name="build.dest" value="${build.dir}/classes"/>
  -    <property name="build.war" value="${build.dir}/webapp"/>
  -    <property name="webapp.dir"   value="../webapp"/>
  -    <property name="lib.dir"   value="../lib"/>
  -    <property name="src.java.dir" value="../src/java"/>
  -    <property name="src.xml.dir" value="../src/xml"/>
  -    <property name="javadoc.destdir" value="../docs/api"/>
  -    <property name="final.name" value="${project}-${version}"/>
  -    <property name="final.dir" value="../${final.name}/"/>
  -    <property name="debug" value="on"/>
  -    <property name="year" value="2000"/>
  -    
  -    <!-- Holds all the files that a full Jetspeed package should contain.-->
  -    <property name="distribution.contents" value="src/*,build/*,docs/*,xdocs/*,lib/*,bin/${project}.jar"/>
  +<!-- Build file for Jetspeed -->
  +
  +<!DOCTYPE project [
  +    <!ENTITY build-tests-22 SYSTEM "file:./build-tests-22.xml">
  +    <!ENTITY build-tests-23 SYSTEM "file:./build-tests-23.xml">
  +]>
  +
  +<!-- ===========================================================================
  +
  +    The following properties need to be set in either ./build.properties,
  +    ${user.home}/.build.properties, a higher level build file, or on the command
  +    line:
  +        
  +        junit.jar             [REQUIRED] The path to the JUnit jar file
  +        cactus-22.jar         [REQUIRED] The path to the Cactus servlet 2.2
  +                                         jar file        
  +        cactus-23.jar         [REQUIRED] The path to the Cactus servlet 2.3
  +                                         jar file        
  +        cactus.ant.jar        [REQUIRED] The path to the Cactus custom Ant
  +                                         tasks jar file
  +
  +    Additionally, and depending on the servlet engines whith which you wish to
  +    run your tests, you'll need to set the following properties:
  +
  +        resin.home.12         [OPTIONAL] Resin 1.2 home directory (required for
  +                                         the tests_resin_12 target only)
  +
  +        resin.home.13         [OPTIONAL] Resin 1.3 home directory (required for
  +                                         the tests_resin_13 target only)
  +                                         
  +        tomcat.home.32        [OPTIONAL] Tomcat 3.2 home directory (required
  +                                         for the tests_tomcat_32 target only)
  +
  +        tomcat.home.40        [OPTIONAL] Tomcat 4.0 home directory (required
  +                                         for the tests_tomcat_40 target only)
  +                                         
  +        weblogic.home.51      [OPTIONAL] WebLogic 5.1 home directory (required
  +                                         for the tests_weblogic_51 target only)                 
  +s
  +============================================================================ -->
  +
  +<project name="Jetspeed" default="jar" basedir="..">
  +
  +    <!-- Give user a chance to override without editing this file 
  +         (and without typing -D each time they invoke a target) -->    
  +
  +    <property file="${user.home}/.build.properties" />
  +    <property file="build/build.properties" />
  +  
  +    <!-- Generic project properties -->
  +
  +    <property name="project.fullname" value="Jetspeed Portal Implementation"/>
  +    <property name="project.name" value="jetspeed"/>
  +    <property name="project.version" value="1.3a1"/>      
  +
  +    <!-- =================================================================== -->
  +    <!-- Set the properties related to the source tree                       -->
  +    <!-- =================================================================== -->
  +
  +    <!-- Source locations for the build -->    
  +
  +    <property name="src.dir" value="src"/>
  +    <property name="src.java.dir" value="${src.dir}/java"/>    
  +    <property name="src.xml.dir" value="${src.dir}/xml"/>
  +    <property name="lib.dir" value="lib"/>    
  +    <property name="conf.test.dir" value="build/cactus"/>
  +    <property name="webapp.dir" value="webapp"/>        
       
  -    <!-- The name of the jar file to put the Jetspeed distribution in -->
  -    <property name="distribution.jar-filename" value="${build.dir}/${final.name}-dist.jar"/>
  +    <!-- =================================================================== -->
  +    <!-- Set the properties related to the build area                        -->
  +    <!-- =================================================================== -->
  +
  +    <!-- Destination locations for the build (relative to the basedir as -->
  +    <!-- specified in the 'basedir' attribute of the project tag)        -->
   
  -    <!--
  -    BEGIN emacs support (this shouldn't break anything)
  -    -->
  -    <property name="build.compiler.emacs" value="on"/>
  +    <property name="build.dir" value="bin"/>        
  +    <property name="out.test.dir" value="${build.dir}/test"/>    
  +    <property name="build.dest.dir" value="${build.dir}/classes"/>        
  +    <property name="javadocs.destdir" value="docs/api"/>    
  +    <property name="release.dir" value="${project.name}-${project.version}/"/>
   
  -    <property name="build.compiler.warnings" value="off"/>
  +    <!-- Miscellaneous settings -->
   
  -    <!--
  -    END emacs support
  -    -->
  +    <property name="year" value="2001"/>
  +    <property name="ant.home" value="build"/>
  +    <property name="debug" value="on"/>
  +    <property name="optimize" value="off"/>
  +    <property name="deprecation" value="off"/>  
   
  -    <property name="docs.dest" value="../docs/site"/>
  -    <property name="docs.src" value="../xdocs"/>
  +    <!-- Anakia doc settings -->
   
  -    <!-- Build classpath -->
  +    <property name="docs.dest" value="docs/site"/>
  +    <property name="docs.src" value="xdocs"/>  
  +    <property name="jdom.jar" value="jdom-b6.jar"/>
  +    <property name="jakarta.site2" value="../jakarta-site2"/>
  +         
  +    <!-- =================================================================== -->
  +    <!-- Builds Classpath                                                    -->
  +    <!-- =================================================================== -->
       <path id="classpath">
  -        <fileset dir=".">
  -            <include name="**/*.jar"/>
  -        </fileset>
  -        <fileset dir="../lib">
  -            <include name="**/*.jar"/>
  +        <fileset dir="${ant.home}/lib">
  +
  +            <!-- Everything in the build lib dir -->
  +
  +            <include name="*.jar"/>
           </fileset>
  +        <fileset dir="${lib.dir}">
  +
  +            <!-- Everything in the project's lib dir -->
  +
  +            <include name="*.jar"/>
  +        </fileset>        
       </path>
   
  -    <!-- ================================================================== -->
  -    <!-- Prints useful build environment values                             -->
  -    <!-- ================================================================== -->
  -    <target name="env" depends="check_for_optional_packages">
  -      <echo message="build.compiler = ${build.compiler}"/>
  -      <echo message="java.home = ${java.home}"/>
  -      <echo message="user.home = ${user.home}"/>
  -      <echo message="java.class.path = ${java.class.path}"/>
  -      <echo message=""/>
  +    <!-- =================================================================== -->
  +    <!-- Initializes the build.                                              -->
  +    <!-- =================================================================== -->    
  +    <target name="init">
  +
  +        <!-- So that we can use the ${TSTAMP}, ${DSTAMP}, ... time stamps
  +             in targets, if need be -->
  +        <tstamp/>
  +
  +        <echo message="---------- ${project.fullname} ${project.version} ----------"/>
  +        <echo message=""/>
  +
  +        <echo message="java.class.path = ${java.class.path}"/>        
  +        <echo message=""/>
  +        <echo message="java.home = ${java.home}"/>
  +	<echo message="ant.home = ${ant.home}"/>
  +        <echo message="user.home = ${user.home}"/>
  +        <echo message=""/>
  +        <echo message="basedir = ${basedir}"/>
  +        <echo message=""/>        
  +        <echo message="cactus-22.jar = ${cactus-22.jar}"/>
  +        <echo message="cactus-23.jar = ${cactus-23.jar}"/>        
  +        <echo message="cactus.ant.jar = ${cactus.ant.jar}"/>
  +        <echo message="junit.jar = ${junit.jar}"/>
  +                
  +        <!-- Initialize custom Ant task needed for running the server tests -->
  +        <taskdef name="runservertests" classname="org.apache.commons.cactus.ant.RunServerTestsTask">
  +            <classpath>
  +                <pathelement location="${cactus.ant.jar}"/>                
  +            </classpath>
  +        </taskdef>       
  +
       </target>
   
       <!-- ================================================================== -->
  -    <!-- Check to see what optional dependencies are available              -->
  +    <!-- Displays usage information                                         -->
       <!-- ================================================================== -->
  -    <target name="check_for_optional_packages">
  -        <available property="junit.present"
  -           classname="junit.framework.TestCase">
  -            <classpath refid="classpath"/>
  -        </available>
  -        <available property="jdom.present"
  -           classname="org.jdom.JDOMException">
  -            <classpath refid="classpath"/>
  -        </available>
  +    <target name="usage" description="Displays usage information">
  +        <echo message="Use -projecthelp to see the available targets"/>
       </target>
  -
  +        
       <!-- =================================================================== -->
  -    <!-- Handles all javac compilations                                      -->
  +    <!-- Compiles the class files                                            -->
       <!-- =================================================================== -->
  -    <target name="core" depends="apis">
  +    <target 
  +        name="compile" depends="apis" 
  +        description="Compiles the class files"
  +    >
           
           <mkdir dir="${build.dir}"/>
  -        <mkdir dir="${build.dest}"/>
  -          
  -        <echo message="Compiling in ${src.java.dir} and saving to ${build.dest}"/>
  -        <javac srcdir="${src.java.dir}/" 
  -               destdir="${build.dest}" 
  -               debug="${debug}"/>
  -    </target>
  -    
  -    <!-- =================================================================== -->
  -    <!-- Creates the .jar file                                               -->
  -    <!-- =================================================================== -->
  -    <target name="dist" depends="core">
  -        <jar jarfile="${build.dir}/${project}.jar" 
  -             basedir="${build.dest}"
  -             compress="false"
  -             includes="org/"/>
  -    </target>
  +        <mkdir dir="${build.dest.dir}"/>
  +                  
  +        <javac 
  +            classpathref="classpath"
  +            srcdir="${src.java.dir}/" 
  +            destdir="${build.dest.dir}" 
  +            debug="${debug}"
  +            deprecation="${deprecation}"
  +            optimize="${optimize}">            
  +        </javac>
  +
  +        <!-- Copies non java files that need to be in the classes directory -->
  +        <copy todir="${build.dest.dir}">            
  +            <fileset dir="${conf.test.dir}">
  +                <include name="cactus.properties"/>
  +            </fileset>
  +        </copy>
   
  -    <!-- =================================================================== -->
  -    <!-- Cleans up the distribution                                          -->
  -    <!-- =================================================================== -->
  -    <target name="clean">
  -        <delete dir="${build.src}"/>
  -        <delete dir="${build.dest}"/>
  -        <delete dir="${build.war}"/>
  -        <delete file="${build.dir}/${project}.jar"/>
       </target>
       
  -
       <!-- =================================================================== -->
  -    <!-- Rebuilds everything                                                 -->
  -    <!-- Basic target which rebuilds Jetspeed clean and then does a full     -->
  -    <!-- rebuild... This is a little quicker than "build clean; build"       -->
  -    <!-- because there is no second JVM bootup.                              -->
  +    <!-- Creates the jar file                                               -->
       <!-- =================================================================== -->
  -    <target name="rebuild" depends="clean,dist"/>
  +    <target name="jar" depends="compile" description="Creates the jar file">
  +        <jar
  +            jarfile="${build.dir}/${project.name}.jar" 
  +            basedir="${build.dest.dir}"            
  +            includes="org/"/>
  +    </target>
  +                
  +    <!-- =================================================================== -->
  +    <!-- Generates the project's API documentation                           -->
  +    <!-- =================================================================== -->
  +    <target 
  +        name="javadocs" depends="jar" 
  +        description="Generates the project's API documentation"
  +    >
  +        <mkdir dir="${javadocs.destdir}"/>
           
  -    <!-- =================================================================== -->
  -    <!-- Generates all javadoc                                               -->
  -    <!-- =================================================================== -->
  -    <target name="javadoc" depends="core">
  -        <mkdir dir="${javadoc.destdir}"/>
  -        
  -    <javadoc   sourcepath="${src.java.dir}" 
  -            destdir="${javadoc.destdir}" 
  +        <javadoc        
  +            sourcepath="${src.java.dir}" 
               packagenames="org.apache.jetspeed.*"
  -            private="false" 
  -            windowtitle="${project} API"
  -            doctitle="${project}"
  +            destdir="${javadocs.destdir}"         
  +            author="true"
  +            private="false"
               version="true"
               use="true"
  +            windowtitle="${project.fullname} API"
  +            doctitle="${project.fullname}"                
               bottom="Copyright &#169; ${year} Apache Software Foundation. All Rights Reserved."
  -            author="true"/>
  +        >
  +            <classpath refid="classpath"/>
  +        </javadoc>
  +
       </target>
  -    
  -    
  +        
       <!-- =================================================================== -->
       <!-- Builds the Jetspeed release                                         -->
  -    <!-- =================================================================== -->
  -
  -    <!-- this creates a distribution. you must run clean,dist -->
  -    <target name="release" depends="clean,webapp-complete">
  -      <delete dir="${final.dir}"/>
  -        
  -      <copy todir="${final.dir}" filtering="off">
  -        <fileset dir="..">
  -          <exclude name="*TODO*"/>
  -          <exclude name="INSTALL-WAR"/>
  -          <exclude name="bin*"/>
  -          <exclude name="proposals*"/>
  -          <exclude name="*copyover.xsl"/>
  -        </fileset>
  -      </copy>
  +    <!-- =================================================================== -->   
  +    <target 
  +        name="release" depends="clean,war" 
  +        description="Builds the Jetspeed release"
  +    >
  +        <delete dir="${release.dir}"/>
  +        
  +        <copy todir="${release.dir}" filtering="off">
  +            <fileset dir=".">
  +                <exclude name="*TODO*"/>
  +                <exclude name="INSTALL-WAR"/>
  +                <exclude name="bin*"/>
  +                <exclude name="proposals*"/>          
  +            </fileset>
  +        </copy>
           
  -      <zip zipfile="../${project}-${version}-src.zip"
  -           basedir="${final.dir}/../"
  -           includes="${final.name}/"/>
  +        <zip 
  +            zipfile="${project.name}-${project.version}-src.zip"
  +            basedir="${release.dir}/../"
  +            includes="${project.name}-${project.version}/"
  +        />
  +
  +        <delete dir="${release.dir}"/>
  +
       </target>
   
  -    <!--
  -    This is the actual work that the package does.  If you want you can call 
  -    this directly assuming that all the dependencies that the package target are
  -    done.
  -    -->
  -    <target name="release-binary" depends="clean,webapp-complete">
  +    <!-- =================================================================== -->
  +    <!-- Builds the Jetspeed binary release                                  -->
  +    <!-- =================================================================== -->    
  +    <target 
  +        name="release_binary" depends="clean,war"
  +        description="Builds the Jetspeed binary release"
  +    >
       
  -      <delete dir="${final.dir}"/>
  -      <mkdir dir="${final.dir}"/>
  +        <delete dir="${release.dir}"/>
  +        <mkdir dir="${release.dir}"/>
           
  -      <copy file="../INSTALL-WAR" tofile="${final.dir}/INSTALL"/>
  -      <copy file="../README" tofile="${final.dir}/README"/>
  -      <copy file="../NOTES" tofile="${final.dir}/NOTES"/>
  -      <copy file="../LICENSE" tofile="${final.dir}/LICENSE"/>
  -      <copy file="../WARNING" tofile="${final.dir}/WARNING"/>
  +        <copy file="INSTALL-WAR" tofile="${release.dir}/INSTALL"/>
  +        <copy file="README" tofile="${release.dir}/README"/>
  +        <copy file="NOTES" tofile="${release.dir}/NOTES"/>
  +        <copy file="LICENSE" tofile="${release.dir}/LICENSE"/>
  +        <copy file="WARNING" tofile="${release.dir}/WARNING"/>
   
  -      <copy file="${build.dir}/${name}.war" tofile="${final.dir}/${name}.war"/>
  +        <copy file="${build.dir}/${project.name}.war" tofile="${release.dir}/${project.name}.war"/>
         
  -      <zip zipfile="../${project}-${version}-war.zip"
  -           basedir="${final.dir}/../"
  -           includes="${final.name}/"/>
  +        <zip 
  +            zipfile="${project.name}-${project.version}-war.zip"
  +            basedir="${release.dir}/../"
  +            includes="${project.name}-${project.version}/"
  +        />
  +
  +        <delete dir="${release.dir}"/>
           
       </target>          
   
  -    <!-- ================================================================== -->
  -    <!-- Make Jetsped jakarta-style documentation                           -->
  -    <!-- ================================================================== -->
  -    <target depends="env" name="docs-prepare-error" unless="jdom.present">
  +    <!-- =================================================================== -->
  +    <!-- Generates Jetspeed jakarta-style site documentation                 -->
  +    <!-- =================================================================== -->
  +    <target name="check_for_jdom">
  +        <available property="jdom.present"
  +           classname="org.jdom.JDOMException">
  +            <classpath>
  +                <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
  +            </classpath>
  +        </available>
  +    </target>
  +
  +    <target 
  +        name="docs_prepare_error" depends="check_for_jdom" 
  +        unless="jdom.present"
  +    >
           <echo>
               The Jakarta-Site2 module is not present! Please check
               to make sure that you have checked it out from CVS.
  @@ -204,22 +301,28 @@
           </echo>
       </target>
   
  -    <target name="docs"
  -            depends="docs-prepare-error"
  -            description="--> generates the HTML documentation"
  -            if="jdom.present">
  +    <target 
  +        name="docs" depends="docs_prepare_error"
  +        description="Generates Jetspeed jakarta-style site documentation"
  +        if="jdom.present"
  +    >
   
           <taskdef name="anakia" 
               classname="org.apache.velocity.anakia.AnakiaTask">
  +            <classpath>
  +                <fileset dir="${jakarta.site2}/lib">
  +                    <include name="*.jar"/>
  +                </fileset>
  +            </classpath>
           </taskdef>
   
           <anakia basedir="${docs.src}" destdir="${docs.dest}/"
  -             extension=".html" style="./site.vsl"
  -             projectFile="stylesheets/project.xml"
  -             excludes="**/stylesheets/** empty.xml"
  -             includes="**/*.xml"
  -             lastModifiedCheck="true"
  -             templatePath="../../jakarta-site2/xdocs/stylesheets">                                                      
  +            extension=".html" style="./site.vsl"
  +            projectFile="stylesheets/project.xml"
  +            excludes="**/stylesheets/** empty.xml"
  +            includes="**/*.xml"
  +            lastModifiedCheck="true"
  +            templatePath="../${jakarta.site2}/xdocs/stylesheets">
           </anakia>
   
           <copy todir="${docs.dest}/images" filtering="no">
  @@ -241,14 +344,16 @@
       <!-- =================================================================== -->
       <!-- Regenerate the castor registry markup Java peers                    -->
       <!-- =================================================================== -->
  -
  -    <target name="prepare">
  -        <uptodate property="apis.uptodate" targetfile="${build.dir}/${project}.jar">
  -            <srcfiles dir="../src/xml" includes="**/*.xsd"/>
  +    <target  name="prepare_apis" depends="init">
  +        <uptodate 
  +            property="apis.uptodate" 
  +            targetfile="${build.dir}/${project.name}.jar"
  +        >
  +            <srcfiles dir="${src.xml.dir}" includes="**/*.xsd"/>
           </uptodate>
       </target>
       
  -    <target name="apis" depends="prepare" unless="apis.uptodate" description="Generate XML interfaces">
  +    <target name="apis" depends="prepare_apis" unless="apis.uptodate">
   
         <!-- regen psml -->
   
  @@ -322,68 +427,260 @@
           <arg value="org.apache.jetspeed.xml.api.registrymarkup" />
         </java>
           
  +    </target>        
  +
  +    <!-- =================================================================== -->
  +    <!-- Creates the war file                                                -->
  +    <!-- =================================================================== -->
  +    <target name="war" depends="jar" description="Creates the war file">        
  +                
  +        <!-- Create the war file -->
  +        <war warfile="${build.dir}/${project.name}.war"
  +            webxml="${webapp.dir}/WEB-INF/web.xml">
  +
  +            <classes dir="${build.dest.dir}">
  +                <!-- Do not include test files in the runtime jar -->
  +                <exclude name="**/Test*.*"/>
  +                <exclude name="**/test*.*"/>
  +
  +                <!-- Also exclude the test cactus.properties file -->
  +                <exclude name="cactus.properties"/>
  +            </classes>
  +                        
  +            <lib dir="${lib.dir}">
  +                <include name="*.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>            
  +            
  +            <fileset dir="${webapp.dir}"> 
  +                <exclude name="WEB-INF/web.xml"/>
  +            </fileset>
  +
  +        </war>       
  +        
  +    </target>    
  +           
  +    <!-- =================================================================== -->
  +    <!-- Creates a binary release war file with javadocs API                 -->
  +    <!-- =================================================================== -->
  +    <target 
  +        name="war_release" depends="jar,javadocs" 
  +        description="Creates a binary release war file with javadocs api"
  +    >
  +        
  +        <!-- Create the war file -->
  +        <war warfile="${build.dir}/${project.name}.war"
  +            webxml="${webapp.dir}/WEB-INF/web.xml">
  +
  +            <classes dir="${build.dest.dir}">
  +                <!-- Do not include test files in the runtime jar -->
  +                <exclude name="**/Test*.*"/>
  +                <exclude name="**/test*.*"/>
  +
  +                <!-- Also exclude the test cactus.properties file -->
  +                <exclude name="cactus.properties"/>
  +            </classes>           
  +                        
  +            <lib dir="${lib.dir}">
  +                <include name="*.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>            
  +            
  +            <fileset dir="${webapp.dir}"> 
  +                <exclude name="WEB-INF/web.xml"/>
  +                <exclude name="apidocs/index.html"/>
  +            </fileset>
  +            
  +            <zipfileset dir="${javadocs.destdir}" 
  +              prefix="apidocs"/>
  +
  +        </war>
       </target>
  +    
  +    <!-- =================================================================== -->
  +    <!-- Run all Cactus tests for Servlet API 2.2                            -->
  +    <!-- =================================================================== -->
  +    <target name="tests_all"
  +        depends="tests_resin_12,tests_tomcat_32,tests_orion_14,tests_weblogic_51,tests_resin_13,tests_tomcat_40"
  +        description="Run all Cactus tests for Servlet API 2.2 and 2.3">
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Run the client JUnit test cases. This target should not be called   -->
  +    <!-- directly. It must be called by a test_XXX target (where XXX is the  -->
  +    <!-- name of the server - see included xml file for different servers)   -->
  +    <!-- =================================================================== -->
  +    <target name="tests_22">
  +
  +        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
  +
  +            <classpath>
  +                <pathelement location="${build.dest.dir}"/>
  +                <path refid="classpath"/>
  +                
  +                <pathelement location="${junit.jar}"/>
  +                <pathelement location="${cactus-22.jar}"/>                
  +
  +            </classpath>
  +
  +            <formatter type="plain" usefile="false"/>            
  +
  +            <!-- Cactus unit tests -->            
  +            <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>            
  +
  +        </junit>
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Run the client JUnit test cases. This target should not be called   -->
  +    <!-- directly. It must be called by a test_XXX target (where XXX is the  -->
  +    <!-- name of the server - see included xml file for different servers)   -->
  +    <!-- =================================================================== -->
  +    <target name="tests_23">
  +
  +        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
  +
  +            <classpath>
  +                <pathelement location="${build.dest.dir}"/>
  +                <path refid="classpath"/>
  +                
  +                <pathelement location="${junit.jar}"/>
  +                <pathelement location="${cactus-23.jar}"/>                
  +
  +            </classpath>
  +
  +            <formatter type="plain" usefile="false"/>            
  +
  +            <!-- Cactus unit tests -->            
  +            <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>            
  +
  +        </junit>
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Creates a test war file that includes the sample application unit   -->
  +    <!-- tests                                                               -->
  +    <!-- =================================================================== -->
  +    <target name="testwar_22" depends="jar">
  +
  +        <delete dir="${out.test.dir}"/>
  +
  +        <!-- Gather libraries -->
  +        <copy tofile="${lib.dir}/junit.jar" file="${junit.jar}"/>
  +        <copy tofile="${lib.dir}/cactus-22.jar" file="${cactus-22.jar}"/>
  +
  +        <!-- Copy the JSP redirector template                                -->
  +        <copy file="${conf.test.dir}/redirector.jsp"
  +        tofile="${webapp.dir}/redirector.jsp"/>
  +
  +        <!-- Make sure the directory for the war exist -->
  +        <mkdir dir="${out.test.dir}"/>        
  +
  +        <!-- Create the war file -->
  +        <war warfile="${out.test.dir}/test.war"
  +             webxml="${conf.test.dir}/web.xml">
  +
  +            <classes dir="${build.dest.dir}">
  +                <exclude name="cactus.properties"/>
  +            </classes>
  +
  +            <!-- 
  +                We need to copy the Cactus and JUnit 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 it's loadable only by the war classloader.
  +            -->
  +            <lib dir="${lib.dir}">
  +                <include name="*.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>
  +            
  +            <fileset dir="${webapp.dir}">                 
  +                <exclude name="WEB-INF/web.xml"/>
  +            </fileset>                      
  +            
  +        </war> 
  +              
  +        <!-- Undo changes -->
  +        <delete file="${lib.dir}/junit.jar"/>
  +        <delete file="${lib.dir}/cactus-22.jar"/>
  +        <delete file="${webapp.dir}/redirector.jsp"/>
  +
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Creates a test war file that includes the sample application unit   -->
  +    <!-- tests                                                               -->
  +    <!-- =================================================================== -->
  +    <target name="testwar_23" depends="jar">
  +
  +        <delete dir="${out.test.dir}"/>
  +
  +        <!-- Gather libraries -->
  +        <copy tofile="${lib.dir}/junit.jar" file="${junit.jar}"/>
  +        <copy tofile="${lib.dir}/cactus-23.jar" file="${cactus-23.jar}"/>
  +
  +        <!-- Copy the JSP redirector template                                -->
  +        <copy file="${conf.test.dir}/redirector.jsp"
  +        tofile="${webapp.dir}/redirector.jsp"/>
  +
  +        <!-- Make sure the directory for the war exist -->
  +        <mkdir dir="${out.test.dir}"/>        
  +
  +        <!-- Create the war file -->
  +        <war warfile="${out.test.dir}/test.war"
  +             webxml="${conf.test.dir}/web.xml">
  +
  +            <classes dir="${build.dest.dir}">
  +                <exclude name="cactus.properties"/>
  +            </classes>
  +
  +            <!-- 
  +                We need to copy the Cactus and JUnit 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 it's loadable only by the war classloader.
  +            -->
  +            <lib dir="${lib.dir}">
  +                <include name="*.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>
  +            
  +            <fileset dir="${webapp.dir}">                 
  +                <exclude name="WEB-INF/web.xml"/>
  +            </fileset>                      
  +            
  +        </war> 
  +              
  +        <!-- Undo changes -->
  +        <delete file="${lib.dir}/junit.jar"/>
  +        <delete file="${lib.dir}/cactus-23.jar"/>
  +        <delete file="${webapp.dir}/redirector.jsp"/>
  +
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Rebuilds everything                                                 -->
  +    <!-- This is a little quicker than "clean; build" because there is no    -->
  +    <!-- second JVM bootup.                                                  -->
  +    <!-- =================================================================== -->
  +    <target name="rebuild" depends="clean,jar" 
  +            description="Rebuilds everything"
  +    />
  +
  +    <!-- =================================================================== -->
  +    <!-- Cleans up the distribution                                          -->
  +    <!-- =================================================================== -->
  +    <target name="clean" description="Cleans up the distribution">
  +        <delete dir="${build.dir}"/>        
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Include the usage target and the test targets for the different     -->
  +    <!-- servlet engine                                                      -->
  +    <!-- =================================================================== -->
       
  -  <!-- =================================================================== -->
  -  <!-- Prapares the webapp directories                                     -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp">
  -    <mkdir dir="${build.war}"/>
  -
  -    <copy todir="${build.war}" filtering="off">
  -      <fileset dir="${webapp.dir}">
  -      </fileset>
  -    </copy>
  -
  -    <copy todir="${build.war}/docs" filtering="off">
  -      <fileset dir="${docs.dest}"/>
  -    </copy>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the libraries for the war package                          -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-libs" depends="dist">
  -    <copy file="${build.dir}/${project}.jar" tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
  -    <copy todir="${build.war}/WEB-INF/lib">
  -      <fileset dir="${lib.dir}">
  -        <include name="*.jar"/>
  -        <exclude name="ant*.jar"/>
  -        <exclude name="stylebook*.jar"/>
  -        <exclude name="servlet*.jar"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the docs and Javadocs for the webapp                       -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-api" depends="javadoc">
  -    <copy todir="${build.war}/apidocs">
  -      <fileset dir="${javadoc.destdir}"/>
  -    </copy>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Creates the war file                                                -->
  -  <!-- =================================================================== -->
  -  <target name="webapp" depends="prepare-webapp, prepare-webapp-libs" description="Generates the war package">
  -    <jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"/>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Creates a binary release war file with javadocs api                 -->
  -  <!-- =================================================================== -->
  -  <target name="webapp-complete" depends="prepare-webapp, prepare-webapp-libs, prepare-webapp-api" description="Generates the war package with javadocs">
  -    <jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"/>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Removes existing uncompressed webapp                                -->
  -  <!-- =================================================================== -->
  -  <target name="remove-webapp" if="remove.webapp" description="Removes existing uncompressed webapp">
  -    <delete dir="${install.war}/${name}"/>
  -  </target>
  +    &build-tests-22;
  +    &build-tests-23;
       
   </project>
  
  
  
  1.1                  jakarta-jetspeed/build/build-tests-22.xml
  
  Index: build-tests-22.xml
  ===================================================================
      <!-- =================================================================== -->
      <!-- Run Resin 1.2 tests                                                 -->
      <!-- =================================================================== -->
      <target name="tests_resin_12" depends="prepare_tests_resin_12" if="resin.home.12"
          description="Run Resin 1.2 tests">
  
          <!-- 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:8080/test"
              startTarget="start_resin_12"
              stopTarget="stop_resin_12"
              testTarget="tests_22"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Resin 1.2                                                     -->
      <!-- =================================================================== -->
      <target name="start_resin_12">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-start"/>
  
              <arg value="-conf"/>
              <arg value="resin.conf"/>
  
              <!-- Needed so that Resin use the resin.home.12 variable as it's
                   root directory for resolving file paths -->
              <jvmarg value="-Dresin.home=${out.resin12.dir}"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.12}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop Resin 1.2                                                      -->
      <!-- =================================================================== -->
      <target name="stop_resin_12">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-stop"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.12}/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_tests_resin_12" depends="testwar_22" unless="resin.home.12">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'resin.home.12' property has not been set."/>
          <echo message="          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_tests_resin_12" depends="check_tests_resin_12" if="resin.home.12">
  
          <echo message="resin.home.12 = ${resin.home.12}"/>
  
          <property name="out.resin12.dir" value="${out.test.dir}/resin12"/>
          <property name="conf.resin12.dir" value="${conf.test.dir}/resin12"/>
  
          <mkdir dir="${out.resin12.dir}"/>
  
          <!-- Copy resin configuration files -->
          <copy file="${conf.resin12.dir}/resin.conf" tofile="${out.resin12.dir}/resin.conf"/>
  
          <!-- Create the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.resin12.dir}/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Tomcat 3.2 tests                                                -->
      <!-- =================================================================== -->
      <target name="tests_tomcat_32" depends="prepare_tests_tomcat_32" if="tomcat.home.32"
          description="Run Tomcat 3.2 tests">
  
          <!-- 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:8080/test"
              startTarget="start_tomcat_32"
              stopTarget="stop_tomcat_32"
              testTarget="tests_22"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Tomcat 3.2                                                    -->
      <!-- =================================================================== -->
      <target name="start_tomcat_32">
  
          <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
              <arg value="-config"/>
              <arg value="${out.tomcat32.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                                                     -->
      <!-- =================================================================== -->
      <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>
  
      <!-- =================================================================== -->
      <!-- Display a warning message if the needed servlet engine home         -->
      <!-- property is not set                                                 -->
      <!-- =================================================================== -->
      <target name="check_tests_tomcat_32" depends="testwar_22" unless="tomcat.home.32">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'tomcat.home.32' property has not been set."/>
          <echo message="          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_tests_tomcat_32" depends="check_tests_tomcat_32" if="tomcat.home.32">
  
          <echo message="tomcat.home.32 = ${tomcat.home.32}"/>
  
          <property name="out.tomcat32.dir" value="${out.test.dir}/tomcat32"/>
          <property name="conf.tomcat32.dir" value="${conf.test.dir}/tomcat32"/>
          <filter token="out.tomcat32.dir" value="${out.tomcat32.dir}"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${out.tomcat32.dir}/conf"/>
          <mkdir dir="${out.tomcat32.dir}/work"/>
          <mkdir dir="${out.tomcat32.dir}/webapps"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${out.tomcat32.dir}/conf/testserver.xml"/>
  
          <!-- Copy the default tomcat web.xml to our test conf/ directory.
               This is needed otherwise tomcat does not start -->
          <copy file="${tomcat.home.32}/conf/web.xml"
              tofile="${out.tomcat32.dir}/conf/web.xml"/>
  
          <copy file="${conf.tomcat32.dir}/server.xml"
              tofile="${out.tomcat32.dir}/conf/server.xml" filtering="on"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.tomcat32.dir}/webapps/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Orion 1.4 tests                                                 -->
      <!-- =================================================================== -->
      <target name="tests_orion_14" depends="prepare_tests_orion_14" if="orion.home.14"
          description="Run Orion 1.4 tests">
  
          <!-- 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:8080/test"
              startTarget="start_orion_14"
              stopTarget="stop_orion_14"
              testTarget="tests_22"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Orion 1.4                                                     -->
      <!-- =================================================================== -->
      <target name="start_orion_14">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${out.orion14.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${orion.home.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="${orion.home.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_tests_orion_14" depends="testwar_22" unless="orion.home.14">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'orion.home.14' property has not been set."/>
          <echo message="          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_tests_orion_14" depends="check_tests_orion_14" if="orion.home.14">
  
          <echo message="orion.home.14 = ${orion.home.14}"/>
  
          <property name="out.orion14.dir" value="${out.test.dir}/orion14"/>
          <property name="conf.orion14.dir" value="${conf.test.dir}/orion14"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${out.orion14.dir}"/>
          <mkdir dir="${out.orion14.dir}/conf"/>
  
          <copy file="${conf.orion14.dir}/server.xml"
              tofile="${out.orion14.dir}/conf/server.xml"/>
          <copy file="${conf.orion14.dir}/application.xml"
              tofile="${out.orion14.dir}/conf/application.xml"/>
          <copy file="${conf.orion14.dir}/default-web-site.xml"
              tofile="${out.orion14.dir}/conf/default-web-site.xml"/>
          <copy file="${conf.orion14.dir}/principals.xml"
              tofile="${out.orion14.dir}/conf/principals.xml"/>
          <copy file="${conf.orion14.dir}/rmi.xml"
              tofile="${out.orion14.dir}/conf/rmi.xml"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.orion14.dir}/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run WebLogic 5.1 tests                                              -->
      <!-- =================================================================== -->
      <target name="tests_weblogic_51" depends="prepare_tests_weblogic_51" if="weblogic.home.51"
          description="Run WebLogic 5.1 tests">
  
          <!-- 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:8080/test"
              startTarget="start_weblogic_51"
              stopTarget="stop_weblogic_51"
              testTarget="tests_22"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start WebLogic 5.1                                                  -->
      <!-- =================================================================== -->
      <target name="start_weblogic_51">
  
          <java classname="weblogic.Server" fork="yes">
  
              <classpath>
                <pathelement location="${weblogic.home.51}/lib/weblogic510sp8boot.jar"/>
                <pathelement location="${weblogic.home.51}/classes/boot"/>
              </classpath>
  
              <jvmarg value="-ms64m"/>
              <jvmarg value="-mx64m"/>
              <jvmarg value="-Dweblogic.class.path=${weblogic.home.51}/lib/weblogic510sp8.jar;${weblogic.home.51}/license;${weblogic.home.51}/classes;${weblogic.home.51}/lib/weblogicaux.jar"/>
              <jvmarg value="-Dweblogic.home=${out.weblogic51.dir}"/>
              <jvmarg value="-Dweblogic.system.home=${out.weblogic51.dir}"/>
              <jvmarg value="-Dweblogic.system.name=testinstance"/>
              <jvmarg value="-Djava.security.manager"/>
              <jvmarg value="-Djava.security.policy==${conf.weblogic51.dir}/weblogic.policy"/>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop WebLogic 5.1                                                   -->
      <!-- =================================================================== -->
      <target name="stop_weblogic_51">
  
          <java classname="weblogic.Admin" fork="yes">
  
              <classpath>
                  <pathelement location="${weblogic.home.51}/lib/weblogic510sp8.jar"/>
                  <pathelement location="${weblogic.home.51}/license"/>
                  <pathelement location="${weblogic.home.51}/classes"/>
                  <pathelement location="${weblogic.home.51}/lib/weblogicaux.jar"/>
              </classpath>
  
              <arg value="t3://localhost:8080/test"/>
              <arg value="SHUTDOWN"/>
              <arg value="system"/>
              <arg value="password"/>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Display a warning message if the needed servlet engine home         -->
      <!-- property is not set                                                 -->
      <!-- =================================================================== -->
      <target name="check_tests_weblogic_51" depends="testwar_22" unless="weblogic.home.51">
  
          <echo message=""/>
          <echo message="***********************************************************"/>
          <echo message="WARNING : The 'weblogic.home.51' property has not been set."/>
          <echo message="          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_tests_weblogic_51" depends="check_tests_weblogic_51" if="weblogic.home.51">
  
          <echo message="weblogic.home.51 = ${weblogic.home.51}"/>
  
          <property name="out.weblogic51.dir" value="${out.test.dir}/weblogic51"/>
          <property name="conf.weblogic51.dir" value="${conf.test.dir}/weblogic51"/>
          <filter token="out.wlinstance.dir" value="${out.weblogic51.dir}/testinstance"/>
  
          <mkdir dir="${out.weblogic51.dir}/testinstance"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${out.weblogic51.dir}/weblogic.properties"/>
  
          <copy file="${conf.weblogic51.dir}/weblogic.properties"
              tofile="${out.weblogic51.dir}/weblogic.properties" filtering="on"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war"
              tofile="${out.weblogic51.dir}/testinstance/test.war"/>
  
          <!-- This is needed here because WebLogic 5.1 does not support
               automatic war deployment (except with latest Service Packs and
               even when it does there are issues with support files -->
          <unwar src="${out.weblogic51.dir}/testinstance/test.war"
              dest="${out.weblogic51.dir}/testinstance/test"/>
  
      </target>
  
  
  
  1.1                  jakarta-jetspeed/build/build-tests-23.xml
  
  Index: build-tests-23.xml
  ===================================================================
      <!-- =================================================================== -->
      <!-- Run Resin 1.3 tests                                                 -->
      <!-- =================================================================== -->
      <target name="tests_resin_13" depends="prepare_tests_resin_13" if="resin.home.13"
          description="Run Resin 1.3 tests">
  
          <!-- 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:8080/test"
              startTarget="start_resin_13"
              stopTarget="stop_resin_13"
              testTarget="tests_23"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Resin 1.3                                                     -->
      <!-- =================================================================== -->
      <target name="start_resin_13">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-start"/>
  
              <arg value="-conf"/>
              <arg value="resin.conf"/>
  
              <!-- Needed so that Resin use the resin.home.13 variable as it's
                   root directory for resolving file paths -->
              <jvmarg value="-Dresin.home=${out.resin13.dir}"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.13}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop Resin 1.3                                                      -->
      <!-- =================================================================== -->
      <target name="stop_resin_13">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-stop"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.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_tests_resin_13" depends="testwar_23" unless="resin.home.13">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'resin.home.13' property has not been set."/>
          <echo message="          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_tests_resin_13" depends="check_tests_resin_13" if="resin.home.13">
  
          <echo message="resin.home.13 = ${resin.home.13}"/>
  
          <property name="out.resin13.dir" value="${out.test.dir}/resin13"/>
          <property name="conf.resin13.dir" value="${conf.test.dir}/resin13"/>
  
          <mkdir dir="${out.resin13.dir}"/>
  
          <!-- Copy resin configuration files -->
          <copy file="${conf.resin13.dir}/resin.conf" tofile="${out.resin13.dir}/resin.conf"/>
  
          <!-- Create the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.resin13.dir}/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Tomcat 4.0 tests                                                -->
      <!-- =================================================================== -->
      <target name="tests_tomcat_40" depends="prepare_tests_tomcat_40" if="tomcat.home.40"
          description="Run Tomcat 4.0 tests">
  
          <!-- 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:8080/test"
              startTarget="start_tomcat_40"
              stopTarget="stop_tomcat_40"
              testTarget="tests_23"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Tomcat 4.0                                                    -->
      <!-- =================================================================== -->
      <target name="start_tomcat_40">
  
          <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
              <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
              <arg value="-config"/>
              <arg value="${out.tomcat40.full.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"/>                  
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop Tomcat 4.0                                                     -->
      <!-- =================================================================== -->
      <target name="stop_tomcat_40">
  
          <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
              <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
              <arg value="stop"/>
              <classpath>
                <fileset dir="${tomcat.home.40}">
                    <include name="bin/bootstrap.jar"/>
                    <include name="server/catalina.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Display a warning message if the needed servlet engine home         -->
      <!-- property is not set                                                 -->
      <!-- =================================================================== -->
      <target name="check_tests_tomcat_40" depends="testwar_23" unless="tomcat.home.40">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'tomcat.home.40' property has not been set."/>
          <echo message="          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_tests_tomcat_40" depends="check_tests_tomcat_40" if="tomcat.home.40">
  
          <echo message="tomcat.home.40 = ${tomcat.home.40}"/>
  
          <property name="out.tomcat40.dir" value="${out.test.dir}/tomcat40"/>
          <property name="conf.tomcat40.dir" value="${conf.test.dir}/tomcat40"/>
          <property name="out.tomcat40.full.dir" value="${basedir}/${out.tomcat40.dir}"/>
  
          <filter token="out.tomcat40.full.dir" value="${out.tomcat40.full.dir}"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${out.tomcat40.dir}/conf"/>
          <mkdir dir="${out.tomcat40.dir}/work"/>
          <mkdir dir="${out.tomcat40.dir}/webapps"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${out.tomcat40.dir}/conf/server.xml"/>
  
          <!-- Remove the auto deployed webapp so that it is redeployed every -->
          <!-- time.                                                          -->
          <delete dir="${out.tomcat40.dir}/webapps/test"/>
  
          <!-- Copy the default tomcat web.xml to our test conf/ directory. -->
          <!-- This is needed otherwise tomcat does not start.              -->
          <copy file="${tomcat.home.40}/conf/web.xml"
              tofile="${out.tomcat40.dir}/conf/web.xml"/>
  
          <copy file="${conf.tomcat40.dir}/server.xml"
              tofile="${out.tomcat40.dir}/conf/server.xml" filtering="on"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.tomcat40.dir}/webapps/test.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-jetspeed/build/build-tests.xml
  
  Index: build-tests.xml
  ===================================================================
      <!-- =================================================================== -->
      <!-- Run all Cactus tests for Servlet API 2.2                            -->
      <!-- =================================================================== -->
      <target name="tests_all"
          depends="tests_resin_12,tests_tomcat_32,tests_orion_14,tests_weblogic_51"
          description="Run all Cactus tests for Servlet API 2.2">
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Resin 1.2 tests                                                 -->
      <!-- =================================================================== -->
      <target name="tests_resin_12" depends="prepare_tests_resin_12" if="resin.home.12"
          description="Run Resin 1.2 tests">
  
          <!-- 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:8080/test"
              startTarget="start_resin_12"
              stopTarget="stop_resin_12"
              testTarget="tests"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Resin 1.2                                                     -->
      <!-- =================================================================== -->
      <target name="start_resin_12">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-start"/>
  
              <arg value="-conf"/>
              <arg value="resin.conf"/>
  
              <!-- Needed so that Resin use the resin.home.12 variable as it's
                   root directory for resolving file paths -->
              <jvmarg value="-Dresin.home=${out.resin12.dir}"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.12}/lib">
                      <include name="*.jar"/>
                  </fileset>
              </classpath>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop Resin 1.2                                                      -->
      <!-- =================================================================== -->
      <target name="stop_resin_12">
  
          <java classname="org.apache.commons.cactus.ant.ResinRun" fork="yes">
  
              <arg value="-stop"/>
  
              <classpath>
                  <pathelement location="${cactus.ant.jar}"/>
                  <fileset dir="${resin.home.12}/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_tests_resin_12" depends="testwar" unless="resin.home.12">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'resin.home.12' property has not been set."/>
          <echo message="          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_tests_resin_12" depends="check_tests_resin_12" if="resin.home.12">
  
          <echo message="resin.home.12 = ${resin.home.12}"/>
  
          <property name="out.resin12.dir" value="${out.test.dir}/resin12"/>
          <property name="conf.resin12.dir" value="${conf.test.dir}/resin12"/>
  
          <mkdir dir="${out.resin12.dir}"/>
  
          <!-- Copy resin configuration files -->
          <copy file="${conf.resin12.dir}/resin.conf" tofile="${out.resin12.dir}/resin.conf"/>
  
          <!-- Create the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.resin12.dir}/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Tomcat 3.2 tests                                                -->
      <!-- =================================================================== -->
      <target name="tests_tomcat_32" depends="prepare_tests_tomcat_32" if="tomcat.home.32"
          description="Run Tomcat 3.2 tests">
  
          <!-- 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:8080/test"
              startTarget="start_tomcat_32"
              stopTarget="stop_tomcat_32"
              testTarget="tests"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Tomcat 3.2                                                    -->
      <!-- =================================================================== -->
      <target name="start_tomcat_32">
  
          <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
              <arg value="-config"/>
              <arg value="${out.tomcat32.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                                                     -->
      <!-- =================================================================== -->
      <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>
  
      <!-- =================================================================== -->
      <!-- Display a warning message if the needed servlet engine home         -->
      <!-- property is not set                                                 -->
      <!-- =================================================================== -->
      <target name="check_tests_tomcat_32" depends="testwar" unless="tomcat.home.32">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'tomcat.home.32' property has not been set."/>
          <echo message="          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_tests_tomcat_32" depends="check_tests_tomcat_32" if="tomcat.home.32">
  
          <echo message="tomcat.home.32 = ${tomcat.home.32}"/>
  
          <property name="out.tomcat32.dir" value="${out.test.dir}/tomcat32"/>
          <property name="conf.tomcat32.dir" value="${conf.test.dir}/tomcat32"/>
          <filter token="out.tomcat32.dir" value="${out.tomcat32.dir}"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${out.tomcat32.dir}/conf"/>
          <mkdir dir="${out.tomcat32.dir}/work"/>
          <mkdir dir="${out.tomcat32.dir}/webapps"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${out.tomcat32.dir}/conf/testserver.xml"/>
  
          <!-- Copy the default tomcat web.xml to our test conf/ directory.
               This is needed otherwise tomcat does not start -->
          <copy file="${tomcat.home.32}/conf/web.xml"
              tofile="${out.tomcat32.dir}/conf/web.xml"/>
  
          <copy file="${conf.tomcat32.dir}/server.xml"
              tofile="${out.tomcat32.dir}/conf/server.xml" filtering="on"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.tomcat32.dir}/webapps/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run Orion 1.4 tests                                                 -->
      <!-- =================================================================== -->
      <target name="tests_orion_14" depends="prepare_tests_orion_14" if="orion.home.14"
          description="Run Orion 1.4 tests">
  
          <!-- 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:8080/test"
              startTarget="start_orion_14"
              stopTarget="stop_orion_14"
              testTarget="tests"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start Orion 1.4                                                     -->
      <!-- =================================================================== -->
      <target name="start_orion_14">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${out.orion14.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${orion.home.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="${orion.home.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_tests_orion_14" depends="testwar" unless="orion.home.14">
  
          <echo message=""/>
          <echo message="*********************************************************"/>
          <echo message="WARNING : The 'orion.home.14' property has not been set."/>
          <echo message="          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_tests_orion_14" depends="check_tests_orion_14" if="orion.home.14">
  
          <echo message="orion.home.14 = ${orion.home.14}"/>
  
          <property name="out.orion14.dir" value="${out.test.dir}/orion14"/>
          <property name="conf.orion14.dir" value="${conf.test.dir}/orion14"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${out.orion14.dir}"/>
          <mkdir dir="${out.orion14.dir}/conf"/>
  
          <copy file="${conf.orion14.dir}/server.xml"
              tofile="${out.orion14.dir}/conf/server.xml"/>
          <copy file="${conf.orion14.dir}/application.xml"
              tofile="${out.orion14.dir}/conf/application.xml"/>
          <copy file="${conf.orion14.dir}/default-web-site.xml"
              tofile="${out.orion14.dir}/conf/default-web-site.xml"/>
          <copy file="${conf.orion14.dir}/principals.xml"
              tofile="${out.orion14.dir}/conf/principals.xml"/>
          <copy file="${conf.orion14.dir}/rmi.xml"
              tofile="${out.orion14.dir}/conf/rmi.xml"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war" tofile="${out.orion14.dir}/test.war"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Run WebLogic 5.1 tests                                              -->
      <!-- =================================================================== -->
      <target name="tests_weblogic_51" depends="prepare_tests_weblogic_51" if="weblogic.home.51"
          description="Run WebLogic 5.1 tests">
  
          <!-- 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:8080/test"
              startTarget="start_weblogic_51"
              stopTarget="stop_weblogic_51"
              testTarget="tests"/>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Start WebLogic 5.1                                                  -->
      <!-- =================================================================== -->
      <target name="start_weblogic_51">
  
          <java classname="weblogic.Server" fork="yes">
  
              <classpath>
                <pathelement location="${weblogic.home.51}/lib/weblogic510sp8boot.jar"/>
                <pathelement location="${weblogic.home.51}/classes/boot"/>
              </classpath>
  
              <jvmarg value="-ms64m"/>
              <jvmarg value="-mx64m"/>
              <jvmarg value="-Dweblogic.class.path=${weblogic.home.51}/lib/weblogic510sp8.jar;${weblogic.home.51}/license;${weblogic.home.51}/classes;${weblogic.home.51}/lib/weblogicaux.jar"/>
              <jvmarg value="-Dweblogic.home=${out.weblogic51.dir}"/>
              <jvmarg value="-Dweblogic.system.home=${out.weblogic51.dir}"/>
              <jvmarg value="-Dweblogic.system.name=testinstance"/>
              <jvmarg value="-Djava.security.manager"/>
              <jvmarg value="-Djava.security.policy==${conf.weblogic51.dir}/weblogic.policy"/>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Stop WebLogic 5.1                                                   -->
      <!-- =================================================================== -->
      <target name="stop_weblogic_51">
  
          <java classname="weblogic.Admin" fork="yes">
  
              <classpath>
                  <pathelement location="${weblogic.home.51}/lib/weblogic510sp8.jar"/>
                  <pathelement location="${weblogic.home.51}/license"/>
                  <pathelement location="${weblogic.home.51}/classes"/>
                  <pathelement location="${weblogic.home.51}/lib/weblogicaux.jar"/>
              </classpath>
  
              <arg value="t3://localhost:8080/test"/>
              <arg value="SHUTDOWN"/>
              <arg value="system"/>
              <arg value="password"/>
  
          </java>
  
      </target>
  
      <!-- =================================================================== -->
      <!-- Display a warning message if the needed servlet engine home         -->
      <!-- property is not set                                                 -->
      <!-- =================================================================== -->
      <target name="check_tests_weblogic_51" depends="testwar" unless="weblogic.home.51">
  
          <echo message=""/>
          <echo message="***********************************************************"/>
          <echo message="WARNING : The 'weblogic.home.51' property has not been set."/>
          <echo message="          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_tests_weblogic_51" depends="check_tests_weblogic_51" if="weblogic.home.51">
  
          <echo message="weblogic.home.51 = ${weblogic.home.51}"/>
  
          <property name="out.weblogic51.dir" value="${out.test.dir}/weblogic51"/>
          <property name="conf.weblogic51.dir" value="${conf.test.dir}/weblogic51"/>
          <filter token="out.wlinstance.dir" value="${out.weblogic51.dir}/testinstance"/>
  
          <mkdir dir="${out.weblogic51.dir}/testinstance"/>
  
          <!-- Delete some config file so that they will be copied every time -->
          <delete file="${out.weblogic51.dir}/weblogic.properties"/>
  
          <copy file="${conf.weblogic51.dir}/weblogic.properties"
              tofile="${out.weblogic51.dir}/weblogic.properties" filtering="on"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war"
              tofile="${out.weblogic51.dir}/testinstance/test.war"/>
  
          <!-- This is needed here because WebLogic 5.1 does not support
               automatic war deployment (except with latest Service Packs and
               even when it does there are issues with support files -->
          <unwar src="${out.weblogic51.dir}/testinstance/test.war"
              dest="${out.weblogic51.dir}/testinstance/test"/>
  
      </target>
  
  
  
  1.1                  jakarta-jetspeed/build/build.properties
  
  Index: build.properties
  ===================================================================
  # Properties related to the user's environment. This file should be provided
  # for building Jetspeed or the properties need to be specified on
  # the command line when starting Ant with the -D switch
  
  servlet.jar = lib/servlet_2_2.jar
  cactus-22.jar = build/lib/commons-cactus-22.jar
  cactus-23.jar = build/lib/commons-cactus-23.jar
  cactus.ant.jar = build/lib/commons-cactus-ant.jar
  junit.jar=build/lib/junit.jar
  
  # Servlet engine locations for the tests
  
  # Note: If you don't want to run the test on a given servlet engine, just
  #       comment it's home property. For example, if you don't want to run the
  #       tests on the Resin 1.2, comment out the "resin.home.12" property.
  
  # resin.home.12=c:\resin-1.2.5
  # resin.home.13=c:\resin-1.3
  tomcat.home.32=d:/server/tomcat
  tomcat.home.40=g:/server/catalina
  # orion.home.14=c:\orion-1.4.5
  # weblogic.home.51=c:\weblogic-5.1
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/cactus.properties
  
  Index: cactus.properties
  ===================================================================
  # Configuration file for Cactus.
  
  # Each project using Cactus need to have such a file put in the CLASSPATH
  # (Meaning the directory containgin this file should be in the CLASSPATH, not
  # the file itself of course ... :) )
  
  # Defines the URLs that will be used by Cactus to call it's redirectors
  # (Servlet and JSP). You need to specify in these URLs the webapp context
  # that you use for your application.
  
  cactus.servletRedirectorURL = http://localhost:8080/test/ServletRedirector
  cactus.jspRedirectorURL = http://localhost:8080/test/JspRedirector
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/redirector.jsp
  
  Index: redirector.jsp
  ===================================================================
  <%@page import="org.apache.commons.cactus.server.*" session="false" %><%
  
      /**                                                
       *                                                 
       * Note:                                           
       * It is very important not to put any character between the end
       * of the page tag and the beginning of the java code expression, otherwise,
       * the generated servlet containss a 'out.println("\r\n");' and this breaks
       * our mechanism !
       */
  
      /**
       * This JSP is used as a proxy to call your server-side unit tests. We use
       * a JSP rather than a servlet because for testing custom JSP tags for
       * example we need access to JSP implicit objects (PageContext and
       * JspWriter).
       */
  
      JspTestCaller caller = new JspTestCaller();
  
      JspImplicitObjects objects = new JspImplicitObjects();
      objects.m_Config = config;
      objects.m_Request = request;
      objects.m_Response = response;
      objects.m_PageContext = pageContext;
      objects.m_JspWriter = out;
  
      caller.doTest(objects);
  
  %>
  
  
  1.1                  jakarta-jetspeed/build/cactus/web.xml
  
  Index: web.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <!DOCTYPE web-app
      PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
      "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
  
  <web-app>
  
      <servlet>
          <servlet-name>ServletRedirector</servlet-name>
          <servlet-class>org.apache.commons.cactus.server.ServletTestRedirector</servlet-class>
      </servlet>
  
      <servlet>
          <servlet-name>JspRedirector</servlet-name>
          <jsp-file>/test/redirector.jsp</jsp-file>        
      </servlet>    
  
      <servlet>
          <servlet-name>
             test
          </servlet-name>
          <servlet-class>
              org.apache.turbine.Turbine
          </servlet-class>
  
          <init-param>
              <param-name>properties</param-name>
              <param-value>
                  WEB-INF/conf/TurbineResources.properties
              </param-value>            
          </init-param>
          <init-param>
              <param-name>resources</param-name>
              <param-value>
                  org.apache.jetspeed.services.resources.VariableResourcesService
              </param-value>
          </init-param>
          <load-on-startup>1</load-on-startup>
      </servlet>
  
      <servlet-mapping>
          <servlet-name>ServletRedirector</servlet-name>
          <url-pattern>/ServletRedirector</url-pattern>
      </servlet-mapping>
  
      <servlet-mapping>
          <servlet-name>JspRedirector</servlet-name>
          <url-pattern>/JspRedirector</url-pattern>
      </servlet-mapping>
         
      <servlet-mapping>
          <servlet-name>
              test
          </servlet-name>
          <url-pattern>
              /portal/*
          </url-pattern>
      </servlet-mapping>
  
      <servlet-mapping>
          <servlet-name>
              test
          </servlet-name>
          <url-pattern>
              /test/*
          </url-pattern>
      </servlet-mapping>
      
      <welcome-file-list>
          <welcome-file>index.jsp</welcome-file>
          <welcome-file>index.html</welcome-file>
      </welcome-file-list>
      
  </web-app>
  
  
  1.1                  jakarta-jetspeed/build/cactus/orion14/application.xml
  
  Index: application.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE orion-application PUBLIC "-//Evermind//DTD J2EE Application runtime 1.2//EN" "http://www.orionserver.com/dtds/orion-application.dtd">
  
  <orion-application>
  
      <web-module id="test" path="../test.war"/>
  
  	<namespace-access>
  		<read-access>
  			<namespace-resource root="">
  				<security-role-mapping>
  					<group name="administrators" />
  				</security-role-mapping>
  			</namespace-resource>
  		</read-access>
  		<write-access>
  			<namespace-resource root="">
  				<security-role-mapping>
  					<group name="administrators" />
  				</security-role-mapping>
  			</namespace-resource>
  		</write-access>
  	</namespace-access>
  
  </orion-application>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/orion14/default-web-site.xml
  
  Index: default-web-site.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
  
  <web-site host="[ALL]" port="8080" display-name="Default Orion WebSite">
  
      <!-- The default web-app for this site, bound to the root -->
      <default-web-app application="default" name="test"/>
  
      <web-app application="default" name="test" root="/test" />
  
  </web-site>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/orion14/principals.xml
  
  Index: principals.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE principals PUBLIC "//Evermind - Orion Principals//" "http://www.orionserver.com/dtds/principals.dtd">
  
  <principals>
  	<groups>
  		<group name="administrators">
  			<description>administrators</description>
  			<permission name="administration" />
  			<permission name="com.evermind.server.AdministrationPermission" />
  		</group>
  		<group name="guests">
  			<description>guests</description>
  		</group>
  		<group name="users">
  			<description>users</description>
  			<permission name="rmi:login" />
  			<permission name="com.evermind.server.rmi.RMIPermission" />
  		</group>
  	</groups>
  	<users>
  		<user username="admin" password="password" deactivated="false">
  			<description>The default administrator</description>
  			<group-membership group="administrators" />
  			<group-membership group="guests" />
  			<group-membership group="users" />
  		</user>
  	</users>
  </principals>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/orion14/rmi.xml
  
  Index: rmi.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE rmi-server PUBLIC "Orion RMI-server" "http://www.orionserver.com/dtds/rmi-server.dtd">
  
  <rmi-server port="23791">	
  </rmi-server>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/orion14/server.xml
  
  Index: server.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
  
  <application-server>
  
      <global-application name="default" path="./application.xml" />
  
      <web-site path="./default-web-site.xml" />
  
  	<rmi-config path="./rmi.xml" />
  	<principals path="./principals.xml" />
  
  </application-server>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/resin12/resin.conf
  
  Index: resin.conf
  ===================================================================
  <caucho.com>
  
    <http-server>
  
      <app-dir>.</app-dir>
  
      <http port='8080'/>
  
      <host id=''>
  
        <war-dir id='.'/>
  
      </host>
      
    </http-server>
  
  </caucho.com>
  
  
  1.1                  jakarta-jetspeed/build/cactus/resin13/resin.conf
  
  Index: resin.conf
  ===================================================================
  <caucho.com>
  
    <http-server>
  
      <app-dir>.</app-dir>
  
      <http port='8080'/>
  
      <host id=''>
        <war-dir id='.'/>
      </host>
      
    </http-server>
  
  </caucho.com>
  
  
  1.1                  jakarta-jetspeed/build/cactus/tomcat32/server.xml
  
  Index: server.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <Server>
  
    <ContextManager home="@out.tomcat32.dir@" debug="0" workDir="work" showDebugInfo="true" >
  
      <ContextInterceptor className="org.apache.tomcat.context.AutoSetup" />
      <ContextInterceptor className="org.apache.tomcat.context.WebXmlReader" />
      <ContextInterceptor className="org.apache.tomcat.context.LoaderInterceptor" />
      <ContextInterceptor className="org.apache.tomcat.context.DefaultCMSetter" />
      <ContextInterceptor className="org.apache.tomcat.context.WorkDirInterceptor" />
      <RequestInterceptor className="org.apache.tomcat.request.SessionInterceptor" noCookies="false" />
      <RequestInterceptor className="org.apache.tomcat.request.SimpleMapper1" debug="0" />
      <RequestInterceptor className="org.apache.tomcat.request.InvokerInterceptor" debug="0" prefix="/servlet/" />
      <RequestInterceptor className="org.apache.tomcat.request.StaticInterceptor" debug="0" suppress="false" />
      <RequestInterceptor className="org.apache.tomcat.session.StandardSessionInterceptor" />
      <RequestInterceptor className="org.apache.tomcat.request.AccessInterceptor" debug="0" />
      <RequestInterceptor className="org.apache.tomcat.request.SimpleRealm" debug="0" />
      <ContextInterceptor className="org.apache.tomcat.context.LoadOnStartupInterceptor" />
      <Connector className="org.apache.tomcat.service.PoolTcpConnector">
          <Parameter name="handler" value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
          <Parameter name="port" value="8080"/>
      </Connector>
      <Connector className="org.apache.tomcat.service.PoolTcpConnector">
          <Parameter name="handler" value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/>
          <Parameter name="port" value="8007"/>
      </Connector>
      <Context path="" docBase="" debug="0" />
  
    </ContextManager>
  </Server>
  
  
  1.1                  jakarta-jetspeed/build/cactus/tomcat40/server.xml
  
  Index: server.xml
  ===================================================================
  <Server port="8005" shutdown="SHUTDOWN" debug="0">
  
    <Service name="Tomcat-Standalone">
  
      <Connector className="org.apache.catalina.connector.http.HttpConnector"
                 port="8080" minProcessors="5" maxProcessors="75"
                 acceptCount="10" debug="0"/>
  
      <Engine name="Standalone" defaultHost="localhost" debug="0">
  
        <Realm className="org.apache.catalina.realm.MemoryRealm" />
  
        <Host name="localhost" debug="0" appBase="@out.tomcat40.full.dir@/webapps">
        </Host>
  
      </Engine>
  
    </Service>
  
  </Server>
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/weblogic51/weblogic.policy
  
  Index: weblogic.policy
  ===================================================================
  grant {
      permission java.security.AllPermission;
  };
  
  
  
  1.1                  jakarta-jetspeed/build/cactus/weblogic51/weblogic.properties
  
  Index: weblogic.properties
  ===================================================================
  
  weblogic.system.listenPort=8080
  
  # Define the test webapp
  weblogic.httpd.webApp.test=@out.wlinstance.dir@/test
  
  #-------------------------------------------------------------------------------
  # Properties below are needed to have a functionning servlet engine
  #-------------------------------------------------------------------------------
  
  # No access.log file generated
  weblogic.httpd.enableLogFile=true
  
  # this property need to exist but the password can be anything
  weblogic.password.system=password
  
  # some security stuff
  weblogic.allow.execute.weblogic.servlet=everyone
  
  
  
  1.1                  jakarta-jetspeed/build/lib/ant-1.3-optional.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/ant-1.3.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/commons-cactus-22.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/commons-cactus-23.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/commons-cactus-ant.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/commons-cactus.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/build/lib/junit.jar
  
  	<<Binary file>>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message