cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2004/10/03 01:53:56
Modified:.build.xml
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardEngine.java
mbeans-descriptors.xml
catalina/src/share/org/apache/catalina/connector
Connector.java
resources/mbeans tomcat5-ant.xml
catalina/src/share/org/apache/catalina/realm RealmBase.java
webapps/docs changelog.xml
Log:
- Fix embed and deployer packaging.
- Fix JMX registration of realm.
- Fix a variety of problems in MBean names.
Revision ChangesPath
1.215 +25 -52jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- build.xml 16 Sep 2004 13:38:14 - 1.214
+++ build.xml 3 Oct 2004 08:53:55 - 1.215
@@ -830,54 +830,42 @@
!-- == Embed target === --
target name=embed description=Create a set of jars for embedded tomcat
-!-- Generic libraries ( share ?) --
+
+ !-- Generic libraries --
copy todir=embed/lib file=${commons-logging.jar}/
-copy todir=embed/lib file=${commons-digester.jar}/
copy todir=embed/lib file=${commons-modeler.jar}/
-copy todir=embed/lib file=${commons-beanutils.jar}/
-copy todir=embed/lib file=${commons-collections.jar}/
-
-copy todir=embed/lib file=${jasper-compiler-jdt.jar}/
-copy todir=embed/lib
- fileset dir=build/server/lib
-include name=tomcat-util.jar/
- /fileset
-/copy
-
!-- Connector --
copy todir=embed/lib
fileset dir=build/server/lib
+ !--include name=tomcat-ajp.jar/--
include name=tomcat-coyote.jar/
-include name=tomcat-http11.jar/
-include name=tomcat-ajp.jar/
+include name=tomcat-http.jar/
+include name=tomcat-util.jar/
/fileset
/copy
!-- Servlet API implementation --
copy todir=embed/lib
fileset dir=build/common/lib
+include name=naming-factory.jar/
include name=servlet-api.jar/
-include name=jsp-api.jar/
-include name=naming-resources.jar/
-include name=naming-common.jar/
/fileset
fileset dir=build/server/lib
-include name=servlets-common.jar/
-include name=servlets-invoker.jar/
-include name=servlets-default.jar/
include name=catalina.jar/
include name=catalina-optional.jar/
+include name=naming-resources.jar/
+include name=servlets-default.jar/
/fileset
/copy
-!-- JNDI extra --
+!-- JNDI extra
copy todir=embed/lib
fileset dir=build/common/lib
-include name=naming-java.jar/
include name=naming-factory.jar/
/fileset
/copy
+--
!-- JSP runtime --
copy todir=embed/lib
@@ -885,24 +873,19 @@
include name=commons-el.jar/
include name=jsp-api.jar/
include name=jasper-runtime.jar/
-include name=jasper-compiler.jar/
/fileset
/copy
!-- JSP compiler - not needed for an minimal server if it
uses precompilation --
-!--
copy todir=embed/lib
fileset dir=build/common/lib
-include name=ant.jar/
-include name=ant-launcher.jar /
- /fileset
- fileset dir=build/common/lib
include name=jasper-compiler.jar/
+include name=jasper-compiler-jdt.jar/
/fileset
/copy
---
-copy tofile=embed/build.xml file=resources/mbeans/tomcat5-ant.xml /
+
+ copy tofile=embed/build.xml file=resources/mbeans/tomcat5-ant.xml /
!--
copy tofile=embed/tomcat5-mbeans.xml
file=resources/mbeans/tomcat5-mbeans.xml /
copy tofile=embed/tomcat5-mlet.xml file=resources/mbeans/tomcat5-mlet.xml
/
@@ -910,9 +893,10 @@
--
mkdir dir=embed/conf/
-copy todir=embed/conf
+ delete file=embed/conf/context.xml /
+ copy todir=embed/conf
fileset dir=build/conf
- include name=jk2.properties/
+ include name=context.xml/
include name=tomcat-users.xml/
include name=web.xml/
!-- no longer needed
@@ -920,7 +904,8 @@
--
/fileset
/copy
-
+ replace file=embed/conf/context.xml token=lt;Context value=lt;Context
privileged='true' /
+
mkdir dir=embed/webapps/
copy todir=embed/webapps
fileset dir=dist/webapps includes=ROOT/**/
@@ -935,7 +920,7 @@
target name=deployer description=Create the Tomcat
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
remm2004/10/03 02:03:21
Modified:jasper2/src/share/org/apache/jasper JspC.java
Log:
- Fix cosmetic issue where extra CRLF would be inserted during each precompilation.
Revision ChangesPath
1.82 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- JspC.java 2 Sep 2004 16:05:06 - 1.81
+++ JspC.java 3 Oct 2004 09:03:21 - 1.82
@@ -683,6 +683,7 @@
}
if (line.indexOf(insertEndMarker) = 0) {
line = reader.readLine();
+line = reader.readLine();
if (line == null) {
return;
}
@@ -696,7 +697,7 @@
break;
}
if (pos = 0) {
-writer.println(line.substring(0, pos));
+writer.print(line.substring(0, pos));
break;
} else {
writer.println(line);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: jakarta-tomcat-5/jakarta-tomcat-dbcp 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-dbcp has an issue affecting its community integration. This issue affects 14 projects, and has been outstanding for 107L runs. Project State : 'Failed' The following are affected: - avalon-http-context : Avalon SVN - avalon-http-demo : Avalon SVN - avalon-http-examples : Avalon SVN - avalon-http-impl : Avalon SVN - avalon-http-server : Avalon SVN - avalon-http-servlet : Avalon SVN - avalon-http-static : Avalon SVN - avalon-http-test : Avalon SVN - avalon-planet-facilities : Avalon SVN - jakarta-tomcat-5 : Servlet 2.4 and JSP 2.0 Reference Implementation - jakarta-tomcat-catalina : Servlet 2.4 Reference Implementation - jakarta-tomcat-dbcp : Servlet 2.4 and JSP 2.0 Reference Implementation - jakarta-tomcat-jk : Connectors to various web servers - metro-reflector-blocks-complete : Avalon SVN Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-dbcp/index.html That said, some snippets follow: The following annotations were provided: -DEBUG- Sole output [naming-factory-dbcp.jar] identifier set to project name -INFO- Made directory [/usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps] -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-dbcp/gump_work/build_jakarta-tomcat-5_jakarta-tomcat-dbcp.html Work Name: build_jakarta-tomcat-5_jakarta-tomcat-dbcp (Type: Build) State: Failed Elapsed: 4 secs Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/usr/local/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dcommons-collections.home=/usr/local/gump/public/workspace/jakarta-commons/collections -Dcommons-dbcp.home=/usr/local/gump/public/workspace/jakarta-commons/dbcp -Dcommons-dbcp.version=03102004 -Dtomcat-dbcp.home=/usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps -Dcommons-pool.home=/usr/local/gump/public/workspace/jakarta-commons/pool build-tomcat-dbcp [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-5] CLASSPATH : /usr/local/j2sdk1.4.2_04/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar- Buildfile: build.xml build-tomcat-dbcp: -build-tomcat-dbcp: [copy] Copying 65 files to /usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps [mkdir] Created dir: /usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps/src/java/org/apache/tomcat/dbcp BUILD FAILED /usr/local/gump/public/workspace/jakarta-tomcat-5/build.xml:628: The following error occurred while executing this line: /usr/local/gump/public/workspace/jakarta-tomcat-5/build.xml:663: Cannot replace directory /usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps/src/java/org/apache/tomcat/dbcp with directory /usr/local/gump/public/workspace/jakarta-tomcat-5/tomcat-deps/src/java/org/apache/commons Total time: 3 seconds - To subscribe to this information via syndicated feeds: RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-dbcp/rss.xml Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-dbcp/atom.xml -- Gump E-mail Identifier (within run) #14. Produced by Gump 2.1.0-alpha-0003. [Run (4203102004, brutus:brutus-public:4203102004)] http://brutus.apache.org/gump/public/index.html http://brutus.apache.org/gump/public/options.html -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
remm2004/10/03 04:48:59 Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java Log: - Oops, made a mistake with what the default should be. Probably I set that to the wrong value during early testing. Revision ChangesPath 1.40 +1 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java Index: PoolTcpEndpoint.java === RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- PoolTcpEndpoint.java 1 Oct 2004 23:46:57 - 1.39 +++ PoolTcpEndpoint.java 3 Oct 2004 11:48:59 - 1.40 @@ -86,7 +86,7 @@ protected boolean tcpNoDelay=false; protected int linger=100; protected int socketTimeout=-1; -private boolean lf = false; +private boolean lf = true; // -- Leader follower fields - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE][RESULT] Tomcat 5.5.2 Stability
Shapira, Yoav wrote: So with 5.5.2 staying where it is, when shall I cut 5.5.3? I'm done with my changes, so I'm +1 for tagging very soon. I'll try to patch as much as possible the save-to-xml feature later today so that it kinda works. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/ROOT index.jsp
funkman 2004/10/03 05:57:56 Modified:webapps/ROOT index.jsp Log: Add a small comment to note changing index.jsp does nothing since it was precompiled. Revision ChangesPath 1.16 +5 -0 jakarta-tomcat-catalina/webapps/ROOT/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- index.jsp 27 May 2004 13:23:14 - 1.15 +++ index.jsp 3 Oct 2004 12:57:56 - 1.16 @@ -155,6 +155,11 @@ pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=tomcat-docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p +pbNOTE:/b This page is precompiled. If you change it, this page will not change since + it was compiled into a servlet at build time. + (See tt$CATALINA_HOME/webapps/ROOT/WEB-INF/web.xml/tt as to how it was mapped.) +/p + pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp is restricted to users with role manager./b - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs tomcat-docs.xsl
funkman 2004/10/03 06:07:36 Modified:webapps/docs tomcat-docs.xsl Log: Allow word wrapping on the title to get rid of the horizontal scrolls. Revision ChangesPath 1.9 +2 -2 jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl Index: tomcat-docs.xsl === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tomcat-docs.xsl 23 Sep 2004 06:55:25 - 1.8 +++ tomcat-docs.xsl 3 Oct 2004 13:07:36 - 1.9 @@ -115,7 +115,7 @@ td width=80% valign=top align=left table border=0 width=100% cellspacing=4 tr - td align=left valign=top nowrap=true + td align=left valign=top h1xsl:value-of select=project/title//h1 h2xsl:value-of select=properties/title//h2 /td - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs introduction.xml
funkman 2004/10/03 06:10:27 Modified:webapps/docs introduction.xml Log: Fix wiki link Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-catalina/webapps/docs/introduction.xml Index: introduction.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/introduction.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- introduction.xml 1 Mar 2004 14:01:28 - 1.6 +++ introduction.xml 3 Oct 2004 13:10:27 - 1.7 @@ -100,7 +100,7 @@ and effort. There's nothing like scouring the web only to find out that the answer was right in front of you all along!/li lia href=http://jakarta.apache.org/tomcat/faq/;Tomcat FAQ/a as maintained by the developers./li -lia href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat;Tomcat WIKI/a/li +lia href=http://wiki.apache.org/jakarta-tomcat/;Tomcat WIKI/a/li liTomcat FAQ at a href=http://www.jguru.com/faq/home.jsp?topic=Tomcat;jGuru/a/li liTomcat mailing list archives - numerous sites archive the Tomcat mailing lists. Since the links change over time, clicking here will search - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 4 [2004/10/03]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 3614|Opn|Nor|2001-09-14|bug in manager webapp | | 3839|Opn|Maj|2001-09-26|Problem bookmarking login page| | 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped | | 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st| | 4663|Opn|Maj|2001-11-05|Broken Pipe under some load | | 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out | | 6582|New|Min|2002-02-20|Sample code does not match behavior | | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7360|New|Nor|2002-03-22|res-sharing-scope not supported | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in h| | 7723|New|Enh|2002-04-03|[patch] additional factory for org.apache.naming.f| | 7831|New|Nor|2002-04-08|[PATCH] JNDIRealm does not work with CLIENT-CERT a| | 7880|Ver|Cri|2002-04-09|If a TLV flags flags an error during the translati| | 8026|New|Enh|2002-04-12|Exceptions in StandardHostDeployer.addChild are lo| | 8275|Ver|Min|2002-04-18|ContextConfig.start() attempts to create a $CATALI| | 8323|New|Enh|2002-04-20|No support for running the 64 bit JVM | | 8343|New|Enh|2002-04-21|adding a absorber logger class to org.apache.ca| | 8441|New|Enh|2002-04-23|Command line files for NetWare| | 8541|New|Nor|2002-04-26|IIS redirector URL-encodes cookie values | | 8705|New|Enh|2002-05-01|SessionListener should extend EventListener | | 8744|New|Enh|2002-05-02|No way to configure/extend runtime classloaders. | | 8776|New|Enh|2002-05-03|The session url encoding under somce circumstances| | 9027|New|Cri|2002-05-13|The Tomcat Servlet Container use the identity spec| | 9050|Ver|Nor|2002-05-13|GET Query Parameters Require an Equal Sign| | 9227|New|Enh|2002-05-19|Allow an empty value of a pathname in the Standard| | 9456|New|Enh|2002-05-28|Problem saving server.xml file: invalid XML markup| | 9511|New|Enh|2002-05-30|Object instantiation optimization in StandardSessi| | 9629|New|Enh|2002-06-05|Fix ServletContext.getResourcePaths to match spec | | 9745|New|Enh|2002-06-10|extern cache mgt bug for conditionally dynamic pag| | 9852|New|Enh|2002-06-13|Odd Digest and Realm Behaviour| | 9856|New|Enh|2002-06-14|sendError(404) fails after getOutputStream() is ca| |10021|New|Enh|2002-06-19|Include upgrade option in installer | |10026|Opn|Nor|2002-06-19|manager/stop and manager/remove | |10060|New|Enh|2002-06-20|Make the common and shared class loaders look in c| |10120|New|Enh|2002-06-21|Custom realm and shared instalation. | |10225|New|Enh|2002-06-25|ANT Tasks Error Situation | |10335|New|Enh|2002-06-28|[RFE,patch] Make JAASRealm more flexible | |10385|Opn|Nor|2002-07-01|SSI-Servlet produces invalid character encoding in| |10457|New|Enh|2002-07-03|Patch submission for DefaultServlet/WebdavServlet | |10526|New|Enh|2002-07-06|Authenticators do not always cache the Principal | |10541|New|Nor|2002-07-08|Content-length header should be automatically set | |10565|Opn|Enh|2002-07-08|shutdown hook problem: java.lang.NoClassDefFoundE| |10671|Opn|Nor|2002-07-11|Major issues with jsp:param in jsp:include and jsp|
Bug report for Tomcat 3 [2004/10/03]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle| | 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/| | 4980|New|Min|2001-11-20|Startup message indicates incorrect log file | | 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu| | 5064|New|Cri|2001-11-25|Socket write error when include files is more than| | 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 | | 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r| | 5160|Unc|Maj|2001-11-28|'IllegalStateException' | | 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization | | 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv| | 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL | | 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin| | 6027|New|Maj|2002-01-25|Tomcat Automatically shuts down as service | | 6168|New|Blk|2002-02-01|IllegalStateException | | 6451|New|Cri|2002-02-14|Stackoverflow | | 6478|New|Enh|2002-02-14|Default Tomcat Encoding | | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err| | 6702|New|Cri|2002-02-27|win 2k services not working | | 6796|New|Cri|2002-03-01|Tomcat dies periodically | | 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil| | 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact| | 7227|New|Nor|2002-03-19|error-code directive don't work | | 7626|New|Nor|2002-03-29|classloader not working properly | | 7652|New|Cri|2002-04-01|Tomcat stalls periodically| | 7785|New|Blk|2002-04-06|tomcat bug in context reloading | | 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS | | 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database | | 8239|New|Cri|2002-04-18|Resource temporary unavailable| | 8263|New|Cri|2002-04-18|url-pattern easy to circumvent| | 9250|New|Maj|2002-05-20|outOfMemoryError | | 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession| | 9390|New|Nor|2002-05-24|jasper compilation error in tomcat| | 9480|New|Nor|2002-05-29|Data connection pooling | | 9607|New|Maj|2002-06-04|precompile JSP| | 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |10047|New|Cri|2002-06-20|IllegalStateException | |10202|New|Maj|2002-06-25|Tomcat is not responding in time | |10357|Unc|Blk|2002-06-30|java.lang.IllegalArgumentException: Short Read| |10406|New|Cri|2002-07-02|IllegalStateException | |11087|New|Blk|2002-07-23|IllegalStateException | |11286|New|Maj|2002-07-30|Tomcat threads not respond if increase JVM size | |11466|New|Nor|2002-08-05|ContextManager: SocketException reading request | |12156|New|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem | |12194|New|Maj|2002-08-30|Tomcat does not send WWW-Authenticate header | |12475|New|Nor|2002-09-10|CPU Usage is 0%, Tomcat doesn't response | |12852|New|Nor|2002-09-20|May be error in _jspService() - out.flushBuffers(| |13706|New|Nor|2002-10-16|Many Processs Java / TOMCAT in a PC with Linux Con| |14386|New|Maj|2002-11-08|Date headers corrupted using setDateHeader| |15632|New|Nor|2002-12-23|Problem with the Tomcat Sessions Parameter on URL |
Bug report for Watchdog [2004/10/03]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld urn should be uri BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| |24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara| |29398|New|Nor|2004-06-04|Update site and note current status | +-+---+---+--+--+ | Total 15 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers CoyoteMapper.java
billbarker2004/10/03 11:01:52
Modified:src/share/org/apache/tomcat/core Request.java
src/share/org/apache/tomcat/modules/mappers
CoyoteMapper.java
Log:
Integrate the MappingData with the Request.
Revision ChangesPath
1.120 +11 -1 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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- Request.java 25 Feb 2004 06:45:07 - 1.119
+++ Request.java 3 Oct 2004 18:01:52 - 1.120
@@ -30,6 +30,7 @@
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.Parameters;
+import org.apache.tomcat.util.http.mapper.MappingData;
/**
* This is a low-level, efficient representation of a server request. Most fields
@@ -155,6 +156,7 @@
protected ContextManager contextM;
protected Context context;
protected Object requestFacade;
+protected MappingData mappingData = null;
// Session
protected String reqSessionId;
@@ -352,6 +354,14 @@
this.localHost = host;
}
+public MappingData getMappingData() {
+ if(mappingData == null) {
+ mappingData = new MappingData();
+ mappingData.wrapperPath = servletPathMB;
+ mappingData.pathInfo = pathInfoMB;
+ }
+ return mappingData;
+}
// Parameters
@@ -1045,7 +1055,7 @@
scookies.recycle();
for( int i=0; iContextManager.MAX_NOTES; i++ ) notes[i]=null;
-
+
// sub-req
parent=null;
child=null;
1.2 +7 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/CoyoteMapper.java
Index: CoyoteMapper.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/CoyoteMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CoyoteMapper.java 22 Aug 2004 23:49:20 - 1.1
+++ CoyoteMapper.java 3 Oct 2004 18:01:52 - 1.2
@@ -56,8 +56,8 @@
public class CoyoteMapper extends BaseInterceptor {
public static final String DEFAULT_HOST = DEFAULT;
-Mapper map;
-Hashtable hostData = new Hashtable();
+private Mapper map;
+private Hashtable hostData = new Hashtable();
public CoyoteMapper() {
}
@@ -190,13 +190,13 @@
// This is a sub-request for the default host.
hostMB.setString(DEFAULT_HOST);
}
- MappingData mdata = new MappingData();
- mdata.wrapperPath = req.servletPath();
- mdata.pathInfo = req.pathInfo();
+ MappingData mdata = req.getMappingData();
+ mdata.recycle();
try {
map.map(hostMB, pathMB, mdata);
} catch(Exception ex) {
log(Error mapping +pathMB,ex);
+ req.getResponse().setErrorException(ex);
return 500;
}
if(mdata.context != null) {
@@ -206,9 +206,9 @@
req.setContainer( container );
if(!mdata.redirectPath.isNull()) {
Response res = req.getResponse();
- if(debug 0)
+ if(debug 9)
log(Redirecting '+req+' to '+
- mdata.redirectPath+', new Exception());
+ mdata.redirectPath+');
res.setHeader(Location, mdata.redirectPath.toString());
return 302;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
