costin 2003/01/20 16:26:09 Modified: . build.xml Log: Added back some of the changes - precompile jsps in admin, generate .ser form for mbean descriptors, speed up compilation. Revision Changes Path 1.66 +89 -1 jakarta-tomcat-5/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- build.xml 21 Jan 2003 00:18:26 -0000 1.65 +++ build.xml 21 Jan 2003 00:26:09 -0000 1.66 @@ -153,6 +153,7 @@ <ant dir="${jtc.home}/jk" target="jkjava"> <property name="tomcat5.home" value="${catalina.build}"/> + <property name="tomcat5.detect" value="true"/> <property name="commons-logging.jar" value="${commons-logging.jar}"/> <property name="jmx.jar" value="${jmx.jar}"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" /> @@ -175,6 +176,7 @@ <ant dir="${jtc.home}/coyote" target="jar.tomcat5"> <property name="catalina.home" value="${tomcat.build}"/> + <property name="build.home" value="${tomcat.build}"/> <property name="tomcat5.detect" value="true"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" /> <property name="servlet.jar" value="${tomcat.build}/common/lib/servlet-api.jar"/> @@ -186,7 +188,7 @@ depends="init"> <echo>========== Building: tomcat-http11 </echo> - <ant dir="${jtc.home}/http11" target="compile"> + <ant dir="${jtc.home}/http11" target="compile-only"> <property name="build.home" value="${tomcat.build}"/> <property name="tomcat-http11.jar" value="${tomcat.build}/server/lib/tomcat-http11.jar"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" /> @@ -205,6 +207,69 @@ <touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" /> </target> + <target name="build-admin-precompile" + depends="init" description="Builds the admin webapp" > + <echo>========== Building: admin to ${tomcat.build}/server/webapps </echo> + <ant dir="${catalina.home}/webapps/admin" target="build-main"> + <property name="flags.hide" value="true" /> + <property name="webapps.build" value="${tomcat.build}/server/webapps"/> + </ant> + + <!-- JSPC --> + <property name="admin.base" location="${tomcat.build}/server/webapps/admin" /> + + <mkdir dir="${admin.base}/WEB-INF/src/admin" /> + + <taskdef classname="org.apache.jasper.JspC" name="jasper2" > + <classpath id="jspc.classpath"> + <pathelement location="${java.home}/../lib/tools.jar"/> + <fileset dir="${tomcat.build}/server/lib"> + <include name="*.jar"/> + </fileset> + <fileset dir="${tomcat.build}/common/lib"> + <include name="*.jar"/> + </fileset> + <pathelement location="${build.dir}/classes"/> + </classpath> + </taskdef> + + <jasper2 verbose="0" + package="admin" + compile="false" + validateXml="false" + uriroot="${admin.base}" + webXmlFragment="${admin.base}/WEB-INF/generated_web.xml" + outputDir="${admin.base}/WEB-INF/src/admin" /> + + <loadfile property="generated_web.xml" + srcFile="${admin.base}/WEB-INF/generated_web.xml" /> + + <replace file="${admin.base}/WEB-INF/web.xml" + token="<!--GENERATED_JSPS-->" value="${generated_web.xml}" /> + + <javac destdir="${admin.base}/WEB-INF/classes" + optimize="off" + debug="on" + srcdir="${admin.base}/WEB-INF/src" > + <classpath> + <pathelement location="${java.home}/../lib/tools.jar"/> + <fileset dir="${tomcat.build}/server/lib"> + <include name="*.jar"/> + </fileset> + <fileset dir="${admin.base}/WEB-INF/lib"> + <include name="*.jar"/> + </fileset> + <fileset dir="${tomcat.build}/common/lib"> + <include name="*.jar"/> + </fileset> + <pathelement location="${tomcat.build}/classes"/> + </classpath> + <include name="admin/**" /> + </javac> + + + </target> + <target name="build" depends="init" description="Builds all components"> @@ -283,6 +348,12 @@ <echo>Target: Catalina - Deploy ...</echo> <ant dir="${catalina.home}" target="deploy"/> + <!-- + <ant dir="${catalina.home}" target="deploy-catalina"/> + <antcall target="build-tomcat-coyote"/> + <antcall target="build-tomcat-jk"/> + <antcall target="build-tomcat-http11"/> + --> <copy todir="${tomcat.build}"> <fileset dir="${catalina.home}/build"/> </copy> @@ -993,6 +1064,9 @@ <cvs cvsroot="${cvsroot}" quiet="true" command="checkout -P jakarta-servletapi-5" dest=".."/> + <cvs cvsroot="${cvsroot}" quiet="true" + command="checkout -P jakarta-commons" + dest=".."/> </target> @@ -1002,6 +1076,20 @@ <param name="subdir" value="${commons-daemon.home}"/> <param name="destfile" value="${commons-daemon.jar}"/> </antcall> + </target> + + <!-- ==================== Modeler tricks ==================== + --> + <target name="convert-mbeans" description="Hack: regenerate the ser form of the descriptors"> + <path id="tomcatCP" > + <fileset dir="${tomcat.build}/common/lib" includes="*.jar"/> + <fileset dir="${tomcat.build}/server/lib" includes="*.jar" /> + </path> + <taskdef resource="org/apache/commons/modeler/ant/ant.properties" + classpathref="tomcatCP" /> + + <mbeans-descriptors file="${catalina.home}/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml" + out="build/classes/org/apache/catalina/mbeans/mbeans-descriptors.xml.ser" /> </target> </project>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>