Author: markt
Date: Mon Feb 5 18:21:15 2007
New Revision: 503958
URL: http://svn.apache.org/viewvc?view=rev&rev=503958
Log:
Update libraries to latest available versions.
Update release notes to make JDK 1.3 requirement clear. This has been the case
for several versions, it just wasn't clearly stated.
Modified:
tomcat/container/branches/tc4.1.x/BUILDING.txt
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/RUNNING.txt
tomcat/container/branches/tc4.1.x/build.properties.default
tomcat/container/branches/tc4.1.x/build.xml
Modified: tomcat/container/branches/tc4.1.x/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/BUILDING.txt?view=diff&rev=503958&r1=503957&r2=503958
==============================================================================
--- tomcat/container/branches/tc4.1.x/BUILDING.txt (original)
+++ tomcat/container/branches/tc4.1.x/BUILDING.txt Mon Feb 5 18:21:15 2007
@@ -8,13 +8,13 @@
This subproject contains the source code Tomcat 4.1, a server that implements
the Servlet 2.3 and JSP 1.2 Specifications. In order to build a binary
distribution version of the container from a source distribution, you must
-have a Java Development Kit (JDK) for version 1.3 (or later) downloaded
+have a Java Development Kit (JDK) for version 1.4 (or later) downloaded
and installed and do the following:
(0) Download and Install a Java Development Kit
-* Download a Java Development Kit (JDK) release (version 1.3 or later) from:
+* Download a Java Development Kit (JDK) release (version 1.4 or later) from:
http://java.sun.com/j2se/
@@ -23,6 +23,10 @@
* Set an environment variable JAVA_HOME to the pathname of the directory
into which you installed the JDK release.
+* Tomcat 4.1 may be built using a 1.3 JDK but this will not create a full
+ binary distribution. The documentation web application is one of the
+ components that will be excluded when building with a 1.3 JDK
+
(1) Download and Install the Ant Binary Distribution
@@ -31,14 +35,14 @@
http://ant.apache.org/bindownload.cgi
On a Windows platform, you will need:
- apache-ant-1.6.5-bin.zip
+ apache-ant-1.7.0-bin.zip
On a Unix platform, you will need:
- apache-ant-1.6.5-bin.tar.gz
+ apache-ant-1.7.0-bin.tar.gz
* Unpack the binary distribution into a convenient location so that the
Ant release resides in its own directory (conventionally named
- "apache-ant-1.6.5"). For the purposes of the remainder of this document,
+ "apache-ant-1.7.0"). For the purposes of the remainder of this document,
the symbolic name "${ant.home}" is used to refer to the full pathname of
the release directory.
@@ -90,7 +94,7 @@
http://xerces.apache.org/xerces2-j/download.cgi
- (Tomcat was tested with "Xerces-J-bin.2.7.1.zip")
+ (Tomcat was tested with "Xerces-J-bin.2.9.0.zip")
* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory (conventionally named
@@ -211,7 +215,7 @@
(11) Download and Install the Commons Logging Binary Distribution
-* Download a binary distribution Version 1.0.1 or later from:
+* Download a binary distribution Version 1.1 or later from:
http://jakarta.apache.org/site/downloads/downloads_commons-logging.cgi
@@ -337,15 +341,15 @@
(21) Download and Install the Struts Binary Distribution
-* Download a binary distribution of Struts 1.0.1, 1.0.2 or 1.1 from:
+* Download a binary distribution of Struts 1.2.4 or later from:
http://archive.apache.org/dist/struts/
On a Windows platform, you will need:
- jakarta-struts-1.1.zip
+ jakarta-struts-X.Y.Z.zip
On a Unix platform, you will need:
- jakarta-struts-1.1.tar.gz
+ jakarta-struts-X.Y.Z.tar.gz
* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory.
@@ -511,9 +515,9 @@
(30) Steps (31) to (33) Build the Windows Installer Distribution - OPTIONAL
-(31) NSISant installer
+(31) NSIS installer
-* Download the NSIS Installer version 2.14 from:
+* Download the NSIS Installer version 2.14 or later from:
http://prdownloads.sourceforge.net/nsis/nsis-2.14-setup.exe?download
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?view=diff&rev=503958&r1=503957&r2=503958
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Mon Feb 5 18:21:15
2007
@@ -161,6 +161,30 @@
[4.1.34] Commons Logging
Upgrade to 1.1
+[4.1.35] Commons Digetster
+ Upgrade to 1.8
+
+[4.1.35] Commons IO
+ Upgrade to 1.2
+
+[4.1.35] Commons Modeler
+ Upgrade to 2.0
+
+[4.1.35] Xerces
+ Upgrade to 2.9.0
+
+[4.1.35] MX4J
+ Upgrade to 3.0.2
+
+[4.1.35] Java Transaction API
+ Upgrade to 1.1
+
+[4.1.35] NSIS
+ Upgrade to 2.23
+
+[4.1.35] JDK
+ JDK 1.3+ is now required.
+
---------------------
Catalina New Features:
@@ -2392,8 +2416,8 @@
A standard installation of Tomcat 4 makes all of the following APIs available
for use by web applications (by placing them in "common/lib" or "shared/lib"):
-* activation.jar (Java Activation Framework)
-* ant.jar (Apache Ant 1.6.5)
+* activation.jar (JavaBeans Activation Framework 1.0.2)
+* ant.jar (Apache Ant 1.7.0)
* commons-collections.jar (Commons Collections 3.2)
* commons-dbcp.jar (Commons DBCP 1.2.1)
* commons-logging-api.jar (Commons Logging 1.1)
@@ -2402,8 +2426,8 @@
* jasper-runtime.jar (Jasper 2 Runtime)
* jdbc2_0-stdext.jar (JDBC 2.0 Optional Package, javax.sql.*)
* jndi.jar (JNDI 1.2 base API classes)
-* jta.jar (Java Transacation API 1.0.1a)
-* mail.jar (JavaMail 1.2)
+* jta.jar (Java Transacation API 1.1)
+* mail.jar (JavaMail 1.3.3)
* naming-common.jar (JNDI Context implementation)
* naming-factory.jar (JNDI object factories)
* naming-resources.jar (JNDI DirContext implementations)
@@ -2413,7 +2437,7 @@
putting unpacked classes into a "classes" directory (not created by default),
or by placing them in JAR files in the "lib" directory.
-Tomcat 4.1 also makes available Xerces 2.8.0 to web applications.
+Tomcat 4.1 also makes available Xerces 2.9.0 to web applications.
--------------------------
Modified: tomcat/container/branches/tc4.1.x/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RUNNING.txt?view=diff&rev=503958&r1=503957&r2=503958
==============================================================================
--- tomcat/container/branches/tc4.1.x/RUNNING.txt (original)
+++ tomcat/container/branches/tc4.1.x/RUNNING.txt Mon Feb 5 18:21:15 2007
@@ -11,7 +11,7 @@
(0) Download and Install the J2SE Software Development Kit (SDK)
-* Download the Java 2 Standard Edition (J2SE) SDK, release version 1.2 or
+* Download the Java 2 Standard Edition (J2SE) SDK, release version 1.3 or
later, from:
http://java.sun.com/j2se/
@@ -20,9 +20,6 @@
sufficient for most users because Tomcat uses the javac.exe that is not
present in the JRE to compile JSP pages. Unless you are *very* sure of
what you are doing, please use the full SDK.
-
-NOTE: Use of the CGI Servlet requires Java 2 Standard Edition (J2SE) SDK,
-release version 1.3 or later.
* Install the SDK according to the instructions included with the release.
Modified: tomcat/container/branches/tc4.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.properties.default?view=diff&rev=503958&r1=503957&r2=503958
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.properties.default (original)
+++ tomcat/container/branches/tc4.1.x/build.properties.default Mon Feb 5
18:21:15 2007
@@ -71,10 +71,10 @@
# ----- Commons Digester, version 1.1.1 or later -----
-commons-digester.home=${base.path}/commons-digester-1.7
+commons-digester.home=${base.path}/commons-digester-1.8
commons-digester.lib=${commons-digester.home}
-commons-digester.jar=${commons-digester.lib}/commons-digester-1.7.jar
-commons-digester.loc=${base-jakarta.loc}/commons/digester/binaries/commons-digester-1.7.tar.gz
+commons-digester.jar=${commons-digester.lib}/commons-digester-1.8.jar
+commons-digester.loc=${base-jakarta.loc}/commons/digester/binaries/commons-digester-1.8.tar.gz
# ----- Commons FileUpload, version 1.0 or later -----
@@ -84,10 +84,10 @@
commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.1.1.tar.gz
# ----- Commons IO, version 1.1 or later -----
-commons-io.home=${base.path}/commons-io-1.2
+commons-io.home=${base.path}/commons-io-1.3
commons-io.lib=${commons-io.home}
-commons-io.jar=${commons-io.lib}/commons-io-1.2.jar
-commons-io.loc=${base-jakarta.loc}/commons/io/binaries/commons-io-1.2.tar.gz
+commons-io.jar=${commons-io.lib}/commons-io-1.3.jar
+commons-io.loc=${base-jakarta.loc}/commons/io/binaries/commons-io-1.3.tar.gz
# ----- Commons Logging, version 1.1 or later -----
@@ -108,10 +108,10 @@
# ----- Commons Modeler, version 1.1 or later -----
-commons-modeler.home=${base.path}/commons-modeler-1.1
+commons-modeler.home=${base.path}/commons-modeler-2.0
commons-modeler.lib=${commons-modeler.home}
-commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
-commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/modeler-1.1.tar.gz
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler-2.0.jar
+commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/commons-modeler-2.0.tar.gz
# ----- Jakarta Regular Expressions Library, version 1.2 -----
@@ -136,9 +136,9 @@
# ----- 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_8_0
+xerces.home=${base.path}/xerces-2_9_0
xerces.lib=${xerces.home}
-xerces.loc=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.8.0.tar.gz
+xerces.loc=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.tar.gz
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xml-apis.jar
@@ -148,7 +148,8 @@
# --------------------------------------------------
-# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
+# ----- JavaBeans Activation Framework (JAF), version 1.0.1 or later -----
+# Note JAF 1.1 is available but requires JDK 1.4+
activation.home=${base.path}/jaf-1.0.2
activation.lib=${activation.home}
activation.jar=${activation.lib}/activation.jar
@@ -170,6 +171,7 @@
# ----- Commons Pool, version 1.0 or later -----
+# Note Commons Pool 2.0 is available but requires JDK 1.4+
commons-pool.home=${base.path}/commons-pool-1.3
commons-pool.lib=${commons-pool.home}
commons-pool.jar=${commons-pool.lib}/commons-pool-1.3.jar
@@ -183,15 +185,15 @@
# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.0 or
later -----
-jmx.home=${base.path}/mx4j-1.1.1
+jmx.home=${base.path}/mx4j-3.0.2
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j-jmx.jar
-jmx.license=${jmx.home}/LICENSE
-jmx.loc=${base-sourceforge.loc}/mx4j/mx4j-1.1.1.tar.gz
+jmx.license=${jmx.home}/LICENSE.txt
+jmx.loc=${base-sourceforge.loc}/mx4j/mx4j-3.0.2.tar.gz
# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
-jsse.home=${base.path}/jsse-1.0.3
+jsse.home=${base.path}/jsse1.0.3_03
jsse.lib=${jsse.home}/lib
jcert.jar=${jsse.lib}/jcert.jar
jnet.jar=${jsse.lib}/jnet.jar
@@ -199,12 +201,13 @@
# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-jta.home=${base.path}/jta-1_0_1b
+jta.home=${base.path}/jta-1.1
jta.lib=${jta.home}
jta.jar=${jta.lib}/jta.jar
# ----- JUnit Unit Test Suite, version 3.7 or later -----
+# Note JUnit 4.x is available but requires Java 5
junit.home=${base.path}/junit3.8.2
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
@@ -212,6 +215,7 @@
# ----- Java Mail, version 1.2 or later -----
+# Note Java Mail 1.4 is available but requires JDK 1.4+
mail.home=${base.path}/javamail-1.3.3_01
mail.lib=${mail.home}
mail.jar=${mail.lib}/mail.jar
@@ -219,8 +223,8 @@
# ----- NSIS, version 2.14 or later -----
nsis.home=C:/Program Files/nsis
-nsis.loc=${base-sourceforge.loc}/nsis/nsis-2.16-setup.exe?download
-nsis.install.exe=${nsis.home}/nsis-216.exe
+nsis.loc=${base-sourceforge.loc}/nsis/nsis-2.23-setup.exe?download
+nsis.install.exe=${nsis.home}/nsis-223.exe
# ----- PureTLS Extension, version 0.9 or later -----
@@ -230,6 +234,7 @@
# ----- Struts, version 1.2.4 or later -----
+# Note struts 1.3.x onwards requires JDK 1.4+
struts.home=${base.path}/struts-1.2.9-bin
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
Modified: tomcat/container/branches/tc4.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?view=diff&rev=503958&r1=503957&r2=503958
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Mon Feb 5 18:21:15 2007
@@ -517,9 +517,10 @@
<param name="destfile" value="${nsis.install.exe}"/>
<param name="destdir" value="${nsis.home}"/>
</antcall>
- <antcall target="downloadgz">
+ <antcall target="downloadzip">
<param name="sourcefile" value="${struts.loc}"/>
<param name="destfile" value="${struts.jar}"/>
+ <param name="destdir" value="${base.path}"/>
</antcall>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
