These are the patches to build.xml and build.properties.sample that I propose:
=====================================================
--- build.xml.orig Thu Jun 13 02:21:36 2002
+++ build.xml Mon Jul 15 00:22:28 2002
@@ -24,7 +24,7 @@
<property name="jasper.build" value="${basedir}/jasper/build"/>
<property name="javaservice.home" value="../javaservice"/>
<property name="nsis.home" value="c:\program files\nsis"/>
- <property name="servlet.home" value="../jakarta-servletapi-4/dist"/>
+ <property name="servlet.home" value="../jakarta-servletapi-4"/>
<property name="tomcat.build" value="${basedir}/build"/>
<property name="tomcat.dist" value="${basedir}/dist"/>
<property name="webapps.build" value="${basedir}/webapps/build"/>
@@ -60,7 +60,7 @@
<!-- ====================== DEPLOY: Deploy Components =================== -->
<target name="deploy" depends="deploy-static"
- description="Build and deploy all components">
+ description="Build and deploy all components (default)">
<echo>Target: Catalina - Deploy ...</echo>
<ant dir="./catalina" target="deploy"/>
<echo>Target: Jasper - Deploy ...</echo>
@@ -445,8 +445,8 @@
<delete file="${tomcat.dist}/${jtc.final-src.name}.tar" />
</target>
- <target name="download" depends="proxyflags">
- <!-- Downdown any sub package or tools needed. -->
+ <target name="download" depends="proxyflags"
+ description="Download any sub package or tools needed.">
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-beanutils.loc}"/>
<param name="destfile" value="${commons-beanutils.jar}"/>
@@ -455,17 +455,16 @@
<param name="sourcefile" value="${commons-collections.loc}"/>
<param name="destfile" value="${commons-collections.jar}"/>
</antcall>
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-digester.loc}"/>
- <param name="destfile" value="${commons-digester.jar}"/>
- </antcall>
-
+
<!-- we need the release to happend, in the meantime use cvs...
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-logging.loc}"/>
<param name="destfile" value="${commons-logging.jar}"/>
</antcall>
-->
+ <!-- commons-logging needs ../LICENSE -->
+ <!-- That is ugly XXX needs a review -->
+ <copy file="LICENSE" tofile="../LICENSE"/>
<antcall target="cvsbuild">
<param name="location" value="${commons-logging.loc}"/>
<param name="subdir" value="${commons-logging.home}"/>
@@ -480,25 +479,46 @@
tofile="${commons-logging-api.jar}"
/>
+ <!-- we need the release to happend, in the meantime use cvs...
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-digester.loc}"/>
+ <param name="destfile" value="${commons-digester.jar}"/>
+ </antcall>
+ -->
+ <antcall target="cvsbuild">
+ <param name="location" value="${commons-digester.loc}"/>
+ <param name="subdir" value="${commons-digester.home}"/>
+ <param name="destfile" value="${commons-digester.jar}"/>
+ </antcall>
+ <copy
+ file="${commons-digester.home}/dist/commons-digester.jar"
+ tofile="${commons-digester.jar}"
+ />
+
<antcall target="downloadgz">
<param name="sourcefile" value="${regexp.loc}"/>
<param name="destfile" value="${regexp.jar}"/>
</antcall>
- <!-- Servlet api needs something different. -->
-
+
+ <!-- Servletapi needs something different. -->
+ <!-- That is ugly XXX needs a review -->
<antcall target="cvsbuild">
<param name="location" value="${servlet.loc}"/>
<param name="subdir" value="${servlet.home}"/>
<param name="destfile" value="${servlet.jar}"/>
</antcall>
+ <!-- Copy docs when building from cvs to mimic binary package -->
+ <copy todir="${servlet.home}/docs">
+ <fileset dir="${servlet.home}/dist/docs/"/>
+ </copy>
<antcall target="downloadgz">
<!-- xerces2 brings 2 files, test for one of them -->
<param name="sourcefile" value="${xerces.loc}"/>
<param name="destfile" value="${xmlParserAPIs.jar}"/>
</antcall>
- <!-- commons- daemons/dbcp/pool need something different. -->
+ <!-- commons- daemons/dbcp/pool need something different. -->
<antcall target="cvsbuild">
<param name="location" value="${commons-daemon.loc}"/>
<param name="subdir" value="${commons-daemon.home}"/>
@@ -509,7 +529,6 @@
<param name="sourcefile" value="${commons-pool.loc}"/>
<param name="destfile" value="${commons-pool.jar}"/>
</antcall>
-
<!-- commons-dbcp needs pool and ../LICENSE -->
<!-- That is ugly XXX needs a review -->
<copy file="LICENSE" tofile="../LICENSE"/>
@@ -552,13 +571,22 @@
<param name="sourcefile" value="${struts.loc}"/>
<param name="destfile" value="${struts.jar}"/>
</antcall>
-<!--
<antcall target="downloadfile">
<param name="sourcefile" value="${tyrex.loc}"/>
<param name="destfile" value="${tyrex.jar}"/>
<param name="destdir" value="${tyrex.home}"/>
</antcall>
--->
+ <!-- jasper and connectors: test for build.xml - Ugly. -->
+ <antcall target="downloadcvs">
+ <param name="location" value="${jasper.loc}"/>
+ <param name="subdir" value="${jasper.home}"/>
+ <param name="destfile" value="${jasper.home}/build.xml"/>
+ </antcall>
+ <antcall target="downloadcvs">
+ <param name="location" value="${jtc.loc}"/>
+ <param name="subdir" value="${jtc.home}"/>
+ <param name="destfile" value="$jtc.home}/build.xml"/>
+ </antcall>
</target>
<target name="proxyflags">
@@ -617,6 +645,20 @@
</move>
<!-- now build the distribution -->
<ant dir="${subdir}" target="dist"/>
+ </target>
+
+ <target name="downloadcvs" unless="exist" depends="testexist">
+ <!-- cvs checkout -->
+ <echo message="cvs co ${location} in ${subdir}"/>
+ <mkdir dir="${base.path}/tmp"/>
+ <cvs cvsRoot="${cvsroot}"
+ 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>
</target>
<target name="jfc">
=====================================================
--- build.properties.sample.orig Thu Jun 27 12:03:46 2002
+++ build.properties.sample Mon Jul 15 00:23:00 2002
@@ -44,11 +44,12 @@
# ----- Jakarta Tomcat Connectors source path -----
-#jtc.home=../../jakarta-tomcat-connectors
-
+#jtc.home=../jakarta-tomcat-connectors
+jtc.loc=jakarta-tomcat-connectors
# ----- Jakarta Tomcat Jasper source path -----
#jasper.home=../jakarta-tomcat-jasper/jasper2
+jasper.loc=jakarta-tomcat-jasper/jasper2
# --------------------------------------------------
@@ -71,10 +72,11 @@
# ----- Commons Digester, version 1.1.1 or later -----
-commons-digester.home=${base.path}/commons-digester-1.2
+commons-digester.home=${base.path}/commons-digester
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
-commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
+commons-digester.loc=jakarta-commons/digester
+#commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
# ----- Commons Logging, version 1.0.1 or later -----
@@ -131,7 +133,7 @@
# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
-activation.home=${base.path}/jaf-1.0.1
+activation.home=${base.path}/jaf-1.0.2
activation.lib=${activation.home}
activation.jar=${activation.lib}/activation.jar
@@ -168,7 +170,6 @@
javaservice.home=${base.path}/javaservice
javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
-
# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
jdbc20ext.home=${base.path}/jdbc2_0-stdext
jdbc20ext.lib=${jdbc20ext.home}
@@ -183,7 +184,7 @@
# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
-jsse.home=${base.path}/jsse-1.0.2
+jsse.home=${base.path}/jsse-1.0.3
jsse.lib=${jsse.home}/lib
jcert.jar=${jsse.lib}/jcert.jar
jnet.jar=${jsse.lib}/jnet.jar
@@ -204,7 +205,7 @@
# ----- Java Mail, version 1.2 or later -----
-mail.home=${base.path}/javamail-1.2
+mail.home=${base.path}/javamail-1.3
mail.lib=${mail.home}
mail.jar=${mail.lib}/mail.jar
@@ -232,5 +233,3 @@
tyrex.lib=${tyrex.home}
tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
tyrex.loc=ftp://ftp.exolab.org/pub/tyrex/tyrex-1.0/tyrex-1.0.jar
-
-
=====================================================
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
