svn commit: r524196 - /jakarta/slide/trunk/wck/build.xml

Author: ozeigermann
Date: Fri Mar 30 10:40:25 2007
New Revision: 524196

URL: http://svn.apache.org/viewvc?view=rev&rev=524196
Log:
Added deployment task for Tomcat 5.0

Modified:
    jakarta/slide/trunk/wck/build.xml

Modified: jakarta/slide/trunk/wck/build.xml
URL: http://svn.apache.org/viewvc/jakarta/slide/trunk/wck/build.xml?view=diff&rev=524196&r1=524195&r2=524196
==============================================================================
--- jakarta/slide/trunk/wck/build.xml (original)
+++ jakarta/slide/trunk/wck/build.xml Fri Mar 30 10:40:25 2007
@@ -177,19 +177,29 @@
          </copy>
     </target>
 
-    <!-- =================================================================== -->
-    <!-- Deploy WCK as a web application with JAAS authentication to       -->
-    <!-- Tomcat 5.0.28 and later                                             -->
-    <!-- This target requires Tomcat 5.0.28                                  -->
-    <!-- =================================================================== -->
-    <target name="deploy" depends="dist" description="Deploys WCK as a web application with JAAS authentication to Tomcat 5">
-        <copy file="dist/slide.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
-        <!-- jaas config -->
-        <copy file="${jaas.config}" todir="${catalina.dist}/conf/" overwrite="yes"/>
-        <!-- patch server.xml -->
-        <patch originalfile="${catalina.dist}/conf/server.xml" patchfile="${slide.base.dir}/src/conf/catalina/tomcat-jaas-server.patch"/>
-        <!-- patch startup -->
-        <patch originalfile="${catalina.dist}/bin/startup.bat" patchfile="${slide.base.dir}/src/conf/catalina/startup-jaas.bat.patch"/>
-        <patch originalfile="${catalina.dist}/bin/catalina.sh" patchfile="${slide.base.dir}/src/conf/catalina/catalina-jaas.sh.patch"/>
-    </target>
+	<!-- =================================================================== -->
+	<!-- Deploy WCK as a web application with JAAS authentication to       -->
+	<!-- Tomcat 5.0.28 and later                                             -->
+	<!-- This target requires Tomcat 5.0.28                                  -->
+	<!-- =================================================================== -->
+	<target name="deploy" depends="deploy5.0" description="Deploys WCK as a web application with JAAS authentication to Tomcat 5" />
+	<target name="deploy5.0" depends="dist" description="Deploys WCK as a web application with JAAS authentication to Tomcat 5">
+		<copy file="dist/slide.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
+		<!-- jaas config -->
+		<copy file="${jaas.config}" todir="${catalina.dist}/conf/" overwrite="yes"/>
+		<!-- patch server.xml -->
+		<patch originalfile="${catalina.dist}/conf/server.xml" patchfile="${slide.base.dir}/src/conf/catalina/tomcat-jaas-server.patch"/>
+		<!-- patch startup -->
+		<patch originalfile="${catalina.dist}/bin/startup.bat" patchfile="${slide.base.dir}/src/conf/catalina/startup-jaas.bat.patch"/>
+		<patch originalfile="${catalina.dist}/bin/catalina.sh" patchfile="${slide.base.dir}/src/conf/catalina/catalina-jaas.sh.patch"/>
+	</target>
+	<target name="deploy5.5" depends="dist" description="Deploys WCK as a web application with JAAS authentication to Tomcat 5.5">
+		<copy file="dist/slide.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
+		<!-- jaas config -->
+		<copy file="${jaas.config}" todir="${catalina.dist}/conf/" overwrite="yes"/>
+		<!-- server.xml -->
+		<copy file="${basedir}/conf/server5.5.xml" toFile="${catalina.dist}/conf/server.xml" overwrite="yes"/>
+		<!-- startup -->
+		<patch originalfile="${catalina.dist}/bin/startup.bat" patchfile="${slide.base.dir}/src/conf/catalina/startup-jaas.bat.patch"/>
+	</target>
 </project>