Author: funkman
Date: Mon Oct 10 04:53:41 2005
New Revision: 312627
URL: http://svn.apache.org/viewcvs?rev=312627&view=rev
Log:
Remove all cvs dependencies/
Modified:
tomcat/build/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=312627&r1=312626&r2=312627&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Mon Oct 10 04:53:41 2005
@@ -7,7 +7,7 @@
<!-- property values you must customize for successful building!!! -->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
-
+
<property file="build.properties.default"/>
<!-- Project Properties -->
@@ -16,7 +16,7 @@
<property name="version.major" value="5" />
<property name="version.minor" value="5" />
<property name="version.build" value="0" />
- <property name="version.patch" value="0" />
+ <property name="version.patch" value="0" />
<property name="version" value="5.5.0-dev" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
@@ -32,14 +32,11 @@
<property name="jasper.project" value="jasper" />
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="ant-launcher.jar"
value="${ant.home}/lib/ant-launcher.jar"/>
- <property name="cvstag" value="" />
- <property name="cvs.base"
- value="${basedir}/.."/>
<!-- Source dependencies -->
<property name="api.home"
value="${basedir}/../${api.project}"/>
- <property name="catalina.home"
+ <property name="catalina.home"
value="${basedir}/../${catalina.project}"/>
<property name="jasper.home"
value="${basedir}/../${jasper.project}/jasper2"/>
@@ -62,13 +59,13 @@
<property name="webapps.build" value="${catalina.home}/webapps/build"/>
<property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
<property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
- <property name="tomcat-dbcp.jar"
+ <property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
<property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
- <property name="jasper-compiler-jdt.jar"
+ <property name="jasper-compiler-jdt.jar"
value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
-
- <!-- Some compilers will disable debugging if true. And it doesn't do
anything
+
+ <!-- Some compilers will disable debugging if true. And it doesn't do
anything
in most cases -->
<property name="compile.optimize" value="false"/>
<property name="compile.debug" value="true" />
@@ -127,17 +124,11 @@
<srcfiles dir="${jtc.home}/http11/src" includes="**" />
</uptodate>
- <uptodate property="admin.build.notrequired"
+ <uptodate property="admin.build.notrequired"
targetfile="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml">
<srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
</uptodate>
- <!--
- <uptodate property="commons-daemon.build.notrequired"
- targetfile="${commons-daemon.jar}">
- <srcfiles dir="${cvs.base}/jakarta-commons/daemon" includes="**" />
- </uptodate>
- -->
</target>
@@ -146,24 +137,24 @@
<copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
<copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
- <copy file="${commons-el.jar}"
+ <copy file="${commons-el.jar}"
todir="${tomcat.build}/common/lib"/>
- <copy todir="${tomcat.build}/bin"
+ <copy todir="${tomcat.build}/bin"
file="${commons-logging-api.jar}" />
<copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
failonerror="false" />
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
-
+ file="${tomcat-native.tar.gz}" />
+
<!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
- <copy todir="${tomcat.build}/common/lib"
file="${jasper-compiler-jdt.jar}"/>
+ <copy todir="${tomcat.build}/common/lib"
file="${jasper-compiler-jdt.jar}"/>
</target>
<!-- ====================== Build all components =================== -->
@@ -195,7 +186,7 @@
</target>
- <target name="build-tomcatjk" unless="tomcatjk.build.notrequired"
+ <target name="build-tomcatjk" unless="tomcatjk.build.notrequired"
description="build j-t-c/jk" >
<echo>========== Building: tomcat-jk ${catalina.build} </echo>
@@ -220,13 +211,13 @@
</ant>
- <!--
- <copy file="${jtc.home}/jk/conf/jk2.properties"
+ <!--
+ <copy file="${jtc.home}/jk/conf/jk2.properties"
todir="${tomcat.build}/conf" />
-->
- <!-- Protocol handlers - AJP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
+ <!-- Protocol handlers - AJP -->
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/ajp/**" />
<include name="org/apache/jk/**" />
@@ -239,8 +230,8 @@
</target>
- <target name="build-tomcatcoyote"
- unless="tomcatcoyote.build.notrequired"
+ <target name="build-tomcatcoyote"
+ unless="tomcatcoyote.build.notrequired"
depends="init" description="Build j-t-c/coyote">
<echo>========== Building: tomcat-coyote </echo>
@@ -253,9 +244,9 @@
<property name="servlet.jar" value="${servlet-api.jar}"/>
</ant>
- <!-- Coyote API -->
- <delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar"
index="true">
+ <!-- Coyote API -->
+ <delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar" index="true">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/*" />
<include name="org/apache/coyote/memory/*" />
@@ -267,8 +258,8 @@
</target>
- <target name="build-tomcathttp11"
- unless="tomcathttp11.build.notrequired"
+ <target name="build-tomcathttp11"
+ unless="tomcathttp11.build.notrequired"
depends="init" description="builds j-t-c/http11">
<echo>========== Building: tomcat-http11 </echo>
@@ -280,9 +271,9 @@
-->
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
</ant>
-
- <!-- Protocol handlers - HTTP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">
+
+ <!-- Protocol handlers - HTTP -->
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">
<fileset dir="${tomcat.build}/classes">
<include name="org/apache/coyote/http11/**" />
<!-- Javadoc and i18n exclusions -->
@@ -293,58 +284,58 @@
</target>
- <target name="build-tomcatapr"
- unless="tomcatapr.build.notrequired"
- depends="init" description="builds j-t-c/apr">
- <echo>========== Building: tomcat-apr </echo>
-
- <ant dir="${jtc.home}/jni" 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" />
- -->
- <property name="commons-logging.jar"
value="${commons-logging.jar}"/>
- </ant>
-
- <!-- APR -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar"
index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/jni/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-juli"
- unless="tomcatjuli.build.notrequired"
- depends="init" description="builds j-t-c/juli">
- <echo>========== Building: tomcat-juli </echo>
-
- <ant dir="${jtc.home}/juli" target="compile-only">
- <property name="build.home" value="${tomcat.build}"/>
- </ant>
-
- <!-- Java.util.logging Implementation -->
- <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/juli/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <copy file="${basedir}/resources/logging.properties"
- todir="${tomcat.build}/conf" />
-
- </target>
+ <target name="build-tomcatapr"
+ unless="tomcatapr.build.notrequired"
+ depends="init" description="builds j-t-c/apr">
+ <echo>========== Building: tomcat-apr </echo>
+
+ <ant dir="${jtc.home}/jni" 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" />
+ -->
+ <property name="commons-logging.jar" value="${commons-logging.jar}"/>
+ </ant>
+
+ <!-- APR -->
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar" index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/tomcat/jni/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
- <target name="build-jasper"
- unless="jasper.build.notrequired"
+ </target>
+
+ <target name="build-juli"
+ unless="tomcatjuli.build.notrequired"
+ depends="init" description="builds j-t-c/juli">
+ <echo>========== Building: tomcat-juli </echo>
+
+ <ant dir="${jtc.home}/juli" target="compile-only">
+ <property name="build.home" value="${tomcat.build}"/>
+ </ant>
+
+ <!-- Java.util.logging Implementation -->
+ <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar" index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/juli/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <copy file="${basedir}/resources/logging.properties"
+ todir="${tomcat.build}/conf" />
+
+ </target>
+
+ <target name="build-jasper"
+ unless="jasper.build.notrequired"
depends="init" description="build jasper">
<echo>========== Building: jasper </echo>
@@ -358,7 +349,7 @@
</ant>
</target>
- <target name="build-admin" unless="admin.build.notrequired"
+ <target name="build-admin" unless="admin.build.notrequired"
depends="init" description="build admin" >
<echo>========== Building: admin </echo>
@@ -373,7 +364,7 @@
<touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" />
</target>
- <target name="build-webapps-precompile"
+ <target name="build-webapps-precompile"
depends="init" description="Precompile webapps" >
<!-- JSPC -->
@@ -410,7 +401,7 @@
<classpath refid="jspc.classpath"/>
</taskdef>
- <jasper2
+ <jasper2
compile="false"
validateXml="false"
uriroot="${ROOT.base}"
@@ -418,15 +409,15 @@
addWebXmlMappings="true"
outputDir="${ROOT.base}/WEB-INF/src" />
- <jasper2
+ <jasper2
compile="false"
validateXml="false"
uriroot="${jsp-examples.base}"
- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+ webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
addWebXmlMappings="true"
outputDir="${jsp-examples.base}/WEB-INF/src" />
- <jasper2
+ <jasper2
package="admin"
compile="false"
validateXml="false"
@@ -437,12 +428,12 @@
<javac destdir="${ROOT.base}/WEB-INF/classes"
optimize="off"
- debug="${compile.debug}"
+ debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
failonerror="false"
- srcdir="${ROOT.base}/WEB-INF/src"
- excludes="**/*.smap">
+ srcdir="${ROOT.base}/WEB-INF/src"
+ excludes="**/*.smap">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -469,8 +460,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
failonerror="false"
- srcdir="${jsp-examples.base}/WEB-INF/src"
- excludes="**/*.smap">
+ srcdir="${jsp-examples.base}/WEB-INF/src"
+ excludes="**/*.smap">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -495,8 +486,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
failonerror="false"
- srcdir="${admin.base}/WEB-INF/src"
- excludes="**/*.smap">
+ srcdir="${admin.base}/WEB-INF/src"
+ excludes="**/*.smap">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -568,9 +559,9 @@
<antcall target="build-tomcatjk"/>
<antcall target="build-tomcathttp11"/>
-
+
<antcall target="build-juli"/>
-
+
<antcall target="build-jasper"/>
<antcall target="build-i18n"/>
@@ -584,7 +575,7 @@
<target name="build-i18n">
- <!-- i18n JARs -->
+ <!-- i18n JARs -->
<jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-es.jar">
<fileset dir="${tomcat.build}/classes">
<include name="**/LocalStrings_es.properties" />
@@ -604,7 +595,7 @@
</fileset>
</jar>
- <!-- Build baseline _en bundle to ease -->
+ <!-- Build baseline _en bundle to ease -->
<copy todir="${tomcat.build}/classes" includeemptydirs="false">
<fileset dir="${tomcat.build}/classes">
<include name="**/LocalStrings.properties"/>
@@ -617,37 +608,12 @@
<exclude name="**/tomcat4/**" />
</fileset>
</jar>
-
- </target>
-
- <!-- ====================== Build dependent code =================== -->
-<!--
- <target name="build-commons-modeler"
unless="commons-modeler.build.notrequired" description="build commons-modeler">
- <echo>========== Building: commons-modeler </echo>
-
- <ant dir="${cvs.base}/jakarta-commons/modeler" target="dist" >
- <property name="dist.home" location="${commons-modeler.home}" />
- <property name="commons-logging.jar" location="${commons-logging.jar}"
/>
- <property name="jmx.jar" location="${jmx.jar}" />
- <property name="commons-digester.jar"
location="${commons-digester.jar}" />
- <property name="build.home" value="${tomcat.build}" />
- </ant>
</target>
--->
-
-<!--
- <target name="build-commons-daemon"
unless="commons-daemon.build.notrequired" description="build commons-daemon" >
- <echo>========== Building: commons-daemon </echo>
- <ant dir="${cvs.base}/jakarta-commons/daemon" target="dist" >
- <property name="compile.optimize" value="false" />
- <property name="dist.home" value="${commons-daemon.home}" />
- </ant>
- </target>
--->
+ <!-- ====================== Build dependent code =================== -->
- <target name="build-all"
depends="init,deploy-static,build,build-webapps,compat,deployer"
+ <target name="build-all"
depends="init,deploy-static,build,build-webapps,compat,deployer"
description="build tomcat, webapps, embed, compat, deployer" />
@@ -663,7 +629,7 @@
<param name="sourcefile" value="${commons-collections-src.loc}"/>
<param name="destfile" value="${tomcat-dbcp.jar}" />
</antcall>
- <antcall target="downloadgz">
+ <antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
<param name="destfile" value="${tomcat-dbcp.jar}" />
</antcall>
@@ -691,38 +657,38 @@
<target name="-build-tomcat-dbcp">
<copy todir="${tomcat-dbcp.home}">
- <fileset dir="${commons-collections.home}" >
- <include name="**/collections/CursorableLinkedList.java" />
- <include name="**/collections/KeyValue.java" />
- <include name="**/collections/LRUMap.java" />
- <include name="**/collections/SequencedHashMap.java" />
- </fileset>
- <fileset dir="${commons-pool.home}">
- <include name="**/*.java" />
- <exclude name="**/Stack*.java" />
- <exclude name="**/SoftReferenceObjectPool.java" />
- <exclude name="**/test/**" />
- </fileset>
- <fileset dir="${commons-dbcp.home}">
- <include name="**/*.java" />
- <exclude name="**/test/**" />
- </fileset>
- </copy>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
- <replacefilter token="return UnmodifiableList.decorate(l);"
- value="return l;" />
- <replacefilter token="import
org.apache.commons.collections.list.UnmodifiableList;"
- value=" " />
- </replace>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
- <replacefilter token="org.apache.commons"
- value="org.apache.tomcat.dbcp" />
- </replace>
- <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
- <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
- <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
/>
+ <fileset dir="${commons-collections.home}" >
+ <include name="**/collections/CursorableLinkedList.java" />
+ <include name="**/collections/KeyValue.java" />
+ <include name="**/collections/LRUMap.java" />
+ <include name="**/collections/SequencedHashMap.java" />
+ </fileset>
+ <fileset dir="${commons-pool.home}">
+ <include name="**/*.java" />
+ <exclude name="**/Stack*.java" />
+ <exclude name="**/SoftReferenceObjectPool.java" />
+ <exclude name="**/test/**" />
+ </fileset>
+ <fileset dir="${commons-dbcp.home}">
+ <include name="**/*.java" />
+ <exclude name="**/test/**" />
+ </fileset>
+ </copy>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
+ <replacefilter token="return UnmodifiableList.decorate(l);"
+ value="return l;" />
+ <replacefilter token="import
org.apache.commons.collections.list.UnmodifiableList;"
+ value=" " />
+ </replace>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
+ <replacefilter token="org.apache.commons"
+ value="org.apache.tomcat.dbcp" />
+ </replace>
+ <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
+ <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
+ <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
</move>
- <mkdir dir="${tomcat-dbcp.home}/classes"/>
+ <mkdir dir="${tomcat-dbcp.home}/classes"/>
<javac destdir="classes"
optimize="off"
debug="${compile.debug}"
@@ -741,24 +707,24 @@
</jar>
</target>
- <target name="build-jasper-compiler-jdt">
- <mkdir dir="${jasper-compiler-jdt.home}"/>
- <antcall target="-build-jasper-compiler-jdt">
- <param name="basedir" value="${jasper-compiler-jdt.home}" />
- </antcall>
- </target>
-
- <target name="-build-jasper-compiler-jdt">
- <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
- <jar destfile="${jasper-compiler-jdt.jar}" index="true">
- <fileset dir="${jasper-compiler-jdt.home}">
- <include
name="org/eclipse/jdt/core/compiler/**"/>
- <include
name="org/eclipse/jdt/internal/compiler/**"/>
- <include
name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
- </fileset>
- </jar>
- </target>
-
+ <target name="build-jasper-compiler-jdt">
+ <mkdir dir="${jasper-compiler-jdt.home}"/>
+ <antcall target="-build-jasper-compiler-jdt">
+ <param name="basedir" value="${jasper-compiler-jdt.home}" />
+ </antcall>
+ </target>
+
+ <target name="-build-jasper-compiler-jdt">
+ <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
+ <jar destfile="${jasper-compiler-jdt.jar}" index="true">
+ <fileset dir="${jasper-compiler-jdt.home}">
+ <include name="org/eclipse/jdt/core/compiler/**"/>
+ <include name="org/eclipse/jdt/internal/compiler/**"/>
+ <include
name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="build-webapps" depends="init"
description="build webapps">
@@ -766,7 +732,7 @@
<mkdir dir="${tomcat.build}/webapps" />
<mkdir dir="${tomcat.build}/server/webapps" />
-
+
<!-- The build files are far too difficult to hack - just build it and
copy -->
<ant dir="${api.home}/jsr154" target="dist">
</ant>
@@ -832,7 +798,7 @@
</ant>
<!-- Precompiling and fixing webapps -->
- <antcall target="build-webapps-precompile" />
+ <antcall target="build-webapps-precompile" />
<antcall target="fix-webapps" />
</target>
@@ -908,16 +874,16 @@
<!-- ====================== Embed target =================== -->
- <target name="embed" description="Create a set of jars for embedded tomcat"
>
+ <target name="embed" description="Create a set of jars for embedded tomcat" >
- <!-- Generic libraries -->
+ <!-- Generic libraries -->
<copy todir="embed/lib" file="${commons-logging.jar}"/>
<copy todir="embed/lib" file="${commons-modeler.jar}"/>
<!-- Connector -->
<copy todir="embed/lib">
<fileset dir="build/server/lib">
- <!--<include name="tomcat-ajp.jar"/>-->
+ <!--<include name="tomcat-ajp.jar"/>-->
<include name="tomcat-coyote.jar"/>
<include name="tomcat-http.jar"/>
<include name="tomcat-util.jar"/>
@@ -938,7 +904,7 @@
</fileset>
</copy>
- <!-- JNDI extra
+ <!-- JNDI extra
<copy todir="embed/lib">
<fileset dir="build/common/lib">
<include name="naming-factory.jar"/>
@@ -955,7 +921,7 @@
</fileset>
</copy>
- <!-- JSP compiler - not needed for an minimal server if it
+ <!-- JSP compiler - not needed for an minimal server if it
uses precompilation -->
<copy todir="embed/lib">
<fileset dir="build/common/lib">
@@ -964,27 +930,27 @@
</fileset>
</copy>
- <copy tofile="embed/build.xml" file="resources/mbeans/tomcat5-ant.xml"
/>
- <!--
+ <copy tofile="embed/build.xml" file="resources/mbeans/tomcat5-ant.xml" />
+ <!--
<copy tofile="embed/tomcat5-mbeans.xml"
file="resources/mbeans/tomcat5-mbeans.xml" />
<copy tofile="embed/tomcat5-mlet.xml"
file="resources/mbeans/tomcat5-mlet.xml" />
<copy tofile="embed/tomcat5-service.xml"
file="resources/mbeans/tomcat5-service.xml" />
-->
<mkdir dir="embed/conf"/>
- <delete file="embed/conf/context.xml" />
- <copy todir="embed/conf">
+ <delete file="embed/conf/context.xml" />
+ <copy todir="embed/conf">
<fileset dir="build/conf">
<include name="context.xml"/>
<include name="tomcat-users.xml"/>
<include name="web.xml"/>
- <!-- no longer needed
+ <!-- no longer needed
<include name="server.xml"/>
-->
</fileset>
</copy>
- <replace file="embed/conf/context.xml" token="<Context"
value="<Context privileged='true'" />
-
+ <replace file="embed/conf/context.xml" token="<Context"
value="<Context privileged='true'" />
+
<mkdir dir="embed/webapps"/>
<copy todir="embed/webapps" >
<fileset dir="dist/webapps" includes="ROOT/**"/>
@@ -992,12 +958,12 @@
<copy todir="embed/webapps" >
<fileset dir="dist/server/webapps" includes="manager/**"/>
</copy>
-
+
</target>
<!-- ====================== Deployer target =================== -->
- <target name="deployer" description="Create the Tomcat deployer binary" >
+ <target name="deployer" description="Create the Tomcat deployer binary" >
<!-- Servlet and JSP -->
<copy todir="${tomcat.deployer}/lib">
@@ -1011,7 +977,7 @@
</copy>
<!-- Digester and dependencies -->
- <copy todir="${tomcat.deployer}/lib"
+ <copy todir="${tomcat.deployer}/lib"
file="${tomcat.build}/server/lib/catalina-ant.jar"/>
<copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/>
<jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
@@ -1065,7 +1031,7 @@
<echo>Target: Catalina - Deploy ...</echo>
<ant dir="${catalina.home}" target="deploy"/>
- <!--
+ <!--
<antcall target="build-tomcat-coyote"/>
<antcall target="build-tomcat-jk"/>
<antcall target="build-tomcat-http11"/>
@@ -1095,7 +1061,7 @@
</copy>
<!-- Copy Unix JSVC from commons-daemon -->
- <copy file="${commons-daemon.jsvc.tar.gz}"
+ <copy file="${commons-daemon.jsvc.tar.gz}"
tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
@@ -1169,7 +1135,7 @@
</target>
<!-- ======================= Single-jar tomcat =========== -->
- <target name="prepare-runtime-once"
+ <target name="prepare-runtime-once"
description="Do once before single jar tomcat">
<mkdir dir="runtime/deps" />
<mkdir dir="runtime/classes" />
@@ -1180,9 +1146,9 @@
</target>
- <target name="compile-runtime"
+ <target name="compile-runtime"
description="Build single jar tomcat">
-
+
<javac destdir="runtime/classes" deprecation="false" debug="false" >
<!-- classpath
path="${base.path}/commons-beanutils-1.6.1/commons-beanutils.jar"/ -->
<!-- classpath
path="${base.path}/commons-logging-1.0.4/commons-logging.jar"/ -->
@@ -1192,7 +1158,7 @@
<classpath path="${base.path}/jmxri-1.2.1.jar"/>
<src>
- <pathelement path="${jtc.home}/util/java"/>
+ <pathelement path="${jtc.home}/util/java"/>
<pathelement path="${jtc.home}/mini/java" />
<!-- pathelement path="${jtc.home}/naming/src"/ -->
<pathelement path="${jtc.home}/coyote/src/java"/>
@@ -1235,12 +1201,12 @@
<jar jarfile="runtime/tomcat-runtime.jar"
manifest="resources/runtime.MF">
<fileset dir="runtime/classes" includes="**" />
<fileset dir="runtime/deps" includes="**" >
-
+
<exclude name="META-INF/**" />
<exclude name="**/*.html" />
<exclude name="org/apache/commons/modeler/ant/**" />
<exclude name="org/apache/catalina/ant/**" />
-
+
</fileset>
<fileset dir="resources" >
<include name="server-embed.xml"/>
@@ -1249,12 +1215,12 @@
</jar>
</target>
-
+
<target name="runtime" depends="prepare-runtime-once,compile-runtime"/>
<!-- ======================= Coyote standalone =========== -->
<!--
- This is only the http connector, for testing/experimental purposes.
+ This is only the http connector, for testing/experimental purposes.
-->
<target name="tomcat-http11" >
@@ -1290,16 +1256,16 @@
<fileset dir="${jtc.home}/util/java" includes="**/*.properties
**/*.xml"/>
</copy>
- <jar jarfile="runtime/tomcat-http11.jar"
manifest="resources/coyote-http11.MF"
- basedir="runtime/http11"
+ <jar jarfile="runtime/tomcat-http11.jar"
manifest="resources/coyote-http11.MF"
+ basedir="runtime/http11"
includes="**" />
</target>
<!-- ======================= TESTER: Run Catalina Tester Tests=========== -->
-
- <target name="dist-tester"
+
+ <target name="dist-tester"
description="Build the Catalina tester">
<ant dir="${catalina.home}/tester" target="dist">
@@ -1311,7 +1277,7 @@
</target>
- <target name="clean-tester"
+ <target name="clean-tester"
description="Clean the Catalina tester">
<ant dir="${catalina.home}/tester" target="clean" />
@@ -1321,11 +1287,11 @@
<target name="run-tester"
description="Catalina Tests" depends="dist-tester">
- <!-- For Java 1.4 -->
- <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+ <!-- For Java 1.4 -->
+ <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
<copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
<copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
-
+
<parallel>
<java classname="LauncherBootstrap" fork="yes">
@@ -1344,7 +1310,7 @@
<!-- Let tomcat starts before starting Tester -->
<sleep seconds="8"/>
- <ant dir="${catalina.home}/tester/dist/bin" antfile="tester.xml"
+ <ant dir="${catalina.home}/tester/dist/bin" antfile="tester.xml"
target="all">
<property name="catalina.home" value="${tomcat.build}"/>
</ant>
@@ -1362,8 +1328,8 @@
</java>
</sequential>
- </parallel>
-
+ </parallel>
+
</target>
<!-- ====================== DIST: Create Directories ==================== -->
@@ -1405,11 +1371,11 @@
<!-- Copy the contents of each "build" directory -->
<copy todir="${tomcat.dist}/bin">
<fileset dir="${tomcat.build}/bin">
- <exclude name="catalina.xml"/>
- <exclude name="commons-launcher.jar"/>
- <exclude name="*-using-launcher.*"/>
- <exclude name="LauncherBootstrap.class"/>
- <exclude name="launcher.properties"/>
+ <exclude name="catalina.xml"/>
+ <exclude name="commons-launcher.jar"/>
+ <exclude name="*-using-launcher.*"/>
+ <exclude name="LauncherBootstrap.class"/>
+ <exclude name="launcher.properties"/>
</fileset>
</copy>
<copy todir="${tomcat.dist}/common/classes">
@@ -1476,7 +1442,7 @@
<!-- ====================== DIST: Create Javadoc ======================== -->
<target name="dist-javadoc">
- <!--
+ <!--
<ant dir="${catalina.home}" target="dist-javadoc"/>
<mkdir dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
<copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
@@ -1589,19 +1555,19 @@
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <copy file="${jtc.home}/procrun/bin/tomcat5.exe"
+ <copy file="${jtc.home}/procrun/bin/tomcat5.exe"
tofile="${tomcat.dist}/bin/tomcat5.exe" />
- <copy file="${jtc.home}/procrun/bin/tomcat5w.exe"
+ <copy file="${jtc.home}/procrun/bin/tomcat5w.exe"
tofile="${tomcat.dist}/bin/tomcat5w.exe" />
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
- <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
+ <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true"/>
<exec dir="${tomcat.dist}" executable="${nsis.exe}">
<arg value="/DNSISDIR=${nsis.home}" />
<arg value="tomcat.nsi" />
</exec>
- <move file="${tomcat.dist}/tomcat-installer.exe"
+ <move file="${tomcat.dist}/tomcat-installer.exe"
tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
</target>
@@ -1611,15 +1577,15 @@
description="Create a Tomcat 5 packaged distribution">
<filter token="VERSION" value="${version}"/>
- <copy file="KEYS"
+ <copy file="KEYS"
todir="${tomcat.release}/v${version}"/>
- <copy file="RELEASE-NOTES"
+ <copy file="RELEASE-NOTES"
todir="${tomcat.release}/v${version}"
filtering="true"/>
- <copy file="resources/welcome.main.html"
+ <copy file="resources/welcome.main.html"
tofile="${tomcat.release}/v${version}/README.html"
filtering="true"/>
- <copy file="resources/welcome.bin.html"
+ <copy file="resources/welcome.bin.html"
tofile="${tomcat.release}/v${version}/bin/README.html"
filtering="true"/>
@@ -1628,89 +1594,89 @@
<target name="package-zip">
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="bin/**"/>
- <include name="common/**"/>
- <include name="conf/**"/>
- <include name="logs/**"/>
- <include name="server/**"/>
- <include name="shared/**"/>
- <include name="webapps/**"/>
- <include name="work/**"/>
- <include name="temp/**"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- <include name="README.txt"/>
- <include name="RELEASE-NOTES"/>
- <include name="RUNNING.txt"/>
- <include name="BENCHMARKS.txt"/>
- <exclude name="server/webapps/admin/**"/>
- <exclude name="conf/Catalina/localhost/admin.xml"/>
+ <include name="bin/**"/>
+ <include name="common/**"/>
+ <include name="conf/**"/>
+ <include name="logs/**"/>
+ <include name="server/**"/>
+ <include name="shared/**"/>
+ <include name="webapps/**"/>
+ <include name="work/**"/>
+ <include name="temp/**"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ <include name="README.txt"/>
+ <include name="RELEASE-NOTES"/>
+ <include name="RUNNING.txt"/>
+ <include name="BENCHMARKS.txt"/>
+ <exclude name="server/webapps/admin/**"/>
+ <exclude name="conf/Catalina/localhost/admin.xml"/>
</zipfileset>
</zip>
</target>
<target name="package-embed-zip">
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-embed.zip">
- <zipfileset dir="${tomcat.embed}" prefix="${final.name}-embed"
+ <zipfileset dir="${tomcat.embed}" prefix="${final.name}-embed"
includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
includes="RELEASE-NOTES" />
</zip>
</target>
<target name="package-deployer-zip">
<zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip">
- <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"
+ <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"
includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
includes="RELEASE-NOTES" />
</zip>
</target>
- <target name="package-compat-zip">
- <zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-compat.zip">
- <zipfileset dir="${tomcat.compat}" prefix="${final.name}"
- includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="RELEASE-NOTES" />
- </zip>
- </target>
-
- <target name="package-admin-zip">
- <zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip">
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**"/>
- <include name="conf/Catalina/localhost/admin.xml"/>
- <exclude name="*.jsp" />
- </zipfileset>
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
- includes="RELEASE-NOTES" />
- </zip>
- </target>
+ <target name="package-compat-zip">
+ <zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-compat.zip">
+ <zipfileset dir="${tomcat.compat}" prefix="${final.name}"
+ includes="**" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="LICENSE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="NOTICE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="README.txt" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="RELEASE-NOTES" />
+ </zip>
+ </target>
+
+ <target name="package-admin-zip">
+ <zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip">
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <include name="server/webapps/admin/**"/>
+ <include name="conf/Catalina/localhost/admin.xml"/>
+ <exclude name="*.jsp" />
+ </zipfileset>
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="LICENSE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="NOTICE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="README.txt" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
+ includes="RELEASE-NOTES" />
+ </zip>
+ </target>
<target name="prepare-release">
@@ -1732,7 +1698,7 @@
</target>
<target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}"
includes="*.txt,LICENSE,NOTICE" eol="lf"/>
<fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
<tar longfile="gnu" compression="gzip"
@@ -1788,7 +1754,7 @@
</target>
<target name="package-embed-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}"
includes="*.txt,LICENSE,NOTICE" eol="lf"/>
<fixcrlf srcdir="${tomcat.embed}" includes="*.xml" eol="lf"/>
<tar longfile="gnu" compression="gzip"
@@ -1806,7 +1772,7 @@
</target>
<target name="package-deployer-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}"
includes="*.txt,LICENSE,NOTICE" eol="lf"/>
<fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"/>
<tar longfile="gnu" compression="gzip"
@@ -1823,43 +1789,43 @@
</tar>
</target>
- <target name="package-compat-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <tar longfile="gnu" compression="gzip"
-
tarfile="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.compat}" prefix="${final.name}">
- <include name="**" />
- </tarfileset>
- </tar>
- </target>
-
- <target name="package-admin-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <tar longfile="gnu" compression="gzip"
-
tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**" />
- <exclude name="*.jsp" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" mode="600"
prefix="${final.name}">
- <include name="conf/Catalina/localhost/admin.xml" />
- </tarfileset>
- </tar>
- </target>
+ <target name="package-compat-tgz">
+ <fixcrlf srcdir="${tomcat.dist}"
+ includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+
tarfile="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz">
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README.txt" />
+ <include name="RELEASE-NOTES" />
+ </tarfileset>
+ <tarfileset dir="${tomcat.compat}" prefix="${final.name}">
+ <include name="**" />
+ </tarfileset>
+ </tar>
+ </target>
+
+ <target name="package-admin-tgz">
+ <fixcrlf srcdir="${tomcat.dist}"
+ includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+
tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README.txt" />
+ <include name="RELEASE-NOTES" />
+ </tarfileset>
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <include name="server/webapps/admin/**" />
+ <exclude name="*.jsp" />
+ </tarfileset>
+ <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
+ <include name="conf/Catalina/localhost/admin.xml" />
+ </tarfileset>
+ </tar>
+ </target>
<target name="package-docs-tgz" depends="prepare-release">
<ant dir="${catalina.home}" target="dist-javadoc"/>
@@ -1872,7 +1838,7 @@
<copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
<fileset dir="${jasper.build}/javadoc" />
</copy>
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}"
includes="*.txt,LICENSE,NOTICE" eol="lf"/>
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
@@ -1897,9 +1863,9 @@
<target name="package-src-tgz">
<!-- Package Tomcat Source -->
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}"
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
- <tar longfile="gnu" compression="gzip"
+ <tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
<tarfileset dir="${tomcat.dist}/src" mode="755"
prefix="${final-src.name}">
<include name="${jtc.project}/jk/native/buildconf.sh" />
@@ -1924,7 +1890,7 @@
<!-- ==================== Download or build the required binary packages
==================== -->
- <target name="download" depends="proxyflags"
+ <target name="download" depends="proxyflags"
description="Download binary packages" >
<mkdir dir="${base.path}" />
@@ -1996,7 +1962,7 @@
<param name="destfile" value="${commons-launcher.jar}"/>
</antcall>
- <!--
+ <!--
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool.loc}"/>
<param name="destfile" value="${commons-pool.jar}"/>
@@ -2024,7 +1990,7 @@
<param name="sourcefile" value="${struts.loc}"/>
<param name="destfile" value="${struts.jar}"/>
</antcall>
-
+
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-daemon.loc}"/>
<param name="destfile" value="${commons-daemon.jar}"/>
@@ -2061,7 +2027,7 @@
<target name="setproxy" if="useproxy">
<taskdef name="setproxy"
classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
<echo message="Using ${proxy.host}:${proxy.port} to download
${sourcefile}"/>
</target>
@@ -2070,14 +2036,6 @@
<available file="${destfile}" property="exist"/>
</target>
- <target name="testsrc">
- <echo message="Testing for ${destfile} versus
${cvs.base}/${location}/src"/>
- <uptodate property="exist"
- targetfile="${destfile}">
- <srcfiles dir="${cvs.base}/${location}/src" includes="**" />
- </uptodate>
- </target>
-
<target name="downloadgz" unless="exist" depends="setproxy,testexist">
<!-- Download and extract the package -->
<get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
@@ -2101,64 +2059,8 @@
<get src="${sourcefile}" dest="${destfile}" />
</target>
- <target name="cvsbuild" unless="exist" depends="testsrc">
- <!-- cvs checkout for all source should be done in "update" -->
- <!-- build the distribution -->
- <ant dir="${cvs.base}/${location}" target="dist">
- </ant>
- <mkdir dir="${subdir}" />
- <copy todir="${subdir}" >
- <fileset dir="${cvs.base}/${location}/dist" includes="**" />
- </copy>
- </target>
-
- <target name="cvsbuild.old" unless="exist" depends="testexist">
- <!-- cvs checkout and ant dist + copy of jar file -->
- <echo message="cvs co ${location} ${cvstag} and ant dist in ${subdir}"/>
- <mkdir dir="${base.path}/tmp"/>
- <cvs cvsRoot="${cvsroot}"
- tag="${cvstag}"
- package="${location}"
- dest="${base.path}/tmp"
- />
- <!-- the software is checked out in ${{base.path}/tmp/${location} -->
- <move todir="${subdir}">
- <fileset dir="${base.path}/tmp/${location}/"/>
- </move>
- <!-- now build the distribution -->
- <ant dir="${subdir}" target="dist"/>
- </target>
-
- <target name="update" depends="checkout" />
-
- <target name="checkout"
- description="Update or checkout required sources from CVS">
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-catalina"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-jasper"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-connectors"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-servletapi-5"
- dest="${cvs.base}"/>
-<!-- Use released daemon instead
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} ${commons-daemon.cvs.loc}"
- dest="${cvs.base}"/>
--->
-<!--
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} ${commons-modeler.cvs.loc}"
- dest="${cvs.base}"/>
--->
- </target>
-
- <!-- ==================== Modeler tricks ====================
+ <!-- ==================== Modeler tricks ====================
-->
<target name="convert-mbeans" description="Hack: regenerate the ser form of
the descriptors">
<path id="tomcatCP" >
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
