[Ejtools-cvs] CVS: build build_application.xml,1.8,1.9

[Laurent E. <let...@us...>]

Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv6388

Modified Files:
	build_application.xml 
Log Message:
Add webapp creation script

Index: build_application.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_application.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build_application.xml	15 May 2002 07:30:29 -0000	1.8
--- build_application.xml	15 May 2002 17:48:18 -0000	1.9
***************
*** 37,44 ****
  	<property name="dist.lib.ext" value="${dist.lib}/ext"/>
  	<property name="dist.logs" value="${dist.home}/logs"/>
- 	<property name="dist.webapp" value="${module.root}/webapp"/>
- 	<property name="dist.webapp.webinf" value="${dist.webapp}/WEB-INF"/>
- 	<property name="dist.webapp.webinf.classes" value="${dist.webapp.webinf}/classes"/>
- 	<property name="dist.webapp.webinf.lib" value="${dist.webapp.webinf}/lib"/>
  	<property name="src.home" value="${module.root}/src"/>
  	<property name="src.bin" value="${src.home}/bin"/>
--- 37,40 ----
***************
*** 95,102 ****
  		<mkdir dir="${dist.lib.ext}"/>
  		<mkdir dir="${dist.logs}"/>
- 		<mkdir dir="${dist.webapp}"/>
- 		<mkdir dir="${dist.webapp.webinf}"/>
- 		<mkdir dir="${dist.webapp.webinf.classes}"/>
- 		<mkdir dir="${dist.webapp.webinf.lib}"/>
  		<available file="${module.root}/lib.properties" property="has.lib.file"/>
  		<available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/>
--- 91,94 ----
***************
*** 121,131 ****
  			<classpath refid="compile.classpath"/>
  		</javac>
- 		<copy todir="${build.classes}">
- 			<fileset dir="${src.resources}">
- 				<include name="**/*.properties"/>
- 				<include name="**/*.gif"/>
- 				<include name="**/*.png"/>
- 			</fileset>
- 		</copy>
  	</target>
  	<!-- ==================== XMLBeans Target ================================== -->
--- 113,116 ----
***************
*** 148,151 ****
--- 133,143 ----
  	<!-- ==================== Build Target ===================================== -->
  	<target name="build" depends="compile,xmlbeans" description="Create binary">
+ 		<copy todir="${build.classes}">
+ 			<fileset dir="${src.resources}">
+ 				<include name="**/*.properties"/>
+ 				<include name="**/*.gif"/>
+ 				<include name="**/*.png"/>
+ 			</fileset>
+ 		</copy>
  		<!-- Create the Bootstrap JAR file -->
  		<jar jarfile="${build.lib}/run.jar" basedir="${build.classes}" manifest="${build.etc}/run.mf" includes="${module.starter}*.*"/>
***************
*** 188,215 ****
  		</copy>
  	</target>
- 	<!-- ==================== WebApp Target ===================================== -->
- 	<target name="webapp" depends="build" description="">
- 		<copy todir="${dist.webapp}">
- 			<fileset dir="${src.webapp.content}"/>
- 		</copy>
- 		<copy todir="${dist.webapp.webinf.classes}">
- 			<fileset dir="${build.classes}"/>
- 		</copy>
- 		<copy todir="${dist.webapp.webinf.lib}">
- 			<mapper type="flatten"/>
- 			<fileset dir="." includesfile="${module.root}/webapp.properties"/>
- 		</copy>
- 		<java classname="org.apache.jasper.JspC" fork="true">
- 			<classpath refid="compile.classpath"/>
- 			<arg value="-d"/>
- 			<arg value="${build.src}"/>
- 			<arg value="-uriroot"/>
- 			<arg value="${dist.webapp}"/>
- 			<arg value="-p"/>
- 			<arg value="${module.package}.servlet"/>
- 			<arg value="${dist.webapp}/index.jsp"/>
- 		</java>
- 		<jar jarfile="${dist.home}/${module.name}.war" basedir="${dist.webapp}"/>
- 	</target>
  	<!-- ==================== Javadoc Target ================================== -->
  	<target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc">
--- 180,183 ----
***************
*** 229,246 ****
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist, webapp" description="">
! 		<tar tarfile="${output.root}/${module.name}.tar">
! 			<tarfileset dir="${dist.home}" mode="755">
! 				<include name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 			<tarfileset dir="${dist.home}">
! 				<include name="${dist.home}/**"/>
! 				<exclude name="${dist.bin}/run.sh"/>
! 			</tarfileset>
! 		</tar>
! 		<zip zipfile="${output.root}/${module.name}.zip">
! 			<fileset dir="${dist.home}"/>
! 		</zip>
! 	</target>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">
--- 197,201 ----
  	</target>
  	<!-- ==================== Package Target =================================== -->
! 	<target name="package" depends="dist" description=""/>
  	<!-- ==================== SVG Logo Target =================================== -->
  	<target name="logo" depends="prepare">
***************
*** 274,278 ****
  		<delete dir="${build.home}"/>
  		<delete dir="${dist.home}"/>
- 		<delete dir="${dist.webapp}"/>
  	</target>
  </project>
--- 229,232 ----