craigmcc 02/01/05 12:24:30
Modified: . BUILDING.txt build.properties.sample
catalina build.xml
Log:
The "commons-digester" package HEAD branch now requires the "commons-logging"
package (and several more Commons packages will soon), so add this as a
required component to build Tomcat, and copy commons-logging.jar to the
"common/lib" directory.
WARNING: If you are building Tomcat 4 (HEAD branch) from source, you will
need to update your build properties to define "commons-logging.jar" if it
is not already there.
Revision Changes Path
1.17 +37 -21 jakarta-tomcat-4.0/BUILDING.txt
Index: BUILDING.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BUILDING.txt 19 Dec 2001 21:08:36 -0000 1.16
+++ BUILDING.txt 5 Jan 2002 20:24:30 -0000 1.17
@@ -1,4 +1,4 @@
-$Id: BUILDING.txt,v 1.16 2001/12/19 21:08:36 remm Exp $
+$Id: BUILDING.txt,v 1.17 2002/01/05 20:24:30 craigmcc Exp $
Building The Tomcat 4.0 Servlet/JSP Container
@@ -180,14 +180,30 @@
distribution resides in its own directory.
-(9) Steps (10)-(22) are optional, but are necessary to build a complete binary
- distribution of Tomcat 4.0. Set the "full.dist" property to "on" in the
- build.properties file (see step (23)) to build a complete distribution.
- Regular contributors to Tomcat are encouraged to use the complete build
- option.
+(9) Download and Install the Commons Logging Binary Distribution
+* Download a binary distribution (nightly build for now) from:
-(10) Download and Install JDBC Optional Package API Binary Distribution
+ http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-logging
+
+ On a Windows platform, you will need:
+ commons-logging-YYYYMMDD.zip
+
+ On a Unix platform, you will need:
+ commons-logging-YYYYMMDD.tar.gz
+
+* Unpack the binary distribution into a convenient location so that the
+ distribution resides in its own directory.
+
+
+(10) Steps (11)-(23) are optional, but are necessary to build a complete binary
+ distribution of Tomcat 4.0. Set the "full.dist" property to "on" in the
+ build.properties file (see step (23)) to build a complete distribution.
+ Regular contributors to Tomcat are encouraged to use the complete build
+ option.
+
+
+(11) Download and Install JDBC Optional Package API Binary Distribution
* Download the JDBC Optional Pacakge API package (version 2.0) from:
@@ -196,7 +212,7 @@
* Place the jar in a convenient location.
-(11) Download and Install the JMX 1.0 Reference Implementation
+(12) Download and Install the JMX 1.0 Reference Implementation
NOTE: This step is only required if you wish to build the Config/Admin
web application.
@@ -210,7 +226,7 @@
it resides in its own subdirectory.
-(12) Download and Install the JNDI 1.2.1 Reference Implementation
+(13) Download and Install the JNDI 1.2.1 Reference Implementation
* Download the Java Naming and Directory Interface (JNDI) package,
(version 1.2.1 or later) from
@@ -225,7 +241,7 @@
subdirectory of the JNDI directory, parallel to "jndi.jar".
-(13) Download and Install the Java Activation Framework 1.0.1
+(14) Download and Install the Java Activation Framework 1.0.1
* Download the Java Activation Framework package (version 1.0.1 or later) from
@@ -235,7 +251,7 @@
resised in its own subdirectory.
-(14) Download and Install JavaMail 1.2
+(15) Download and Install JavaMail 1.2
* Download the JavaMail package (version 1.2 or later) from
@@ -245,7 +261,7 @@
it resides in its own subdirectory.
-(15) Download and Install the JSSE 1.0.2 Reference Implementation
+(16) Download and Install the JSSE 1.0.2 Reference Implementation
* Download the Java Secure Sockets Extension (JSSE) package,
(version 1.0.2 or later) from
@@ -256,7 +272,7 @@
it resides in its own subdirectory.
-(16) Download and Install the Java Transaction APIs
+(17) Download and Install the Java Transaction APIs
* Download the Java Transaction API (JTA) package (version 1.0.1) from:
@@ -266,7 +282,7 @@
own subdirectory.
-(17) Download and Install the Struts Binary Distribution
+(18) Download and Install the Struts Binary Distribution
* Download a binary distribution of Struts 1.0 from:
@@ -282,7 +298,7 @@
distribution resides in its own directory.
-(18) Download and Install the Tyrex Data Source Package
+(19) Download and Install the Tyrex Data Source Package
NOTE: This step is only required if you wish to build the Tyrex connection
pool implementation for JNDI-accessed data sources.
@@ -295,7 +311,7 @@
own subdirectory.
-(19) Download and Install the JUnit Testing Package (OPTIONAL)
+(20) Download and Install the JUnit Testing Package (OPTIONAL)
NOTE: This step is only required if you wish to build and execute the unit
tests that are part of the Tomcat 4.0 source base.
@@ -308,7 +324,7 @@
own subdirectory.
-(20) Download and Install the Commons Modeler Binary Distribution
+(21) Download and Install the Commons Modeler Binary Distribution
NOTE: This step is only required if you wish to build the Config/Admin
web application.
@@ -327,7 +343,7 @@
distribution resides in its own directory.
-(21) Download and Install the Commons DBCP Binary Distribution
+(22) Download and Install the Commons DBCP Binary Distribution
NOTE: This step is only required if you wish to use the database JDBC data
source factory.
@@ -346,7 +362,7 @@
distribution resides in its own directory.
-(22) Download and Install the Commons Pool Binary Distribution
+(23) Download and Install the Commons Pool Binary Distribution
NOTE: This step is only required if you wish to use the database JDBC data
source factory.
@@ -365,7 +381,7 @@
distribution resides in its own directory.
-(23) Customize Build Properties For This Subproject
+(24) Customize Build Properties For This Subproject
Most Jakarta subprojects allow you to customize Ant properties (with default
values defined in the "build.xml" file. This is done by creating a text file
@@ -389,7 +405,7 @@
each developer will have their own version.
-(24) Build A Binary Distribution
+(25) Build A Binary Distribution
Open a command line shell, and issue the following commands:
1.23 +7 -1 jakarta-tomcat-4.0/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.properties.sample 6 Nov 2001 21:52:14 -0000 1.22
+++ build.properties.sample 5 Jan 2002 20:24:30 -0000 1.23
@@ -6,7 +6,7 @@
# 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.sample,v 1.22 2001/11/06 21:52:14 patrickl Exp $
+# $Id: build.properties.sample,v 1.23 2002/01/05 20:24:30 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -54,6 +54,12 @@
commons-digester.home=${base.path}/commons-digester-1.1.1
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
+
+
+# ----- Commons Logging, version 0.1 or later -----
+commons-logging.home=${base.path}/commons-logging-1.1.1
+commons-logging.lib=${commons-logging.home}
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
# ----- Commons Modeler, version 20011026 or later -----
1.94 +16 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- build.xml 30 Dec 2001 01:58:20 -0000 1.93
+++ build.xml 5 Jan 2002 20:24:30 -0000 1.94
@@ -26,6 +26,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${jaas.jar}"/>
@@ -54,6 +55,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${jaas.jar}"/>
@@ -102,6 +104,9 @@
<available property="digester.present"
classname="org.apache.commons.digester.Digester"
classpath="${commons-digester.jar}"/>
+ <available property="logging.present"
+ classname="org.apache.commons.logging.Log"
+ classpath="${commons-logging.jar}"/>
<available property="modeler.present"
classname="org.apache.commons.modeler.Registry"
classpath="${commons-modeler.jar}"/>
@@ -193,6 +198,7 @@
<available property="jta.jar.present" file="${jta.jar}" />
<available property="junit.jar.present" file="${junit.jar}" />
<available property="ldap.jar.present" file="${ldap.jar}" />
+ <available property="logging.jar.present" file="${commons-logging.jar}" />
<available property="modeler.jar.present" file="${commons-modeler.jar}" />
<available property="pool.jar.present" file="${commons-pool.jar}" />
<available property="regexp.jar.present" file="${regexp.jar}" />
@@ -381,6 +387,12 @@
<equals arg1="${modeler.present}" arg2="true" />
</or>
</condition>
+ <condition property="copy.logging.jar">
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${logging.present}" arg2="true" />
+ </or>
+ </condition>
<condition property="copy.pool.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -433,6 +445,7 @@
<echo message="digester.present=${digester.present}" />
<echo message="jaxp.present=${jaxp.present}" />
<echo message="jndi.present=${jndi.present}" />
+ <echo message="logging.present=${logging.present}" />
<echo message="regexp.present=${regexp.present}" />
<echo message="servlet.present=${servlet.present}" />
@@ -496,6 +509,7 @@
<echo message="copy.jndi.jar=${copy.jndi.jar}" />
<echo message="copy.jta.jar=${copy.jta.jar}" />
<echo message="copy.ldap.jar=${copy.ldap.jar}" />
+ <echo message="copy.logging.jar=${copy.logging.jar}" />
<echo message="copy.modeler.jar=${copy.modeler.jar}" />
<echo message="copy.pool.jar=${copy.pool.jar}" />
<echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
@@ -613,6 +627,8 @@
file="${commons-beanutils.jar}"/>
<copy todir="${catalina.build}/server/lib"
file="${commons-digester.jar}"/>
+ <copy todir="${catalina.build}/common/lib"
+ file="${commons-logging.jar}"/>
<copy todir="${catalina.build}/server/lib" file="${regexp.jar}"/>
<!-- Not needed for stand alone use
<copy todir="${catalina.build}/server/lib" file="${jmxri.jar}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
