You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/06/12 22:19:50 UTC
cvs commit: jakarta-struts build.xml
craigmcc 00/06/12 13:19:50
Modified: . build.xml
Log:
Update the build.xml script to support deployment to either Catalina or
Tomcat, so that both can be tested.
Revision Changes Path
1.5 +22 -7 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2000/06/11 22:38:32 1.4
+++ build.xml 2000/06/12 20:19:48 1.5
@@ -3,8 +3,9 @@
<!-- Initialization properties -->
<property name="app.name" value="struts"/>
<property name="build.home" value="../build/${app.name}"/>
- <property name="deploy.home" value="../build/catalina/webapps/struts"/>
+ <property name="catalina.build" value="../build/catalina"/>
<property name="dist.home" value="../dist/${app.name}"/>
+ <property name="tomcat.build" value="../build/tomcat"/>
<property name="upload.dest" value="craigmcc@jakarta.apache.org:/www/jakarta.apache.org/builds/struts/nightly"/>
<property name="upload.home" value="../upload/${app.name}"/>
@@ -133,13 +134,27 @@
<target name="dist"
depends="dist.library,dist.documentation,dist.example,dist.source"/>
- <!-- DEPLOY: Deploy this application on Tomcat -->
- <target name="deploy" depends="compile.example">
- <mkdir dir="${deploy.home}"/>
- <copydir src="${build.home}/example" dest="${deploy.home}"/>
+ <!-- DEPLOY: Deploy these applications on Catalina -->
+ <target name="deploy.catalina" depends="compile.documentation,compile.example">
+ <mkdir dir="${catalina.build}/webapps/struts-documentation"/>
+ <copydir src="${build.home}/documentation"
+ dest="${catalina.build}/webapps/struts-documentation"/>
+ <mkdir dir="${catalina.build}/webapps/struts-example"/>
+ <copydir src="${build.home}/example"
+ dest="${catalina.build}/webapps/struts-example"/>
+ </target>
+
+ <!-- DEPLOY: Deploy these applications on Tomcat -->
+ <target name="deploy.tomcat" depends="compile.documentation,compile.example">
+ <mkdir dir="${tomcat.build}/webapps/struts-documentation"/>
+ <copydir src="${build.home}/documentation"
+ dest="${tomcat.build}/webapps/struts-documentation"/>
+ <mkdir dir="${tomcat.build}/webapps/struts-example"/>
+ <copydir src="${build.home}/example"
+ dest="${tomcat.build}/webapps/struts-example"/>
</target>
- <!-- DEPLOY: Package up the distribution in various formats -->
+ <!-- UPLOAD: Package up the distribution in various formats -->
<target name="package" depends="dist">
<!-- Create the uploads directory -->
<deltree dir="${upload.home}"/>
@@ -156,7 +171,7 @@
basedir="${dist.home}/.." includes="${app.name}/**"/>
</target>
- <!-- DEPLOY: Upload distribution files to Jakarta web site -->
+ <!-- UPLOAD: Upload distribution files to Jakarta web site -->
<target name="upload" depends="package">
<exec dir="${upload.home}"
command="scp ${app.name}-${DSTAMP}.* ${upload.dest}"/>