[cvs] expresso build.xml

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso
In directory jcorp2.servlets.net:/tmp/cvs-serv26923

Modified Files:
	build.xml 
Log Message:
update test target


Index: build.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/build.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** build.xml	4 May 2004 11:29:02 -0000	1.71
--- build.xml	8 Jun 2004 03:26:29 -0000	1.72
***************
*** 1126,1168 ****
  	</target>
  
!     <target name="test" description="run junit test suite, server-side only; assumes that we are inside container"
!         depends="init" >
!         <property name="logdir" value="${container.home}/logs" />
!         <property name="outfile" value="${container.home}/testout.txt" />
!         <property name="containedWebinf" value="${container.home}/webapps/expresso/WEB-INF" />
!         <mkdir dir="${logdir}" />
!         <echo message="output going to: ${outfile}" />
!         <echo message="logs going to: ${logdir}" />
          <java
              classname="com.jcorporate.expresso.core.ExpressoTestSuite"
              fork="true"
              output="${outfile}"
!         >
  
              <classpath>
!                 <!-- add container -->
!                 <pathelement path="${catalina_path}"/>
! 
!                 <fileset dir="${container.home}">
!                     <include name="lib/*.jar" unless="haveCatalina"/>
!                 </fileset>
  
!             <!-- add webapp jars, including expresso jars -->
                  <fileset dir="${containedWebinf}/lib">
                      <include name="*.jar"/>
                      <include name="*.zip"/>
                  </fileset>
              </classpath>
  
              <jvmarg value="-Xms128m"/>
              <jvmarg value="-Xmx128m"/>
!             <jvmarg value="-Djunit.argv.configDir=${containedWebinf}/config" />
!             <jvmarg value="-Djunit.argv.webAppDir=${containedWebinf}/.." />
!             <jvmarg value="-Djunit.argv.testContext=test" />
!             <jvmarg value="-Djunit.argv.logDir=${logdir}" />
  
          </java>
      </target>
- 
  
      <target name="xmlpp" depends="init" description="Pretty prints a XML File.  Define xmlpp.input=filename (e.g. ant -Dxmlpp.input='c:\blah') and optionally xmlpp.output for the output result.">
--- 1126,1172 ----
  	</target>
  
!     <target name="test" description="run junit test suite. assumes that we are testing
!     inside tomcat or resin servlet container located at ${container.home}, and that a database 'test'
!     is available as described in the expresso-config.xml located at ${container.home}/webapps/${app.name}/WEB-INF/config"
!         depends="init,add_catalina_path,empty_catalina_path">
! 
!         <property name="logdir" value="${container.home}/logs"/>
!         <property name="outfile" value="${container.home}/testout.txt"/>
!         <property name="containedWebinf" value="${container.home}/webapps/${app.name}/WEB-INF"/>
!         <mkdir dir="${logdir}"/>
!         <echo message="output going to: ${outfile} (you might want to tail -f that file)"/>
!         <echo message="logs going to: ${logdir}"/>
          <java
              classname="com.jcorporate.expresso.core.ExpressoTestSuite"
              fork="true"
              output="${outfile}"
!             >
  
              <classpath>
!                 <!-- compiled local classes -->
!                 <pathelement path="${containedWebinf}/classes"/>
  
!                 <!-- add webapp jars, including expresso jars -->
                  <fileset dir="${containedWebinf}/lib">
                      <include name="*.jar"/>
                      <include name="*.zip"/>
                  </fileset>
+ 
+                 <!-- add container -->
+                 <fileset dir="${container.home}">
+                     <include name="lib/*.jar" unless="haveCatalina"/>
+                 </fileset>
+                 <pathelement path="${catalina_path}"/>
              </classpath>
  
              <jvmarg value="-Xms128m"/>
              <jvmarg value="-Xmx128m"/>
!             <jvmarg value="-Djunit.argv.configDir=${containedWebinf}/config"/>
!             <jvmarg value="-Djunit.argv.webAppDir=${containedWebinf}/.."/>
!             <jvmarg value="-Djunit.argv.testContext=test"/>
!             <jvmarg value="-Djunit.argv.logDir=${logdir}"/>
  
          </java>
      </target>
  
      <target name="xmlpp" depends="init" description="Pretty prints a XML File.  Define xmlpp.input=filename (e.g. ant -Dxmlpp.input='c:\blah') and optionally xmlpp.output for the output result.">