remm 01/09/22 17:12:35
Modified: . BUILDING.txt build.properties.sample build.xml
catalina build.xml
catalina/src/conf server.xml
Log:
- Update build instructions (but steps 16 and 17 will need to be improved).
- The binary will now include the JK 1.3 connector for Catalina.
- Add a commented out JK connector in server.xml.
- New "detect" target, which will display the flags.
Revision Changes Path
1.7 +26 -12 jakarta-tomcat-4.0/BUILDING.txt
Index: BUILDING.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BUILDING.txt 2001/09/21 05:20:01 1.6
+++ BUILDING.txt 2001/09/23 00:12:34 1.7
@@ -1,4 +1,4 @@
-$Id: BUILDING.txt,v 1.6 2001/09/21 05:20:01 ccain Exp $
+$Id: BUILDING.txt,v 1.7 2001/09/23 00:12:34 remm Exp $
Building The Tomcat 4.0 Servlet/JSP Container
@@ -138,8 +138,15 @@
distribution resides in its own directory.
-(6) Download and Install JDBC Optional Package API Binary Distribution
+(6) Steps (7) - (17) 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 (18)) to build a complete distribution.
+ Regular contributors to Tomcat are encouraged to use the complete build
+ option.
+
+(7) Download and Install JDBC Optional Package API Binary Distribution
+
* Download the JDBC Optional Pacakge API package (version 2.0) from:
http://java.sun.com/products/jdbc/download.html
@@ -147,7 +154,7 @@
* Place the jar in a convenient location.
-(7) Download and Install the JMX 1.0 Reference Implementation
+(8) Download and Install the JMX 1.0 Reference Implementation
* Download the JMX Instrumentation and Agent Reference Implementation
(version 1.0 or later) from
@@ -158,7 +165,7 @@
it resides in its own subdirectory.
-(8) Download and Install the JNDI 1.2.1 Reference Implementation
+(9) 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
@@ -172,7 +179,7 @@
same download page. Be sure that you unpack "ldap.jar" into the "lib"
subdirectory of the JNDI directory, parallel to "jndi.jar".
-(9) Download and Install the Java Activation Framework 1.0.1
+(10) Download and Install the Java Activation Framework 1.0.1
* Download the Java Activation Framework package (version 1.0.1 or later) from
@@ -181,7 +188,7 @@
* Unpack the package into a convenient location so that it
resised in its own subdirectory.
-(10) Download and Install JavaMail 1.2
+(11) Download and Install JavaMail 1.2
* Download the JavaMail package (version 1.2 or later) from
@@ -191,7 +198,7 @@
it resides in its own subdirectory.
-(11) Download and Install the JSSE 1.0.2 Reference Implementation
+(12) 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
@@ -202,7 +209,7 @@
it resides in its own subdirectory.
-(12) Download and Install the Java Transaction APIs
+(13) Download and Install the Java Transaction APIs
* Download the Java Transaction API (JTA) package (version 1.0.1) from:
@@ -212,7 +219,7 @@
own subdirectory.
-(13) Download and Install the Tyrex Data Source Package
+(14) 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.
@@ -225,7 +232,7 @@
own subdirectory.
-(14) Download and Install the JUnit Testing Package (OPTIONAL)
+(15) 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.
@@ -237,8 +244,15 @@
* Unpack the package into a convenient location so that it resides in its
own subdirectory.
+
+(16) Check out the jakarta-tomcat-connectors repository, using the "TOMCAT_4_1"
+ tag.
+
+
+(17) Compile the "util" module, and the "jk" module.
+
-(15) Customize Build Properties For This Subproject
+(18) 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
@@ -262,7 +276,7 @@
each developer will have their own version.
-(16) Build A Binary Distribution
+(19) Build A Binary Distribution
Open a command line shell, and issue the following commands:
1.14 +9 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties.sample 2001/09/21 00:50:23 1.13
+++ build.properties.sample 2001/09/23 00:12:34 1.14
@@ -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.13 2001/09/21 00:50:23 remm Exp $
+# $Id: build.properties.sample,v 1.14 2001/09/23 00:12:34 remm Exp $
# -----------------------------------------------------------------------------
@@ -24,6 +24,14 @@
# ----- Default Base Path for Dependent Packages -----
base.path=/usr/local
+
+
+# ----- Tomcat Util -----
+tomcat-util.jar=../../jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar
+
+
+# ----- JK 1.3 connector for Tomcat 4.0 -----
+ajp.jar=../../jakarta-tomcat-connectors/jk/build/lib/ajp.jar
# ----- Jakarta Regular Expressions Library, version 1.2 -----
1.40 +7 -0 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 2001/09/18 03:29:26 1.39
+++ build.xml 2001/09/23 00:12:34 1.40
@@ -20,6 +20,13 @@
+ <!-- =================== DETECT: Display configuration ================== -->
+ <target name="detect"
+ description="Display configuration flags">
+ <ant dir="./catalina" target="flags.display"/>
+ </target>
+
+
<!-- ===================== DEPLOY: Create Directories =================== -->
<target name="deploy-prepare">
<mkdir dir="${tomcat.build}"/>
1.67 +25 -1 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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 2001/09/21 16:08:34 1.66
+++ build.xml 2001/09/23 00:12:34 1.67
@@ -127,6 +127,7 @@
classpath="${tyrex.jar}" />
<!-- JAR files availability flags -->
+ <available property="ajp.jar.present" file="${ajp.jar}" />
<condition property="javamail.jar.present">
<and>
<available file="${activation.jar}" />
@@ -143,6 +144,7 @@
<available property="ldap.jar.present" file="${ldap.jar}" />
<available property="regexp.jar.present" file="${regexp.jar}" />
<available property="servlet.jar.present" file="${servlet.jar}" />
+ <available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
<available property="tyrex.jar.present" file="${tyrex.jar}" />
<!-- Conditional compilation flags (determined from the flags above) -->
@@ -200,6 +202,12 @@
<!-- Conditional copy flags (determined from the flags above) -->
+ <condition property="copy.ajp.jar">
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${ajp.jar.present}" arg2="true" />
+ </or>
+ </condition>
<condition property="copy.jdbc20ext.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -264,6 +272,12 @@
</and>
</or>
</condition>
+ <condition property="copy.tomcat-util.jar">
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${tomcat-util.jar.present}" arg2="true" />
+ </or>
+ </condition>
<condition property="copy.tyrex.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -313,8 +327,10 @@
<echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
<echo message="regexp.jar.present=${regexp.jar.present}" />
<echo message="servlet.jar.present=${servlet.jar.present}" />
+ <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
<echo message="--- Optional JARs ---" />
+ <echo message="ajp.jar.present=${ajp.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
<echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
<echo message="jta.jar.present=${jta.jar.present}" />
@@ -333,11 +349,13 @@
<echo message="compile.tyrex=${compile.tyrex}" />
<echo message="--- Distribution flags ---" />
+ <echo message="copy.ajp.jar=${copy.ajp.jar}" />
<echo message="copy.jdbc20ext.jar=${copy.jdbc20ext.jar}" />
<echo message="copy.jndi.jar=${copy.jndi.jar}" />
<echo message="copy.javamail.jar=${copy.javamail.jar}" />
<echo message="copy.jta.jar=${copy.jta.jar}" />
<echo message="copy.ldap.jar=${copy.ldap.jar}" />
+ <echo message="copy.tomcat-util.jar=${copy.tomcat-util.jar}" />
<echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
</target>
@@ -361,6 +379,9 @@
<!-- ======================== BUILD: Copy JARs ========================== -->
+ <target name="copy-ajp.jar" if="copy.ajp.jar">
+ <copy todir="${catalina.build}/server/lib" file="${ajp.jar}"/>
+ </target>
<target name="copy-activation.jar" if="copy.javamail.jar">
<copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
<copy todir="${catalina.build}/common/lib" file="${mail.jar}"/>
@@ -386,6 +407,9 @@
<copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
-->
</target>
+ <target name="copy-tomcat-util.jar" if="copy.tomcat-util.jar">
+ <copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
+ </target>
<target name="copy-tyrex.jar" if="copy.tyrex.jar">
<copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
<copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
@@ -393,7 +417,7 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tyrex.jar">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
1.30 +6 -0 jakarta-tomcat-4.0/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- server.xml 2001/09/09 04:00:08 1.29
+++ server.xml 2001/09/23 00:12:34 1.30
@@ -67,6 +67,12 @@
</Connector>
-->
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <!--
+ <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
+ port="8009" acceptCount="10" debug="0"/>
+ -->
+
<!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
<!-- See proxy documentation for more information about using this. -->
<!--
