cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
mturk 2002/11/15 00:10:20
Modified:jk/native2/common jk_uriMap.c
Log:
Restore the uri if no context found.
XXX: I dont't like this jsessionid rewriting or uri made on const char.
Can we use some temp pool or provide the buffer to the mapUri call.
Revision ChangesPath
1.58 +2 -0 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jk_uriMap.c 22 Oct 2002 10:11:43 - 1.57
+++ jk_uriMap.c 15 Nov 2002 08:10:19 - 1.58
-933,6 +933,8
ctxEnv = jk2_uriMap_prefixMap(env, uriMap, hostEnv-webapps, uri, uriLen);
if (ctxEnv == NULL) {
+if (url_rewrite)
+*url_rewrite = origChar;
env-l-jkLog(env, env-l, JK_LOG_INFO,
uriMap.mapUri() no context %s\n, uri);
return NULL;
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
RE: ServletOutputStreamWrapper
Duh! Thank you - why ddn't I think of that! On Fri, 2002-11-15 at 09:01, Martin Algesten wrote: Java tip: System.out.println( request.getInputStream().getClass().getName() ); and all shall be revealed. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
ServletContext.getContext() still completely broken.
Are we going to release 4.1.15 without addressing this? This is a standard API call that currently DOES NOT WORK (or am I wrong, can anyone get hold of a foreign context from the ROOT context?) I've submitted a possible fix in BZ #13040 ... If you don't like it, then tell me why and I'll try patching it differently. I'm bored of maintaining my own patched up version locally. Surely a broken javax.servlet API call is serious enough to not be ignored? Martin
DO NOT REPLY [Bug 14583] New: - How to specify Classpath for the Tomcat NT Service ?
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14583. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14583 How to specify Classpath for the Tomcat NT Service ? Summary: How to specify Classpath for the Tomcat NT Service ? Product: Tomcat 4 Version: 4.0 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, I am using Tomcat 4.x as my servlet container. I hv installed it with the NT service option. One of my servlets which has load-on-startup as TRUE refers to oracle.jdbc.driver.OracleDriver via the Class.forName() statement. The stderr.log created when the serivce is started shows that it is unable to find the jar/zip file containing the Oracle driver. (I hv set it under classpath environment settings) Pls advise how I can make the Oracle Driver zip/ jar available to the Tomcat service. In other words how to specify the classpath for the Tomcat service (which uses the Hotspot JVM.DLL) rgds g1 -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14583] - How to specify Classpath for the Tomcat NT Service ?
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14583. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14583 How to specify Classpath for the Tomcat NT Service ? [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 10:31 --- Bugzilla is meant for bugs, not asking for explanations on how to use features (use tomcat-user for that). JavaService allows configuring the classpath. Overall, modifying the classpath is unsupported, as it can cause classloading problems which are hard to debug. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
RE: ServletOutputStreamWrapper
Java tip: System.out.println( request.getInputStream().getClass().getName() ); and all shall be revealed. Martin -Original Message- From: Paul Hunnisett [mailto:develop;lombok.org.uk] Sent: 14 November 2002 20:05 To: Tomcat Developers List Subject: Re: ServletOutputStreamWrapper Thanks Craig, I'll take a look at that - hope fully it'll help me to move forward. I'm somewhat confused though - surely Tomcat must have subclasses of ServletInputStream and ServletOutputStream? What gets returned when an application call request.getInputStream() or response.getOutputStream? Paul Hunnisett www.lombok.org.uk -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/jk/xdocs .cvsignore
jfclere 2002/11/15 03:48:19 Modified:jk/xdocs .cvsignore Log: menu.idx is generated depending -Dnojk2doc=true or -Dnojkdoc=true. Revision ChangesPath 1.2 +1 -0 jakarta-tomcat-connectors/jk/xdocs/.cvsignore Index: .cvsignore === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore6 Sep 2002 16:04:50 - 1.1 +++ .cvsignore15 Nov 2002 11:48:19 - 1.2 -1,2 +1,3 style.css style.xsl +menu.idx -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
/x2/www/jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2
Hi, I have updated my script that processes the mod_jk and mod_jk2, now it fills: /x2/www/jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc for mod_jk /x2/www/jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/doc for mod_jk2 The Tomcat 4.1 points to a not yet automaticly generated files. Should I also update the /x2/www/jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2 automaticly? Cheers Jean-frederic -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14588] New: - DefaultContext: After webapp-restarting parameters are missing
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14588. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14588 DefaultContext: After webapp-restarting parameters are missing Summary: DefaultContext: After webapp-restarting parameters are missing Product: Tomcat 4 Version: 4.1.12 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Major Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] In server.xml, I have some settings for the default-context: DefaultContext Resource name=test/datsource auth=Container type=com.abc.IConnectionFactory/ ResourceParams name=dataprovider/BR8 parameternamemy_name1/namevaluemy_value1/value/parameter parameternamemy_name2/namevaluemy_value2/value/parameter /ResourceParams /DefaultContext These settings are taken correctly when starting the server. Unfortunatelly, after restarting (via manager/reload) the webapp that is using these default-settings, the settings are no longer available and the application crashes. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 9564] - Manager App hangs when instructed to reload itself
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9564. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9564 Manager App hangs when instructed to reload itself [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:34 --- This has been fixed a while ago (and was probably a duplicate bug). -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14565] - Tomcat Server hangs and does not make entries in the database
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14565. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14565 Tomcat Server hangs and does not make entries in the database [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:35 --- I experienced this problem with hSQL. It is not a problem with DBCP, however, not Tomcat. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/jk build.xml
jfclere 2002/11/15 05:34:29
Modified:jk build.xml
Log:
emove the menu.idx otherwise I got mod_jk2 menus in mod_jk docs and reverse.
Revision ChangesPath
1.61 +1 -0 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build.xml 17 Oct 2002 18:18:48 - 1.60
+++ build.xml 15 Nov 2002 13:34:29 - 1.61
-328,6 +328,7
delete dir=${build.docs}/
delete file=${source.docs}/style.css/
delete file=${source.docs}/style.xsl/
+delete file=${source.docs}/menu.idx/
/target
!-- It's better to call it directly with individual tags --
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 13759] - Tomcat Coyote hangs at fill() spending 100% CPU
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13759. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13759 Tomcat Coyote hangs at fill() spending 100% CPU [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:37 --- I cannot reproduce this. If there actually was a bug, the change introduced in Tomcat 4.1.14 will fix it. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14588] - DefaultContext: After webapp-restarting parameters are missing
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14588. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14588 DefaultContext: After webapp-restarting parameters are missing [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:40 --- This is an obvious duplicate. Use stop + start as a workaround. *** This bug has been marked as a duplicate of 13364 *** -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 13364] - JNDI DataSource not available after manager reload
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13364. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13364 JNDI DataSource not available after manager reload [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:40 --- *** Bug 14588 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14568] - servlet.init() can't access JNDI DB resources
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14568. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14568 servlet.init() can't access JNDI DB resources [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:47 --- This works in 4.1.15. I don't know if this was actually broken in 4.1.12. (tested by adding a lookup for maxExemptions in init() of the JNDIServlet from the examples) -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 12135] - servlets-examples application does not get started up
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12135. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12135 servlets-examples application does not get started up [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:48 --- This was fixed in Tomcat CVS. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 12460] - Tomcat server hangs when getting datasource connection
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12460. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12460 Tomcat server hangs when getting datasource connection [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:53 --- This cannot be a bug in Tomcat. Doing a thread dump should confirm this. You might want to file a bug against commons-dbcp (with at least some stack information added). -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 12601] - Listener Exception does not cause server error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12601. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12601 Listener Exception does not cause server error [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2002-11-15 13:55 --- According to the spec wording, it is acceptable to not return 500 for other requests. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
[GUMP] Build failed jakarta-tomcat-jk2-native
Not really automatic and the patch below will not fix the problem (but help you not to lose track of it): http://cvs.apache.org/builds/gump/2002-11-15/jakarta-tomcat-jk2-native.html Stefan Patch: Index: gump.xml === RCS file: /home/cvspublic/jakarta-tomcat-connectors/gump.xml,v retrieving revision 1.9 diff -u -r1.9 gump.xml --- gump.xml13 Nov 2002 00:12:49 - 1.9 +++ gump.xml15 Nov 2002 13:54:00 - @@ -96,7 +96,12 @@ project name=jakarta-tomcat-jk2-native ant basedir=jk/native2 target=all /ant + depend project=jakarta-ant / +depend project=xml-xerces/ + +nag to=[EMAIL PROTECTED] + from=Craig McClanahan lt;[EMAIL PROTECTED]gt;/ /project /module -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
DO NOT REPLY [Bug 14595] New: - bind to RMI registry fails in Registry.rebind() with noClassDefFoundError
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14595. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14595 bind to RMI registry fails in Registry.rebind() with noClassDefFoundError Summary: bind to RMI registry fails in Registry.rebind() with noClassDefFoundError Product: Tomcat 4 Version: 4.1.12 Platform: PC OS/Version: Linux Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Trying to create/bind to an RMI registry fails with the error: java.lang.NoClassDefFoundError: sun/reflect/SerializationConstructorAccessorImpl The Java installation is SDK 1.4.1. The OS is RedHat 7.3. In searching the Web the only reference to this problem I have located is to do with a bug in Java 1.4 or Ant. The workaround during building is to set the fork=true option for Ant. A temporary fix is to run Tomcat with JRE 1.3.1. -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
Re: /x2/www/jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2
Remy Maucherat wrote: jean-frederic clere wrote: Hi, I have updated my script that processes the mod_jk and mod_jk2, now it fills: /x2/www/jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc for mod_jk /x2/www/jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/doc for mod_jk2 The Tomcat 4.1 points to a not yet automaticly generated files. Should I also update the /x2/www/jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2 automaticly? Oui, pourquoi pas ? Done. Have fun! Jean-frederic Remy -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
FW: Apache Tomcat
FYI -- Forwarded Message From: Manjiri Devdhar [EMAIL PROTECTED] Reply-To: [EMAIL PROTECTED] Date: Fri, 15 Nov 2002 19:23:52 +0530 To: [EMAIL PROTECTED] Subject: Apache Tomcat Hello, This is Manjiri from Wrox Press Ltd taking care of the Open source titles. I really have high regard for your apache site, which really contributes, a great deal to the Apache and other open source lovers. Would like to update you with our Apache title released this year. This may help your community. 1. ProfessionalApache Tomcat ISBN 1861007213 released in Sep 2002 Would you kind enough to include this in your list of books at http://jakarta.apache.org/tomcat/resources.html http://httpd.apache.org/info/apache_books.html under the books section. Please do not hesitate to contact me if you have any concerns. Thank you, --Manjiri -- Peer Information India Pvt Ltd, Mumbai, India -- End of Forwarded Message
cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml
remm2002/11/15 09:37:12 Modified:docs bugreport.html building.html index.html irc.html news.html resources.html xdocsindex.xml xdocs/stylesheets project.xml Log: - Website update. Revision ChangesPath 1.7 +1 -3 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bugreport.html29 Oct 2002 19:12:51 - 1.6 +++ bugreport.html15 Nov 2002 17:37:11 - 1.7 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -lia href=./index.htmlFront Page/a -/li -lia href=./news.htmlNews Status/a +lia href=./index.htmlHome/a /li lia href=./bugreport.htmlBug Database/a /li 1.3 +1 -3 jakarta-tomcat-site/docs/building.html Index: building.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/building.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- building.html 14 Nov 2002 18:53:28 - 1.2 +++ building.html 15 Nov 2002 17:37:11 - 1.3 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -lia href=./index.htmlFront Page/a -/li -lia href=./news.htmlNews Status/a +lia href=./index.htmlHome/a /li lia href=./bugreport.htmlBug Database/a /li 1.31 +1 -3 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- index.html29 Oct 2002 19:12:51 - 1.30 +++ index.html15 Nov 2002 17:37:11 - 1.31 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -lia href=./index.htmlFront Page/a -/li -lia href=./news.htmlNews Status/a +lia href=./index.htmlHome/a /li lia href=./bugreport.htmlBug Database/a /li 1.8 +1 -3 jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- irc.html 29 Oct 2002 19:12:51 - 1.7 +++ irc.html 15 Nov 2002 17:37:12 - 1.8 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -lia href=./index.htmlFront Page/a -/li -lia href=./news.htmlNews Status/a +lia href=./index.htmlHome/a /li lia href=./bugreport.htmlBug Database/a /li 1.31 +1 -3 jakarta-tomcat-site/docs/news.html Index: news.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/news.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- news.html 29 Oct 2002 19:12:51 - 1.30 +++ news.html 15 Nov 2002 17:37:12 - 1.31 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -lia href=./index.htmlFront Page/a -/li -lia href=./news.htmlNews Status/a +lia href=./index.htmlHome/a /li lia href=./bugreport.htmlBug Database/a /li 1.7 +1 -3 jakarta-tomcat-site/docs/resources.html Index: resources.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- resources.html14 Nov 2002 18:53:28 - 1.6 +++ resources.html15 Nov 2002 17:37:12 - 1.7 -41,9 +41,7 td width=20% valign=top nowrap=true pstrongTomcat/strong/p ul -
DO NOT REPLY [Bug 13942] - Modification of catalina.sh for additional CLASSPATH
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13942.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13942
Modification of catalina.sh for additional CLASSPATH
--- Additional Comments From [EMAIL PROTECTED] 2002-11-15 17:59 ---
All things considered, it probably would make more sense to flip
things around and append, instead of prepend, the information. Thus,
if [ x$AUX_CLASSPATH != x ]; then
CLASSPATH=$CLASSPATH:${AUX_CLASSPATH}
fi
would be better so that stuff set by setclasspath.sh takes precedence.
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
luehe 2002/11/15 11:41:28
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Optimization: Do not create JSP fragment for simple tag invocation if
tag body is empty
Revision ChangesPath
1.126 +14 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- Generator.java13 Nov 2002 17:40:38 - 1.125
+++ Generator.java15 Nov 2002 19:41:28 - 1.126
-1843,8 +1843,11
}
out.printil(try {);
out.pushIndent();
+ out.printil(if (getJspBody() != null));
+ out.pushIndent();
out.printil(getJspBody().invoke(_jspx_sout););
out.popIndent();
+ out.popIndent();
out.printil( } finally { );
out.pushIndent();
// Copy page scope of invoking page back to virtual page scope of
-2082,12 +2085,15
if (findJspBody(n) == null) {
/*
* Encapsulate body of custom tag invocation in JspFragment
- * and pass it to tag handler's setJspBody()
+ * and pass it to tag handler's setJspBody(), unless tag body
+ * is empty
*/
- out.printin(tagHandlerVar);
- out.print(.setJspBody();
- generateJspFragment(n, tagHandlerVar);
- out.println(););
+ if (n.getBody() != null) {
+ out.printin(tagHandlerVar);
+ out.print(.setJspBody();
+ generateJspFragment(n, tagHandlerVar);
+ out.println(););
+ }
} else {
/*
* Body of tag is the body of the jsp:body element.
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/15 12:39:21
Modified:.tomcat.nsi
Log:
- Daily NSIS update.
Revision ChangesPath
1.17 +2 -3 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tomcat.nsi14 Nov 2002 10:36:39 - 1.16
+++ tomcat.nsi15 Nov 2002 20:39:21 - 1.17
-19,7 +19,6
!define MUI_UNINSTALLER
- !define MUI_WINDOWTITLE
!define MUI_CUSTOMPAGECOMMANDS
!define TEMP1 $R0
-83,7 +82,7
!insertmacro MUI_UNPAGECOMMAND_CONFIRM
!insertmacro MUI_UNPAGECOMMAND_INSTFILES
- ReserveFile ${NSISDIR}\Plugins\InstallOptions.dll
+ !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
ReserveFile jvm.ini
ReserveFile config.ini
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
[PATCH] Setting TagHandlerPool size as InitParameter for jasper servlet
PATCH Content:
Adding handling of init parameter tagPoolSize
Changing Generator to use tagPoolSize for initialize TagHandlerPool
This should, hopefully, be correctly formatted.
Torsten Fohrer
Index: resources/messages.properties
===
RCS file: /home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.58
diff -u -w -b -r1.58 messages.properties
--- resources/messages.properties 8 Nov 2002 19:55:47 - 1.58
+++ resources/messages.properties 15 Nov 2002 20:36:19 -
-121,6 +121,7
jsp.warning.keepgen=Warning: Invalid value for the initParam keepgenerated. Will use the default value of \false\
jsp.warning.largeFile=Warning: Invalid value for the initParam largeFile. Will use the default value of \true\
jsp.warning.enablePooling=Warning: Invalid value for the initParam enablePooling. Will use the default value of \true\
+jsp.warning.tagpoolsize=Warning: Invalid value for the initParam tagpoolsize. Will use the default value of \5\
jsp.warning.mappedFile=Warning: Invalid value for the initParam mappedFile. Will use the default value of \false\
jsp.warning.sendErrToClient=Warning: Invalid value for the initParam sendErrToClient. Will use the default value of \false\
jsp.warning.classDebugInfo=Warning: Invalid value for the initParam classdebuginfo. Will use the default value of \false\
Index: EmbededServletOptions.java
===
RCS file: /home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.11
diff -u -w -b -r1.11 EmbededServletOptions.java
--- EmbededServletOptions.java 22 Oct 2002 22:23:14 - 1.11
+++ EmbededServletOptions.java 15 Nov 2002 20:36:19 -
-108,6 +108,11
private boolean poolingEnabled = true;
/**
+ * Size of the tag handler pool.
+ */
+private boolean tagPoolSize = 5;
+
+/**
* Do you want support for mapped files? This will generate
* servlet that has a print statement per line of the JSP file.
* This seems like a really nice feature to have for debugging.
-201,6 +206,10
return poolingEnabled;
}
+public int getTagPoolSize() {
+ return tagPoolSize;
+}
+
/**
* Are we supporting HTML mapped servlets?
*/
-336,6 +345,21
Logger.WARNING);
}
+String tagPoolSize = config.getInitParameter(tagPoolSize);
+if (checkInterval != null) {
+try {
+this.tagPoolSize = Integer.parseInt( tagPoolSize );
+if (this.checkInterval = 0) {
+this.checkInterval = 5;
+Constants.message(jsp.warning.tagpoolsize,
+ Logger.WARNING);
+}
+} catch(NumberFormatException ex) {
+Constants.message (jsp.warning.tagpoolsize, Logger.WARNING);
+}
+}
+
+
String mapFile = config.getInitParameter(mappedfile);
if (mapFile != null) {
if (mapFile.equalsIgnoreCase(true))
-366,7 +390,7
String checkInterval = config.getInitParameter(checkInterval);
if (checkInterval != null) {
try {
-this.checkInterval = new Integer(checkInterval).intValue();
+this.checkInterval = Integer.parseInt(checkInterval);
if (this.checkInterval == 0) {
this.checkInterval = 300;
Constants.message(jsp.warning.checkInterval,
Index: Options.java
===
RCS file: /home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.8
diff -u -w -b -r1.8 Options.java
--- Options.java 20 Aug 2002 03:52:18 - 1.8
+++ Options.java 15 Nov 2002 20:36:20 -
-94,6 +94,11
public boolean isPoolingEnabled();
/**
+ * Size of the tag handler pool.
+ */
+public int getTagPoolSize();
+
+/**
* Are we supporting HTML mapped servlets?
*/
public boolean getMappedFile();
Index: compiler/Generator.java
===
RCS file: /home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.126
diff -u -w -b -r1.126 Generator.java
--- compiler/Generator.java 15 Nov 2002 19:41:28 - 1.126
+++ compiler/Generator.java 15 Nov 2002 20:36:22 -
-659,7 +659,9
out.pushIndent();
for (int i=0; itagHandlerPoolNames.size(); i++) {
out.printin((String) tagHandlerPoolNames.elementAt(i));
- out.println( = new org.apache.jasper.runtime.TagHandlerPool(););
+ out.print( = new org.apache.jasper.runtime.TagHandlerPool();
+out.print( ctxt.getOptions().getTagPoolSize());
+
[PATCH] Wokers How To Documentation
Had a bad run in with firewalls using Apache 1.3 and AJP13. Thought the following changes might help the next victim. Andrew Gilbert Index: workershowto.xml === RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml,v retrieving revision 1.8 diff -u -r1.8 workershowto.xml --- workershowto.xml20 Sep 2002 21:35:30 - 1.8 +++ workershowto.xml15 Nov 2002 20:41:40 - -170,8 +170,7 frequently used strings as small integers. /li li -ajpv13 reuse open sockets and leaves them open for future requests (remember when you've got a Firewall between your -WebServer and Tomcat). +ajpv13 reuses open sockets and leaves them open for future requests. When you've got +a firewall between your WebServer and Tomcat you need to ensure these connections +aren't torn down during periods of inactivity. See bsocket_keepalive/b for more +information. /li li ajpv13 has special treatment for SSL information so that the container can implement -204,53 +203,36 /p p -bcachesize/b property is usefull when you're using JK in multithreaded -web servers such as Apache 2.0, IIS and Netscape. They will benefit the most by -setting this value to a higher level (such as the estimated average concurrent users for Tomcat). +bcachesize/b property is useful when you're using JK in multithreaded +web servers such as Apache 2.0, IIS and Netscape. The default value is 1. +Multithreaded web servers will benefit by setting this value to a higher level, such +as the estimated average concurrent users for Tomcat. With forking model web servers +you probably want to use the default. /p p -bcache_timeout/b property should be used with bcachesize/b to specify how to time JK should keep -an open socket in cache before closing it. This property should be used to reduce the number of threads -on the Tomcat WebServer. +bcache_timeout/b property should be used with bcachesize/b to specify how +long JK should keep inactive connections in the cache before cleaning them up and +closing them. Note that this property will have no affect with the default cachesize +of 1. /p p -You should know that under heavy load some WebServers, for example Apache's create many childs/threads -to handle the load and they destroy the childs/threads only when the load decrease. +In a multithreaded web server scenario an AJP13 worker will use the cache to manage +connection load to Tomcat. As load increases the web server will create threads to +handle the load, and the AJP13 worker will create, cache and reuse connections to +Tomcat as required, up to bcachesize/b. As load decreases the web server is +responsible for reaping extra threads, and the worker will clean out connections to +Tomcat per the bcache_timeout/b property. Note this clean up occurs only when new +activity resumes following idle time. There is no reaper thread. /p -p -Each child could open an ajp13 connection if it have to forward a request to Tomcat, creating -a new ajp13 thread on Tomcat side. +p +Tomcat creates a new thread to handle each connection. By recovering unused +connections from the cache, threads on Tomcat that are servicing idle connections +will be recovered as well. /p -p -The problem is that after an ajp13 connection is created, the child won't drop it -until killed. And since the webserver will keep its childs/threads running -to handle high-load, even it the child/thread handle only static contents, you could -finish having many unused ajp13 threads on the Tomcat side. +p +In a forking model scenario, the web server will create new processes to handle load. +Each process will have it's own cache. Each cache will probably not extend beyond one +connection. The benefit of the cache in this scenario is marginal. Connections that +exist to Tomcat will be cleaned only when inactive child processes are cleaned by the +web server. /p p -bsocket_keepalive/b property should be used when you have a firewall between your webserver -and the Tomcat engine, who tend to drop inactive connections. This flag will told Operating System -to send codeKEEP_ALIVE/code message on inactive connections (interval depend on global OS settings, -generally 120mn), and sus prevent the firewall to cut the connection. +bsocket_keepalive/b property should be used when you have a firewall that drops +inactive connections between your webserver and Tomcat. This property will cause the +keep alive flag to be set on socket connections to Tomcat. The operating system will +then send codeKEEP_ALIVE/code packets on inactive connections. The keep alive +timeout is often a global OS setting, usually of 120 minutes. The keep alive packets +will prevent the firewall from cutting the connection because of no activity. Be sure +to adjust either the firewall or operating system so that keep alives happen inside +the window of firewall timeouts. /p p -The
[PATCH] Which access time determines cache cleanup?
Not sure about this, but would seem to make more sense that an endpoint gets cleaned
out of the cache based on it's own last access time, not the last access time of the
endpoint that has been taken out for use. Or is this intentional?
Andrew Gilbert
Index: jk_ajp_common.c
===
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.32
diff -u -r1.32 jk_ajp_common.c
--- jk_ajp_common.c 30 Oct 2002 22:12:20 - 1.32
+++ jk_ajp_common.c 15 Nov 2002 20:57:33 -
-1420,7 +1420,7
if (aw-cache_timeout) {
for ( ; i aw-ep_cache_sz ; i++) {
if (aw-ep_cache[i]) {
-unsigned elapsed = (unsigned)(now - ae-last_access);
+unsigned elapsed = (unsigned)(now -
+aw-ep_cache[i]-last_access);
if (elapsed aw-cache_timeout) {
jk_log(l, JK_LOG_DEBUG,
In jk_endpoint_t::ajp_get_endpoint, \
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
Re: ServletContext.getContext() still completely broken.
Martin Algesten [EMAIL PROTECTED] wrote: Are we going to release 4.1.15 without addressing this? This is a standard API call that currently DOES NOT WORK (or am I wrong, can anyone get hold of a foreign context from the ROOT context?) I've submitted a possible fix in BZ #13040 ... If you don't like it, then tell me why and I'll try patching it differently. I'm bored of maintaining my own patched up version locally. Surely a broken javax.servlet API call is serious enough to not be ignored? I wouldn't worry too much about it now... It might even be deprecated in the servlet specification in the future... Pier -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.xml
costin 2002/11/15 16:51:20
Modified:catalina/src/bin catalina.xml
Log:
Update the ant-based startup - instead of the custom ant tasks it now uses
the JMX-based tasks ( that are now available in modeler ). I'm still
investigating embed-startup and setting other properties as well as
dynamic deployment ( based on JMX ), to give ant full control.
Revision ChangesPath
1.6 +36 -36jakarta-tomcat-catalina/catalina/src/bin/catalina.xml
Index: catalina.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- catalina.xml 24 Oct 2002 19:10:30 - 1.5
+++ catalina.xml 16 Nov 2002 00:51:20 - 1.6
-169,55 +169,55
/target
- !-- === Ant task based --
+ !-- === Ant/JMX based --
+ target name=taskdef
+property name=tomcat.home location=../../jakarta-tomcat-5/build /
- target name=run-wait depends=echo-config
-description=Start tomcat as a task and wait for it to end
-taskdef name=tomcat5
- classname=org.apache.catalina.startup.CatalinaService
- classpathref=tomcatcp /
-
-tomcat5 do=start home=${catalina.home} wait=true compiler=jikes/
-!-- the task will not end until tomcat shutdown is received --
-
-echo message= Tomcat5 stoped /
+path id=jmx.test.classpath
+ pathelement location=target/classes /
+ fileset dir=${tomcat.home}/common/lib includes=*.jar/
+ fileset dir=${tomcat.home}/server/lib includes=*.jar/
+ fileset dir=${tomcat.home}/bin includes=*.jar/
+/path
+
+!-- part of modeler --
+taskdef resource=META-INF/ant.properties
+ classpathref=jmx.test.classpath /
/target
- target name=run depends=echo-config
+
+ target name=run depends=echo-config,taskdef
description=Start tomcat as a task and return
-taskdef name=tomcat5
- classname=org.apache.catalina.startup.CatalinaService
- classpathref=tomcatcp /
-tomcat5 do=start home=${catalina.home} wait=false compiler=jikes/
-
-!-- the task will end when tomcat is initialised. You can now use it in
- other tasks --
+MLET code=org.apache.commons.modeler.BaseModelMBean
+ name=catalina:type=server
+ arg value=org.apache.catalina.startup.Catalina /
+/MLET
+
+jmxSet name=catalina:type=server
+attribute=catalinaHome
+value=${tomcat.home}/
+
+!-- We could also call init and set other properties -
+ init should load the modules --
+
+jmx name=catalina:type=server
+ method=start /
+
+echo message=Tomcat5 running/
-echo message= Tomcat5 running /
/target
+
!-- === Exec/java --
target name=java-start depends=echo-config
description=Run tomcat in-process and wait for it to end, using java task
-java classname=org.apache.catalina.startup.CatalinaService fork=false
- classpath refid=tomcatcp /
- arg value=start /
- sysproperty key=catalina.home value=${catalina.home}/
- sysproperty key=build.compiler value=jikes/
- sysproperty key=java.endorsed.dirs
value=${ant.home}/lib:${java.home}/lib/
-/java
-
-echo message= Tomcat5 up and running
/
- /target
-
- target name=java-fork depends=echo-config
-description=Fork a tomcat java process and wait for it to end
+property name=tomcat.fork value=false /
-java classname=org.apache.catalina.startup.CatalinaService fork=true
+java classname=org.apache.catalina.startup.CatalinaService
fork=${tomcat.fork}
classpath refid=tomcatcp /
arg value=start /
sysproperty key=catalina.home value=${catalina.home}/
-225,8 +225,8
sysproperty key=java.endorsed.dirs
value=${ant.home}/lib:${java.home}/lib/
/java
-echo message= Tomcat5 up and running
/
- /target
+echo message=Tomcat5 running/
+ /target
/project
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime TagHandlerPool.java
luehe 2002/11/15 20:20:10
Modified:jasper2/src/share/org/apache/jasper Constants.java
EmbededServletOptions.java JspC.java Options.java
jasper2/src/share/org/apache/jasper/compiler Generator.java
ServletWriter.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
jasper2/src/share/org/apache/jasper/runtime
TagHandlerPool.java
Log:
Added init param to configure tag pool size.
Revision ChangesPath
1.9 +7 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Constants.java20 Sep 2002 18:06:38 - 1.8
+++ Constants.java16 Nov 2002 04:20:09 - 1.9
@@ -138,6 +138,13 @@
public static final int DEFAULT_TAG_BUFFER_SIZE = 512;
/**
+ * Default tag handler pool size.
+ */
+public static final int MAX_POOL_SIZE = 5;
+public static final Integer MAX_POOL_SIZE_INTEGER
+ = new Integer(MAX_POOL_SIZE);
+
+/**
* The query parameter that causes the JSP engine to just
* pregenerated the servlet but not invoke it.
*/
1.12 +42 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EmbededServletOptions.java22 Oct 2002 22:23:14 - 1.11
+++ EmbededServletOptions.java16 Nov 2002 04:20:09 - 1.12
@@ -105,7 +105,12 @@
/**
* Determines whether tag handler pooling is enabled.
*/
-private boolean poolingEnabled = true;
+private boolean isPoolingEnabled = true;
+
+ /**
+ * Tag handler pool size.
+ */
+private int tagPoolSize;
/**
* Do you want support for mapped files? This will generate
@@ -198,7 +203,14 @@
}
public boolean isPoolingEnabled() {
- return poolingEnabled;
+ return isPoolingEnabled;
+}
+
+/**
+ * Returns the tag handler pool size.
+ */
+public int getTagPoolSize() {
+ return tagPoolSize;
}
/**
@@ -293,12 +305,15 @@
* Create an EmbededServletOptions object using data available from
* ServletConfig and ServletContext.
*/
-public EmbededServletOptions(ServletConfig config, ServletContext context) {
+public EmbededServletOptions(ServletConfig config,
+ ServletContext context) {
+
+ this.tagPoolSize = Constants.MAX_POOL_SIZE;
+
Enumeration enum=config.getInitParameterNames();
while( enum.hasMoreElements() ) {
String k=(String)enum.nextElement();
String v=config.getInitParameter( k );
-
setProperty( k, v);
}
@@ -325,17 +340,34 @@
else Constants.message (jsp.warning.largeFile, Logger.WARNING);
}
- poolingEnabled = true;
+ this.isPoolingEnabled = true;
String poolingEnabledParam
= config.getInitParameter(enablePooling);
if (poolingEnabledParam != null
!poolingEnabledParam.equalsIgnoreCase(true)) {
if (poolingEnabledParam.equalsIgnoreCase(false))
-this.poolingEnabled = false;
+this.isPoolingEnabled = false;
else Constants.message(jsp.warning.enablePooling,
Logger.WARNING);
}
+String tagPoolSizeParam = config.getInitParameter(tagPoolSize);
+if (tagPoolSizeParam != null) {
+try {
+this.tagPoolSize = Integer.parseInt(tagPoolSizeParam);
+if (this.tagPoolSize = 0) {
+this.tagPoolSize = Constants.MAX_POOL_SIZE;
+Constants.message(jsp.warning.invalidTagPoolSize,
+ new Object[] { Constants.MAX_POOL_SIZE_INTEGER },
+ Logger.WARNING);
+}
+} catch(NumberFormatException ex) {
+Constants.message(jsp.warning.invalidTagPoolSize,
+ new Object[] { Constants.MAX_POOL_SIZE_INTEGER },
+ Logger.WARNING);
+}
+
cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml
luehe 2002/11/15 20:20:57 Modified:catalina/src/conf web.xml Log: Added init param to configure tag pool size. Revision ChangesPath 1.7 +2 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- web.xml 21 Oct 2002 08:40:37 - 1.6 +++ web.xml 16 Nov 2002 04:20:57 - 1.7 @@ -115,6 +115,8 @@ !-- enablePooling Determines whether tag handler pooling is -- !-- enabled [true]-- !-- -- + !-- tagPoolSize The tag handler pool size -- + !-- -- !-- logVerbosityLevel The level of detailed messages to be produced -- !-- by this servlet. Increasing levels cause the -- !-- generation of more messages. Valid values are -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] Setting TagHandlerPool size as InitParameter for jasper servlet
Torsten,
I've applied your patch.
However, I found the following issues with it:
PATCH Content:
Adding handling of init parameter tagPoolSize
Changing Generator to use tagPoolSize for initialize TagHandlerPool
This should, hopefully, be correctly formatted.
Index: resources/messages.properties
===
+jsp.warning.tagpoolsize=Warning: Invalid value for the initParam tagpoolsize.
Will use the default value of \5\
Instead of hardcoding the default pool size in the error message, I
pass it as an argument.
Also, instead of specifying the default pool size in several places
(which could get out-of-sync), I now declare it in a single place
(org.apache.jasper.Constants.MAX_POOL_SIZE).
Index: EmbededServletOptions.java
===
+String tagPoolSize = config.getInitParameter(tagPoolSize);
I don't think it is a good idea in general to have an instance and a
local variable with the same name (in this case: tagPoolSize). I've
renamed the above tagPoolSize to tagPoolSizeParam.
+if (checkInterval != null) {
checkInterval should be tagPoolSize.
Index: Options.java
===
/**
+ * Size of the tag handler pool.
+ */
+public int getTagPoolSize();
An implementation of this method also must be added to
org.apache.jasper.JspC, which implements the Options interface.
Index: compiler/Generator.java
===
- out.println( = new org.apache.jasper.runtime.TagHandlerPool(););
+ out.print( = new org.apache.jasper.runtime.TagHandlerPool();
+ out.print( ctxt.getOptions().getTagPoolSize());
This didn't compile, because there currently is no
ServletWriter.print() method that takes an int. I added one.
I also added a description of the new tagPoolSize init param to
the default web.xml.
Jan
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java
billbarker2002/11/15 20:49:22
Modified:catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java
Log:
Taking Craig's suggestion and changing the attribute from noProxyCaching to
disableProxyCaching.
Revision ChangesPath
1.35 +10 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AuthenticatorBase.java15 Nov 2002 05:29:35 - 1.34
+++ AuthenticatorBase.java16 Nov 2002 04:49:22 - 1.35
@@ -198,7 +198,7 @@
* Flag to determine if we disable proxy caching, or leave the issue
* up to the webapp developer.
*/
-protected boolean noProxyCaching = true;
+protected boolean disableProxyCaching = true;
/**
* The lifecycle event support for this component.
@@ -397,8 +397,8 @@
* Return the flag that states if we add headers to disable caching by
* proxies.
*/
-public boolean getNoProxyCaching() {
-return noProxyCaching;
+public boolean getDisableProxyCaching() {
+return disableProxyCaching;
}
/**
@@ -407,8 +407,8 @@
* @param nocache codetrue/code if we add headers to disable proxy
* caching, codefalse/code if we leave the headers alone.
*/
-public void setNoProxyCaching(boolean nocache) {
-noProxyCaching = nocache;
+public void setDisableProxyCaching(boolean nocache) {
+disableProxyCaching = nocache;
}
// - Public Methods
@@ -498,7 +498,7 @@
// Make sure that constrained resources are not cached by web proxies
// or browsers as caching can provide a security hole
-if (noProxyCaching
+if (disableProxyCaching
!(((HttpServletRequest) hrequest.getRequest()).isSecure())) {
HttpServletResponse sresponse =
(HttpServletResponse) response.getResponse();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java
billbarker2002/11/15 21:05:42
Modified:catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java
Log:
Porting attribute name change.
Revision ChangesPath
1.5 +10 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AuthenticatorBase.java13 Nov 2002 06:10:38 - 1.4
+++ AuthenticatorBase.java16 Nov 2002 05:05:42 - 1.5
@@ -198,7 +198,7 @@
* Flag to determine if we disable proxy caching, or leave the issue
* up to the webapp developer.
*/
-protected boolean noProxyCaching = true;
+protected boolean disableProxyCaching = true;
/**
* The lifecycle event support for this component.
@@ -397,8 +397,8 @@
* Return the flag that states if we add headers to disable caching by
* proxies.
*/
-public boolean getNoProxyCaching() {
-return noProxyCaching;
+public boolean getDisableProxyCaching() {
+return disableProxyCaching;
}
/**
@@ -407,8 +407,8 @@
* @param nocache codetrue/code if we add headers to disable proxy
* caching, codefalse/code if we leave the headers alone.
*/
-public void setNoProxyCaching(boolean nocache) {
-noProxyCaching = nocache;
+public void setDisableProxyCaching(boolean nocache) {
+disableProxyCaching = nocache;
}
// - Public Methods
@@ -501,7 +501,7 @@
// Make sure that constrained resources are not cached by web proxies
// or browsers as caching can provide a security hole
-if (noProxyCaching
+if (disableProxyCaching
!(((HttpServletRequest) hrequest.getRequest()).isSecure())) {
HttpServletResponse sresponse =
(HttpServletResponse) response.getResponse();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] Setting TagHandlerPool size as InitParameter for jasper servlet
thanks for applying and correcting my patch.
Torsten
On Saturday 16 November 2002 05:22, Jan Luehe wrote:
Torsten,
I've applied your patch.
However, I found the following issues with it:
PATCH Content:
Adding handling of init parameter tagPoolSize
Changing Generator to use tagPoolSize for initialize TagHandlerPool
This should, hopefully, be correctly formatted.
Index: resources/messages.properties
===
+jsp.warning.tagpoolsize=Warning: Invalid value for the initParam
tagpoolsize. Will use the default value of \5\
Instead of hardcoding the default pool size in the error message, I
pass it as an argument.
Also, instead of specifying the default pool size in several places
(which could get out-of-sync), I now declare it in a single place
(org.apache.jasper.Constants.MAX_POOL_SIZE).
Index: EmbededServletOptions.java
===
+String tagPoolSize = config.getInitParameter(tagPoolSize);
I don't think it is a good idea in general to have an instance and a
local variable with the same name (in this case: tagPoolSize). I've
renamed the above tagPoolSize to tagPoolSizeParam.
+if (checkInterval != null) {
checkInterval should be tagPoolSize.
Index: Options.java
===
/**
+ * Size of the tag handler pool.
+ */
+public int getTagPoolSize();
An implementation of this method also must be added to
org.apache.jasper.JspC, which implements the Options interface.
Index: compiler/Generator.java
===
- out.println( = new org.apache.jasper.runtime.TagHandlerPool(););
+ out.print( = new org.apache.jasper.runtime.TagHandlerPool();
+ out.print( ctxt.getOptions().getTagPoolSize());
This didn't compile, because there currently is no
ServletWriter.print() method that takes an int. I added one.
I also added a description of the new tagPoolSize init param to
the default web.xml.
Jan
--
To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED] For additional commands,
e-mail: mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] Setting TagHandlerPool size as InitParameter for jasper servlet
i write it yesterday without any build env.
sorry, for the work...
On Saturday 16 November 2002 05:22, Jan Luehe wrote:
Torsten,
I've applied your patch.
However, I found the following issues with it:
PATCH Content:
Adding handling of init parameter tagPoolSize
Changing Generator to use tagPoolSize for initialize TagHandlerPool
This should, hopefully, be correctly formatted.
Index: resources/messages.properties
===
+jsp.warning.tagpoolsize=Warning: Invalid value for the initParam
tagpoolsize. Will use the default value of \5\
Instead of hardcoding the default pool size in the error message, I
pass it as an argument.
Also, instead of specifying the default pool size in several places
(which could get out-of-sync), I now declare it in a single place
(org.apache.jasper.Constants.MAX_POOL_SIZE).
Index: EmbededServletOptions.java
===
+String tagPoolSize = config.getInitParameter(tagPoolSize);
I don't think it is a good idea in general to have an instance and a
local variable with the same name (in this case: tagPoolSize). I've
renamed the above tagPoolSize to tagPoolSizeParam.
+if (checkInterval != null) {
checkInterval should be tagPoolSize.
Index: Options.java
===
/**
+ * Size of the tag handler pool.
+ */
+public int getTagPoolSize();
An implementation of this method also must be added to
org.apache.jasper.JspC, which implements the Options interface.
Index: compiler/Generator.java
===
- out.println( = new org.apache.jasper.runtime.TagHandlerPool(););
+ out.print( = new org.apache.jasper.runtime.TagHandlerPool();
+ out.print( ctxt.getOptions().getTagPoolSize());
This didn't compile, because there currently is no
ServletWriter.print() method that takes an int. I added one.
I also added a description of the new tagPoolSize init param to
the default web.xml.
Jan
--
To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED] For additional commands,
e-mail: mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
