Trotz Stellenabbau
Lese selbst: http://www.spiegel.de/wirtschaft/0,1518,338652,00.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
larryi 2005/04/11 08:07:46 Modified:webapps/docs changelog.xml Log: Correct a correction. Mainly verifying my setup still works. :) Revision ChangesPath 1.287 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- changelog.xml 10 Apr 2005 19:29:09 - 1.286 +++ changelog.xml 11 Apr 2005 15:07:46 - 1.287 @@ -69,7 +69,7 @@ to it would leak a minimal amount of memory) (remm) /fix update -Re-aad patch causing Session.getId to throw an ISE, and make all internal components +Re-add patch causing Session.getId to throw an ISE, and make all internal components use a safe getIdInternal method (remm) /update update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
larryi 2004/03/06 07:44:37
Modified:src/share/org/apache/tomcat/core ContextManager.java
Log:
Update release name
Revision ChangesPath
1.208 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ContextManager.java 25 Feb 2004 06:45:07 - 1.207
+++ ContextManager.java 6 Mar 2004 15:44:37 - 1.208
@@ -105,7 +105,7 @@
public class ContextManager {
/** Official name and version
*/
-public static final String TOMCAT_VERSION = 3.3.2 Release Candidate 1;
+public static final String TOMCAT_VERSION = 3.3.2 Final;
public static final String TOMCAT_NAME = Tomcat Web Server;
/** System property used to set the base directory ( tomcat home ).
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
larryi 2004/02/21 07:13:05
Modified:src/share/org/apache/tomcat/core ContextManager.java
Log:
Update version
Revision ChangesPath
1.206 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- ContextManager.java 28 Mar 2002 02:27:01 - 1.205
+++ ContextManager.java 21 Feb 2004 15:13:05 - 1.206
@@ -148,7 +148,7 @@
public class ContextManager {
/** Official name and version
*/
-public static final String TOMCAT_VERSION = 3.3.2 Dev;
+public static final String TOMCAT_VERSION = 3.3.2 Release Candidate 1;
public static final String TOMCAT_NAME = Tomcat Web Server;
/** System property used to set the base directory ( tomcat home ).
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java
larryi 2004/02/19 15:15:11
Modified:src/share/org/apache/tomcat/core Request.java
Log:
Apply encoding to query string as well to retain prior behavior. This will likely
need to change slightly if we want to support configurability of this behavior.
Revision ChangesPath
1.118 +5 -2 jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
Index: Request.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- Request.java 22 Sep 2003 09:18:21 - 1.117
+++ Request.java 19 Feb 2004 23:15:11 - 1.118
@@ -449,10 +449,13 @@
public void handleQueryParameters() {
// set the encoding for query parameters.
getCharacterEncoding();
- if( charEncoding != null )
+ if( charEncoding != null ) {
params.setEncoding( getCharacterEncoding() );
- else
+params.setQueryStringEncoding( getCharacterEncoding() );
+} else {
params.setEncoding( DEFAULT_CHARACTER_ENCODING );
+params.setQueryStringEncoding( DEFAULT_CHARACTER_ENCODING );
+}
params.handleQueryParameters();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3 Tomcat3Response.java
larryi 2004/02/19 15:16:17 Modified:coyote/src/java/org/apache/coyote/tomcat3 Tomcat3Response.java Log: Ensure that the core response is aware that the encoding has been set. Revision ChangesPath 1.9 +1 -0 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java Index: Tomcat3Response.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Tomcat3Response.java 18 Sep 2003 16:13:57 - 1.8 +++ Tomcat3Response.java 19 Feb 2004 23:16:17 - 1.9 @@ -188,6 +188,7 @@ coyoteResponse.setContentType(contentType); this.contentType = coyoteResponse.getContentType(); this.characterEncoding = coyoteResponse.getCharacterEncoding(); +this.haveCharacterEncoding = true; // maintain Tomcat 3.3 behavior by setting the header too headers.setValue(Content-Type).setString(contentType); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
larryi 2004/02/19 19:55:03
Modified:.build.xml
src/admin/WEB-INF/scripts watchdog-jsp.xml
watchdog-servlet.xml
src/admin/test sanity-form.jsp
Log:
Update admin webapp to be able run self tests when built with Ant 1.6.
Revision ChangesPath
1.201 +4 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- build.xml 6 Feb 2004 03:37:20 - 1.200
+++ build.xml 20 Feb 2004 03:55:03 - 1.201
@@ -60,6 +60,7 @@
property name=ant.bin location=${ant.home}/bin/
property name=ant.lib location=${ant.home}/lib/
property name=ant.jar location=${ant.home}/lib/ant.jar/
+ property name=ant-launcher.jar location=${ant.home}/lib/ant-launcher.jar/
property name=optional.jar location=${ant.home}/lib/optional.jar/
property name=ant-optional.jar location=${ant.home}/lib/ant-optional.jar/
@@ -837,11 +838,14 @@
/copy
copy tofile=${tomcat.build}/webapps/admin/WEB-INF/lib/ant.jar
file=${ant.jar}/
+copy tofile=${tomcat.build}/webapps/admin/WEB-INF/lib/ant-launcher.jar
+ file=${ant-launcher.jar}/
jar jarfile=${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar
basedir=${tomcat.build}/classes
include name=org/apache/tomcat/util/**/
/jar
javac srcdir=src/admin/WEB-INF/classes
+ debug=${debug}
optimize=${optimize}
destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
classpath
1.3 +2 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml
Index: watchdog-jsp.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- watchdog-jsp.xml 22 Sep 2001 02:53:51 - 1.2
+++ watchdog-jsp.xml 20 Feb 2004 03:55:03 - 1.3
@@ -16,6 +16,8 @@
pathelement
path=../lib/ant.jar /
pathelement
+ path=../lib/ant-launcher.jar /
+ pathelement
path=${stests.home}/WEB-INF/classes /
pathelement
path=${tomcat.home}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar /
1.7 +2 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml
Index: watchdog-servlet.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- watchdog-servlet.xml 17 Jul 2001 13:36:49 - 1.6
+++ watchdog-servlet.xml 20 Feb 2004 03:55:03 - 1.7
@@ -16,6 +16,8 @@
pathelement
path=../lib/ant.jar /
pathelement
+ path=../lib/ant-launcher.jar /
+ pathelement
path=${stests.home}/WEB-INF/classes /
pathelement
path=${tomcat.home}/lib/container/jaxp.jar /
1.8 +3 -3 jakarta-tomcat/src/admin/test/sanity-form.jsp
Index: sanity-form.jsp
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/sanity-form.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sanity-form.jsp 13 Jan 2002 03:32:01 - 1.7
+++ sanity-form.jsp 20 Feb 2004 03:55:03 - 1.8
@@ -29,7 +29,7 @@
curPort = String.valueOf(request.getServerPort());
String curProto = request.getParameter(server.proto);
if ( curProto == null )
- curProto = HTTP/1.0;
+ curProto = HTTP/1.1;
String webServer = request.getParameter(web.server);
if ( webServer == null )
webServer = Tomcat;
@@ -58,8 +58,8 @@
trtd valign=topExpected protocol:/td
td valign=topselect name=server.proto
% listOptions(protocols, curProto, out); %/select/td
-td valign=topSpecify HTTP/1.0 for Tomcat as the host web serverbr
-Specify HTTP/1.1 for others./td/tr
+td valign=topSpecify HTTP/1.0 for Tomcat when using deprecated HTTP 1.0
connector.br
+Specify HTTP/1.1 for Tomcat with new HTTP 1.1 connector and for other
servers./td/tr
trtd valign=topStatic Page Server: /td
td valign=topselect name=static.server
% listOptions(webservers, staticServer, out); %/select/td
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport build.xml
larryi 2004/02/11 08:24:14
Modified:proposals/JmxSupport build.xml
Log:
Include the jmxtools jar in the classpath so this add-on can build.
Revision ChangesPath
1.3 +1 -0 jakarta-tomcat/proposals/JmxSupport/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/proposals/JmxSupport/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 13 Oct 2003 09:45:05 - 1.2
+++ build.xml 11 Feb 2004 16:24:14 - 1.3
@@ -60,6 +60,7 @@
destdir=${tomcat.build.modules}/JmxSupport/WEB-INF/classes
classpath path=${tomcat.classes}/
classpath location=${jmx.jar}/
+ classpath location=${jmxtools.jar}/
classpath location=${commons-logging.jar}/
/javac
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java
larryi 2004/01/24 05:47:26 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java Log: Add missing defaults to reset() method. Revision ChangesPath 1.13 +7 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java Index: ConnectorForm.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ConnectorForm.java22 Jan 2004 02:39:33 - 1.12 +++ ConnectorForm.java24 Jan 2004 13:47:26 - 1.13 @@ -770,6 +770,9 @@ this.enableLookups = false; this.minProcessorsText = null; this.maxProcessorsText = null; +this.uriEncodingText = null; +this.useBodyEncodingForURI = false; +this.allowTrace = false; this.portText = null; this.redirectPortText = null; this.proxyName = null; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java
larryi 2004/01/24 05:48:04 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java Log: Add missing default to reset() method. Revision ChangesPath 1.7 +5 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java Index: ConnectorForm.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ConnectorForm.java22 Jan 2004 02:05:05 - 1.6 +++ ConnectorForm.java24 Jan 2004 13:48:04 - 1.7 @@ -1131,6 +1131,7 @@ this.minSpare = null; this.uriEncodingText = null; this.useBodyEncodingForURI = false; +this.allowTrace = false; this.portText = null; this.redirectPortText = null; this.proxyName = null; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/connector connector.jsp
larryi 2004/01/21 18:05:05 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties ApplicationResources_ja.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java webapps/admin/connector connector.jsp Log: Add support for URIEncoding, useBodyEncodingForURI, and allowTrace properties on the connector. Revision ChangesPath 1.19 +2 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ApplicationResources_en.properties20 Nov 2003 21:00:26 - 1.18 +++ ApplicationResources_en.properties22 Jan 2004 02:05:05 - 1.19 @@ -122,6 +122,8 @@ connector.connection.disableUploadTimeout=Disable Upload Timeout connector.enable.dns=Enable DNS Lookups connector.uriencoding=URI Encoding +connector.useBodyEncodingForURI=Use Body Encoding For URI Query Parameters +connector.allowTrace=Allow TRACE Method connector.address.ip=IP Address connector.redirect.portnumber=Redirect Port Number connector.min=Minimum 1.18 +5 -2 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ApplicationResources_es.properties17 Jan 2004 01:45:19 - 1.17 +++ ApplicationResources_es.properties22 Jan 2004 02:05:05 - 1.18 @@ -121,6 +121,9 @@ connector.default.buffer=Tamaño por defecto del Búfer connector.connection.disableUploadTimeout=Desactivar Tiempo de Espera de la Carga connector.enable.dns=Permitir Búsquedas en el DNS +connector.uriencoding=Codificación de URI +connector.useBodyEncodingForURI=Usar Codificación de Cuerpo (Body) para Parámetros de Consulta de URI +connector.allowTrace=Permitir Método de TRAZA connector.address.ip=Dirección IP connector.redirect.portnumber=Número del puerto de redireccionamiento connector.min=Mínimo @@ -164,7 +167,7 @@ context.path=Trayectoria context.reloadable=Recargable context.swallowOutput=Salida del Trago (Swallow) -context.usenaming=Utilice el Nombramiento (Naming) +context.usenaming=Utilizar el Nombramiento (Naming) context.workdir=Directorio de Trabajo context.loader.properties=Propiedades del cargador context.sessionmgr.properties=Propiedades del gestor de Sesión @@ -172,7 +175,7 @@ context.sessionId=Inicializador de la Identificación De la Sesión context.max.sessions=Máximas Sesiones Activas defaultcontext.properties=Propiedades de DefaultContext -error.context.directory=La base del documento no existe ni es un directorio legible +error.context.directory=La base del documento ni existe ni es un directorio legible error.docBase.required=liLa base del documento no puede ser nula/li error.path.required=liLa trayectoria no puede ser nula/li error.workDir.required=liEl directorio de trabajo no puede ser nulo/li 1.7 +2 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties Index: ApplicationResources_ja.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApplicationResources_ja.properties1 Dec 2003 21:34:00 - 1.6 +++ ApplicationResources_ja.properties22 Jan 2004 02:05:05 - 1.7 @@ -122,6 +122,8 @@ connector.connection.disableUploadTimeout=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306e\u7121\u52b9\u5316 connector.enable.dns=DNS\u306e\u30eb\u30c3\u30af\u30a2\u30c3\u30d7 connector.uriencoding=URI\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 +connector.useBodyEncodingForURI=URI\u30af\u30a8\u30ea\u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u30dc\u30c7\u30a3\u306e\u30a8\u30f3\u30b3\u30fc
cvs commit: jakarta-tomcat-catalina/catalina build.xml
larryi 2004/01/21 18:30:47
Modified:catalina build.xml
Log:
Try to fix some character corruption in non-English resource strings in the
nightly build.
Revision ChangesPath
1.57 +1 -1 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build.xml 6 Sep 2003 17:49:43 - 1.56
+++ build.xml 22 Jan 2004 02:30:47 - 1.57
@@ -611,7 +611,7 @@
!-- Copy static resource files --
filter token=VERSION value=${version}/
-copy todir=${classes.dir} filtering=true
+copy todir=${classes.dir} filtering=true encoding=ISO-8859-1
fileset dir=src/share
exclude name=**/*.java/
exclude name=**/*.ser/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml
larryi 2004/01/21 18:34:56 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml Log: Port the allowTrace flag from Tomcat 5. Revision ChangesPath 1.81 +5 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- mbeans-descriptors.xml12 Dec 2003 02:45:01 - 1.80 +++ mbeans-descriptors.xml22 Jan 2004 02:34:56 - 1.81 @@ -243,6 +243,10 @@ description=The IP address on which to bind type=java.lang.String/ +attribute name=allowTrace + description=Allow disabling TRACE method + type=boolean/ + attribute name=bufferSize description=The input buffer size we should create on input streams type=int/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
larryi 2004/01/21 18:39:33
Modified:webapps/admin build.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
ApplicationResources_ja.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java EditConnectorAction.java
SaveConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Add support for URIEncoding, useBodyEncodingForURI, and allowTrace
properties on the connector.
Fixed some broken Spanish translations in the
ApplicationResources_es.properties file.
Revision ChangesPath
1.7 +1 -1 jakarta-tomcat-4.0/webapps/admin/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 18 Aug 2003 23:54:26 - 1.6
+++ build.xml 22 Jan 2004 02:39:33 - 1.7
@@ -55,7 +55,7 @@
classpath=${jmx.jar} /
available property=modeler.present
classname=org.apache.commons.modeler.Registry
- classpath=${commons-modeler.jar}/
+ classpath=${commons-modeler.jar}:${jmx.jar}/
available property=regexp.present
classname=org.apache.regexp.RE
classpath=${regexp.jar} /
1.75 +2 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ApplicationResources_en.properties20 Nov 2003 20:59:56 - 1.74
+++ ApplicationResources_en.properties22 Jan 2004 02:39:33 - 1.75
@@ -117,6 +117,8 @@
connector.default.buffer=Default Buffer Size
connector.enable.dns=Enable DNS Lookups
connector.uriencoding=URI Encoding
+connector.useBodyEncodingForURI=Use Body Encoding For URI Query Parameters
+connector.allowTrace=Allow TRACE Method
connector.address.ip=IP Address
connector.redirect.portnumber=Redirect Port Number
connector.min=Minimum
1.63 +23 -20
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ApplicationResources_es.properties11 Feb 2003 02:27:15 - 1.62
+++ ApplicationResources_es.properties22 Jan 2004 02:39:33 - 1.63
@@ -21,15 +21,15 @@
sample.someText.required=li\u00abAlg\u00fan Texto\u00bb no puede estar
vac\u00edo/li
sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede estar
vac\u00edo/li
save.success=\u00a1Guardardo con \u00e9xito!
-server.portnumber=N\u00fmero de Puerto
+server.portnumber=N\u00famero de Puerto
server.debuglevel=Nivel de Depuraci\u00f3n
server.shutdown=Detener
server.properties=Propiedades
warning.header=centerh4font color=redAlerta!/font/h4/center ul
server.port.warning=liEl numero de acceso menos de 1024 requiere capacidades
especiales del software logica./li
-error.portNumber.required=liEl n\u00fmero del puerto no puede estar
vac\u00edo./li
-error.portNumber.format=liEl n\u00fmero del puerto no es un entero v\u00elido!
/li
-error.portNumber.range=liEl n\u00fmero del puerto esta fuera del rango. El rango
v\u00elido es 1-65535./li
+error.portNumber.required=liEl n\u00famero del puerto no puede estar
vac\u00edo./li
+error.portNumber.format=liEl n\u00famero del puerto no es un entero v\u00elido!
/li
+error.portNumber.range=liEl n\u00famero del puerto esta fuera del rango. El rango
v\u00elido es 1-65535./li
error.shutdownText.length=liLa longitud del texto para Detener debe ser de al
menos 6 caracteres!/li
error.engineName.required=liSe requiere el nombre del motor/li
error.acceptCountText.required=liAccept count required/li
@@ -42,19 +42,19 @@
error.bufferSizeText.format=liTama\u00f1o del Buffer no es un entero! /li
error.bufferSizeText.range=liTama\u00f1o del Buffer esta fuera del rango. El
rango v\u00elido es 1-8192. /li
error.address.invalid=liDirecci\u00f3n IP inv\u00elida/li
-error.redirectPortText.required=liN\u00fmero del puerto de
cvs commit: jakarta-tomcat-4.0/tester/web/WEB-INF web.xml
larryi 2004/01/21 18:44:18 Modified:tester/web/WEB-INF web.xml Log: Tester expects invoker to be enabled. Revision ChangesPath 1.59 +4 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- web.xml 28 Dec 2002 04:22:55 - 1.58 +++ web.xml 22 Jan 2004 02:44:17 - 1.59 @@ -1013,6 +1013,10 @@ !-- == Servlet Mappings == -- +servlet-mapping +servlet-nameinvoker/servlet-name +url-pattern/servlet/*/url-pattern +/servlet-mapping !-- Map CGI Gateway Service for this Web App -- !-- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/tester/web/golden JspDoc01.txt
larryi 2004/01/21 18:52:23 Modified:tester/web/golden JspDoc01.txt Log: Update the expected result. Note that the Tomcat 4.1 Jasper currently removes white space from within jsp:text tags in violation of the spec. This file is being updated with the correct response, causing this test to fail. I looked at porting the correct behavior from the Tomcat 5 Jasper, but too much had changed for me to feel comfortable attempting the port. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-4.0/tester/web/golden/JspDoc01.txt Index: JspDoc01.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/golden/JspDoc01.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JspDoc01.txt 11 Feb 2002 02:25:39 - 1.2 +++ JspDoc01.txt 22 Jan 2004 02:52:23 - 1.3 @@ -1 +1 @@ -atextb/b/aatextb/b/acdtext/d/ccdtext/d/cef/ftextf/f/eef/ftextf/f/e +atextb//aatextb/b/acdtext/d/ccdtext/d/cef/textf//eef/ftextf/f/e - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources LocalStrings_es.properties
larryi 2004/01/16 17:43:58
Modified:catalina/src/share/org/apache/catalina/authenticator
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/logger
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/realm
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/startup
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/util
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/valves
LocalStrings_es.properties
Added: catalina/src/share/org/apache/catalina/core
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/loader
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/security
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/servlets
LocalStrings_es.properties
catalina/src/share/org/apache/catalina/session
LocalStrings_es.properties
catalina/src/share/org/apache/coyote/tomcat5
LocalStrings_es.properties
catalina/src/share/org/apache/naming/resources
LocalStrings_es.properties
Log:
Updates and additions to Spanish translations.
Supplied by: Jesús Marín
Revision ChangesPath
1.3 +2 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_es.properties12 Jan 2004 19:59:05 - 1.2
+++ LocalStrings_es.properties17 Jan 2004 01:43:57 - 1.3
@@ -1,9 +1,4 @@
-# $Id$
-# language es
-# package org.apache.catalina.authenticator
-
-
-authenticator.alreadyStarted=El interceptor de seguridad ya ha sido iniciado
+authenticator.alreadyStarted=El interceptor de seguridad ya ha sido arrancado
authenticator.certificates=No hay cadena de certificados del cliente en esta
petición
authenticator.forbidden=El acceso al recurso pedido ha sido denegado
authenticator.formlogin=Referencia directa al formulario de conexión (página de
formulario de login) inválida
@@ -14,4 +9,4 @@
authenticator.notContext=Error de Configuración: Debe de estar unido a un Contexto
authenticator.notStarted=El Interceptor de seguridad no sido aún iniciado
authenticator.unauthorized=Imposible autenticar mediante las credenciales
suministradas
-authenticator.userDataConstraint=Esta petición viola una Restrición de usuario para
esta aplicación
+authenticator.userDataConstraint=Esta petición viola una Restrición de Datos de
usuario para esta aplicación
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
applicationContext.attributeEvent=Excepción lanzada por escuchador de eventos de
atributos
applicationContext.mapping.error=Error durante mapeo
applicationContext.requestDispatcher.iae=La Trayectoria {0} no comienza con carácter
/
applicationContext.setAttribute.namenull=El nombre no puede ser nulo
applicationDispatcher.allocateException=Excepción de reserva de espacio para servlet
{0}
applicationDispatcher.deallocateException=Excepción de recuperación de espacio para
servlet {0}
applicationDispatcher.forward.ise=No puedo reenviar después de que la respuesta se
haya llevado a cabo.
applicationDispatcher.forward.throw=El recurso reenviado lanzó un excepción
applicationDispatcher.include.throw=El recurso incluído lanzó una excepción
applicationDispatcher.isUnavailable=El Servlet {0} no está disponible en este momento
applicationDispatcher.serviceException=El Servlet.service() para servlet {0} lanzó
una excepción
applicationRequest.badParent=No puedo localizar la implementación de Requerimiento
padre
applicationRequest.badRequest=El requerimiento no es un
javax.servlet.ServletRequestWrapper
applicationResponse.badParent=No puedo localizar implementación de Respuesta padre
applicationResponse.badResponse=La Respuesta no es un
javax.servlet.ServletResponseWrapper
containerBase.addDefaultMapper=Excepción configurando mapeador por defecto de clase
{0}
containerBase.alreadyStarted=Ya ha sido arrancado el Contenedor {0}
containerBase.notConfigured=No se ha
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_es.properties
larryi 2004/01/16 17:45:19 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_es.properties Log: Updates and additions to Spanish translations. Supplied by: Jesús Marín Revision ChangesPath 1.17 +361 -357 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ApplicationResources_es.properties29 Aug 2003 19:09:36 - 1.16 +++ ApplicationResources_es.properties17 Jan 2004 01:45:19 - 1.17 @@ -1,67 +1,68 @@ -application.title=Configuraci\u00f3n del Servidor Tomcat -errors.header=h3font color=redError(es) de Validaci\u00f3n/font/h3Debe corregir el/los siguiente(s) error(es) antes de continuar:ul +application.title=Administración del Servidor Tomcat +errors.header=h3font color=redError(es) de Validación/font/h3Debe corregir el/los siguiente(s) error(es) antes de continuar:ul errors.footer=/ulhr -error.login=liNombre de usuario o contrase\u00f1a inv\u00e1lidos/li +error.login=liNombre de usuario o contraseña inválidos/li prompt.username=Nombre de Usuario -prompt.password=Contrase\u00f1a -button.login=Autenticar -button.reset=Reiniciar +prompt.password=Contraseña +button.login=Login +button.reset=Limpiar button.save=Guardar button.change=Cambiar -button.cancel=Reajuste -button.commit=Confie Cambiar -button.logout=Log Out -login.enter=Introduzca un nombre de usuario y una contrase\u00f1a para iniciar una nueva sesi\u00f3n +button.cancel=Cancelar +button.commit=Acometer Cambios +button.logout=Salir +login.enter=Introduzca un nombre de usuario y una contraseña para iniciar una nueva sesión login.changeLanguage=Cambio de idioma -error.login=Nombre de usuario o contrase\u00f1a inv\u00e1lidos -error.tryagain=Para intentar de nuevo, presione -error.here=aqu\u00ed -prompt.someText=Alg\u00fan Texto -prompt.moreText=M\u00e1s Texto -sample.someText.required=li\u00abAlg\u00fan Texto\u00bb no puede estar vac\u00edo/li -sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede estar vac\u00edo/li -save.success=\u00a1Guardardo con \u00e9xito! -server.portnumber=N\u00fmero de Puerto -server.debuglevel=Nivel de Depuraci\u00f3n -server.shutdown=Detener -server.properties=Propiedades -warning.header=centerh4font color=redAlerta!/font/h4/center ul -server.port.warning=liEl numero de acceso menos de 1024 requiere capacidades especiales del software logica./li -error.portNumber.required=liEl n\u00fmero del puerto no puede estar vac\u00edo./li -error.portNumber.format=liEl n\u00fmero del puerto no es un entero v\u00elido! /li -error.portNumber.range=liEl n\u00fmero del puerto esta fuera del rango. El rango v\u00elido es 1-65535./li -error.shutdownText.length=liLa longitud del texto para Detener debe ser de al menos 6 caracteres!/li -error.engineName.required=liSe requiere el nombre del motor/li -error.acceptCountText.required=liAccept count required/li -error.acceptCountText.format=liAccept count not a valid integer!/li -error.acceptCountText.range=liAccept count seems out of range. Valid range is 0-128. /li -error.connTimeOutText.required=liEl tiempo de espera de la conexi\u00f3n no puede estar vac\u00edo./li -error.connTimeOutText.format=liEl tiempo de espera de la conexi\u00f3n no es un entero v\u00elido! /li -error.connTimeOutText.range=liEl tiempo de espera de la conexi\u00f3n esta fuera de rango. El rango v\u00elido es 0-6. /li -error.bufferSizeText.required=liTama\u00f1o del Buffer requerido/li -error.bufferSizeText.format=liTama\u00f1o del Buffer no es un entero! /li -error.bufferSizeText.range=liTama\u00f1o del Buffer esta fuera del rango. El rango v\u00elido es 1-8192. /li -error.address.invalid=liDirecci\u00f3n IP inv\u00elida/li -error.redirectPortText.required=liN\u00fmero del puerto de redireccionamiento no puede estar vac\u00edo /li -error.redirectPortText.format=liN\u00fmero del puerto de redireccionamiento no es un entero v\u00elido! /li -error.redirectPortText.range=liN\u00fmero del puerto de redireccionamiento esta fuera de rango. El rango v\u00elido es 1-65535./li -error.minProcessorsText.required=liEl m\u00ednimo de procesadores no puede estar vac\u00edo/li -error.minProcessorsText.format=liM\u00ednimo de procesadores no es un entero v\u00elido!/li -error.minProcessorsText.range=liEl m\u00ednimo de procesadores esta fuera de rango. El rango v\u00elido es 1-512./li -error.maxProcessorsText.required=liEl m\u00eximo de procesadores no puede
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager LocalStrings_es.properties
larryi 2004/01/16 17:45:40
Added: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
LocalStrings_es.properties
Log:
Updates and additions to Spanish translations.
Supplied by: Jesús Marín
Revision ChangesPath
1.1
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
htmlManagerServlet.appsAvailable=Ejecutándose
htmlManagerServlet.appsName=Nombre a Mostrar
htmlManagerServlet.appsPath=Trayectoria
htmlManagerServlet.appsReload=Recargar
htmlManagerServlet.appsUndeploy=Replegar
htmlManagerServlet.appsSessions=Sesiones
htmlManagerServlet.appsStart=Arrancar
htmlManagerServlet.appsStop=Parar
htmlManagerServlet.appsTasks=Comandos
htmlManagerServlet.appsTitle=Aplicaciones
htmlManagerServlet.helpHtmlManager=Ayuda HTML de Gestor
htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html
htmlManagerServlet.helpManager=Ayuda de Gestor
htmlManagerServlet.helpManagerFile=manager-howto.html
htmlManagerServlet.deployButton=Desplegar
htmlManagerServlet.deployConfig=URL de archivo de Configuración XML:
htmlManagerServlet.deployPath=Trayectoria de Contexto (opcional):
htmlManagerServlet.deployServer=Desplegar directorio o archivo WAR localizado en
servidor
htmlManagerServlet.deployTitle=Desplegar
htmlManagerServlet.deployUpload=Archivo WAR a desplegar
htmlManagerServlet.deployUploadFail=FALLO - Falló Carga de Despliegue, Excepción: {0}
htmlManagerServlet.deployUploadFile=Seleccione archivo WAR a cargar
htmlManagerServlet.deployUploadNotWar=FALLO - El archivo cargado \{0}\ debe de ser
un .war
htmlManagerServlet.deployUploadNoFile=FALLO - Falló la carga de archivo, no hay
archivo
htmlManagerServlet.deployUploadWarExists=FALLO - El archivo war \{0}\ ya existe en
el servidor
htmlManagerServlet.deployWar=URL de WAR o Directorio:
htmlManagerServlet.list=Listar Aplicaciones
htmlManagerServlet.manager=Gestor
htmlManagerServlet.messageLabel=Mensaje:
htmlManagerServlet.serverJVMVendor=Vendedor JVM
htmlManagerServlet.serverJVMVersion=Versión JVM
htmlManagerServlet.serverOSArch=Arquitectura de SO
htmlManagerServlet.serverOSName=Nombre de SO
htmlManagerServlet.serverOSVersion=Versión de SO
htmlManagerServlet.serverTitle=Información de Servidor
htmlManagerServlet.serverVersion=Versión de Tomcat
htmlManagerServlet.title=Gestor de Aplicaciones Web de Tomcat
managerServlet.alreadyContext=FALLO - Ya existe la aplicación en la trayectoria {0}
managerServlet.alreadyDocBase=FALLO - Directorio {0} ya está siendo usado
managerServlet.cannotInvoke=No puedo invocar servlet de gestor a través de invocador
managerServlet.configured=OK - Desplegada aplicación desde archivo de contexto {0}
managerServlet.deployed=OK - Desplegada aplicación en trayectoria de contexto {0}
managerServlet.exception=FALLO - Encontrada excepción {0}
managerServlet.deployed=OK - Desplegada aplicación en trayectoria de contexto {0}
managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida de
contexto {0}
managerServlet.invalidWar=FALLO - Se ha especificado una URL de aplicación inválida
{0}
managerServlet.listed=OK - Aplicaciones listadas para máquinda virutal {0}
managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.noAppBase=FALLO - No puedo identificar aplicación base para
trayectoria de contexto {0}
managerServlet.noCommand=FALLO - No se ha especificado comando
managerServlet.noContext=FALLO - No existe contexto para trayectoria {0}
managerServlet.noDirectory=FALLO - Documento base No-directorio para trayectoria {0}
managerServlet.noDocBase=FALLO - No puedo replegar documento base para trayectoria
{0}
managerServlet.noGlobal=FALLO - No hay disponibles recursos globales JNDI
managerServlet.noReload=FALLO - Recarga no soportada en WAR desplegado en
trayectoria {0}
managerServlet.noRename=FALLO - No pudeo desplegar WAR cargado para trayectoria {0}
managerServlet.noRole=FALLO - El usuario no desempeña el papel de {0}
managerServlet.noSelf=FALLO - El gestor no puede recargarse, replegarse, pararse o
replegarse a sí mismo
managerServlet.noWrapper=El Contenedor no ha llamado a setWrapper() para este servlet
managerServlet.reloaded=OK - Recargada aplicación en trayectoria de contexto {0}
managerServlet.undeployd=OK - Replegada aplicación en trayectoria de contexto {0}
managerServlet.resourcesAll=OK - Listados recursos globales de todos los tipos
managerServlet.resourcesType=OK - Listados recursos globales de tipo {0}
managerServlet.rolesList=OK - Listados papeles de seguridad
managerServlet.saveFail=FAIL - Fallo al guardar la configuración: {0}
managerServlet.saved=OK - Configuración de Servidor guardada
managerServlet.savedContext=OK - Configuración de Contexto {0
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res LocalStrings_es.properties
larryi 2004/01/16 18:33:06
Modified:naming/src/org/apache/naming/res LocalStrings_es.properties
util/java/org/apache/tomcat/util/http/res
LocalStrings_es.properties
Added: coyote/src/java/org/apache/coyote/tomcat4
LocalStrings_es.properties
http11/src/java/org/apache/coyote/http11
LocalStrings_es.properties
jk/java/org/apache/ajp/tomcat4 LocalStrings_es.properties
util/java/org/apache/tomcat/util/net/jsse/res
LocalStrings_es.properties
util/java/org/apache/tomcat/util/net/res
LocalStrings_es.properties
util/java/org/apache/tomcat/util/threads/res
LocalStrings_es.properties
Log:
Updates and additions to Spanish translations.
Supplied by: Jesús Marín
Revision ChangesPath
1.1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
#
# CoyoteConnector
#
coyoteConnector.alreadyInitialized=Ya ha sido inicializado el conector
coyoteConnector.alreadyStarted=Ya ha sido arrancado el conector
coyoteConnector.notStarted=El conector Coyote no ha sido arrancado
coyoteConnector.protocolHandlerDestroyFailed=Falló la destrucción del manejador de
protocolo: {0}
coyoteConnector.protocolHandlerInitializationFailed=Falló la inicialización del
manejador de protocolo: {0}
coyoteConnector.protocolHandlerInstantiationFailed=Falló la instanciación del
manejador de protocolo: {0}
coyoteConnector.protocolHandlerStartFailed=Falló el arranque del manejador de
protocolo: {0}
#
# CoyoteAdapter
#
coyoteAdapter.service=Ha tenido lugar una excepción o error en el contenedor durante
el procesamiento del requerimiento
#
# CoyoteResponse
#
coyoteResponse.getOutputStream.ise=getWriter() ya ha sido llamado para esta respuesta
coyoteResponse.getWriter.ise=getOutputStream() ya ha sido llamado para esta respuesta
coyoteResponse.resetBuffer.ise=No puedo limpiar el búfer después de que la repuesta
ha sido llevada a cabo
coyoteResponse.sendError.ise=No puedo llamar a sendError() tras llevar a cabo la
respuesta
coyoteResponse.sendRedirect.ise=No puedo llamar a sendRedirect() tras llevar a cabo
la respuesta
coyoteResponse.setBufferSize.ise=No puedo cambiar la medida del búfer tras escribir
los datos
#
# CoyoteRequest
#
coyoteRequest.getInputStream.ise=getReader() ya ha sido llamado para este
requerimiento
coyoteRequest.getReader.ise=getInputStream() ya ha sido llamado para este
requerimiento
coyoteRequest.sessionCreateCommitted=No puedo crear una sesión después de llevar a
cabo la respueta
coyoteRequest.setAttribute.namenull=No pudeo llamar a setAttribute con un nombre nulo
1.1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
# $Id: LocalStrings_es.properties,v 1.1 2004/01/17 02:33:06 larryi Exp $
# language
# package org.apache.coyote.http11
#
# Http11Protocol
#
http11protocol.endpoint.initerror=Error inicializando punto final (endpoint)
http11protocol.endpoint.starterror=Error arrancando punto final (endpoint)
http11protocol.init=Inicializando Coyote HTTP/1.1 en puerto {0}
http11protocol.proto.error=Error leyendo requerimiento, ignorado
http11protocol.proto.ioexception.debug=IOException leyendo requerimiento
http11protocol.proto.ioexception.info=IOException leyendo requerimiento, ignorada
http11protocol.proto.socketexception.debug=SocketException leyendo requerimiento
http11protocol.proto.socketexception.info=SocketException leyendo requerimiento,
ignorada
http11protocol.getattribute=Atributo {0}
http11protocol.setattribute=Atributo {0}: {1}
http11protocol.socketfactory.initerror=Error inicializando fábrica de enchufes
(sockets)
http11protocol.start=Arrancando Coyote HTTP/1.1 en puerto {0}
#
# Http11Processor
#
#
# InternalInputBuffer
#
iib.eof.error=Inesperado Fin De Archivo (EOF) leído en el enchufe (socket)
iib.requestheadertoolarge.error=La cabecera del requerimiento es demasido grande
1.1
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
# $Id: LocalStrings_es.properties,v 1.1 2004/01/17 02:33:06 larryi Exp $
# language
# package org.apache.jk.ajp.tomcat4;
ajp13Connector.alreadyStarted=Ya ha sido arrancado el conector Ajp13
ajp13Connector.allAddresses=Abriendo enchufe
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_es.properties
larryi 2004/01/16 18:38:32
Modified:jasper2/src/share/org/apache/jasper/resources
messages_es.properties
Log:
Updates and additions to Spanish translations.
Supplied by: Jesús Marín
Revision ChangesPath
1.46 +320 -177
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- messages_es.properties4 Dec 2003 19:37:58 - 1.45
+++ messages_es.properties17 Jan 2004 02:38:32 - 1.46
@@ -3,14 +3,18 @@
# Default localized string information
# Localized para Locale es_ES
-jsp.error.bad.servlet.engine=¡Version incorrecta del motor servlet!
+jsp.error.bad.servlet.engine=¡Versión incorrecta del motor servlet!
jsp.error.no.scratch.dir=El motor JSP no tiene configurado un directorio de
trabajo.\
-\n Añada \jsp.initparams=scratchdir=dir-name\ \
+\n Añada \jsp.initparams=scratchdir=dir-name\ \
\n en el fichero servlets.properties para este contexto.
jsp.error.bad.scratch.dir=El directorio de trabajo especificado: {0} no es
utilizable.
jsp.message.scratch.dir.is=El directorio de trabajo para el motor JSP es: {0}
jsp.message.parent_class_loader_is=El cargador de clases es: {0}
jsp.message.dont.modify.servlets=IMPORTANTE: No modifique los servlets generados
+jsp.error.nojavac=\n\nNo se ha hallado compilador Java para compilar el fuente
generado para el JSP. \
+\nEsto se puede resolver normálmente copiando manuálmente $JAVA_HOME/lib/tools.jar
desde el JDK \
+\nal directorio common/lib del servidor Tomcat, seguido de un rearranque de Tomcat.
\
+\nSi usa un compilador Java alternativo, revise por favor su trayectoria de
instalación y de acceso.
jsp.error.not.impl.comments=Error Interno: Comments no implementado
jsp.error.not.impl.directives=Error Interno: Directives no implementado
jsp.error.not.impl.declarations=Error Interno: Declarations no implementado
@@ -22,90 +26,151 @@
jsp.error.not.impl.plugin=Error Interno: plugin no implementado
jsp.error.not.impl.forward=Error Interno: forward no implementado
jsp.error.not.impl.include=Error Interno: include no implementado
-jsp.error.classname=No puede determinar el nombre de clase desde el fichero .class
-jsp.warning.bad.type=Aviso: typo no valido en archivo .class
-jsp.error.data.file.write=Error mientras escribia el archivo de datos
-jsp.error.page.invalid.contenttype=Directiva Page: valor incorrecto para
contentType
-jsp.error.page.invalid.session=Directiva Page: valor incorrecto para session
-jsp.error.page.invalid.buffer=Directiva Page: valor incorrecto para buffer
-jsp.error.page.invalid.autoflush==Directiva Page: valor incorrecto para autoFlush
-jsp.error.page.invalid.isthreadsafe==Directiva Page: valor incorrecto para
isThreadSafe
-jsp.error.page.invalid.info==Directiva Page: valor incorrecto para info
-jsp.error.page.invalid.iserrorpage==Directiva Page: valor incorrecto para
isErrorPage
-jsp.error.page.defafterusar.language=Directiva Page: No puede define language
after a scriptlet
-jsp.error.page.nomapping.language=Directiva Page: No hay mapeado para language:
-jsp.error.page.bad_b_and_a_combo=Directiva Page: Combinacion ilegal de
buffer=\none\ y autoFlush=\false\
+jsp.error.unavailable=JSP ha sido marcado como no disponible
+jsp.error.usebean.missing.attribute=useBean: falta atributo id o está mal digitado
+jsp.error.usebean.missing.type=useBean ({0}): Se debe de especificar atributo class
o type:
+jsp.error.usebean.duplicate=useBean: Nombre de bean duplicado: {0}
+jsp.error.usebean.prohibited.as.session=No puedo usar como bean de sesión {0} ya
que está prohibido \
+por directiva jsp definida previamente:
+jsp.error.usebean.not.both=useBean: No puede especificar ambos atributos class y
beanName:
+jsp.error.usebean.bad.type.cast=useBean ({0}): Tipo ({1}) no es asignable desde
clase ({2})
+jsp.error.invalid.scope=Valor ilegal de atributo \'scope\': {0} (debe de ser uno de
\page\, \request\, \session\, o \application\)
+jsp.error.classname=No pude determinar el nombre de clase desde el fichero .class
+jsp.warning.bad.type=Aviso: tipo incorrecto en archivo .class
+jsp.error.data.file.write=Error mientras escribía el archivo de datos
+jsp.error.page.invalid.buffer=Directiva Page: medida de buffer inválida
+jsp.error.page.conflict.contenttype=Directiva Page: es ilegal tener múltiples
ocurrencias de 'contentType' con valores distintos (viejo: {0}, nuevo: {1})
+jsp.error.page.invalid.contenttype=Directiva Page: valor incorrecto para contentType
+jsp.error.page.conflict.session=Directiva Page: es
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_ja.properties
larryi 2004/01/14 05:01:00
Modified:jasper2/src/share/org/apache/jasper/resources
messages_ja.properties
Log:
Add Japanese strings.
Provided by Kazuhiro Kazama
Revision ChangesPath
1.49 +8 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- messages_ja.properties4 Dec 2003 19:37:58 - 1.48
+++ messages_ja.properties14 Jan 2004 13:01:00 - 1.49
@@ -65,6 +65,7 @@
jsp.error.page.invalid.iselignored=page\u6307\u793a\u5b50:
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
jsp.error.tag.invalid.iselignored=tag\u6307\u793a\u5b50:
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
jsp.error.page.multi.pageencoding=page\u6307\u793a\u5b50\u306f\u8907\u6570\u306epageencoding\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
+jsp.error.tag.conflict.attr=Tag\u6307\u793a\u5b50:
\u5c5e\u6027\{0}\\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u4e0d\u6b63\u3067\u3059
(\u65e7: {1}, \u65b0: {2})
jsp.error.tag.multi.pageencoding=tag\u6307\u793a\u5b50\u306f\u8907\u6570\u306epageencoding\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
jsp.error.page.bad_b_and_a_combo=page\u6307\u793a\u5b50:
buffer=\none\\u3068autoFlush=\false\\u3092\u540c\u6642\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
jsp.error.not.impl.taglib=\u5185\u90e8\u30a8\u30e9\u30fc:
\u30bf\u30b0\u62e1\u5f35\u5b50\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
@@ -112,7 +113,7 @@
jsp.error.include.badflush=jsp:include page=\...\ flush=\true\ \u306f\u3001JSP
1.0\u3067\u306e\u307f\u6709\u52b9\u306a\u7d44\u307f\u5408\u308f\u305b\u3067\u3059
jsp.error.attempt_to_clear_flushed_buffer=\u30a8\u30e9\u30fc:
\u65e2\u306b\u30d5\u30e9\u30c3\u30b7\u30e5\u3055\u308c\u3066\u3044\u308b\u30d0\u30c3\u30d5\u30a1\u3092\u30af\u30ea\u30a2\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f
jsp.error.overflow=\u30a8\u30e9\u30fc:
JSP\u30d0\u30c3\u30d5\u30a1\u304c\u30aa\u30fc\u30d0\u30fc\u30d5\u30ed\u30fc\u3057\u307e\u3057\u305f
-jsp.error.paramexpected=\name\\u5c5e\u6027 \u3068 \value\
\u5c5e\u6027\u3092\u6301\u3064 \param\ \u30bf\u30b0\u304c\u5fc5\u8981\u3067\u3059
+jsp.error.paramexpected=\name\\u5c5e\u6027 \u3068 \value\
\u5c5e\u6027\u3092\u6301\u3064 \jsp:param\
\u6a19\u6e96\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059
jsp.error.param.invalidUse=jsp:include\u3001jsp:forward\u3001\u53c8\u306fjsp:params\u8981\u7d20\u306e\u5916\u3067jsp:param\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
jsp.error.params.invalidUse=jsp:params\u306fjsp:plugin\u306e\u76f4\u63a5\u306e\u5b50\u4f9b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
jsp.error.fallback.invalidUse=jsp:fallback\u306fjsp:plugin\u306e\u76f4\u63a5\u306e\u5b50\u4f9b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
@@ -178,7 +179,7 @@
jsp.message.adding_jar=jar {0}
\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u8ffd\u52a0\u3057\u307e\u3059
jsp.message.compiling_with={0}
\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u4e2d\u3067\u3059
jsp.message.template_text=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c6\u30ad\u30b9\u30c8
-jsp.error.missing_attribute=TLD\u306b\u3088\u308b\u3068\u3001\u5c5e\u6027 {0}
\u306f\u30bf\u30b0 {1} \u306b\u306f\u5fc5\u9808\u3067\u3059
+jsp.error.missing_attribute=TLD\u53c8\u306f\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb\u306b\u3088\u308b\u3068\u3001\u5c5e\u6027
{0} \u306f\u30bf\u30b0 {1} \u306b\u306f\u5fc5\u9808\u3067\u3059
jsp.error.bad_attribute=TLD\u306b\u3088\u308b\u3068\u3001\u30bf\u30b0 {1}
\u306e\u5c5e\u6027 {0} \u306f\u7121\u52b9\u3067\u3059
jsp.error.tld.unable_to_read=JAR\u30d5\u30a1\u30a4\u30eb \{0}\ \u304b\u3089TLD
\{1}\ \u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093: {2}
jsp.error.tld.unable_to_get_jar=TLD\u3092\u542b\u3080JAR\u30ea\u30bd\u30fc\u30b9
\{0}\ \u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093 : {1}
@@ -291,7 +292,7 @@
jsp.error.invalid.javaEncoding=\u7121\u52b9\u306aJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059\u3002{0}\u3092\u8a66\u3057\u3066\u3001\u305d\u308c\u304b\u3089{1}\u3092\u8a66\u3057\u307e\u3057\u305f\u304c\u3001\u4e21\u65b9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
{0}
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session LocalStrings_ja.properties
larryi 2004/01/14 05:01:19
Modified:catalina/src/share/org/apache/catalina/core
LocalStrings_ja.properties
catalina/src/share/org/apache/catalina/session
LocalStrings_ja.properties
Log:
Add Japanese strings.
Provided by Kazuhiro Kazama
Revision ChangesPath
1.7 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings_ja.properties1 Dec 2003 21:33:59 - 1.6
+++ LocalStrings_ja.properties14 Jan 2004 13:01:19 - 1.7
@@ -65,6 +65,7 @@
standardContext.reloadingCompleted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f
standardContext.reloadingFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
standardContext.reloadingStarted=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u518d\u30ed\u30fc\u30c9\u3092\u958b\u59cb\u3057\u307e\u3057\u305f
+standardContext.resourcesStart=\u9759\u7684\u30ea\u30bd\u30fc\u30b9\u306e\u8d77\u52d5\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
standardContext.securityConstraint.pattern=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u5236\u7d04\u306e\u4e2d\u306b\u7121\u52b9\u306a
url-pattern {0} \u304c\u3042\u308a\u307e\u3059
standardContext.servletMap.name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d
{0} \u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059
standardContext.servletMap.pattern=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a
url-pattern {0} \u304c\u3042\u308a\u307e\u3059
1.5 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_ja.properties2 Sep 2003 14:09:46 - 1.4
+++ LocalStrings_ja.properties14 Jan 2004 13:01:19 - 1.5
@@ -6,6 +6,7 @@
fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb
{1} \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059
JDBCStore.alreadyStarted=JDBC\u30b9\u30c8\u30a2\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a {0}
\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
JDBCStore.notStarted=JDBC\u30b9\u30c8\u30a2\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u307e\u305b\u3093
JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059
JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1}
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java CoyoteRequest.java
larryi 2004/01/05 18:06:26
Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
CoyoteRequest.java
Log:
Port convertURI() method so URIEncoding setting has the desired effect.
Revision ChangesPath
1.25 +62 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CoyoteAdapter.java11 Dec 2003 21:35:24 - 1.24
+++ CoyoteAdapter.java6 Jan 2004 02:06:26 - 1.25
@@ -68,6 +68,7 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -220,7 +221,7 @@
*/
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
-throws IOException {
+throws Exception {
// XXX the processor needs to set a correct scheme and port prior to this
point,
// in ajp13 protocols dont make sense to get the port from the connector..
// XXX the processor may have set a correct scheme and port prior to this
point,
@@ -268,7 +269,6 @@
res.setMessage(Invalid URI);
throw ioe;
}
-req.decodedURI().setEncoding(UTF-8);
// Normalize decoded URI
if (!normalize(req.decodedURI())) {
@@ -277,6 +277,9 @@
throw new IOException(Invalid URI);
}
+// URI character decoding
+convertURI(req.decodedURI(), request);
+
// Parse session Id
parseSessionId(req, request);
@@ -293,6 +296,7 @@
// Redoing the URI decoding
req.decodedURI().duplicate(req.requestURI());
req.getURLDecoder().convert(req.decodedURI(), true);
+convertURI(req.decodedURI(), request);
}
}
@@ -512,6 +516,58 @@
// Return the normalized path that we have completed
return (normalized);
+
+}
+
+
+/**
+ * Character conversion of the URI.
+ */
+protected void convertURI(MessageBytes uri, CoyoteRequest request)
+throws Exception {
+
+ByteChunk bc = uri.getByteChunk();
+CharChunk cc = uri.getCharChunk();
+cc.allocate(bc.getLength(), -1);
+
+String enc = connector.getURIEncoding();
+if (enc != null) {
+B2CConverter conv = request.getURIConverter();
+try {
+if (conv == null) {
+conv = new B2CConverter(enc);
+request.setURIConverter(conv);
+} else {
+conv.recycle();
+}
+} catch (IOException e) {
+// Ignore
+log(Invalid URI encoding; using HTTP default, e);
+connector.setURIEncoding(null);
+}
+if (conv != null) {
+try {
+conv.convert(bc, cc);
+uri.setChars(cc.getBuffer(), cc.getStart(),
+ cc.getLength());
+return;
+} catch (IOException e) {
+if (debug = 1) {
+log(Invalid URI character encoding; trying ascii, e);
+}
+cc.recycle();
+}
+}
+}
+
+// Default encoding: fast conversion
+byte[] bbuf = bc.getBuffer();
+char[] cbuf = cc.getBuffer();
+int start = bc.getStart();
+for (int i = 0; i bc.getLength(); i++) {
+cbuf[i] = (char) (bbuf[i + start] 0xff);
+}
+uri.setChars(cbuf, 0, bc.getLength());
}
1.36 +27 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CoyoteRequest.java12 Dec 2003 02:44:34 - 1.35
+++ CoyoteRequest.java6 Jan 2004 02:06:26 - 1.36
@@ -110,6 +110,7 @@
import
cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester ErrorPage04.java
larryi 2004/01/05 18:21:29
Modified:tester/src/tester/org/apache/tester ErrorPage04.java
Log:
Port some changes to tester from Tomcat 5. These changes currently leave
just two failures.
1. The access to /examples/.. fails the first time tester is run since starting
Tomcat by returning 200. Subsequent runs of tester return the expected
302.
2. For the JspDoc1.jsp test, Jasper condenses a/a to a/ within
jsp:text tags, instead of preserving whitespace. Don't know how easy
it would be to port changes from Jasper HEAD. This commit includes
updating the JspDoc1.txt golden file to that found in the Tomcat 5 tester.
I believe this should be the expected result for JSP 1.2 too.
Revision ChangesPath
1.4 +7 -18
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java
Index: ErrorPage04.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorPage04.java 26 Apr 2001 16:39:13 - 1.3
+++ ErrorPage04.java 6 Jan 2004 02:21:29 - 1.4
@@ -82,33 +82,22 @@
// Accumulate all the reasons this request might fail
ServletException exception = null;
-Throwable rootCause = null;
StringBuffer sb = new StringBuffer();
Object value = null;
value = request.getAttribute(javax.servlet.error.exception);
if (value == null)
sb.append( exception is missing/);
-else if (!(value instanceof javax.servlet.ServletException)) {
+else if (!(value instanceof org.apache.tester.TesterException)) {
sb.append( exception class is );
sb.append(value.getClass().getName());
sb.append(/);
} else {
-exception = (ServletException) value;
-rootCause = exception.getRootCause();
-if (rootCause == null) {
-sb.append( rootCause is missing/);
-} else if (!(rootCause instanceof TesterException)) {
-sb.append( rootCause is );
-sb.append(rootCause.getClass().getName());
+TesterException te = (TesterException) value;
+if (!ErrorPage03 Threw Exception.equals(te.getMessage())) {
+sb.append( exception message is );
+sb.append(te.getMessage());
sb.append(/);
-} else {
-TesterException te = (TesterException) rootCause;
-if (!ErrorPage03 Threw Exception.equals(te.getMessage())) {
-sb.append( exception message is );
-sb.append(te.getMessage());
-sb.append(/);
-}
}
}
@@ -121,7 +110,7 @@
sb.append(/);
} else {
Class clazz = (Class) value;
-if (!javax.servlet.ServletException.equals(clazz.getName())) {
+if (!org.apache.tester.TesterException.equals(clazz.getName())) {
sb.append( exception_type class is );
sb.append(clazz.getName());
sb.append(/);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteRequest.java
larryi 2003/12/11 18:44:34
Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteRequest.java
Log:
Port Remy's update for the useBodyEncodingForURI attribute.
Revision ChangesPath
1.28 +32 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CoyoteConnector.java 19 Nov 2003 23:23:18 - 1.27
+++ CoyoteConnector.java 12 Dec 2003 02:44:34 - 1.28
@@ -357,6 +357,12 @@
private String URIEncoding = null;
+ /**
+ * URI encoding as body.
+ */
+ private boolean useBodyEncodingForURI = false;
+
+
// - Properties
@@ -972,6 +978,28 @@
public void setURIEncoding(String URIEncoding) {
this.URIEncoding = URIEncoding;
+
+ }
+
+
+ /**
+ * Return the true if the entity body encoding should be used for the URI.
+ */
+ public boolean getUseBodyEncodingForURI() {
+
+ return (this.useBodyEncodingForURI);
+
+ }
+
+
+ /**
+ * Set if the entity body encoding should be used for the URI.
+ *
+ * @param useBodyEncodingForURI The new value for the flag.
+ */
+ public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) {
+
+ this.useBodyEncodingForURI = useBodyEncodingForURI;
}
1.35 +14 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- CoyoteRequest.java11 Dec 2003 22:55:48 - 1.34
+++ CoyoteRequest.java12 Dec 2003 02:44:34 - 1.35
@@ -443,7 +443,7 @@
/**
* Associated Catalina connector.
*/
-protected Connector connector;
+protected CoyoteConnector connector;
/**
* Return the Connector through which this Request was received.
@@ -458,7 +458,7 @@
* @param connector The new connector
*/
public void setConnector(Connector connector) {
-this.connector = connector;
+this.connector = (CoyoteConnector) connector;
}
/**
@@ -1927,11 +1927,19 @@
Parameters parameters = coyoteRequest.getParameters();
String enc = coyoteRequest.getCharacterEncoding();
+boolean useBodyEncodingForURI = connector.getUseBodyEncodingForURI();
if (enc != null) {
parameters.setEncoding(enc);
+if (useBodyEncodingForURI) {
+parameters.setQueryStringEncoding(enc);
+}
} else {
parameters.setEncoding
(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
+if (useBodyEncodingForURI) {
+parameters.setQueryStringEncoding
+(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
+}
}
parameters.handleQueryParameters();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config coyote.xml jk2.xml
larryi 2003/12/11 18:45:01 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml webapps/tomcat-docs/config coyote.xml jk2.xml Log: Port Remy's update for the useBodyEncodingForURI attribute. Revision ChangesPath 1.80 +5 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- mbeans-descriptors.xml20 Nov 2003 10:10:55 - 1.79 +++ mbeans-descriptors.xml12 Dec 2003 02:45:01 - 1.80 @@ -331,6 +331,10 @@ description=Character encoding used to decode the URI type=java.lang.String/ +attribute name=useBodyEncodingForURI + description=Should the body encoding be used for URI query parameters + type=boolean/ + attributename=disableUploadTimeout description=Should Tomcat ignore setting a timeout for uploads? type=boolean/ 1.8 +8 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml Index: coyote.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- coyote.xml20 Nov 2003 15:14:57 - 1.7 +++ coyote.xml12 Dec 2003 02:45:01 - 1.8 @@ -100,6 +100,14 @@ /p /attribute +attribute name=useBodyEncodingForURI required=false + pThis specifies if the encoding specified in contentType should be used + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.27 and earlier. + The default value is codefalse/code. + /p +/attribute + /attributes /subsection 1.7 +14 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk2.xml Index: jk2.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk2.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk2.xml 17 Mar 2003 09:51:43 - 1.6 +++ jk2.xml 12 Dec 2003 02:45:01 - 1.7 @@ -82,6 +82,20 @@ SSL Connector). The default value is codefalse/code./p /attribute +attribute name=URIEncoding required=false + pThis specifies the character encoding used to decode the URI bytes, + after %xx decoding the URL. If not specified, ISO-8859-1 will be used. + /p +/attribute + +attribute name=useBodyEncodingForURI required=false + pThis specifies if the encoding specified in contentType should be used + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.27 and earlier. + The default value is codefalse/code. + /p +/attribute + /attributes /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 mbeans-descriptors.xml
larryi 2003/12/11 18:52:07 Modified:catalina/src/share/org/apache/coyote/tomcat5 mbeans-descriptors.xml Log: Make description a little more specific, since the topic of URI path parameters seems to be gaining popularity, at leat for the moment. Revision ChangesPath 1.11 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mbeans-descriptors.xml10 Dec 2003 22:26:28 - 1.10 +++ mbeans-descriptors.xml12 Dec 2003 02:52:07 - 1.11 @@ -174,7 +174,7 @@ type=java.lang.String/ attribute name=useBodyEncodingForURI - description=Should the body encoding be used for URI parameters + description=Should the body encoding be used for URI query parameters type=boolean/ attributename=xpoweredBy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
larryi 2003/12/11 18:52:27 Modified:webapps/docs/config ajp.xml http.xml Log: Make description a little more specific, since the topic of URI path parameters seems to be gaining popularity, at leat for the moment. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ajp.xml 10 Dec 2003 22:34:18 - 1.2 +++ ajp.xml 12 Dec 2003 02:52:26 - 1.3 @@ -86,7 +86,7 @@ attribute name=useBodyEncodingForURI required=false pThis specifies if the encoding specified in contentType should be used - for URI parameters, instead of using the URIEncoding. This setting is + for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x. The default value is codefalse/code. /p 1.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- http.xml 10 Dec 2003 22:34:18 - 1.2 +++ http.xml 12 Dec 2003 02:52:26 - 1.3 @@ -103,7 +103,7 @@ attribute name=useBodyEncodingForURI required=false pThis specifies if the encoding specified in contentType should be used - for URI parameters, instead of using the URIEncoding. This setting is + for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x. The default value is codefalse/code. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf ByteChunk.java
larryi 2003/12/05 16:50:08
Modified:util/java/org/apache/tomcat/util/buf ByteChunk.java
Log:
Port optimization from CharChunk to prevent needless allocation of byte
arrays.
Revision ChangesPath
1.16 +9 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java
Index: ByteChunk.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ByteChunk.java12 Sep 2003 12:58:53 - 1.15
+++ ByteChunk.java6 Dec 2003 00:50:08 - 1.16
@@ -324,6 +324,14 @@
return;
}
+// Optimize on a common case.
+// If the buffer is empty and the source is going to fill up all the
+// space in buffer, may as well write it directly to the output,
+// and avoid an extra copy
+if ( len == limit end == start) {
+out.realWriteBytes( src, off, len );
+return;
+}
// if we have limit and we're below
if( len = limit - end ) {
// makeSpace will grow the buffer to the limit,
@@ -452,7 +460,7 @@
// limit buf.length ( the buffer is already big )
// or we already have space XXX
- if( desiredSize buff.length ) {
+ if( desiredSize = buff.length ) {
return;
}
// grow in larger chunks
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_ja.properties
larryi 2003/12/01 13:34:00
Modified:catalina/src/share/org/apache/catalina/core
LocalStrings_ja.properties
catalina/src/share/org/apache/catalina/realm
LocalStrings_ja.properties
catalina/src/share/org/apache/catalina/valves
LocalStrings_ja.properties
catalina/src/share/org/apache/coyote/tomcat5
LocalStrings_ja.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_ja.properties
Log:
Update Japanese resource strings.
Submitted by: Kazuhiro Kazama
Revision ChangesPath
1.6 +3 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalStrings_ja.properties6 Oct 2003 16:00:46 - 1.5
+++ LocalStrings_ja.properties1 Dec 2003 21:33:59 - 1.6
@@ -121,9 +121,11 @@
standardHost.unfoundContext=\u30ea\u30af\u30a8\u30b9\u30c8URI {0}
\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
standardHost.warRequired=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6\u306eURL\u304c\u5fc5\u8981\u3067\u3059
standardHost.warURL=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306aURL\u3067\u3059:
{0}
+standardHost.validationEnabled=XML\u691c\u8a3c\u306f\u6709\u52b9\u3067\u3059
+standardHost.validationDisabled=XML\u691c\u8a3c\u306f\u7121\u52b9\u3067\u3059
standardPipeline.alreadyStarted=\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
standardPipeline.notStarted=\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-standardPipeline.noValve=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u4e2d\u306b\u3053\u308c\u4ee5\u4e0a\u306e\u30d0\u30eb\u30d6\u304c\u3042\u308a\u307e\u305b\u3093
+standardPipeline.noValve=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u4e2d\u306b\u3053\u308c\u4ee5\u4e0a\u306e\u30d0\u30eb\u30d6\u306f\u3042\u308a\u307e\u305b\u3093
standardServer.addContainer.ise=\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u95a2\u9023\u3065\u3051\u308b\u305f\u3081\u306e\u30b3\u30cd\u30af\u30bf\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093
standardServer.initialize.initialized=\u3053\u306e\u30b5\u30fc\u30d0\u306f\u65e2\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardServer.start.connectors=\u30b3\u30f3\u30c6\u30ca\u306b\u4e00\u3064\u3082\u30b3\u30cd\u30af\u30bf\u304c\u95a2\u9023\u3065\u3051\u3089\u308c\u3066\u3044\u307e\u305b\u3093
1.5 +2 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_ja.properties2 Sep 2003 14:09:46 - 1.4
+++ LocalStrings_ja.properties1 Dec 2003 21:33:59 - 1.5
@@ -9,6 +9,7 @@
jaasRealm.credentialExpired=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a3c\u660e\u66f8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
jaasRealm.failedLogin=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
jaasRealm.loginException=\u30e6\u30fc\u30b6\u540d {0}
\u306e\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+jaasRealm.unexpectedError=\u4e88\u6e2c\u3057\u306a\u3044\u30a8\u30e9\u30fc\u3067\u3059
jdbcRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
jdbcRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
jdbcRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
1.3 +13 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res LocalStrings_ja.properties
larryi 2003/12/01 13:36:35
Modified:util/java/org/apache/tomcat/util/net/res
LocalStrings_ja.properties
Added: util/java/org/apache/tomcat/util/net/jsse/res
LocalStrings_ja.properties
util/java/org/apache/tomcat/util/threads/res
LocalStrings_ja.properties
Log:
Add/update Japanese resource strings.
Submitted by: Kazuhiro Kazama
Revision ChangesPath
1.1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
jsse.alias_no_key_entry=\u5225\u540d {0}
\u306f\u30ad\u30fc\u30a8\u30f3\u30c8\u30ea\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093
1.3 +1 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_ja.properties4 Mar 2003 17:30:13 - 1.2
+++ LocalStrings_ja.properties1 Dec 2003 21:36:34 - 1.3
@@ -3,3 +3,4 @@
endpoint.err.nonfatal=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8 {0}
\u306f\u4f8b\u5916\u3092\u7121\u8996\u3057\u307e\u3057\u305f: {1}
endpoint.warn.reinit=ServerSocket\u3092\u518d\u521d\u671f\u5316\u3057\u307e\u3059
endpoint.warn.restart=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059
+endpoint.warn.security=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8 {0}
\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4f8b\u5916\u3067\u3059: {1}
1.1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
threadpool.busy=\u3059\u3079\u3066\u306e\u30b9\u30ec\u30c3\u30c9 ({0})
\u304c\u73fe\u5728\u7a3c\u50cd\u4e2d\u3067\u5f85\u6a5f\u3057\u3066\u3044\u307e\u3059\u3002maxThreads
({1})
\u3092\u5897\u3084\u3059\u304b\u3001\u305d\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
threadpool.max_threads_too_low=maxThreads\u306e\u8a2d\u5b9a ({0})
\u304c\u5c0f\u3055\u3059\u304e\u308b\u306e\u3067\u3001{1}\u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
threadpool.thread_error={1} \u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916 ({0})
\u3092\u30ad\u30e3\u30c3\u30c1\u3057\u305f\u306e\u3067\u3001\u30b9\u30ec\u30c3\u30c9\u3092\u7d42\u4e86\u3057\u307e\u3059
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_ja.properties
larryi 2003/12/01 13:37:44
Modified:jasper2/src/share/org/apache/jasper/resources
messages_ja.properties
Log:
Update Japanese resource strings.
Submitted by: Kazuhiro Kazama
Revision ChangesPath
1.47 +5 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- messages_ja.properties2 Sep 2003 14:12:04 - 1.46
+++ messages_ja.properties1 Dec 2003 21:37:43 - 1.47
@@ -147,6 +147,8 @@
jsp.warning.development=\u8b66\u544a: initParam
development\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\true\\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.fork=\u8b66\u544a: initParam
fork\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\true\\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.reloading=\u8b66\u544a: initParam
reloading\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\true\\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
+jsp.warning.dumpSmap=\u8b66\u544a: initParam
dumpSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\false\\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
+jsp.warning.genchararray=\u8b66\u544a: initParam
genStrAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\false\\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.suppressSmap=\u8b66\u544a: initParam
suppressSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\false\ \u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0}
\u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093: {1}
jsp.error.badGetReader=\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306f\u3001Reader\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
@@ -396,3 +398,5 @@
jsp.error.text.has_subelement=lt;jsp:textgt;
\u306f\u526f\u8981\u7d20\u3092\u6301\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
jsp.error.data.file.read=\u30d5\u30a1\u30a4\u30eb \{0}\
\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
jsp.error.prefix.refined=\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9 {0}
\u304c\u73fe\u5728\u306e\u30b9\u30b3\u30fc\u30d7\u4e2d\u3067\u65e2\u306b {2}
\u3068\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u306e\u3067 {1}
\u306b\u518d\u5b9a\u7fa9\u3057\u307e\u3057\u305f
+jsp.error.nested_jsproot=\u5165\u308c\u5b50\u306b\u306a\u3063\u305f
lt;jsp:rootgt; \u3067\u3059
+jsp.error.unbalanced.endtag=\u7d42\u4e86\u30bf\u30b0 \lt;/{0}\
\u306e\u5bfe\u5fdc\u304c\u53d6\u308c\u3066\u3044\u307e\u305b\u3093
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config coyote.xml
larryi 2003/11/20 07:14:57 Modified:webapps/tomcat-docs/config coyote.xml Log: Port documentation for new attribute and a correction. Revision ChangesPath 1.7 +7 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml Index: coyote.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- coyote.xml10 Feb 2003 19:36:58 - 1.6 +++ coyote.xml20 Nov 2003 15:14:57 - 1.7 @@ -94,6 +94,12 @@ SSL Connector). The default value is codefalse/code./p /attribute +attribute name=URIEncoding required=false + pThis specifies the character encoding used to decode the URI bytes, + after %xx decoding the URL. If not specified, ISO-8859-1 will be used. + /p +/attribute + /attributes /subsection @@ -137,7 +143,7 @@ specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to on or more aggressive, the output will also be compressed. If not specified, this - attribute is set to false./p + attribute is set to off./p /attribute attribute name=connectionLinger required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
larryi 2003/11/20 08:11:37
Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
Log:
Port Jan Luehe's patch to prevent setCharacterEncoding from changing
the encoding once it's too late.
Revision ChangesPath
1.31 +8 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- CoyoteRequest.java18 Sep 2003 16:13:51 - 1.30
+++ CoyoteRequest.java20 Nov 2003 16:11:37 - 1.31
@@ -1186,6 +1186,10 @@
public void setCharacterEncoding(String enc)
throws UnsupportedEncodingException {
+if (requestParametersParsed || usingReader || usingInputStream) {
+return;
+}
+
// Ensure that the specified encoding is valid
byte buffer[] = new byte[1];
buffer[0] = (byte) 'a';
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties
larryi 2003/11/20 12:59:57 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties Log: Adding string for new URIEncoding connector attribute. I have changes ready that add support for this attribute to the admin webapp. They won't be commited until the corresponding es and ja files are updated with this new string. Revision ChangesPath 1.74 +1 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- ApplicationResources_en.properties11 Feb 2003 02:27:15 - 1.73 +++ ApplicationResources_en.properties20 Nov 2003 20:59:56 - 1.74 @@ -116,6 +116,7 @@ connector.connection.timeout=Connection Timeout connector.default.buffer=Default Buffer Size connector.enable.dns=Enable DNS Lookups +connector.uriencoding=URI Encoding connector.address.ip=IP Address connector.redirect.portnumber=Redirect Port Number connector.min=Minimum - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties
larryi 2003/11/20 13:00:26 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties Log: Adding string for new URIEncoding connector attribute. I'm working on changes to the admin webapp to add support for this new attribute. I won't commit the changes until the corresponding es and ja files are updated with this new string. Revision ChangesPath 1.18 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ApplicationResources_en.properties29 Aug 2003 02:40:51 - 1.17 +++ ApplicationResources_en.properties20 Nov 2003 21:00:26 - 1.18 @@ -121,6 +121,7 @@ connector.default.buffer=Default Buffer Size connector.connection.disableUploadTimeout=Disable Upload Timeout connector.enable.dns=Enable DNS Lookups +connector.uriencoding=URI Encoding connector.address.ip=IP Address connector.redirect.portnumber=Redirect Port Number connector.min=Minimum - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
larryi 2003/11/20 13:13:41
Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
Log:
Reverting previous port, since it was reverted in Tomcat 5.
Revision ChangesPath
1.32 +4 -8
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- CoyoteRequest.java20 Nov 2003 16:11:37 - 1.31
+++ CoyoteRequest.java20 Nov 2003 21:13:40 - 1.32
@@ -1186,10 +1186,6 @@
public void setCharacterEncoding(String enc)
throws UnsupportedEncodingException {
-if (requestParametersParsed || usingReader || usingInputStream) {
-return;
-}
-
// Ensure that the specified encoding is valid
byte buffer[] = new byte[1];
buffer[0] = (byte) 'a';
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/10/01 19:50:59
Modified:.build.xml
Log:
Update to build using MAIN branch of JTC coyote and http11. The jars are
a little different from coyote_10 version.
Sync log4j detection property name.
Revision ChangesPath
1.197 +10 -4 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- build.xml 4 Aug 2003 23:30:44 - 1.196
+++ build.xml 2 Oct 2003 02:50:59 - 1.197
@@ -71,6 +71,7 @@
location=${jtc.util.build}/lib/tomcat-util.jar/
property name=jtc.coyote.home location=${jakarta-tomcat-connectors}/coyote/
+ property name=jtc.coyote.lib location=${jtc.coyote.home}/build/lib/
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
@@ -259,7 +260,7 @@
echo message=tomcat-util.jar is up to date/
/target
- target name=msg.log4j if=log4j.present
+ target name=msg.log4j if=log4j-present
echo message=Detected Log4j /
/target
@@ -405,7 +406,9 @@
ant dir=${jtc.http11.home} inheritAll=false
property name=util.home value=${jtc.util.home}/
+property name=commons-logging.jar value=${commons-logging.jar}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
+property name=jmx.jar value=${jmx.jar}/
/ant
ant dir=${jtc.jk.home} target=build-jk
@@ -689,11 +692,14 @@
copy tofile=${tomcat.build}/lib/common/tomcat33-resource.jar
file=${jtc.http11.lib}/tomcat33-resource.jar/
-copy tofile=${tomcat.build}/lib/container/tomcat-http11.jar
- file=${jtc.http11.lib}/tomcat-http11.jar/
+copy tofile=${tomcat.build}/lib/container/tomcat-coyote.jar
+ file=${jtc.coyote.lib}/tomcat-coyote.jar/
copy tofile=${tomcat.build}/lib/container/tomcat33-coyote.jar
- file=${jtc.http11.lib}/tomcat33-coyote.jar/
+ file=${jtc.coyote.lib}/tomcat33-coyote.jar/
+
+copy tofile=${tomcat.build}/lib/container/tomcat-http11.jar
+ file=${jtc.http11.lib}/tomcat-http11.jar/
copy todir=${tomcat.build}/lib/container
file=${jtc.jk.home}/build/lib/tomcat-jk2.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF/classes/dispatch ForwardPI.java
larryi 2003/10/01 19:52:03 Modified:src/tests/webpages/WEB-INF/classes/dispatch ForwardPI.java Log: Remove unneeded import. This allows building with Jdk1.4. Revision ChangesPath 1.2 +1 -3 jakarta-tomcat/src/tests/webpages/WEB-INF/classes/dispatch/ForwardPI.java Index: ForwardPI.java === RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/classes/dispatch/ForwardPI.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForwardPI.java26 Aug 2001 01:45:39 - 1.1 +++ ForwardPI.java2 Oct 2003 02:52:03 - 1.2 @@ -9,8 +9,6 @@ import javax.servlet.http.*; import java.io.*; -import RequestDump; - /** * Test FORWARD with a path info * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/08/04 16:30:45
Modified:.build.xml
Log:
Update to copy commons-logging-api.jar since JTC-util HEAD no longer
copies it.
Revision ChangesPath
1.196 +4 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- build.xml 7 Apr 2003 00:48:11 - 1.195
+++ build.xml 4 Aug 2003 23:30:44 - 1.196
@@ -456,12 +456,15 @@
/jar
!-- Add jakarta-tomcat-connectors utils --
-!-- Includes the tomcat-utils.jar and common-logging.jar --
copy todir=${tomcat.build}/lib/common
fileset dir=${jtc.util.build}/lib
include name=*.jar/
/fileset
/copy
+
+!-- Copy commons-logging-api.jar since tomcat-util depends on it --
+copy todir=${tomcat.build}/lib/common
+ file=${commons-logging.jar}/
!-- All tomcat3 specific utils --
jar jarfile=${tomcat.build}/lib/container/container_util.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2 build.xml
larryi 2003/03/04 06:46:46
Modified:jasper2 build.xml
Log:
Fix the dist target. It's looking like Gump will need it.
Revision ChangesPath
1.21 +1 -1 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 5 Feb 2003 08:43:02 - 1.20
+++ build.xml 4 Mar 2003 14:46:46 - 1.21
@@ -254,7 +254,7 @@
!-- Executable commands --
mkdir dir=${jasper.dist}/bin/
-copy dest=${jasper.dist}/bin
+copy todir=${jasper.dist}/bin
fileset dir=${jasper.build}/bin /
/copy
fixcrlf srcdir=${jasper.dist}/bin includes=*.sh eol=lf/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2 build.xml
larryi 2003/03/04 06:47:41
Modified:jasper2 Tag: tomcat_4_branch build.xml
Log:
Port patch from HEAD for dist target.
Revision ChangesPath
No revision
No revision
1.7.2.2 +1 -1 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- build.xml 30 Aug 2002 11:40:34 - 1.7.2.1
+++ build.xml 4 Mar 2003 14:47:41 - 1.7.2.2
@@ -215,7 +215,7 @@
!-- Executable commands --
mkdir dir=${jasper.dist}/bin/
-copy dest=${jasper.dist}/bin
+copy todir=${jasper.dist}/bin
fileset dir=${jasper.build}/bin /
/copy
fixcrlf srcdir=${jasper.dist}/bin includes=*.sh eol=lf/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java
larryi 2003/02/16 14:22:16
Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
Log:
If a trailing /. is being trimmed to /, rather that being removed, then a
trailing /foo/.. should have the same result.
Revision ChangesPath
1.20 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
Index: DecodeInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DecodeInterceptor.java26 Jan 2003 03:06:43 - 1.19
+++ DecodeInterceptor.java16 Feb 2003 22:22:16 - 1.20
@@ -289,7 +289,7 @@
buff[end-1]=='.'
buff[end-2]=='.'
buff[end-3]=='/' ) {
- end-=4;
+ end-=3;
if(end start) {
end = start;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml
larryi 2003/02/16 14:23:08 Modified:src/tests/webpages/WEB-INF test-tomcat.xml Log: Update test to reflect new behavior for trailing /. and /foo/... Revision ChangesPath 1.54 +3 -6 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml Index: test-tomcat.xml === RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- test-tomcat.xml 27 Apr 2002 01:44:11 - 1.53 +++ test-tomcat.xml 16 Feb 2003 22:23:08 - 1.54 @@ -1252,15 +1252,12 @@ httpClient unless=not.standalone httpRequest path=/test/jsp/ShowPathInfo.jsp/. method=GET / - httpStatusMatch match=200/ - responseMatch match=getRequestURI: /test/jsp/ShowPathInfo.jsp/ + httpStatusMatch match=404/ /httpClient httpClient unless=not.standalone httpRequest path=/test/jsp/ShowPathInfo.jsp/foo/.. method=GET / - httpStatusMatch match=200/ - responseMatch match=getRequestURI: /test/jsp/ShowPathInfo.jsp/ - responseMatch match=getPathInfo: null/ + httpStatusMatch match=404/ /httpClient httpClient httpRequest path=/test/ShowPathInfo.jsp/./ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers SessionMatch.java
larryi 2003/02/16 15:18:50
Modified:src/share/org/apache/tomcat/util/test HttpClient.java
src/share/org/apache/tomcat/util/test/matchers
SessionMatch.java
Log:
Add some session handling ability.
Revision ChangesPath
1.11 +3 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java
Index: HttpClient.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpClient.java 22 Sep 2001 21:10:50 - 1.10
+++ HttpClient.java 16 Feb 2003 23:18:50 - 1.11
@@ -188,6 +188,9 @@
public void addResponseMatchFile( ResponseMatchFile m ) {
addMatcher( m );
}
+public void addSessionMatch( SessionMatch m ) {
+addMatcher( m );
+}
// Access to the actions
1.3 +24 -2
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/SessionMatch.java
Index: SessionMatch.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/SessionMatch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionMatch.java 22 Sep 2001 21:10:50 - 1.2
+++ SessionMatch.java 16 Feb 2003 23:18:50 - 1.3
@@ -69,6 +69,7 @@
public class SessionMatch extends Matcher {
String id;
String cookieName=JSESSIONID;
+String property;
public SessionMatch() {
}
@@ -83,6 +84,10 @@
id=v;
}
+public void setProperty(String prop) {
+property = prop;
+}
+
public String getTestDescription() {
return Session extract;
}
@@ -105,7 +110,24 @@
{
Hashtable headers=response.getHeaders();
- Header resH=(Header)headers.get(Cookie);
+Header resH=(Header)headers.get(Set-Cookie);
+if (null != resH) {
+String temp = resH.getValue();
+if (null != temp) {
+int begin = temp.indexOf(JSESSIONID);
+if (begin = 0) {
+if (null != property) {
+int end = temp.indexOf(;,begin);
+if (end = 0) {
+temp = temp.substring(begin,end);
+} else {
+temp = temp.substring(begin);
+}
+client.getProject().setUserProperty(property,temp);
+}
+result = true;
+}
+}
+}
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/etc server.xml
larryi 2003/02/16 15:21:18 Modified:src/etc server.xml Log: Doing MxInterceptor as an add-on. Revision ChangesPath 1.100 +0 -27 jakarta-tomcat/src/etc/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- server.xml19 Sep 2002 11:14:30 - 1.99 +++ server.xml16 Feb 2003 23:21:18 - 1.100 @@ -69,33 +69,6 @@ Jdk12Interceptor / - !-- Use MxInterceptor to enable JMX monitoring. - -options are : - -port : http adaptor will listen to this port - -If you're using the MX4J HTTP Adaptor, you could also -set host and authentication : - -host : the MX4J http adaptor will listen to this IP/host - -authentication: the MX4J http adaptor will use HTTP authentification -method which could be (none, basic, digest) - -user: set the user to be entered when asking for user/password in - HTTP authentification. - -password : define the password for HTTP authentification - -Note, if you're using a JMX console, you don't have to -use the http adaptor - -MxInterceptor port=8999 authentification=basic - user=admin password=changeillico/ - - -- - !-- Non-standard invoker, for backward compat. ( /servlet/* ) -- InvokerInterceptor / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/webpages/WEB-INF/classes SnoopServlet.java
larryi 2003/02/16 17:39:43 Removed: src/webpages/WEB-INF/classes SnoopServlet.java Log: Rather that fix for cross site scripting, remove since there is a duplicate in the examples webapp. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Cookies.java
larryi 2003/02/16 17:40:55
Modified:util/java/org/apache/tomcat/util/http Cookies.java
Log:
Fix to return values instead of the names.
Revision ChangesPath
1.3 +3 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cookies.java 31 Dec 2001 18:20:05 - 1.2
+++ Cookies.java 17 Feb 2003 01:40:55 - 1.3
@@ -321,13 +321,13 @@
continue;
}
if( equals( $Path, bytes, startName, endName ) ) {
- sc.getPath().setBytes( bytes, startName, endName-startName );
+ sc.getPath().setBytes( bytes, startValue, endValue-startValue );
}
if( equals( $Domain, bytes, startName, endName ) ) {
- sc.getDomain().setBytes( bytes, startName, endName-startName );
+ sc.getDomain().setBytes( bytes, startValue, endValue-startValue );
}
if( equals( $Port, bytes, startName, endName ) ) {
- // sc.getPort().setBytes( bytes, startName, endName-startName );
+ // sc.getPort().setBytes( bytes, startValue, endValue-startValue );
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Cookies.java
larryi 2003/02/16 17:45:24
Modified:util/java/org/apache/tomcat/util/http Tag: coyote_10
Cookies.java
Log:
Port fix from HEAD.
Revision ChangesPath
No revision
No revision
1.2.2.1 +3 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Cookies.java 31 Dec 2001 18:20:05 - 1.2
+++ Cookies.java 17 Feb 2003 01:45:24 - 1.2.2.1
@@ -321,13 +321,13 @@
continue;
}
if( equals( $Path, bytes, startName, endName ) ) {
- sc.getPath().setBytes( bytes, startName, endName-startName );
+sc.getPath().setBytes( bytes, startValue, endValue-startValue );
}
if( equals( $Domain, bytes, startName, endName ) ) {
- sc.getDomain().setBytes( bytes, startName, endName-startName );
+sc.getDomain().setBytes( bytes, startValue, endValue-startValue );
}
if( equals( $Port, bytes, startName, endName ) ) {
- // sc.getPort().setBytes( bytes, startName, endName-startName );
+// sc.getPort().setBytes( bytes, startValue, endValue-startValue );
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2003/02/16 17:47:36
Modified:coyote build.xml
Log:
Allow some independence from the version of util.
Revision ChangesPath
1.21 +6 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 17 Feb 2003 01:03:49 - 1.20
+++ build.xml 17 Feb 2003 01:47:36 - 1.21
@@ -21,6 +21,9 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+
!-- == Derived Values --
@@ -81,7 +84,7 @@
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
pathelement location=${jmx.jar}/
@@ -91,7 +94,7 @@
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${tomcat33.home}/lib/container/container_util.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2003/02/16 17:48:08
Modified:coyote Tag: coyote_10 build.xml
Log:
Allow some independence from the version of util.
Revision ChangesPath
No revision
No revision
1.16.2.1 +6 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- build.xml 11 Jan 2003 00:03:01 - 1.16
+++ build.xml 17 Feb 2003 01:48:08 - 1.16.2.1
@@ -21,6 +21,9 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+
!-- == Derived Values --
@@ -77,7 +80,7 @@
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${jmx.jar}/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
@@ -85,7 +88,7 @@
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${tomcat33.home}/lib/container/container_util.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
larryi 2003/02/16 17:49:12
Modified:http11 build.xml
Log:
Allow some independence from the version of util, and coyote if desired.
Revision ChangesPath
1.11 +8 -4 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 16 Jan 2003 22:29:51 - 1.10
+++ build.xml 17 Feb 2003 01:49:12 - 1.11
@@ -21,15 +21,19 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+ property name=coyote.home value=../coyote/
+
!-- == Derived Values --
!-- The locations of necessary jar files --
- property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
- property name=tomcat-coyote.jar value=../coyote/build/lib/tomcat-coyote.jar/
+ property name=tomcat-util.jar value=${util.home}/build/lib/tomcat-util.jar/
+ property name=tomcat-coyote.jar
value=${coyote.home}/build/lib/tomcat-coyote.jar/
property name=tomcat33-coyote.jar
- value=../coyote/build/lib/tomcat33-coyote.jar/
+ value=${coyote.home}/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
property name=jmx.jar location=../lib/mx4j.jar /
property name=commons-modeler.jar
location=../../jakarta-commons/modeler/dist/commons-modeler.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
larryi 2003/02/16 17:50:02
Modified:http11 Tag: coyote_10 build.xml
Log:
Allow some independence from the version of util, and coyote if desired.
Revision ChangesPath
No revision
No revision
1.9.2.1 +8 -4 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- build.xml 13 Nov 2002 00:14:25 - 1.9
+++ build.xml 17 Feb 2003 01:50:02 - 1.9.2.1
@@ -21,15 +21,19 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+ property name=coyote.home value=../coyote/
+
!-- == Derived Values --
!-- The locations of necessary jar files --
- property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
- property name=tomcat-coyote.jar value=../coyote/build/lib/tomcat-coyote.jar/
+ property name=tomcat-util.jar value=${util.home}/build/lib/tomcat-util.jar/
+ property name=tomcat-coyote.jar
value=${coyote.home}/build/lib/tomcat-coyote.jar/
property name=tomcat33-coyote.jar
- value=../coyote/build/lib/tomcat33-coyote.jar/
+ value=${coyote.home}/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
property name=commons-logging.jar value=../lib/commons-logging.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3 Tomcat3Response.java
larryi 2003/02/16 17:54:00
Modified:coyote/src/java/org/apache/coyote/tomcat3
Tomcat3Response.java
Log:
Add overrides to keep Tomcat's and Coyote's local and
Revision ChangesPath
1.7 +24 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java
Index: Tomcat3Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Tomcat3Response.java 4 Jun 2002 03:09:56 - 1.6
+++ Tomcat3Response.java 17 Feb 2003 01:54:00 - 1.7
@@ -175,4 +175,28 @@
coyoteResponse.acknowledge();
acknowledged=true;
}
+
+public void setLocale(Locale locale) {
+if (locale == null || included) {
+return; // throw an exception?
+}
+this.locale = locale;
+coyoteResponse.setLocale(locale);
+contentLanguage = coyoteResponse.getContentLanguage();
+// maintain Tomcat 3.3 behavior by setting the header too
+// and by not trying to guess the characterEncoding
+headers.setValue(Content-Language).setString(contentLanguage);
+}
+
+public void setContentType(String contentType) {
+if (included) {
+return;
+}
+coyoteResponse.setContentType(contentType);
+this.contentType = coyoteResponse.getContentType();
+this.characterEncoding = coyoteResponse.getCharacterEncoding();
+// maintain Tomcat 3.3 behavior by setting the header too
+headers.setValue(Content-Type).setString(contentType);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3 Tomcat3Response.java
larryi 2003/02/16 17:57:10
Modified:coyote/src/java/org/apache/coyote/tomcat3 Tag: coyote_10
Tomcat3Response.java
Log:
Port fix from HEAD. Add overrides to keep Tomcat's and Coyote's local and
content type in sync.
This time with full commit comment.
Revision ChangesPath
No revision
No revision
1.6.2.1 +24 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java
Index: Tomcat3Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Tomcat3Response.java 4 Jun 2002 03:09:56 - 1.6
+++ Tomcat3Response.java 17 Feb 2003 01:57:10 - 1.6.2.1
@@ -175,4 +175,28 @@
coyoteResponse.acknowledge();
acknowledged=true;
}
+
+public void setLocale(Locale locale) {
+if (locale == null || included) {
+return; // throw an exception?
+}
+this.locale = locale;
+coyoteResponse.setLocale(locale);
+contentLanguage = coyoteResponse.getContentLanguage();
+// maintain Tomcat 3.3 behavior by setting the header too
+// and by not trying to guess the characterEncoding
+headers.setValue(Content-Language).setString(contentLanguage);
+}
+
+public void setContentType(String contentType) {
+if (included) {
+return;
+}
+coyoteResponse.setContentType(contentType);
+this.contentType = coyoteResponse.getContentType();
+this.characterEncoding = coyoteResponse.getCharacterEncoding();
+// maintain Tomcat 3.3 behavior by setting the header too
+headers.setValue(Content-Type).setString(contentType);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/02/16 17:59:03
Modified:.build.xml
Log:
Update to allow independent control over location of util, coyote, and
http11 locations.
Revision ChangesPath
1.193 +17 -11jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- build.xml 26 Jan 2003 03:05:31 - 1.192
+++ build.xml 17 Feb 2003 01:59:02 - 1.193
@@ -70,6 +70,13 @@
property name=tomcat-util.jar
location=${jtc.util.build}/lib/tomcat-util.jar/
+ property name=jtc.coyote.home location=${jakarta-tomcat-connectors}/coyote/
+
+ property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
+ property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
+
+ property name=jtc.jk.home location=${jakarta-tomcat-connectors}/jk/
+
property name=jsse.home location=${install.dir}/jsse1.0.2/
property name=jsse.lib location=${jsse.home}/lib/
property name=jsse.jar location=${jsse.lib}/jsse.jar/
@@ -100,9 +107,6 @@
property name=commons-modeler.lib location=${commons-modeler.home} /
property name=commons-modeler.jar
location=${commons-modeler.lib}/commons-modeler.jar /
- property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
- property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
-
property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
@@ -382,19 +386,21 @@
target name=dep.tomcat-util unless=tomcat-util.is.uptodate
description=Build j-t-c util which we depend on. To be called before
main
-ant dir=${jakarta-tomcat-connectors}/util /
+ant dir=${jtc.util.home} /
/target
target name=deps description=Build repositoried that depends on. To be called
before main
-ant dir=${jakarta-tomcat-connectors}/coyote
+ant dir=${jtc.coyote.home}
property name=tomcat33.home value=${tomcat.build}/
+property name=util.home value=${jtc.util.home}/
/ant
-ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false
+ant dir=${jtc.http11.home} inheritAll=false
+property name=util.home value=${jtc.util.home}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
/ant
-ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
+ant dir=${jtc.jk.home} target=build-jk
property name=tomcat33.home value=${tomcat.build}/
property name=servlet-api.jar value=${basedir}/${servlet22.jar}/
/ant
@@ -444,7 +450,7 @@
!-- Add jakarta-tomcat-connectors utils --
!-- Includes the tomcat-utils.jar and common-logging.jar --
copy todir=${tomcat.build}/lib/common
- fileset dir=${jakarta-tomcat-connectors}/util/build/lib
+ fileset dir=${jtc.util.build}/lib
include name=*.jar/
/fileset
/copy
@@ -665,7 +671,7 @@
!-- This can't be compiled while j-t-c is built - tomcat is built
after, so files depending on 3.3 are ignored --
-ant dir=${jakarta-tomcat-connectors}/coyote target=compile.tomcat33
+ant dir=${jtc.coyote.home} target=compile.tomcat33
property name=tomcat33.home value=${tomcat.build}/
/ant
@@ -679,10 +685,10 @@
file=${jtc.http11.lib}/tomcat33-coyote.jar/
copy todir=${tomcat.build}/lib/container
- file=${jakarta-tomcat-connectors}/jk/build/lib/tomcat-jk2.jar/
+ file=${jtc.jk.home}/build/lib/tomcat-jk2.jar/
copy todir=${tomcat.build}/conf
- file=${jakarta-tomcat-connectors}/jk/conf/jk2.properties/
+ file=${jtc.jk.home}/conf/jk2.properties/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/02/16 19:12:05
Modified:.build.xml
Log:
Remove task to build SnoopServlet removed from ROOT webapp
Revision ChangesPath
1.194 +0 -4 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- build.xml 17 Feb 2003 01:59:02 - 1.193
+++ build.xml 17 Feb 2003 03:12:05 - 1.194
@@ -800,10 +800,6 @@
copy todir=${tomcat.build}/webapps/ROOT/doc
fileset dir=src/doc/
/copy
-javac srcdir=src/webpages/WEB-INF/classes
- optimize=${optimize}
- destdir=${tomcat.build}/webapps/ROOT/WEB-INF/classes
- classpath=${tomcat.build}/classes;${servlet22.jar}/
!-- admin context --
mkdir dir=${tomcat.build}/webapps/admin/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
larryi 2003/01/25 19:00:23
Modified:jk build.xml
Log:
Allow servlet-api.jar location to be more flexible
Revision ChangesPath
1.64 +2 -1 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build.xml 20 Jan 2003 23:57:58 - 1.63
+++ build.xml 26 Jan 2003 03:00:23 - 1.64
@@ -34,6 +34,7 @@
property name=coyote.home
location=../coyote/build /
property name=tomcat-coyote.jar
location=${coyote.home}/lib/tomcat-coyote.jar /
+property name=servlet-api.jar
location=${tomcat5.home}/common/lib/servlet-api.jar /
property name=commons-logging.jar location=../lib/commons-logging.jar /
property name=tomcat-util.jar location=../util/build/lib/tomcat-util.jar /
@@ -53,11 +54,11 @@
fileset dir=../lib includes=*.jar /
pathelement location=../util/build/classes/
pathelement location=${tomcat5.home}/server/lib/catalina.jar/
-pathelement location=${tomcat5.home}/common/lib/servlet-api.jar/
pathelement location=${tomcat41.home}/server/lib/catalina.jar/
pathelement location=${tomcat40.home}/server/lib/catalina.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
pathelement location=${tomcat33.home}/lib/common/core_util.jar/
+pathelement location=${servlet-api.jar}/
pathelement location=${tomcat-util.jar} /
pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/01/25 19:05:33
Modified:.build.xml
Log:
Update commons-logging default version and add commons-modeler
properties. Pass commons-modeler to http11 build.
Update tomcat-ant.jar build to use one jar task. I had strange rename
problems in my gump build on WinXP when using two jar tasks.
Revision ChangesPath
1.192 +17 -10jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- build.xml 22 Oct 2002 06:57:29 - 1.191
+++ build.xml 26 Jan 2003 03:05:31 - 1.192
@@ -88,7 +88,7 @@
property name=commons-pool.lib location=${commons-pool.home}/dist/
property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
- property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.1 /
+ property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.2 /
property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
@@ -96,6 +96,10 @@
property name=commons-collections.lib
location=${commons-collections.home}/dist/
property name=commons-collections.jar
location=${commons-collections.lib}/commons-collections.jar/
+ property name=commons-modeler.home
location=${jakarta-commons}/commons-modeler-1.0 /
+ property name=commons-modeler.lib location=${commons-modeler.home} /
+ property name=commons-modeler.jar
location=${commons-modeler.lib}/commons-modeler.jar /
+
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
@@ -386,10 +390,13 @@
property name=tomcat33.home value=${tomcat.build}/
/ant
-ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false /
+ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false
+property name=commons-modeler.jar value=${commons-modeler.jar}/
+/ant
ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
property name=tomcat33.home value=${tomcat.build}/
+property name=servlet-api.jar value=${basedir}/${servlet22.jar}/
/ant
/target
@@ -743,14 +750,14 @@
/classpath
/javac
mkdir dir=${tomcat.build}/ant /
-jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
- basedir=${tomcat.build}/classes
- include name=org/apache/tomcat/ant/*.class /
-/jar
-jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
- basedir=src/share/org/apache/tomcat/ant
- update=yes
- include name=META-INF/*.properties /
+
+jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
+fileset dir=${tomcat.build}/classes
+include name=org/apache/tomcat/ant/*.class/
+/fileset
+fileset dir=src/share/org/apache/tomcat/ant
+include name=META-INF/*.properties/
+/fileset
/jar
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java
larryi 2003/01/25 19:06:43
Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
Log:
Treat the presence of null characters in the URL path as unsafe.
Revision ChangesPath
1.19 +4 -0
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
Index: DecodeInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DecodeInterceptor.java14 Oct 2002 05:20:17 - 1.18
+++ DecodeInterceptor.java26 Jan 2003 03:06:43 - 1.19
@@ -442,6 +442,10 @@
if( pathMB.indexOfIgnoreCase(%5C,start) = 0 )
return false;
}
+if (pathMB.indexOf('\0') = 0)
+{
+return false;
+}
return true;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.2.txt
larryi 2003/01/25 19:16:30 Modified:.RELEASE-NOTES-3.3.2.txt Log: Add update made to DecodeInterceptor Revision ChangesPath 1.17 +4 -1 jakarta-tomcat/RELEASE-NOTES-3.3.2.txt Index: RELEASE-NOTES-3.3.2.txt === RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.2.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- RELEASE-NOTES-3.3.2.txt 10 Jan 2003 07:21:38 - 1.16 +++ RELEASE-NOTES-3.3.2.txt 26 Jan 2003 03:16:30 - 1.17 @@ -67,6 +67,9 @@ 15894 Fix race condition on reusing Sessions. + Updated DecodeInterceptor to treat URL paths containing null + characters as unsafe. + Jasper: Bug No. Description -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs news.xml
larryi 2003/01/25 19:56:11 Modified:xdocsnews.xml Log: Add note about Tomcat 3.3.1a security update Revision ChangesPath 1.26 +15 -0 jakarta-tomcat-site/xdocs/news.xml Index: news.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/news.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- news.xml 11 May 2002 17:27:44 - 1.25 +++ news.xml 26 Jan 2003 03:56:11 - 1.26 @@ -10,6 +10,21 @@ section name=News amp; Status +h325 January 2003 - Security update: Tomcat 3.3.1a Released/h3 +p +Tomcat 3.3.1a is available to address security vulnerabilities +present in Tomcat 3.3.1. Refer to the Tomcat 3.3.1a download +site for details on the vulnerabilities. You may download new +distribution files or replacement jars +a href=http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3.1a/;here/a. +/p +p +The following Tomcat 4 versions have been verified to not have +these vulnerabilities: 4.0.4, 4.0.6, 4.1.12, 4.1.18, and 4.1.19. +/p + +hr size=1 noshade=noshade / + h311 May 2002 - Tomcat 4.0.4 Beta 3 Released/h3 p The Tomcat Team is proud to announce the release of Tomcat 4.0.4 Beta 3. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs news.html
larryi 2003/01/25 19:56:35 Modified:docs news.html Log: Add note about Tomcat 3.3.1a security update Revision ChangesPath 1.34 +14 -1 jakarta-tomcat-site/docs/news.html Index: news.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/news.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- news.html 17 Dec 2002 16:40:23 - 1.33 +++ news.html 26 Jan 2003 03:56:35 - 1.34 @@ -119,7 +119,20 @@ /td/tr trtd blockquote -h311 May 2002 - Tomcat 4.0.4 Beta 3 Released/h3 +h325 January 2003 - Security update: Tomcat 3.3.1a Released/h3 +p +Tomcat 3.3.1a is available to address security vulnerabilities +present in Tomcat 3.3.1. Refer to the Tomcat 3.3.1a download +site for details on the vulnerabilities. You may download new +distribution files or replacement jars +a href=http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3.1a/;here/a. +/p +p +The following Tomcat 4 versions have been verified to not have +these vulnerabilities: 4.0.4, 4.0.6, 4.1.12, 4.1.18, and 4.1.19. +/p +hr size=1 noshade=noshade / +h311 May 2002 - Tomcat 4.0.4 Beta 3 Released/h3 p The Tomcat Team is proud to announce the release of Tomcat 4.0.4 Beta 3. Binary and source distributions are available a href=http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.4-b3/;here/a. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport - New directory
larryi 2002/09/29 19:13:07 jakarta-tomcat/proposals/JmxSupport - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF - New directory
larryi 2002/09/29 19:13:44 jakarta-tomcat/proposals/JmxSupport/WEB-INF - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes - New directory
larryi 2002/09/29 19:13:53 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org - New directory
larryi 2002/09/29 19:13:59 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache - New directory
larryi 2002/09/29 19:14:03 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat - New directory
larryi 2002/09/29 19:14:07 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules - New directory
larryi 2002/09/29 19:14:11 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config - New directory
larryi 2002/09/29 19:14:16 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config DynamicMBeanProxy.java MxInterceptor.java
larryi 2002/09/29 19:17:43
Added: proposals/JmxSupport build.xml
proposals/JmxSupport/WEB-INF interceptors.xml
proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config
DynamicMBeanProxy.java MxInterceptor.java
Log:
Files for JmxSupport add-on. Derived from original MxInterceptor.java
and DynamicMBeanProxy.java files.
Revision ChangesPath
1.1 jakarta-tomcat/proposals/JmxSupport/build.xml
Index: build.xml
===
?xml version=1.0?
project name=PasswordPrompter default=main basedir=.
!-- Compilation properties --
property name=optimize value=false/
property name=debug value=on/
!-- Directories --
property name=ws value=../../../
property name=work.dir value=${ws}/jakarta-tomcat/
property name=tomcat.build value=${ws}/jakarta-tomcat/build/tomcat/
property name=tomcat.dist value=${ws}/jakarta-tomcat/dist/tomcat/
property name=tomcat.build.modules value=${tomcat.build}/modules/
property name=tomcat.dist.modules value=${tomcat.dist}/modules/
property name=commons-logging.jar
location=${tomcat.build}/lib/common/commons-logging.jar /
property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
property name=tomcat.classes.dir location=${tomcat.build}/classes/
property name=tomcat.classes value=${tomcat.classes.dir}/
!-- Initialization - check if build and dist present
== --
target name=init
available property=build.modules.available file=${tomcat.build.modules}/
available property=dist.modules.available file=${tomcat.dist.modules}/
available property=jmx-present file=${jmx.jar} /
available property=jmxtools-present file=${jmxtools.jar} /
/target
!-- Preparation --
target name=prepare depends=init
/target
target name=build.modules.check depends=prepare
unless=build.modules.available
echo message=You must build Tomcat first!/
/target
target name=dist.modules.check depends=prepare
unless=dist.modules.available
echo message=You must build the Tomcat distribution first!/
/target
!-- Build the Password Prompter sample add-on
== --
target name=jmx.support depends=prepare if=build.modules.available
mkdir dir=${tomcat.build.modules}/JmxSupport/
copy todir=${tomcat.build.modules}/JmxSupport
fileset dir=${work.dir}/proposals/JmxSupport excludes=build.xml/
/copy
javac srcdir=${tomcat.build.modules}/JmxSupport/WEB-INF/classes
optimize=${optimize}
debug=${debug}
destdir=${tomcat.build.modules}/JmxSupport/WEB-INF/classes
classpath path=${tomcat.classes}/
classpath location=${jmx.jar}/
classpath location=${commons-logging.jar}/
/javac
mkdir dir=${tomcat.build.modules}/JmxSupport/WEB-INF/lib/
copy todir=${tomcat.build.modules}/JmxSupport/WEB-INF/lib file=${jmx.jar}/
copy todir=${tomcat.build.modules}/JmxSupport/WEB-INF/lib
file=${jmxtools.jar}/
copy todir=${tomcat.build.modules}/JmxSupport/WEB-INF/lib
file=${commons-logging.jar}/
jar jarFile=${tomcat.build.modules}/JmxSupport/WEB-INF/lib/JmxSupport.jar
basedir=${tomcat.build.modules}/JmxSupport/WEB-INF/classes/
delete dir=${tomcat.build.modules}/JmxSupport/WEB-INF/classes/
/target
!-- Build the Password Prompter sample add-on WAR
== --
target name=jmx.support.war
depends=build.modules.check,dist.modules.check,jmx.support
if=dist.modules.available
jar jarFile=${tomcat.dist.modules}/JmxSupport.war
baseDir=${tomcat.build.modules}/JmxSupport/
/target
!-- Admin agreagate --
target name=clean depends=init
delete dir=${tomcat.build.modules}/JmxSupport/
delete dir=${tomcat.dist.modules}/JmxSupport/
delete file=${tomcat.dist.modules}/JmxSupport.war/
/target
target name=main depends=build.modules.check,jmx.support/
/project
1.1 jakarta-tomcat/proposals/JmxSupport/WEB-INF/interceptors.xml
Index: interceptors.xml
===
?xml version=1.0 encoding=UTF-8?
Server
module name=MxInterceptor
javaClass=org.apache.tomcat.modules.config.MxInterceptor /
ContextManager
!-- MxInterceptor to enable JMX monitoring.
options are :
port : http adaptor will listen to this port
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config MxInterceptor.java
larryi 2002/09/29 19:23:50 Removed: src/share/org/apache/tomcat/modules/config MxInterceptor.java Log: Remove MxInterceptor from main source tree due to dependencies. Convert to an add-on. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2002/09/29 19:25:19 Modified:.build.xml Log: Remove MxInterceptor from main build. Add tasks for JmxSupport add-on. Revision ChangesPath 1.190 +3 -3 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- build.xml 19 Sep 2002 11:12:06 - 1.189 +++ build.xml 30 Sep 2002 02:25:18 - 1.190 @@ -637,9 +637,6 @@ name=org/apache/tomcat/modules/config/LoaderInterceptor12.java unless=jdk12.present/ exclude - name=org/apache/tomcat/modules/config/MxInterceptor.java - unless=jmx-present/ - exclude name=org/apache/tomcat/modules/aaa/PooledJDBCRealm.java unless=commons-dbcp.complete/ exclude @@ -861,16 +858,19 @@ !-- Build the sample add-on modules === -- target name=sample.add-ons +ant antfile=proposals/JmxSupport/build.xml / ant antfile=proposals/PasswordPrompter/build.xml/ ant antfile=proposals/StreamHandler/build.xml / /target target name=sample.add-ons.dist +ant antfile=proposals/JmxSupport/build.xml target=jmx.support.war/ ant antfile=proposals/PasswordPrompter/build.xml target=password.prompter.war/ ant antfile=proposals/StreamHandler/build.xml target=stream.handler.war / /target target name=sample.add-ons.clean +ant antfile=proposals/JmxSupport/build.xml target=clean/ ant antfile=proposals/PasswordPrompter/build.xml target=clean/ ant antfile=proposals/StreamHandler/build.xml target=clean / /target -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util build.xml
larryi 2002/09/26 18:45:07
Modified:util build.xml
Log:
Update to keep original name of the commons-logging jar. Tomcat 3.3.x
uses commons-logging-api.jar, which shouldn't be renamed to
commons-logging.jar. My Gump test still runs. Sorry if it breaks anybody
else's build.
Revision ChangesPath
1.11 +1 -1 jakarta-tomcat-connectors/util/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 9 Aug 2002 20:49:44 - 1.10
+++ build.xml 27 Sep 2002 01:45:07 - 1.11
@@ -79,7 +79,7 @@
/
!-- Include a copy of the commons-logging.jar that we built with --
- copy tofile=${tomcat-util.build}/lib/commons-logging.jar
+ copy todir=${tomcat-util.build}/lib
file=${commons-logging.jar}/
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/shell tomcat.sh tomcat.bat
larryi 2002/09/26 18:47:23
Modified:src/shell tomcat.sh tomcat.bat
Log:
Update to use the original name of the commons-logging jar we are
including.
Revision ChangesPath
1.35 +2 -2 jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tomcat.sh 19 Sep 2002 04:21:17 - 1.34
+++ tomcat.sh 27 Sep 2002 01:47:22 - 1.35
@@ -117,7 +117,7 @@
oldCP=$CLASSPATH
unset CLASSPATH
-CLASSPATH=${TOMCAT_INSTALL}/lib/tomcat.jar:${TOMCAT_INSTALL}/lib/common/commons-logging.jar
+CLASSPATH=${TOMCAT_INSTALL}/lib/tomcat.jar:${TOMCAT_INSTALL}/lib/common/commons-logging-api.jar
# Ignore previous CLASSPATH
1.48 +2 -2 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- tomcat.bat19 Sep 2002 04:21:17 - 1.47
+++ tomcat.bat27 Sep 2002 01:47:23 - 1.48
@@ -97,7 +97,7 @@
:setClasspath
-set
CLASSPATH=%TOMCAT_INSTALL%\lib\tomcat.jar;%TOMCAT_INSTALL%\lib\common\commons-logging.jar
+set
CLASSPATH=%TOMCAT_INSTALL%\lib\tomcat.jar;%TOMCAT_INSTALL%\lib\common\commons-logging-api.jar
rem - Execute The Requested Command -
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/PasswordPrompter build.xml
larryi 2002/09/26 19:06:18
Modified:proposals/PasswordPrompter build.xml
Log:
Update to make it easier to build against a different (i.e. earlier) version of
Tomcat so backwards compatible versions can be built.
Revision ChangesPath
1.4 +8 -3 jakarta-tomcat/proposals/PasswordPrompter/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/proposals/PasswordPrompter/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 30 Jul 2002 12:22:25 - 1.3
+++ build.xml 27 Sep 2002 02:06:18 - 1.4
@@ -17,6 +17,12 @@
property name=tomcat.build.modules value=${tomcat.build}/modules/
property name=tomcat.dist.modules value=${tomcat.dist}/modules/
+ property name=commons-logging.jar
location=${tomcat.build}/lib/common/commons-logging.jar /
+
+ property name=tomcat.classes.dir location=${tomcat.build}/classes/
+ property name=jtc.util.jar
location=${tomcat.build}/lib/common/tomcat-util.jar/
+ property name=tomcat.classes value=${tomcat.classes.dir};${jtc.util.jar}/
+
!-- Initialization - check if build and dist present
== --
target name=init
available file=${tomcat.build.modules} property=build.modules.available/
@@ -49,9 +55,8 @@
optimize=${optimize}
debug=${debug}
destdir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/classes
- classpath location=${tomcat.build}/classes/
- classpath location=${tomcat.build}/lib/common/tomcat-util.jar/
- classpath location=${tomcat.build}/lib/common/commons-logging.jar/
+ classpath path=${tomcat.classes}/
+ classpath location=${commons-logging.jar}/
/javac
mkdir dir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/lib/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/StreamHandler build.xml
larryi 2002/09/26 19:06:31
Modified:proposals/StreamHandler build.xml
Log:
Update to make it easier to build against a different (i.e. earlier) version of
Tomcat so backwards compatible versions can be built.
Revision ChangesPath
1.3 +4 -1 jakarta-tomcat/proposals/StreamHandler/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/proposals/StreamHandler/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 12 Jan 2002 07:08:40 - 1.2
+++ build.xml 27 Sep 2002 02:06:31 - 1.3
@@ -17,6 +17,9 @@
property name=tomcat.build.modules value=${tomcat.build}/modules/
property name=tomcat.dist.modules value=${tomcat.dist}/modules/
+ property name=tomcat.classes.dir location=${tomcat.build}/classes/
+ property name=tomcat.classes value=${tomcat.classes.dir}/
+
!-- Initialization - check if build and dist present
== --
target name=init
available file=${tomcat.build.modules} property=build.modules.available/
@@ -49,7 +52,7 @@
optimize=${optimize}
debug=${debug}
destdir=${tomcat.build.modules}/StreamHandler/WEB-INF/classes
-classpath=${tomcat.build}/classes/
+classpath=${tomcat.classes}/
mkdir dir=${tomcat.build.modules}/StreamHandler/WEB-INF/lib/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/test Body.java Cookie.java Header.java HttpRequest.java Parameter.java
larryi 2002/09/20 16:58:05
Modified:src/share/org/apache/tomcat/util/test Body.java Cookie.java
Header.java HttpRequest.java Parameter.java
Log:
Update to work with ant.jar from Ant Version 1.5
Revision ChangesPath
1.3 +3 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java
Index: Body.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Body.java 28 Jan 2001 21:46:01 - 1.2
+++ Body.java 20 Sep 2002 23:58:05 - 1.3
@@ -95,5 +95,8 @@
return body;
}
+public void execute()
+{
+}
}
1.2 +4 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java
Index: Cookie.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cookie.java 9 Feb 2001 03:48:15 - 1.1
+++ Cookie.java 20 Sep 2002 23:58:05 - 1.2
@@ -91,4 +91,8 @@
return value;
}
+public void execute()
+{
+}
+
}
1.6 +4 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java
Index: Header.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Header.java 28 Aug 2001 05:46:28 - 1.5
+++ Header.java 20 Sep 2002 23:58:05 - 1.6
@@ -170,4 +170,8 @@
return sb.toString();
}
+public void execute()
+{
+}
+
}
1.6 +5 -1
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java
Index: HttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpRequest.java 14 Apr 2002 06:17:40 - 1.5
+++ HttpRequest.java 20 Sep 2002 23:58:05 - 1.6
@@ -265,7 +265,11 @@
/** Alternate method for sending a verbose request
*/
public void addText(String s ) {
- fullRequest=s;
+// set if text isn't just whitespace
+if (null != s s.trim().length() 0)
+{
+fullRequest=s;
+}
}
// Execute the request
1.3 +3 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java
Index: Parameter.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Parameter.java9 Feb 2001 03:48:15 - 1.2
+++ Parameter.java20 Sep 2002 23:58:05 - 1.3
@@ -107,5 +107,8 @@
return type;
}
+public void execute()
+{
+}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2002/09/11 10:23:07
Modified:.build.xml
Log:
Fix, I assume, cut paste error with jakarta-logging. Default to version
1.0.1 since this is the one that has commons-logging-api.jar.
Revision ChangesPath
1.187 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- build.xml 11 Sep 2002 05:36:42 - 1.186
+++ build.xml 11 Sep 2002 17:23:07 - 1.187
@@ -84,8 +84,8 @@
property name=commons-pool.lib location=${commons-pool.home}/dist/
property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
- property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0 /
- property name=commons-logging.lib location=${jakarta-logging.home} /
+ property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.1 /
+ property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
property name=commons-collections.home
location=${jakarta-commons}/collections/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc serverxml.html
larryi 2002/09/11 10:35:26
Modified:src/doc serverxml.html
Log:
A correction for LogSetter I had lying around
Revision ChangesPath
1.26 +5 -3 jakarta-tomcat/src/doc/serverxml.html
Index: serverxml.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- serverxml.html8 May 2002 02:27:54 - 1.25
+++ serverxml.html11 Sep 2002 17:35:26 - 1.26
@@ -2116,8 +2116,8 @@
tr valign=top
tdpath/td
tdPath to the desired log file. You may embed a
- codejava.text.SimpleDateFormat/code string enclosed within '{}'
- to create a path that encorporates the current date and or time./td
+ codejava.text.SimpleDateFormat/code string enclosed within quot;${}quot;
+ to create a path that encorporates the current date and/or time./td
tdnull, log output goes to stderr/td
/tr
tr valign=top
@@ -2144,6 +2144,8 @@
pre
lt;LogSetter name=quot;tc_logquot; verbosityLevel=quot;DEBUGquot; /gt;
+lt;LogSetter name=quot;servlet_logquot; timestamps=quot;truequot;
+verbosityLevel=quot;INFORMATIONquot;
path=quot;logs/servlet-${MMdd}.logquot; /gt;
/pre
hr size=5
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2002/08/09 05:55:02
Modified:coyote build.xml
Log:
Exclude tomcat5 from compile.shared too.
Revision ChangesPath
1.12 +2 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 4 Aug 2002 19:39:49 - 1.11
+++ build.xml 9 Aug 2002 12:55:01 - 1.12
@@ -185,6 +185,7 @@
deprecation=${compile.deprecation}
optimize=${compile.optimize}
classpath refid=compile.classpath/
+ exclude name=org/apache/coyote/tomcat5/** /
exclude name=org/apache/coyote/tomcat4/** /
exclude name=org/apache/coyote/tomcat3/** /
/javac
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/PasswordPrompter build.xml
larryi 2002/07/30 05:22:25
Modified:proposals/PasswordPrompter build.xml
Log:
Include dependency on commons-logging
Revision ChangesPath
1.3 +5 -2 jakarta-tomcat/proposals/PasswordPrompter/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/proposals/PasswordPrompter/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 11 Apr 2002 02:03:26 - 1.2
+++ build.xml 30 Jul 2002 12:22:25 - 1.3
@@ -48,8 +48,11 @@
javac srcdir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/classes
optimize=${optimize}
debug=${debug}
-destdir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/classes
-
classpath=${tomcat.build}/classes;${tomcat.build}/lib/common/tomcat-util.jar/
+destdir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/classes
+ classpath location=${tomcat.build}/classes/
+ classpath location=${tomcat.build}/lib/common/tomcat-util.jar/
+ classpath location=${tomcat.build}/lib/common/commons-logging.jar/
+/javac
mkdir dir=${tomcat.build.modules}/PasswordPrompter/WEB-INF/lib/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2002/07/30 12:07:29
Modified:.build.xml
Log:
Use j-t-c propety for mx4j.jar location. Add a message for JMX detection.
Note that this detection needs to be in sync with the detection in
jakarta-tomcat-util.
Revision ChangesPath
1.185 +6 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- build.xml 11 Jun 2002 12:13:22 - 1.184
+++ build.xml 30 Jul 2002 19:07:28 - 1.185
@@ -91,7 +91,7 @@
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
- property name=jmx.jar location=../jakarta-tomcat-connectors/lib/mx4j.jar/
+ property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
@@ -147,6 +147,10 @@
echo message=Detected JSSE/
/target
+ target name=msg.jmx if=jmx-present
+echo message=Detected JMX/
+ /target
+
target name=msg.puretls if=puretls.present
echo message=Detected PureTLS/
/target
@@ -164,7 +168,7 @@
/target
target name=init
-
depends=detect,uptodate,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp,msg.jtc,msg.jtc.util
+
depends=detect,uptodate,msg.jdk12,msg.jsse,msg.jmx,msg.puretls,msg.commons-dbcp,msg.jtc,msg.jtc.util
/target
target name=prepare.jaxp101 depends=detect if=jaxp10-present
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper gump2.xml
larryi 2002/07/30 22:19:30 Added: .gump2.xml Log: Add new gump file for building tomcat_4_branch for Tomcat 4.1.x. Keep gump.xml for building head. Revision ChangesPath 1.1 jakarta-tomcat-jasper/gump2.xml Index: gump2.xml === module name=jakarta-tomcat-jasper_tc4 tag=tomcat_4_branch description JavaServer Pages JSP 1.2 implementation (for Tomcat 4.1.x) /description url href=http://jakarta.apache.org/tomcat/index.html/ cvs repository=jakarta module=jakarta-tomcat-jasper/ project name=jakarta-tomcat-jasper_tc4 home nested=jasper2/ /project /module -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat gump.xml
larryi 2002/07/30 22:37:26 Modified:.gump.xml Log: Remove unused jakarta-tomcat-jasper property. Update JMX dependency to match that used by jakarta-tomcat-util project. Revision ChangesPath 1.9 +2 -3 jakarta-tomcat/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-tomcat/gump.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gump.xml 26 Jul 2002 23:23:20 - 1.8 +++ gump.xml 31 Jul 2002 05:37:26 - 1.9 @@ -14,11 +14,10 @@ property name=jaxp.home reference=home project=jaxp/ property name=ant.home reference=home project=jakarta-ant/ property name=jsse.home reference=home project=jsse/ + property name=jmx.jar project=jmx path=jmx/lib/jmxri.jar / property name=jakarta-tomcat-connectors reference=srcdir project=jakarta-tomcat-connectors/ - property name=jakarta-tomcat-jasper reference=srcdir -project=jakarta-tomcat-jasper/ /ant depend project=xml-xerces/ depend project=jakarta-ant/ @@ -26,7 +25,7 @@ depend project=jakarta-tomcat-util/ depend project=jakarta-tomcat-connectors/ depend project=jsse/ -option project=mx4j/ +depend project=jmx/ work nested=build/tomcat/classes/ home nested=build/tomcat/ jar name=lib/common/tomcat_core.jar/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 gump.xml
larryi 2002/07/30 22:41:03 Modified:.gump.xml Log: Add ant.home and jasper.home properties. Revision ChangesPath 1.7 +3 -0 jakarta-tomcat-4.0/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/gump.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gump.xml 19 Jul 2002 12:48:08 - 1.6 +++ gump.xml 31 Jul 2002 05:41:03 - 1.7 @@ -39,6 +39,7 @@ packageorg.apache.catalina/package ant target=dist + property name=ant.home reference=home project=jakarta-ant/ property name=servlet.home reference=home project=jakarta-servletapi-4/ property name=jsse.home reference=home project=jsse/ @@ -54,6 +55,8 @@ property name=mail.home reference=home project=javamail/ property name=tomcat-coyote.home reference=home project=jakarta-tomcat-coyote/ + property name=jasper.home reference=home +project=jakarta-tomcat-jasper_tc4/ depend property=mail.jar project=javamail/ property name=activation.home reference=home project=jaf/ depend property=activation.jar project=jaf/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 gump.xml
larryi 2002/07/19 04:59:55 Modified:.gump.xml Log: Update per request by Stefan Bodewig. Revision ChangesPath 1.5 +4 -5 jakarta-tomcat-4.0/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/gump.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gump.xml 11 Jul 2002 09:59:07 - 1.4 +++ gump.xml 19 Jul 2002 11:59:55 - 1.5 @@ -17,9 +17,9 @@ depend property=commons-digester.jar project=commons-digester runtime=true/ depend property=commons-logging.jar project=commons-logging -runtime=true/ +runtime=true id=all/ depend property=commons-logging-api.jar project=commons-logging -runtime=true/ +runtime=true id=all/ property name=regexp.jar reference=jarpath id=regexp project=jakarta-regexp/ property name=jtc.home reference=srcdir @@ -76,9 +76,9 @@ depend property=commons-dbcp.jar project=commons-dbcp/ depend property=commons-pool.jar project=commons-pool/ depend property=commons-logging.jar project=commons-logging -runtime=true/ +runtime=true id=all/ depend property=commons-logging-api.jar project=commons-logging -runtime=true/ +runtime=true id=all /ant depend project=jakarta-ant/ @@ -91,7 +91,6 @@ option project=jakarta-avalon/ option project=jakarta-avalon-phoenix/ depend project=jakarta-tomcat-coyote/ -depend project=tomcat-catalina/ depend project=jakarta-tomcat-util/ depend project=jakarta-servletapi-4/ depend project=jakarta-regexp/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 gump.xml
larryi 2002/07/19 05:48:08 Modified:.gump.xml Log: Correction to last patch. Submitted by: Stefan Bodewig Revision ChangesPath 1.6 +2 -2 jakarta-tomcat-4.0/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/gump.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gump.xml 19 Jul 2002 11:59:55 - 1.5 +++ gump.xml 19 Jul 2002 12:48:08 - 1.6 @@ -19,7 +19,7 @@ depend property=commons-logging.jar project=commons-logging runtime=true id=all/ depend property=commons-logging-api.jar project=commons-logging -runtime=true id=all/ +runtime=true id=api/ property name=regexp.jar reference=jarpath id=regexp project=jakarta-regexp/ property name=jtc.home reference=srcdir @@ -78,7 +78,7 @@ depend property=commons-logging.jar project=commons-logging runtime=true id=all/ depend property=commons-logging-api.jar project=commons-logging -runtime=true id=all +runtime=true id=api/ /ant depend project=jakarta-ant/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade JspInterceptor.java
larryi 2002/06/18 11:34:50 Modified:src/facade22/org/apache/tomcat/facade JspInterceptor.java Log: Update the depth of the classloader URLs to get. DependClassloader now includes the Context's classloader in the parent chain, so we need to go one parent deeper. This should get JSP compilation working again. Revision ChangesPath 1.39 +2 -2 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java Index: JspInterceptor.java === RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- JspInterceptor.java 5 Jun 2002 03:52:50 - 1.38 +++ JspInterceptor.java 18 Jun 2002 18:34:50 - 1.39 @@ -934,8 +934,8 @@ URL commonCP[]; ClassLoader loader=ctx.getClassLoader(); //The next will be the container classpath in trusted apps -appsCP=jdkProxy.getURLs(loader,1); -commonCP=jdkProxy.getURLs(loader,2); +appsCP=jdkProxy.getURLs(loader,2); +commonCP=jdkProxy.getURLs(loader,3); if( appsCP!=null ) cpath+=separator+extractClassPath(appsCP); if( commonCP!=null ) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util CookieToolsTestCase.java
larryi 02/05/23 03:35:55
Modified:catalina/src/test/org/apache/catalina/util Tag:
tomcat_40_branch CookieToolsTestCase.java
Log:
Port change from HEAD branch to test for current behavior with respect to
Cookies.
Revision ChangesPath
No revision
No revision
1.3.2.1 +6 -6
jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
Index: CookieToolsTestCase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- CookieToolsTestCase.java 5 Sep 2001 18:35:32 - 1.3
+++ CookieToolsTestCase.java 23 May 2002 10:35:55 - 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
1.3 2001/09/05 18:35:32 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/09/05 18:35:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
1.3.2.1 2002/05/23 10:35:55 larryi Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2002/05/23 10:35:55 $
*
*
*
@@ -74,7 +74,7 @@
* Unit tests for the codeCookieTools/code class.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/09/05 18:35:32 $
+ * @version $Revision: 1.3.2.1 $ $Date: 2002/05/23 10:35:55 $
*/
public class CookieToolsTestCase extends TestCase {
@@ -185,13 +185,13 @@
sb = new StringBuffer();
CookieTools.getCookieHeaderValue(version0, sb);
assertEquals(Version 0 cookie header value,
-
Version+0+Name=Version+0+Value;Domain=localhost;Path=/version0,
+ Version 0 Name=Version 0
Value;Domain=localhost;Path=/version0,
sb.toString());
sb = new StringBuffer();
CookieTools.getCookieHeaderValue(version1, sb);
assertEquals(Version 1 cookie header value,
-
Version+1+Name=Version+1+Value;Version=1;Comment=Version+1+Comment;Domain=localhost;Discard;Path=\/version1\,
+ Version 1 Name=\Version 1
Value\;Version=1;Comment=\Version 1
Comment\;Domain=localhost;Discard;Path=\/version1\,
sb.toString());
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c
larryi 02/05/09 17:44:09
Modified:jk/native/netscape jk_nsapi_plugin.c
Log:
Finally port the input chunking changes from Tomcat 3.3.x
Revision ChangesPath
1.8 +34 -7 jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
Index: jk_nsapi_plugin.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_nsapi_plugin.c 29 Nov 2001 20:02:44 - 1.7
+++ jk_nsapi_plugin.c 10 May 2002 00:44:09 - 1.8
@@ -58,7 +58,7 @@
/***
* Description: NSAPI plugin for Netscape servers *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***/
@@ -478,6 +478,8 @@
static int setup_http_headers(nsapi_private_data_t *private_data,
jk_ws_service_t *s)
{
+int need_content_length_header = (s-content_length == 0) ? JK_TRUE : JK_FALSE;
+
pblock *headers_jar = private_data-rq-headers;
int cnt;
int i;
@@ -490,9 +492,13 @@
}
}
+s-headers_names = NULL;
+s-headers_values = NULL;
+s-num_headers = cnt;
if(cnt) {
-s-headers_names = jk_pool_alloc(private_data-p, cnt * sizeof(char *));
-s-headers_values = jk_pool_alloc(private_data-p, cnt * sizeof(char *));
+/* allocate an extra header slot in case we need to add a content-length
header */
+s-headers_names = jk_pool_alloc(private_data-p, (cnt + 1) * sizeof(char
*));
+s-headers_values = jk_pool_alloc(private_data-p, (cnt + 1) * sizeof(char
*));
if(s-headers_names s-headers_values) {
for(i = 0, cnt = 0 ; i headers_jar-hsize ; i++) {
@@ -500,18 +506,39 @@
while(h h-param) {
s-headers_names[cnt] = h-param-name;
s-headers_values[cnt] = h-param-value;
+if(need_content_length_header
+!strncmp(h-param-name,content-length,14)) {
+need_content_length_header = JK_FALSE;
+}
cnt++;
h = h-next;
}
}
+/* Add a content-length = 0 header if needed.
+ * Ajp13 assumes an absent content-length header means an unknown,
+ * but non-zero length body.
+ */
+if(need_content_length_header) {
+s-headers_names[cnt] = content-length;
+s-headers_values[cnt] = 0;
+cnt++;
+}
s-num_headers = cnt;
return JK_TRUE;
}
} else {
-s-num_headers = cnt;
-s-headers_names = NULL;
-s-headers_values = NULL;
-return JK_TRUE;
+if (need_content_length_header) {
+s-headers_names = jk_pool_alloc(private_data-p, sizeof(char *));
+s-headers_values = jk_pool_alloc(private_data-p, sizeof(char *));
+if(s-headers_names s-headers_values) {
+s-headers_names[0] = content-length;
+s-headers_values[0] = 0;
+s-num_headers++;
+return JK_TRUE;
+}
+}
+else
+return JK_TRUE;
}
return JK_FALSE;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
larryi 02/05/06 18:37:51 Modified:jk/native/iis jk_isapi_plugin.c Log: Update to use common version string Revision ChangesPath 1.17 +2 -2 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_isapi_plugin.c 1 May 2002 22:59:12 - 1.16 +++ jk_isapi_plugin.c 7 May 2002 01:37:51 - 1.17 @@ -60,7 +60,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Larry Isaacs [EMAIL PROTECTED] * * Author: Ignacio J. Ortega [EMAIL PROTECTED] * - * Version: $Revision: 1.16 $ * + * Version: $Revision: 1.17 $ * ***/ // This define is needed to include wincrypt,h, needed to get client certificates @@ -78,7 +78,7 @@ #include jk_worker.h #include jk_uri_worker_map.h -#define VERSION_STRING Jakarta/ISAPI/1.0b1 +#define VERSION_STRING Jakarta/ISAPI/ JK_VERSTRING #define DEFAULT_WORKER_NAME (ajp13) /* -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
larryi 02/05/02 22:24:17
Modified:jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
Log:
Add quotes around include files, if not already present, in case path includes
spaces.
Revision ChangesPath
1.5 +8 -1
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java
Index: MsvcCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MsvcCompiler.java 4 Dec 2001 01:43:52 - 1.4
+++ MsvcCompiler.java 3 May 2002 05:24:17 - 1.5
@@ -156,7 +156,14 @@
ccpw.println(localCflags);
for( int i=0; iincludeList.length; i++ ) {
ccpw.print(-I);
-ccpw.println(includeList[i] );
+if (!includeList[i].startsWith(\)) {
+ccpw.print(\);
+}
+ccpw.print(includeList[i] );
+if (!includeList[i].endsWith(\)) {
+ccpw.print(\);
+}
+ccpw.println();
}
if( defines.size() 0 ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
larryi 02/05/02 22:25:54
Modified:jk build.xml
Log:
Update jkant target so it can build immediately after a clean.
Revision ChangesPath
1.39 +3 -0 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 1 May 2002 22:39:09 - 1.38
+++ build.xml 3 May 2002 05:25:54 - 1.39
@@ -189,6 +189,9 @@
/target
target name=jkant
+mkdir dir=${jk.build}/classes/
+mkdir dir=${jk.build}/classes/META-INF /
+mkdir dir=${jk.build}/lib/
javac srcdir=jkant/java
destdir=${jk.build}/classes
debug=${debug}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.properties.sample
larryi 02/05/02 22:27:45
Modified:jk build.properties.sample
Log:
Change parens to curly braces so substitution will work as expected
Revision ChangesPath
1.12 +2 -2 jakarta-tomcat-connectors/jk/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties.sample 20 Apr 2002 22:51:10 - 1.11
+++ build.properties.sample 3 May 2002 05:27:45 - 1.12
@@ -62,6 +62,6 @@
# Microsft SDK
# mssdk.home=c:/Program Files/Microsoft SDK
-# mssdk.include=$(mssdk.home)/include
-# mssdk.lib=$(mssdk.home)/lib
+# mssdk.include=${mssdk.home}/include
+# mssdk.lib=${mssdk.home}/lib
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
larryi 02/05/02 22:31:20
Modified:jk/native build.xml
Log:
Add required MS SDK include and lib entries. Drop the if=win32 in the
linkOpt since the iis target is valid only for win32.
Revision ChangesPath
1.31 +3 -1 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 12 Apr 2002 15:57:31 - 1.30
+++ build.xml 3 May 2002 05:31:20 - 1.31
@@ -310,6 +310,7 @@
include name=${java.home}/../include /
include name=${java.home}/../include/win32 /
include name=${native.dir}/common /
+include name=${mssdk.include} /
include name=${build.compiler.base}/include /
/includes
depends
@@ -332,7 +333,8 @@
export symbol=HttpExtensionProc/
export symbol=TerminateFilter/
export symbol=TerminateExtension/
- linkOpt value=/libpath:quot;${build.compiler.base}/libquot; if=win32 /
+ linkOpt value=/libpath:quot;${mssdk.lib}quot; /
+ linkOpt value=/libpath:quot;${build.compiler.base}/libquot; /
/so
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
larryi 02/05/02 22:39:58
Modified:jk/native/common jk_global.h
Log:
Add a macro for WIN32 to emulate the gettimeofday() function using the
WIN32 _ftime() function.
Revision ChangesPath
1.17 +7 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_global.h 4 Dec 2001 19:44:23 - 1.16
+++ jk_global.h 3 May 2002 05:39:58 - 1.17
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.16 $ *
+ * Version: $Revision: 1.17 $ *
***/
#ifndef JK_GLOBAL_H
@@ -81,6 +81,7 @@
#ifdef WIN32
#include windows.h
#include winsock.h
+#include sys/timeb.h
#else
#include unistd.h
#include netdb.h
@@ -192,6 +193,11 @@
#endif /* CHARSET_EBCDIC */
#endif /* APR_CHARSET_EBCDIC */
+
+#ifdef WIN32
+/* For WIN32, emulate gettimeofday() using _ftime() */
+#define gettimeofday(tv,tz) { struct _timeb tb; _ftime(tb); (tv)-tv_sec =
tb.time; (tv)-tv_usec = tb.millitm * 1000; }
+#endif
#ifdef __cplusplus
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/dispatch foo.jsp rdForward.jsp rdInclude.jsp
larryi 02/04/26 18:44:11
Modified:src/tests/webpages/WEB-INF test-tomcat.xml
Added: src/tests/webpages/dispatch foo.jsp rdForward.jsp
rdInclude.jsp
Log:
Add test case for Bugzilla 8092. RequestDispatcher.include followed by
a RequestDispacher.forward to a static page. Also added one that forwards
to a JSP page.
Reported by: Andreas.Junghans
Revision ChangesPath
1.53 +15 -1 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
Index: test-tomcat.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- test-tomcat.xml 18 Apr 2002 13:58:01 - 1.52
+++ test-tomcat.xml 27 Apr 2002 01:44:11 - 1.53
@@ -16,7 +16,7 @@
early tests.
--
- property name=revision value=$Revision: 1.52 $ /
+ property name=revision value=$Revision: 1.53 $ /
property name=host value=127.0.0.1 /
property name=port value=8080 /
property name=colonPort value=:${port} /
@@ -549,6 +549,20 @@
httpRequest path=/test/servlet/dispatch.IncludeJspWithTaglib /
httpStatusMatch match=200 /
responseMatch match=This is a taglib test/
+ /httpClient
+
+ httpClient
+ commentRequestDispatcher.include to JSP which RequestDispatcher.forward
to a static page/comment
+ httpRequest path=/test/dispatch/rdInclude.jsp /
+ httpStatusMatch match=200 /
+ responseMatch match=FOO/
+ /httpClient
+
+ httpClient
+ commentRequestDispatcher.include to JSP which RequestDispatcher.forward
to a JSP page/comment
+ httpRequest path=/test/dispatch/rdInclude.jsp?type=jsp /
+ httpStatusMatch match=200 /
+ responseMatch match=JSPFOO/
/httpClient
/target
1.1 jakarta-tomcat/src/tests/webpages/dispatch/foo.jsp
Index: foo.jsp
===
% String txt=FOO; %
JSP%= txt %
1.1 jakarta-tomcat/src/tests/webpages/dispatch/rdForward.jsp
Index: rdForward.jsp
===
%
String type = request.getParameter(type);
String pg = foo.html;
if (jsp.equals(type))
pg = foo.jsp;
RequestDispatcher rd = application.getRequestDispatcher(
/dispatch/ + pg);
if (null != rd)
rd.forward(request, response);
else
response.sendError(HttpServletResponse.SC_NOT_FOUND,
/dispatch/ + pg + not found.);
%
1.1 jakarta-tomcat/src/tests/webpages/dispatch/rdInclude.jsp
Index: rdInclude.jsp
===
%
RequestDispatcher rd = application.getRequestDispatcher(
/dispatch/rdForward.jsp);
if (null != rd)
rd.include(request, response);
else
response.sendError(HttpServletResponse.SC_NOT_FOUND,
/dispatch/rdForward.jsp not found.);
%
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
