Update of /cvsroot/ejtools/build
In directory usw-pr-cvs1:/tmp/cvs-serv13647
Modified Files:
build_webapp.xml
Log Message:
Add jsp compilation
Index: build_webapp.xml
===================================================================
RCS file: /cvsroot/ejtools/build/build_webapp.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_webapp.xml 15 May 2002 17:47:54 -0000 1.1
--- build_webapp.xml 17 May 2002 07:28:53 -0000 1.2
***************
*** 29,33 ****
<property name="build.src" value="${build.home}/src"/>
<property name="webapp.home" value="${module.root}/webapp"/>
! <property name="webapp.lib" value="${webapp.home}/lib"/>
<property name="src.home" value="${module.root}/src"/>
<property name="src.bin" value="${src.home}/bin"/>
--- 29,36 ----
<property name="build.src" value="${build.home}/src"/>
<property name="webapp.home" value="${module.root}/webapp"/>
! <property name="webapp.tmp" value="${webapp.home}/tmp"/>
! <property name="webapp.tmp.webinf" value="${webapp.tmp}/WEB-INF"/>
! <property name="webapp.tmp.webinf.classes" value="${webapp.tmp.webinf}/classes"/>
! <property name="webapp.tmp.webinf.lib" value="${webapp.tmp.webinf}/lib"/>
<property name="src.home" value="${module.root}/src"/>
<property name="src.bin" value="${src.home}/bin"/>
***************
*** 79,82 ****
--- 82,89 ----
<mkdir dir="${build.src}"/>
<mkdir dir="${webapp.home}"/>
+ <mkdir dir="${webapp.tmp}"/>
+ <mkdir dir="${webapp.tmp.webinf}"/>
+ <mkdir dir="${webapp.tmp.webinf.classes}"/>
+ <mkdir dir="${webapp.tmp.webinf.lib}"/>
<copy todir="${build.etc}">
<fileset dir="${src.etc}">
***************
*** 104,112 ****
<fileset dir="${src.resources}">
<include name="**/*.properties"/>
- <include name="**/*.gif"/>
- <include name="**/*.png"/>
</fileset>
</copy>
! <!--
<java classname="org.apache.jasper.JspC" fork="true">
<classpath refid="compile.classpath"/>
--- 111,133 ----
<fileset dir="${src.resources}">
<include name="**/*.properties"/>
</fileset>
</copy>
! <copy todir="${webapp.tmp}">
! <fileset dir="${src.webapp.content}"/>
! </copy>
! <copy todir="${webapp.tmp.webinf}">
! <fileset dir="${src.webapp.resources}"/>
! </copy>
! <copy todir="${webapp.tmp.webinf}" file="${src.webapp}/web.xml"/>
! <copy todir="${webapp.tmp.webinf.classes}">
! <fileset dir="${build.classes}"/>
! </copy>
! <copy todir="${webapp.tmp.webinf.lib}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/webapp.properties"/>
! </copy>
! </target>
! <!-- ==================== JSP Build Target ===================================== -->
! <target name="build.jsp" depends="build" description="">
<java classname="org.apache.jasper.JspC" fork="true">
<classpath refid="compile.classpath"/>
***************
*** 114,138 ****
<arg value="${build.src}"/>
<arg value="-uriroot"/>
! <arg value="${webapp.home}"/>
! <arg value="-p"/>
! <arg value="${module.package}.servlet"/>
! <arg value="${webapp.home}/*.jsp"/>
</java>
! -->
</target>
<!-- ==================== Dist Target ===================================== -->
! <target name="dist" depends="build" description="">
! <mkdir dir="${webapp.lib}"/>
! <copy todir="${webapp.lib}">
! <mapper type="flatten"/>
! <fileset dir="." includesfile="${module.root}/webapp.properties"/>
! </copy>
! <war warfile="${webapp.home}/${module.name}.war" webxml="${src.webapp}/web.xml">
! <fileset dir="${src.webapp.content}"/>
! <lib dir="${webapp.lib}"/>
! <webinf dir="${src.webapp.resources}"/>
! <classes dir="${build.classes}"/>
! </war>
! <delete dir="${webapp.lib}"/>
</target>
<!-- ==================== Javadoc Target ================================== -->
--- 135,151 ----
<arg value="${build.src}"/>
<arg value="-uriroot"/>
! <arg value="${webapp.tmp}"/>
! <arg value="${webapp.tmp}/*.jsp"/>
</java>
! <javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="*.java" excludes="**/CVS/**">
! <classpath refid="compile.classpath"/>
! </javac>
! <copy todir="${webapp.tmp.webinf.classes}">
! <fileset dir="${build.classes}"/>
! </copy>
</target>
<!-- ==================== Dist Target ===================================== -->
! <target name="dist" depends="build,build.jsp" description="">
! <jar jarfile="${webapp.home}/${module.name}.war" basedir="${webapp.tmp}"/>
</target>
<!-- ==================== Javadoc Target ================================== -->
|
