remm 02/03/23 22:37:11 Modified: . Tag: tomcat_40_branch RELEASE-NOTES-4.0.4-B2.txt build.properties.sample catalina Tag: tomcat_40_branch build.xml catalina/src/conf Tag: tomcat_40_branch server.xml catalina/src/share/org/apache/catalina Tag: tomcat_40_branch Globals.java lib Tag: tomcat_40_branch tomcat-ajp.jar webapps/ROOT Tag: tomcat_40_branch index.html Added: lib Tag: tomcat_40_branch commons-logging.jar Log: - Document recent changes. - Include Coyote in the build. - Update version number. Revision Changes Path No revision No revision 1.1.2.4 +11 -1 jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.4-B2.txt Index: RELEASE-NOTES-4.0.4-B2.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.4-B2.txt,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- RELEASE-NOTES-4.0.4-B2.txt 19 Mar 2002 00:56:44 -0000 1.1.2.3 +++ RELEASE-NOTES-4.0.4-B2.txt 24 Mar 2002 06:37:10 -0000 1.1.2.4 @@ -3,7 +3,7 @@ Release Notes ============= -$Id: RELEASE-NOTES-4.0.4-B2.txt,v 1.1.2.3 2002/03/19 00:56:44 remm Exp $ +$Id: RELEASE-NOTES-4.0.4-B2.txt,v 1.1.2.4 2002/03/24 06:37:10 remm Exp $ ============ @@ -37,6 +37,12 @@ ***** Please note the revised documentation below related to ***** ***** using XML parsers with Tomcat 4.0 based applications. ***** +Coyote: This release include a completely new HTTP/1.1 connector and connector + API, called Coyote. This connector provides much improved performance and + robustness over the default HTTP/1.1 connector. + This connector is disabled in the default configuration, but can be enabled + by uncommenting an element in the server.xml configuration file. + --------------------- Catalina New Features: @@ -91,9 +97,13 @@ Bugzilla Bugs Resolved: ---------------------- +6846 dispatcher.forward() is confused when using special servlet mapping URLs +6982 Stop + start of the context makes weird things 7061 Servlet loaded TWICE on application startup? 7102 response.encodeURL() doesn't encode 7171 FileStore directory must exists +7344 Tomcat appears to be case-sensitive with regard to the token "Basic" + in Authorization request parameter ============================ 1.7.2.10 +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.7.2.9 retrieving revision 1.7.2.10 diff -u -r1.7.2.9 -r1.7.2.10 --- build.properties.sample 8 Feb 2002 07:19:43 -0000 1.7.2.9 +++ build.properties.sample 24 Mar 2002 06:37:10 -0000 1.7.2.10 @@ -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.7.2.9 2002/02/08 07:19:43 remm Exp $ +# $Id: build.properties.sample,v 1.7.2.10 2002/03/24 06:37:10 remm Exp $ # ----------------------------------------------------------------------------- @@ -37,6 +37,12 @@ # ----- JK 1.3 connector for Tomcat 4.0 ----- tomcat-ajp.jar=../lib/tomcat-ajp.jar + + +# ----- Coyote connector for Tomcat 4.0 ----- +commons-logging.jar=../lib/commons-logging.jar +tomcat-coyote.jar=../lib/tomcat-coyote.jar +tomcat-http11.jar=../lib/tomcat-http11.jar # ----- Jakarta Regular Expressions Library, version 1.2 ----- No revision No revision 1.60.2.11 +6 -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.60.2.10 retrieving revision 1.60.2.11 diff -u -r1.60.2.10 -r1.60.2.11 --- build.xml 14 Feb 2002 02:27:36 -0000 1.60.2.10 +++ build.xml 24 Mar 2002 06:37:10 -0000 1.60.2.11 @@ -435,6 +435,11 @@ <target name="copy-tomcat-ajp.jar" if="copy.tomcat-ajp.jar"> <copy todir="${catalina.build}/server/lib" file="${tomcat-ajp.jar}"/> </target> + <target name="copy-tomcat-coyote.jar"> + <copy todir="${catalina.build}/server/lib" file="${commons-logging.jar}"/> + <copy todir="${catalina.build}/server/lib" file="${tomcat-coyote.jar}"/> + <copy todir="${catalina.build}/server/lib" file="${tomcat-http11.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}"/> @@ -473,7 +478,7 @@ <!-- =================== BUILD: Copy Static Files ======================= --> - <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-tomcat-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar,copy-xerces.jar"> + <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-tomcat-ajp.jar,copy-tomcat-coyote.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar,copy-xerces.jar"> <!-- Executable Commands --> <copy todir="${catalina.build}/bin"> No revision No revision 1.29.2.13 +10 -2 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.2.12 retrieving revision 1.29.2.13 diff -u -r1.29.2.12 -r1.29.2.13 --- server.xml 17 Jan 2002 12:26:42 -0000 1.29.2.12 +++ server.xml 24 Mar 2002 06:37:10 -0000 1.29.2.13 @@ -59,6 +59,14 @@ <!-- Note : To disable connection timeouts, set connectionTimeout value to -1 --> + <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8081 --> + <!-- + <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" + port="8081" minProcessors="5" maxProcessors="75" + enableLookups="true" redirectPort="8443" + acceptCount="10" debug="0" connectionTimeout="20000"/> + --> + <!-- Define an SSL HTTP/1.1 Connector on port 8443 --> <!-- <Connector className="org.apache.catalina.connector.http.HttpConnector" @@ -79,7 +87,7 @@ <!-- See proxy documentation for more information about using this. --> <!-- <Connector className="org.apache.catalina.connector.http.HttpConnector" - port="8081" minProcessors="5" maxProcessors="75" + port="8082" minProcessors="5" maxProcessors="75" enableLookups="true" acceptCount="10" debug="0" connectionTimeout="60000" proxyPort="80"/> @@ -88,7 +96,7 @@ <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8082 --> <!-- <Connector className="org.apache.catalina.connector.http10.HttpConnector" - port="8082" minProcessors="5" maxProcessors="75" + port="8083" minProcessors="5" maxProcessors="75" enableLookups="true" redirectPort="8443" acceptCount="10" debug="0"/> --> No revision No revision 1.39.2.16 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java Index: Globals.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v retrieving revision 1.39.2.15 retrieving revision 1.39.2.16 diff -u -r1.39.2.15 -r1.39.2.16 --- Globals.java 1 Mar 2002 22:35:31 -0000 1.39.2.15 +++ Globals.java 24 Mar 2002 06:37:10 -0000 1.39.2.16 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v 1.39.2.15 2002/03/01 22:35:31 remm Exp $ - * $Revision: 1.39.2.15 $ - * $Date: 2002/03/01 22:35:31 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v 1.39.2.16 2002/03/24 06:37:10 remm Exp $ + * $Revision: 1.39.2.16 $ + * $Date: 2002/03/24 06:37:10 $ * * ==================================================================== * @@ -69,7 +69,7 @@ * Global constants that are applicable to multiple packages within Catalina. * * @author Craig R. McClanahan - * @version $Revision: 1.39.2.15 $ $Date: 2002/03/01 22:35:31 $ + * @version $Revision: 1.39.2.16 $ $Date: 2002/03/24 06:37:10 $ */ public final class Globals { @@ -219,7 +219,7 @@ /** * The descriptive information about this server and version. */ - public static final String SERVER_INFO = "Apache Tomcat/4.0.4-dev"; + public static final String SERVER_INFO = "Apache Tomcat/4.0.4-b2"; /** No revision No revision 1.1.2.8 +119 -119 jakarta-tomcat-4.0/lib/Attic/tomcat-ajp.jar <<Binary file>> No revision No revision 1.1.2.1 +119 -0 jakarta-tomcat-4.0/lib/Attic/commons-logging.jar <<Binary file>> No revision No revision 1.29.2.15 +1 -1 jakarta-tomcat-4.0/webapps/ROOT/Attic/index.html Index: index.html =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/Attic/index.html,v retrieving revision 1.29.2.14 retrieving revision 1.29.2.15 diff -u -r1.29.2.14 -r1.29.2.15 --- index.html 1 Mar 2002 22:36:20 -0000 1.29.2.14 +++ index.html 24 Mar 2002 06:37:11 -0000 1.29.2.15 @@ -44,7 +44,7 @@ <td align="left" valign="top"> <table> <tr><td align="left" valign="top"><b>Tomcat</b></td></tr> - <tr><td align="left" valign="top"><b>Version 4.0.4 Dev</b></td></tr> + <tr><td align="left" valign="top"><b>Version 4.0.4 Beta 2</b></td></tr> </table> </td> <td align="right"><a href="http://jakarta.apache.org/"><img src="jakarta-banner.gif" height="100" width="350" border="0" alt="The Jakarta Project"></a></td>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>