cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspCompilationContext.java
remm2004/08/17 02:05:50
Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java
Log:
- Add missing check.
- It worked for me because I had removed Ant.
Revision ChangesPath
1.50 +8 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- JspCompilationContext.java16 Aug 2004 23:48:36 - 1.49
+++ JspCompilationContext.java17 Aug 2004 09:05:50 - 1.50
@@ -202,12 +202,14 @@
// Log ?
// FIXME: log
}
-try {
-jspCompiler =
-(Compiler)
Class.forName(org.apache.jasper.compiler.AntCompiler).newInstance();
-} catch (Throwable t) {
-// Log ?
-// FIXME: log
+if (jspCompiler == null) {
+try {
+jspCompiler =
+(Compiler)
Class.forName(org.apache.jasper.compiler.AntCompiler).newInstance();
+} catch (Throwable t) {
+// Log ?
+// FIXME: log
+}
}
jspCompiler.init(this, jsw);
return jspCompiler;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Delivery Notification
With many thanks, I acknowledge the receipt of your email. I very much appreciate all your feedback. Please do not hesitate to contact me in the future with any further comments, questions or concerns. Best Regards, Hassan Zerehi Editor in Chief Shahrvand Publication http://www.shahrvand.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: jakarta-tomcat-5/jakarta-tomcat-5 failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact folk at [EMAIL PROTECTED] Project jakarta-tomcat-5 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3L runs. Project State : 'Failed', Reason 'Build Failed' The following are affected: - jakarta-tomcat-5 : Servlet 2.4 and JSP 2.0 Reference Implementation Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-5/index.html That said, some snippets follow: The following annotations were provided: -DEBUG- Jar [naming-resources.jar] identifier set to jar basename: [naming-resources] -DEBUG- Jar [servlets-default.jar] identifier set to jar basename: [servlets-default] -DEBUG- Jar [naming-common.jar] identifier set to jar basename: [naming-common] -DEBUG- Jar [catalina.jar] identifier set to jar basename: [catalina] -DEBUG- Jar [bootstrap.jar] identifier set to jar basename: [bootstrap] -DEBUG- Jar [servlets-common.jar] identifier set to jar basename: [servlets-common] -DEBUG- Jar [servlets-invoker.jar] identifier set to jar basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jakarta-servletapi-5-servlet exists, no need to add for property servlet-api.jar. -DEBUG- Dependency on jakarta-servletapi-5-jsp exists, no need to add for property jsp-api.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xercesImpl.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xml-apis.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-el exists, no need to add for property commons-el.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on commons-modeler exists, no need to add for property commons-modeler.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx-tools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-tomcat-coyote exists, no need to add for property tomcat-coyote.home. -DEBUG- Dependency on jakarta-tomcat-jasper_tc5 exists, no need to add for property jasper.home. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -DEBUG- Dependency on commons-modeler exists, no need to add for property commons-modeler.home. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.jsvc.tar.gz. -DEBUG- Dependency on jakarta-struts exists, no need to add for property struts.home. -INFO- Failed with reason build failed -INFO- Enable debug output, due to build failure. The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-5/gump_work/build_jakarta-tomcat-5_jakarta-tomcat-5.html Work Name: build_jakarta-tomcat-5_jakarta-tomcat-5 (Type: Build) State: Failed Elapsed: 1 min 13 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-xerces2/java/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/usr/local/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtomcat33.home=--UnSet-- -Djsp-api.jar=/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djasper-compiler-jdt.jar=/usr/local/gump/packages/eclipse-2.1/plugins/org.eclipse.jdt.core_2.1.0/jdtcore.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-17082004.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dsite2.home=/usr/local/gump/public/workspace/jakarta-site2
Incorrect classloading
Hi, I recently tried to use the newest version of jgroups within a webapp running in tomcat. JGroups comes with a commons-logging.jar for it's own logging. I discovered that Jgroups couldn't use commons logging, because commons logging coulnd't load a log4j class, even though log4j.jar was in WEB-INF/lib. I solved the problem by placing log4j.jar along with the rest of tomcat's jar files (e.g. tomcat's commons-logging.jar). This makes me wonder if there is a problem with using commons logging in a webapp in general? It seems tomcat isn't loading commons-logging from the webapp as expected, but rather uses the one loaded in tomcat already. Is that correct, and if so, why shouldn't a webapp be allowed to use it's own commons-logging? Could this be a variant of http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22701 ? I'm using Tomcat 4.1.30. -dennis - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Incorrect classloading
Hi, A webapp can use its own commons-logging library, but it must then move the one supplied with Tomcat out of the common and into the server lib directory. Yoav Shapira Millennium Research Informatics -Original Message- From: Dennis Thrysøe [mailto:[EMAIL PROTECTED] Sent: Tuesday, August 17, 2004 9:59 AM To: [EMAIL PROTECTED] Subject: Incorrect classloading Hi, I recently tried to use the newest version of jgroups within a webapp running in tomcat. JGroups comes with a commons-logging.jar for it's own logging. I discovered that Jgroups couldn't use commons logging, because commons logging coulnd't load a log4j class, even though log4j.jar was in WEB-INF/lib. I solved the problem by placing log4j.jar along with the rest of tomcat's jar files (e.g. tomcat's commons-logging.jar). This makes me wonder if there is a problem with using commons logging in a webapp in general? It seems tomcat isn't loading commons-logging from the webapp as expected, but rather uses the one loaded in tomcat already. Is that correct, and if so, why shouldn't a webapp be allowed to use it's own commons-logging? Could this be a variant of http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22701 ? I'm using Tomcat 4.1.30. -dennis - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Incorrect classloading
Shapira, Yoav wrote: Hi, A webapp can use its own commons-logging library, but it must then move the one supplied with Tomcat out of the common and into the server lib directory. I see. That makes sense. Thanks. -dennis - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Load balance in tomcat
Hi! Which is the best way to load balance, across multiple tomcat instances, without using jk conectors or apache web servers? Is there support for it in the Catalina core? Thanks, Henrique Faria Senior Consultant Java Software Team tel:55.11.3285 4699 cel:55.11.9811 8281 fax: 55.11.3266 5121 [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Load balance in tomcat
I would first look at a hardware(or dns) loadbalancer and tomcat 5's clustering. -Tim Henrique Faria wrote: Hi! Which is the best way to load balance, across multiple tomcat instances, without using jk conectors or apache web servers? Is there support for it in the Catalina core? Thanks, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: Load balance in tomcat
Hi, You can use you favourite load balancing hardware or software, e.g. WLBS. Then set up tomcat in cluster mode. Drawbacks are slightly less performance and all your session data has to be serializeable. -- Björn Andersen www.premiere.de -Ursprüngliche Nachricht- Von: Henrique Faria [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 17. August 2004 16:34 An: [EMAIL PROTECTED] Betreff: Load balance in tomcat Hi! Which is the best way to load balance, across multiple tomcat instances, without using jk conectors or apache web servers? Is there support for it in the Catalina core? Thanks, Henrique Faria Senior Consultant Java Software Team tel:55.11.3285 4699 cel:55.11.9811 8281 fax: 55.11.3266 5121 [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17095] - Tomcat hangs after a while
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=17095. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=17095 Tomcat hangs after a while [EMAIL PROTECTED] changed: What|Removed |Added OS/Version|Linux |All --- Additional Comments From [EMAIL PROTECTED] 2004-08-17 15:40 --- Still happening with Tomcat 4.1.30. Any idea? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Failed to build TC because org.apache.commons.logging.Log can not been found
Howdy , I am building TC after check it out from CVS like this:
C:\Work2\workspace2\jakarta-tomcatant
Buildfile: build.xml
detect:
uptodate:
msg.ant15:
[echo] Detected Ant 1.5
...
but failed by the compile error though jakarta-commons has been
checkout to my local disk:
--\
[javac] C:\Work2\workspace2\jakarta-tomcat-connectors\util\java
\org\apache\tomcat\util\compat\Jdk14Compat.java:24
***package org.apache.commons.logging could not been found.***
[javac] import org.apache.commons.logging.Log;
...
BUILD FAILED
C:\Work2\workspace2\jakarta-tomcat-catalina\catalina\build.xml:542:
Warning: Could not find file C:\Work2\workspace2\
jakarta-tomcat-catalina\catalina\${commons-logging-api.jar} to copy.
--/
Could anybody tell me how to let ant find the class
org.apache.commons.logging.Log ?
TIA
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: Load balance in tomcat
guys, please move this stuff to tomcat-user, I see the same people over and over posting user related questions to tomcat-dev Filip -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, August 17, 2004 9:40 AM To: [EMAIL PROTECTED] Subject: AW: Load balance in tomcat Hi, You can use you favourite load balancing hardware or software, e.g. WLBS. Then set up tomcat in cluster mode. Drawbacks are slightly less performance and all your session data has to be serializeable. -- Björn Andersen www.premiere.de -Ursprüngliche Nachricht- Von: Henrique Faria [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 17. August 2004 16:34 An: [EMAIL PROTECTED] Betreff: Load balance in tomcat Hi! Which is the best way to load balance, across multiple tomcat instances, without using jk conectors or apache web servers? Is there support for it in the Catalina core? Thanks, Henrique Faria Senior Consultant Java Software Team tel:55.11.3285 4699 cel:55.11.9811 8281 fax: 55.11.3266 5121 [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --- Incoming mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.735 / Virus Database: 489 - Release Date: 8/6/2004 --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.735 / Virus Database: 489 - Release Date: 8/6/2004 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28914] - add a thread pool property to set thread priority for tuning quality of service
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28914. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28914 add a thread pool property to set thread priority for tuning quality of service [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Additional Comments From [EMAIL PROTECTED] 2004-08-17 19:07 --- Priority not applied. Run tomcat in a debugger, like eclipse, pause processors/monitors threads, look at first stackframe (thread run()), the variable 'this' (the thread). look at the priority field: still = 5 (normal prio) instead of prescribed value. Expected to see the monitor thread and the processors threads at priority 8 in the case below. Connector port=1026 maxThreads=15 minSpareThreads=2 maxSpareThreads=5 enableLookups=false acceptCount=100 debug=1 connectionTimeout=2 disableUploadTimeout=true threadPriority=8 redirectPort=18443 / Thr: d P=05 ALIVE http-1026-Processor1 (org.apache.tomcat.util.threads.ThreadWithAttributes) Thr: d P=05 ALIVE http-1026-Processor2 (org.apache.tomcat.util.threads.ThreadWithAttributes) Thr: P=05 ALIVE http-1026-Monitor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Delivery Notification
With many thanks, I acknowledge the receipt of your email. I very much appreciate all your feedback. Please do not hesitate to contact me in the future with any further comments, questions or concerns. Best Regards, Hassan Zerehi Editor in Chief Shahrvand Publication http://www.shahrvand.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28914] - add a thread pool property to set thread priority for tuning quality of service
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28914. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28914 add a thread pool property to set thread priority for tuning quality of service [EMAIL PROTECTED] changed: What|Removed |Added Version|5.0.18 |5.0.27 --- Additional Comments From [EMAIL PROTECTED] 2004-08-17 19:08 --- against 5.0.27 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
common/endorsed classLoader
I wrote up some code in Bootstrap/ClassLoaderFactory to not load xml api jars in common/endorsed if JDK 1.5 is used. I see that the jars don't get loaded when I check the StandardClassLoader but still the jars conflict somehow resulting an error when used JDK1.5 unless endorsed directory is physically removed. Are endorsed jars getting loaded somewhere else other than Bootstrap? Thanks, Amy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: common/endorsed classLoader
- Original Message - From: Amy Roh [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Tuesday, August 17, 2004 12:57 PM Subject: common/endorsed classLoader I wrote up some code in Bootstrap/ClassLoaderFactory to not load xml api jars in common/endorsed if JDK 1.5 is used. I see that the jars don't get loaded when I check the StandardClassLoader but still the jars conflict somehow resulting an error when used JDK1.5 unless endorsed directory is physically removed. Are endorsed jars getting loaded somewhere else other than Bootstrap? Using the default startup scripts, they are loaded into the System CL (the only way a delegating CL can find them :). Of course, TC 5.5 no longer copies Xerces to endorsed by default. Thanks, Amy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs cgi-howto.xml
markt 2004/08/17 14:44:33 Modified:catalina/src/conf web.xml catalina/src/share/org/apache/catalina/servlets CGIServlet.java webapps/tomcat-docs cgi-howto.xml Log: Fix bug 18273. Add support for optionally passing the shell environment variables to the CGI script. - Based heavily on a href=http://www.rgagnon.com/javadetails/java-0150.html; Read environment variables from an application/a by Real Gagnon Revision ChangesPath 1.58 +14 -12jakarta-tomcat-4.0/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- web.xml 16 Aug 2004 22:29:33 - 1.57 +++ web.xml 17 Aug 2004 21:44:32 - 1.58 @@ -226,19 +226,22 @@ !-- supports the following initialization parameters (default values -- !-- are in square brackets): -- !-- -- - !-- cgiPathPrefix The CGI search path will start at -- - !-- webAppRootDir + File.separator + this prefix. -- - !-- [WEB-INF/cgi] -- + !-- cgiPathPrefixThe CGI search path will start at -- + !--webAppRootDir + File.separator + this prefix. -- + !--[WEB-INF/cgi] -- !-- -- - !-- debug Debugging detail level for messages logged -- - !-- by this servlet. [0] -- + !-- debugDebugging detail level for messages logged-- + !--by this servlet. [0] -- !-- -- - !-- executable Name of the exectuable used to run the script. -- - !-- [perl] -- + !-- executable Name of the exectuable used to run the-- + !--script. [perl]-- !-- -- - !-- parameterEncoding Name of parameter encoding to be used with CGI -- - !-- servlet. -- - !-- [System.getProperty(file.encoding,UTF-8)] -- + !-- parameterEncodingName of parameter encoding to be used with-- + !--CGI servlet. -- + !--[System.getProperty(file.encoding,UTF-8)] -- + !-- -- + !-- passShellEnvironment Should the shell environment variables (if-- + !--any) be passed to the CGI script? [false] -- !-- -- !-- IMPORTANT: To use the CGI servlet, you also need to rename the -- !--$CATALINA_HOME/server/lib/servlets-cgi.renametojar file -- @@ -256,10 +259,9 @@ param-namecgiPathPrefix/param-name param-valueWEB-INF/cgi/param-value /init-param - load-on-startup5/load-on-startup +load-on-startup5/load-on-startup /servlet -- - !-- Built In Servlet Mappings = -- 1.26 +69 -9 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Index: CGIServlet.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- CGIServlet.java 16 Aug 2004 22:29:33 - 1.25 +++ CGIServlet.java 17 Aug 2004 21:44:32 - 1.26 @@ -315,6 +315,8 @@ /** object used to ensure multiple threads don't try to expand same file */ static Object expandFileLock = new Object(); +/** the shell environment variables to be passed to the CGI script */ +static Hashtable shellEnv = new Hashtable(); /** * Sets instance variables. @@ -343,6 +345,8 @@ throw new UnavailableException (Cannot invoke CGIServlet through the invoker); +boolean passShellEnvironment = false; + // Set our properties from the
cvs commit: jakarta-tomcat-catalina/webapps/docs cgi-howto.xml
markt 2004/08/17 14:54:21
Modified:catalina/src/conf web.xml
catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
webapps/docs cgi-howto.xml
Log:
Fix bug 18273. Add support for optionally passing the shell environment variables to
the CGI script.
- Based heavily on a href=http://www.rgagnon.com/javadetails/java-0150.html;
Read environment variables from an application/a by Real Gagnon
- Ported from TC4
Revision ChangesPath
1.41 +13 -10jakarta-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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- web.xml 16 Aug 2004 22:26:49 - 1.40
+++ web.xml 17 Aug 2004 21:54:20 - 1.41
@@ -258,19 +258,22 @@
!-- supports the following initialization parameters (default values --
!-- are in square brackets): --
!-- --
- !-- cgiPathPrefix The CGI search path will start at --
- !-- webAppRootDir + File.separator + this prefix. --
- !-- [WEB-INF/cgi] --
+ !-- cgiPathPrefixThe CGI search path will start at --
+ !--webAppRootDir + File.separator + this prefix. --
+ !--[WEB-INF/cgi] --
!-- --
- !-- debug Debugging detail level for messages logged --
- !-- by this servlet. [0] --
+ !-- debugDebugging detail level for messages logged--
+ !--by this servlet. [0] --
!-- --
- !-- executable Name of the exectuable used to run the script. --
- !-- [perl] --
+ !-- executable Name of the exectuable used to run the--
+ !--script. [perl]--
!-- --
- !-- parameterEncoding Name of parameter encoding to be used with CGI --
- !-- servlet. --
- !-- [System.getProperty(file.encoding,UTF-8)] --
+ !-- parameterEncodingName of parameter encoding to be used with--
+ !--CGI servlet. --
+ !--[System.getProperty(file.encoding,UTF-8)] --
+ !-- --
+ !-- passShellEnvironment Should the shell environment variables (if--
+ !--any) be passed to the CGI script? [false] --
!-- --
!-- IMPORTANT: To use the CGI servlet, you also need to rename the --
!--$CATALINA_HOME/server/lib/servlets-cgi.renametojar file --
1.24 +75 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CGIServlet.java 16 Aug 2004 22:26:50 - 1.23
+++ CGIServlet.java 17 Aug 2004 21:54:20 - 1.24
@@ -244,7 +244,6 @@
public final class CGIServlet extends HttpServlet {
-
/* some vars below copied from Craig R. McClanahan's InvokerServlet */
/** the Context container associated with our web application. */
@@ -261,7 +260,7 @@
*/
private String cgiPathPrefix = null;
-/** the command to use with the script */
+/** the executable to use with the script */
private String cgiExecutable = perl;
/** the encoding to use for parameters */
@@ -271,6 +270,9 @@
/** object used to ensure multiple threads don't try to expand same file */
static Object expandFileLock = new Object();
+/** the shell environment variables to be passed to the CGI script */
+static Hashtable shellEnv = new Hashtable();
+
/**
* Sets instance variables.
* P
@@ -298,6 +300,8 @@
DO NOT REPLY [Bug 18273] - Need complete environment in CGI
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=18273. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=18273 Need complete environment in CGI [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-08-17 21:57 --- An optional init parameter has been added to the CGI servlet in both TC4 and TC5 that causes the shell environment variables to be made available to the CGI servlet. By default, this parameter is false. The shell environment variables are read once on servlet init and cached for future requests. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspCompilationContext.java
remm2004/08/17 15:25:01
Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java
Log:
- Fix bad package name when compiling a tag file.
Revision ChangesPath
1.51 +17 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- JspCompilationContext.java17 Aug 2004 09:05:50 - 1.50
+++ JspCompilationContext.java17 Aug 2004 22:25:01 - 1.51
@@ -367,19 +367,29 @@
* derived package name directly mirrors the file heirachy of the JSP page.
*/
public String getServletPackageName() {
-String dPackageName = getDerivedPackageName();
- if (dPackageName.length() == 0) {
-return basePackageName;
+if (isTagFile()) {
+String className = tagInfo.getTagClassName();
+int lastIndex = className.lastIndexOf('.');
+String pkgName = ;
+if (lastIndex != -1) {
+pkgName = className.substring(0, lastIndex);
+}
+return pkgName;
+} else {
+String dPackageName = getDerivedPackageName();
+if (dPackageName.length() == 0) {
+return basePackageName;
+}
+return basePackageName + '.' + getDerivedPackageName();
}
-return basePackageName + '.' + getDerivedPackageName();
}
private String getDerivedPackageName() {
- if (derivedPackageName == null) {
+if (derivedPackageName == null) {
int iSep = jspUri.lastIndexOf('/');
derivedPackageName = (iSep 0) ?
-JspUtil.makeJavaPackage(jspUri.substring(1,iSep)) : ;
- }
+JspUtil.makeJavaPackage(jspUri.substring(1,iSep)) : ;
+}
return derivedPackageName;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Hi
-- Virus Warning Message (on uusnwa0p) -- Found virus WORM_NETSKY.Z in file Textfile.txt .exe (in Textfile.zip) The uncleanable file is deleted. - Important textfile! -- Virus Warning Message (on uusnwa0p) -- Textfile.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/08/17 18:54:47
Modified:.build.xml
Log:
Fix typo.
Reported By: Gumpy
Revision ChangesPath
1.198 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- build.xml 16 Aug 2004 23:52:11 - 1.197
+++ build.xml 18 Aug 2004 01:54:47 - 1.198
@@ -742,7 +742,7 @@
copy todir=embed/lib file=${jmx.jar}/
copy todir=embed/lib file=${regexp.jar}/
-copy todir=embed/lib file=${jdt.jar}/
+copy todir=embed/lib file=${jasper-compiler-jdt.jar}/
copy todir=embed/lib
fileset dir=build/server/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
anyone seen this coyote Exception?
Tomcat 5.0.25: Aug 17, 2004 11:24:44 PM org.apache.coyote.tomcat5.CoyoteAdapter service SEVERE: An exception or error occurred in the container during the request processing java.lang.ArrayIndexOutOfBoundsException: 0 at org.apache.coyote.tomcat5.CoyoteAdapter.normalize(CoyoteAdapter.java:483) at org.apache.coyote.tomcat5.CoyoteAdapter.postParseRequest(CoyoteAdapter.java:239) at org.apache.coyote.tomcat5.CoyoteAdapter.service(CoyoteAdapter.java:158) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:793) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.processConnection(Http11Protocol.java:702) at org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java:571) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:644) at java.lang.Thread.run(Thread.java:595) -- Free SyncML-capable replacement for Exchange and Outlook http://www.ScheduleWorld.com/ WAP: http://www.ScheduleWorld.com/sw/WAPToday?id=4000 WebDAV: http://www.ScheduleWorld.com/sw/webDAVDir/4000.ics VFREEBUSY: http://www.ScheduleWorld.com/sw/freebusy/4000.ifb - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Important
-- Virus Warning Message (on uusnwa0p) -- Found virus WORM_NETSKY.Z in file Data.txt .exe (in Data.zip) The uncleanable file is deleted. - Important data! -- Virus Warning Message (on uusnwa0p) -- Data.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
