ozeigermann 2004/02/11 03:24:51
Modified: . build.xml
Log:
Selectively merged from the release branch
Revision Changes Path
1.194 +5 -8 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- build.xml 5 Feb 2004 11:14:28 -0000 1.193
+++ build.xml 11 Feb 2004 11:24:51 -0000 1.194
@@ -154,7 +154,8 @@
<echo message=" XML SAX 2 API ${sax.present}"/>
<echo message=""/>
<echo message="Optional Tomcat bundle:"/>
- <echo message=" Tomcat (5.0 or later) ${catalina.dist}"/>
+ <echo message=" Tomcat (4.1.x or 5.0.x) ${catalina.dist}"/>
+ <echo message=" Present ${catalina.present}"/>
<echo message=""/>
<condition property="required.present">
<and>
@@ -439,8 +440,7 @@
<!-- This target requires Tomcat 4.x -->
<!-- =================================================================== -->
<target name="tomcat-4-install" depends="tomcat-install" if="catalina.present"
description="Modifies Tomcat 4.x installation to include Slide">
- <filter token="CATALINA" value="${catalina.dist}"/>
- <copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
+ <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-4-server.patch"/>
</fileset>
@@ -453,8 +453,7 @@
<!-- This target requires Tomcat 5.x -->
<!-- =================================================================== -->
<target name="tomcat-5-install" depends="tomcat-install" if="catalina.present"
description="Modifies Tomcat 4.x installation to include Slide">
- <filter token="CATALINA" value="${catalina.dist}"/>
- <copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
+ <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-5-server.patch"/>
</fileset>
@@ -477,11 +476,9 @@
<include name="log4j.properties"/>
</fileset>
</copy>
- <filter token="CATALINA" value="${catalina.dist}"/>
- <copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
+ <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="slide.properties"/>
- <include name="server.patch"/>
</fileset>
</copy>
<copy file="${slide.dist}/slide/catalina-conf/slide.properties"
tofile="${slide.build}/classes/org/apache/slide/slide.properties"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
