[cvs] expresso commit by dlloyd: better checks for tomcat 5.x and added

[JCorporate Ltd]

Log Message:
-----------
better checks for tomcat 5.x and added rebuild to nightly build

Modified Files:
--------------
    expresso:
        build.xml

Revision Data
-------------
Index: build.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/build.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -Lbuild.xml -Lbuild.xml -u -r1.91 -r1.92
--- build.xml
+++ build.xml
@@ -169,6 +169,7 @@
 
     <target name="check_catalina" description="support for tomcat which uses /common directory, as opposed to Resin"  >
 <!--        determine whether catalina is found -->
+        <available file="${container.home}/common/lib/servlet-api.jar" property="haveCatalina"  />
         <available file="${container.home}/common/lib/activation.jar" property="haveCatalina"  />
     </target>
     <target name="add_catalina_path" if="haveCatalina" >
@@ -776,7 +777,7 @@
 		Creates the Expresso binary war without doing a complete rebuild.
 	========================================================================
 	-->
-	<target name="bld-nightly" depends="init,buildDirs" description="Build the Expresso Nightly Binary Distribution">
+	<target name="bld-nightly" depends="init,clean,buildDirs,build" description="Build the Expresso Nightly Binary Distribution">
 		<property name="expresso.bin-nightly-war" value="${expresso.build.dist}/expresso-${NIGHTLY}-bin.war"/>
 		<property name="expresso.src-nightly-war" value="${expresso.build.dist}/expresso-${NIGHTLY}-src.zip"/>
 		<property name="expresso.doc-nightly-war" value="${expresso.build.dist}/expresso-${NIGHTLY}-doc.zip"/>
@@ -1106,6 +1107,7 @@
 		<copy file="${basedir}/../build.xml" todir="${container.home}" verbose="true"/>
 	</target>
 	<target name="nightly" description="Build a distribution suitable for nightly builds" depends="init,build,expresso-complete-prep">
+
 		<delete file="${expresso.build.dist}/expresso-${DSTAMP}-bin.war" failonerror="false"/>
 		<jar jarfile="${expresso.build.dist}/expresso-${DSTAMP}-bin.war" compress="on" basedir="${expresso.build.dist}/complete-temp/webapps/ROOT" includes="WEB-INF/web.xml,
         WEB-INF/bin/**/*,