remm 2002/07/25 05:01:05
Modified: . build.xml
Added: . build.properties.default
Removed: . build.properties.sample
Log:
- Fix a few basic problems with the scripts.
Revision Changes Path
1.2 +23 -9 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 19 Jul 2002 00:39:13 -0000 1.1
+++ build.xml 25 Jul 2002 12:01:05 -0000 1.2
@@ -8,6 +8,7 @@
<property file="download.properties"/>
<property file="build.properties"/>
<property file="${user.home}/build.properties"/>
+ <property file="build.properties.default"/>
<!-- Project Properties -->
<property name="name" value="Apache Tomcat" />
@@ -20,6 +21,16 @@
<property name="jtc.final.name" value="${jtc.project}-${version}" />
<property name="jtc.final-src.name" value="${jtc.project}-${version}-src" />
+ <!-- Source dependencies -->
+ <property name="api.home"
+ value="${basedir}/../jakarta-servletapi-5"/>
+ <property name="catalina.home"
+ value="${basedir}/../jakarta-tomcat-catalina"/>
+ <property name="jasper.home"
+ value="${basedir}/../jakarta-tomcat-jasper/jasper2"/>
+ <property name="jtc.home"
+ value="${basedir}/../jakarta-tomcat-connectors"/>
+
<!-- Build Defaults -->
<property name="catalina.build" value="${catalina.home}/build"/>
<property name="jasper.build" value="${jasper.home}/build"/>
@@ -32,19 +43,16 @@
<property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
- <!-- Source dependencies -->
- <property name="catalina.home"
- value="${basedir}/../jakarta-tomcat-catalina"/>
- <property name="jasper.home"
- value="${basedir}/../jakarta-tomcat-jasper/jasper2"/>
- <property name="jtc.home"
- value="${basedir}/../jakarta-tomcat-connectors"/>
-
-
<!-- =================== DETECT: Display configuration ================== -->
<target name="detect"
description="Display configuration and conditional compilation flags">
+ <echo message="--- ${name} ${version} Build ---"/>
+ <echo message="api.home=${api.home}"/>
+ <echo message="catalina.home=${catalina.home}"/>
+ <echo message="jasper.home=${jasper.home}"/>
+ <echo message="jtc.home=${jtc.home}"/>
+
<ant dir="${catalina.home}" target="flags.display"/>
<ant dir="${basedir}/webapps/admin" target="flags.display"/>
@@ -64,6 +72,8 @@
<!-- ====================== DEPLOY: Deploy Components =================== -->
<target name="deploy" depends="deploy-static"
description="Build and deploy all components">
+ <echo>Target: API - Dist ...</echo>
+ <ant dir="${api.home}" target="dist"/>
<echo>Target: Catalina - Deploy ...</echo>
<ant dir="${catalina.home}" target="deploy"/>
<echo>Target: Jasper - Deploy ...</echo>
@@ -77,6 +87,8 @@
<target name="clean"
description="Clean all components">
<delete dir="${tomcat.build}"/>
+ <echo>Target: API - Clean ...</echo>
+ <ant dir="${api.home}" target="clean"/>
<echo>Target: Catalina - Clean ...</echo>
<ant dir="${catalina.home}" target="clean"/>
<echo>Target: Jasper - Clean ...</echo>
@@ -90,6 +102,8 @@
<!-- ======================= COMBO: Build All Components ================ -->
<target name="all"
description="Clean, build, and deploy all components">
+ <echo>Target: API - Dist ...</echo>
+ <ant dir="${api.home}" target="dist"/>
<echo>Target: Catalina - All ...</echo>
<ant dir="${catalina.home}" target="all"/>
<echo>Target: Jasper - All ...</echo>
1.1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
# -----------------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize building Tomcat
# for your local environment. It defines the location of all external
# modules that Tomcat depends on. Copy this file to "build.properties"
# in the top-level source directory, and customize it as needed.
#
# $Id: build.properties.default,v 1.1 2002/07/25 12:01:05 remm Exp $
# -----------------------------------------------------------------------------
# ----- Compile Control Flags -----
compile.debug=on
compile.deprecation=off
compile.optimize=on
# ----- Build Control Flags
#Build all components
#full.dist=on
#Build lightweight JDK 1.4 distribution
#light.dist=on
#Hide configuration flags display
#flags.hide=on
#Version number
version=5.0
# ----- CVS setup
#Proxy to download subproject
#proxy.host=proxy.domain
#proxy.port=8080
#proxy.use=on
#CVS root for the jakarta repositories.
cvsroot=":pserver:[EMAIL PROTECTED]:/home/cvspublic"
# ----- Default Base Path for Dependent Packages -----
base.path=/usr/local
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
# ----- Commons Beanutils, version 1.1 or later -----
commons-beanutils.home=${base.path}/commons-beanutils-1.3
commons-beanutils.lib=${commons-beanutils.home}
commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
commons-beanutils.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.3/commons-beanutils-1.3.tar.gz
# ----- Commons Collections, version 1.0 or later -----
commons-collections.home=${base.path}/commons-collections-2.0
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections.jar
commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0.tar.gz
# ----- Commons Digester, version 1.1.1 or later -----
commons-digester.home=${base.path}/commons-digester-1.2
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 Logging, version 1.0.1 or later -----
commons-logging.home=${base.path}/commons-logging-1.0.1
commons-logging.lib=${commons-logging.home}
commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
commons-logging.jar=${commons-logging.lib}/commons-logging.jar
commons-logging.loc=jakarta-commons/logging
#commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.1/commons-logging-1.0.1.tar.gz
# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
# Note: Optional with JDK 1.3+
jndi.home=${base.path}/jndi-1.2.1
jndi.lib=${jndi.home}/lib
jndi.jar=${jndi.lib}/jndi.jar
ldap.jar=${jndi.lib}/ldap.jar
jaas.jar=${jndi.lib}/jaas.jar
# ----- Jakarta Regular Expressions Library, version 1.2 -----
regexp.home=${base.path}/jakarta-regexp-1.2
regexp.lib=${regexp.home}
regexp.jar=${regexp.lib}/jakarta-regexp-1.2.jar
regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
# Note: Optional with JDK 1.4+
#xerces.home=${base.path}/xerces-1_4_4
#xerces.lib=${xerces.home}
#xerces.jar=${xerces.lib}/xerces.jar
# ----- Xerces XML Parser, version 2.0.0 or later -----
# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
xerces.home=${base.path}/xerces-2_0_2
xerces.lib=${xerces.home}
xerces.loc=http://xml.apache.org/dist/xerces-j/Xerces-J-bin.2.0.2.tar.gz
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
# --------------------------------------------------
# OPTIONAL LIBRARIES
# --------------------------------------------------
# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
activation.home=${base.path}/jaf-1.0.1
activation.lib=${activation.home}
activation.jar=${activation.lib}/activation.jar
# ----- Commons Daemon, version 20020219 or later -----
commons-daemon.home=${base.path}/commons-daemon
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
commons-daemon.loc=jakarta-commons-sandbox/daemon
# ----- Commons DBCP, version 20011030 or later -----
commons-dbcp.home=${base.path}/commons-dbcp
commons-dbcp.lib=${commons-dbcp.home}
commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
commons-dbcp.loc=jakarta-commons/dbcp
# ----- Commons Modeler, version 1.0 or later -----
commons-modeler.home=${base.path}/commons-modeler-1.0
commons-modeler.lib=${commons-modeler.home}
commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
# ----- Commons Pool, version 1.0 or later -----
commons-pool.home=${base.path}/commons-pool-1.0
commons-pool.lib=${commons-pool.home}
commons-pool.jar=${commons-pool.lib}/commons-pool.jar
commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0/commons-pool-1.0.tar.gz
# ----- JavaService, version 1.2.0 or later -----
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}
jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later
-----
jmx.home=${base.path}/mx4j-1.1
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j-jmx.jar
jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz
# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
jsse.home=${base.path}/jsse-1.0.2
jsse.lib=${jsse.home}/lib
jcert.jar=${jsse.lib}/jcert.jar
jnet.jar=${jsse.lib}/jnet.jar
jsse.jar=${jsse.lib}/jsse.jar
# ----- Java Transaction API (JTA), version 1.0.1 or later -----
jta.home=${base.path}/jta-spec1_0_1
jta.lib=${jta.home}
jta.jar=${jta.lib}/jta-spec1_0_1.jar
# ----- JUnit Unit Test Suite, version 3.7 or later -----
junit.home=${base.path}/junit3.7
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
# ----- Java Mail, version 1.2 or later -----
mail.home=${base.path}/javamail-1.2
mail.lib=${mail.home}
mail.jar=${mail.lib}/mail.jar
# ----- NSIS, version 1.90 or later -----
nsis.home=${base.path}/nsis
nsis.loc=http://www.nullsoft.com/free/nsis/nsis198.exe
# ----- PureTLS Extension, version 0.9 or later -----
puretls.home=${base.path}/puretls-0.9b2
puretls.lib=${puretls.home}/build
puretls.jar=${puretls.lib}/puretls.jar
# ----- Struts, version 1.0.1 or later -----
struts.home=${base.path}/jakarta-struts-1.0.2
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.2/jakarta-struts-1.0.2.tar.gz
# ----- Tyrex Data Source, version 1.0 -----
tyrex.home=${base.path}/tyrex-1.0
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]>
