PATCH: Japanese Resorce Bundles

2001-10-04 Thread Kazuhiro Kazama

These patches are for Japanese resource bundles and they includes a
little modification and a change for a change of an original resource
bundle.

Would you apply them to a HEAD branch and a tomcat_40_branch?

Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories




Index: jasper/src/share/org/apache/jasper/resources/messages_ja.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.3
diff -c -u -r1.3 messages_ja.properties
--- jasper/src/share/org/apache/jasper/resources/messages_ja.properties 2001/10/03 
21:48:30 1.3
+++ jasper/src/share/org/apache/jasper/resources/messages_ja.properties 2001/10/04 
+07:13:17
@@ -209,7 +209,7 @@
 
jspc.error.emptyWebApp=-webapp\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u5f15\u6570\u304c\u5fc5\u8981\u3067\u3059
 
jsp.error.library.invalid=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306b\u5f93\u3046\u3068JSP\u30da\u30fc\u30b8\u306f\u7121\u52b9\u3067\u3059:
 {1}
 
jsp.warning.tlvclass.is.null=TagLibraryValidator\u30af\u30e9\u30b9{0}\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093:
 {1}
-jsp.error.taglibraryvalidator.invalidpage=
+jsp.error.taglibraryvalidator.invalidpage=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea 
+{0} 
+\u306e\u8a3c\u660e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 
jsp.parser.sax.propertynotsupported=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093:
 {0}
 
jsp.parser.sax.propertynotrecognized=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093:
 {0}
 
jsp.parser.sax.featurenotsupported=SAX\u30d5\u30a3\u30fc\u30c1\u30e3\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093:
 {0}


Index: catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties,v
retrieving revision 1.1
diff -c -u -r1.1 LocalStrings_ja.properties
--- catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
2001/09/13 02:19:21 1.1
+++ catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
+2001/10/04 07:12:26
@@ -1,9 +1,9 @@
-accessLogValve.alreadyStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u3059\u3067\u306b\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059
-accessLogValve.notStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u307e\u3060\u8d77\u52d5\u3057\u3066\u3044\u307e\u305b\u3093
-certificatesValve.alreadyStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u3059\u3067\u306b\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059
-certificatesValve.notStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3057\u3066\u3044\u307e\u305b\u3093
-interceptorValve.alreadyStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u3059\u3067\u306b\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059
-interceptorValve.notStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3057\u3066\u3044\u307e\u305b\u3093
+accessLogValve.alreadyStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+accessLogValve.notStarted=\u30a2\u30af\u30bb\u30b9\u30ed\u30ac\u30fc\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+certificatesValve.alreadyStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+certificatesValve.notStarted=\u8a8d\u8a3c\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+interceptorValve.alreadyStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+interceptorValve.notStarted=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u30d0\u30eb\u30d6\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 
requestFilterValve.next=\u6b21\u306e\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 
requestFilterValve.syntax=\u30ea\u30af\u30a8\u30b9\u30c8\u30d5\u30a3\u30eb\u30bf\u30d1\u30bf\u30fc\u30f3
 {0} \u306b\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059
 valveBase.noNext=\u8a2d\u5b9a\u30a8\u30e9\u30fc: 
\u6b21\u306e\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093



DO NOT REPLY [Bug 3961] New: - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3961

FactoryConfigurationError on Servlet+JSP+taglib

   Summary: FactoryConfigurationError on Servlet+JSP+taglib
   Product: Tomcat 3
   Version: 3.3 Release Candidate 1
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


When using a controller servlet, that includes a JSP page with a custom taglib
I get the error
javax.xml.parsers.FactoryConfigurationError: Provider 
org.apache.crimson.jaxp.DocumentBuilderFactoryImpl not found
Root cause:
java.lang.ClassNotFoundException: 
org.apache.crimson.jaxp.DocumentBuilderFactoryImpl
at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
at java.lang.ClassLoader.loadClass(ClassLoader.java:297)
at java.net.FactoryURLClassLoader.loadClass(URLClassLoader.java:553)
at java.lang.ClassLoader.loadClass(ClassLoader.java:253)
at javax.xml.parsers.FactoryFinder.newInstance(FactoryFinder.java:141)
at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:233)
at 
javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java
:139)
at org.apache.jasper.compiler.JspUtil.parseXMLDocJaxp(JspUtil.java:144)
at org.apache.jasper.compiler.JspUtil.parseXMLDoc(JspUtil.java:134)
at 
org.apache.jasper.compiler.TagLibraryInfoImpl.(TagLibraryInfoImpl.java:165)
at 
org.apache.jasper.compiler.JspParseEventListener.handleDirective(JspParseEventLi
stener.java:728)
at 
org.apache.jasper.compiler.DelegatingListener.handleDirective(DelegatingListener
.java:116)
at org.apache.jasper.compiler.Parser$Directive.accept(Parser.java:215)

The same Servlet+JSP+taglib combination works fine with Tomcat 3.2.x and 4.0.



DO NOT REPLY [Bug 3851] - SingleThreadModel ignored

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3851

SingleThreadModel ignored





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 01:31 ---
>From the early comments we draw the conclusion that this bug was
known to exist and would not be fixed in the 3.3 branch.

Actually, a check with 3.3rc1 shows that the bug does not show
up in 3.3rc1 with our code.

(It obviosly would show up if useJspServlet was set to true,
but I see no reason we would want to do that. And even that
case should be fixed now.)



Re: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Jan Grant

On Wed, 3 Oct 2001, Craig R. McClanahan wrote:

> It's not at all clear that the "Persistent URI" article you referenced has
> anything to do with whether a redirect is used for a welcome file or not

actually, I was more concerned with exposing implementation mechanisms
in URIs; and future-proofing so that when index.jsp becomes
index.csharpsp in the future (only kidding...) I'm not left with an
unmanageable mess.

> Originally (back in the pre-3.2-final days), Tomcat did the equivalent of
> a RequestDispatcher.forward() to display welcome pages.  This caused
> massive problems for people who didn't understand the difference between:
>
>   http://foo.bar/webapp
>
> and
>
>   http://foo.bar/webapp/
>
> In the former case, any relative urls on the "real" welcome page are
> broken.  This caused bug reports about welcome files not working (never
> mind that using a  element in your welcome page would have fixed
> it), which led to the current behavior.

Assuming I want this behaviour and I know the difference, is there a
preferred mechanism to replace this line in DefaultServlet.java?


redirectPath = appendParameters(request, redirectPath);
--  response.sendRedirect(redirectPath);
return;

Cheers,
jan

-- 
jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822 [EMAIL PROTECTED]
Talk is cheap: free, as in beer. As in Real Ale, not that Budweiser rubbish.




RE: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Colin Wilson-Salt

Surely the way to fix this is that a request for http://foo.bar/webapp
generates a redirect to http://foo.bar/webapp/, and a request to
http://foo.bar/webapp/ will serve the default content using forward() or
some equivalent.

> -Original Message-
> From: Jan Grant [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 10:06
> To: tomcat-dev
> Subject: Re: welcome files being forwarded to rather than 
> redirected to?
> 
> 
> On Wed, 3 Oct 2001, Craig R. McClanahan wrote:
> 
> > It's not at all clear that the "Persistent URI" article you 
> referenced has
> > anything to do with whether a redirect is used for a 
> welcome file or not
> 
> actually, I was more concerned with exposing implementation mechanisms
> in URIs; and future-proofing so that when index.jsp becomes
> index.csharpsp in the future (only kidding...) I'm not left with an
> unmanageable mess.
> 
> > Originally (back in the pre-3.2-final days), Tomcat did the 
> equivalent of
> > a RequestDispatcher.forward() to display welcome pages.  This caused
> > massive problems for people who didn't understand the 
> difference between:
> >
> >   http://foo.bar/webapp
> >
> > and
> >
> >   http://foo.bar/webapp/
> >
> > In the former case, any relative urls on the "real" welcome page are
> > broken.  This caused bug reports about welcome files not 
> working (never
> > mind that using a  element in your welcome page would 
> have fixed
> > it), which led to the current behavior.
> 
> Assuming I want this behaviour and I know the difference, is there a
> preferred mechanism to replace this line in DefaultServlet.java?
> 
> 
> redirectPath = appendParameters(request, 
> redirectPath);
> --  response.sendRedirect(redirectPath);
> return;
> 
> Cheers,
> jan
> 
> -- 
> jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
> Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822 
> [EMAIL PROTECTED]
> Talk is cheap: free, as in beer. As in Real Ale, not that 
> Budweiser rubbish.
> 



Re: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Bojan Smojver

Jan Grant wrote:

> actually, I was more concerned with exposing implementation mechanisms
> in URIs; and future-proofing so that when index.jsp becomes
> index.csharpsp in the future (only kidding...) I'm not left with an
> unmanageable mess.

He, he, good one!

:-))

Bojan



RE: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Jan Grant

On Thu, 4 Oct 2001, Colin Wilson-Salt wrote:

> Surely the way to fix this is that a request for http://foo.bar/webapp
> generates a redirect to http://foo.bar/webapp/, and a request to
> http://foo.bar/webapp/ will serve the default content using forward() or
> some equivalent.

Yep, reckon so. I've no problem with blah.../dirname generating a
redirect to blah.../dirname/ - it's the forwarding I'm interested in.

>
> > -Original Message-
> > From: Jan Grant [mailto:[EMAIL PROTECTED]]
> > Sent: Thursday, October 04, 2001 10:06
> > To: tomcat-dev
> > Subject: Re: welcome files being forwarded to rather than
> > redirected to?
> >
> >
> > On Wed, 3 Oct 2001, Craig R. McClanahan wrote:
> >
> > > It's not at all clear that the "Persistent URI" article you
> > referenced has
> > > anything to do with whether a redirect is used for a
> > welcome file or not
> >
> > actually, I was more concerned with exposing implementation mechanisms
> > in URIs; and future-proofing so that when index.jsp becomes
> > index.csharpsp in the future (only kidding...) I'm not left with an
> > unmanageable mess.
> >
> > > Originally (back in the pre-3.2-final days), Tomcat did the
> > equivalent of
> > > a RequestDispatcher.forward() to display welcome pages.  This caused
> > > massive problems for people who didn't understand the
> > difference between:
> > >
> > >   http://foo.bar/webapp
> > >
> > > and
> > >
> > >   http://foo.bar/webapp/
> > >
> > > In the former case, any relative urls on the "real" welcome page are
> > > broken.  This caused bug reports about welcome files not
> > working (never
> > > mind that using a  element in your welcome page would
> > have fixed
> > > it), which led to the current behavior.
> >
> > Assuming I want this behaviour and I know the difference, is there a
> > preferred mechanism to replace this line in DefaultServlet.java?
> >
> >
> > redirectPath = appendParameters(request,
> > redirectPath);
> > --  response.sendRedirect(redirectPath);
> > return;
> >
> > Cheers,
> > jan
> >
> > --
> > jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
> > Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822
> > [EMAIL PROTECTED]
> > Talk is cheap: free, as in beer. As in Real Ale, not that
> > Budweiser rubbish.
> >
>
>

-- 
jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822 [EMAIL PROTECTED]
You see what happens when you have fun with a stranger in the Alps?




DO NOT REPLY [Bug 3941] - PrinWriter.flush() HttpServletResponse.flushBuffer() do not work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3941

PrinWriter.flush() HttpServletResponse.flushBuffer() do not work

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 03:59 ---
I should clarify that I am implementing a SERVLET-TO-SERVLET streaming 
communication and although the flushing works with a browser it doesn't in
a situation such as shown in my simple example. It could be that the problem
is not with PrinWriter.flush() or HttpServletResponse.flushBuffer(), but with 
another component of Tomcat 4 which is doing some additional buffering behind 
the scenes and thus preventing the output from being sent straight away to the 
client side.
BufferedReader on the client side did not cause any problems on Tomcat 3.
When I run my test example under Tomcat 3.2.3 it outputs banana: yellow, waits 
for 2 seconds then outputs sea: blue, waits for 2 seconds and then outputs 
snow: white before exiting (AS IT SHOULD).
With Tomcat 4 I get all 3 parameters at once and ONLY when the program exits, 
without 
the 2 second wait time between the 3 parameters, showing that flushing the 
writer and the response is not enough to send the output to the client. only 
when the program exits that the output appears.



[PATCH]JSP compiler plugin for GPLd Java compiler

2001-10-04 Thread Takashi Okamoto
Hi, tomcat.

I wrote JSP compiler plugin for kjc which is open source Java
compiler (see http://www.dms.at/kopi/ for more detail). This plugin
works with tomcat 4.0. You can see TC4.0 example JSPs with this
plugin.

I have posted 3.2 versions already though you didn't take it.
If someone is interested in kjc, please try this patch.

BTW, I'll quit this ml soon. If you have a question or a suggestion about
this,  please forward me
([EMAIL PROTECTED]).

regards.

Takashi Okamoto
 KjcJavaCompiler.java


RE: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Jan Grant

On Thu, 4 Oct 2001, Jan Grant wrote:

> On Thu, 4 Oct 2001, Colin Wilson-Salt wrote:
>
> > Surely the way to fix this is that a request for http://foo.bar/webapp
> > generates a redirect to http://foo.bar/webapp/, and a request to
> > http://foo.bar/webapp/ will serve the default content using forward() or
> > some equivalent.
>
> Yep, reckon so. I've no problem with blah.../dirname generating a
> redirect to blah.../dirname/ - it's the forwarding I'm interested in.

Right, this seems to be a straightforward fix (after a fashion)...
however: I seem to recall there being early problems with jsps that
wanted to know if the original request was for
blah/
or
blah/index.jsp

...does anyone have details? As an example: sticking the snoop.jsp as a
welcome-file index.jsp gives the following output:

Request URI: /../d3/index.jsp
Request Protocol: HTTP/1.0
Servlet path: /d3/index.jsp
Path info: null
Path translated: null
Query string: null

when I'd suspect the request URI ought to be /../d3/ ...comments?

Otherwise I'll slap a configurable parameter on the DefaultServlet that
lets you choose the behaviour and post a patch.


-- 
jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822 [EMAIL PROTECTED]
Donate a signature: http://tribble.ilrt.bris.ac.uk/~cmjg/sig-submit




cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c mod_jk.dsp

2001-10-04 Thread marcsaeg

marcsaeg01/10/04 06:09:42

  Modified:jk/native/apache-2.0 mod_jk.c mod_jk.dsp
  Log:
  Changes to allow builds on Win32 platforms.
  
  Revision  ChangesPath
  1.28  +3 -1  jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_jk.c  2001/10/02 09:41:09 1.27
  +++ mod_jk.c  2001/10/04 13:09:42 1.28
  @@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Henri Gomez <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.27 $   *
  + * Version: $Revision: 1.28 $   *
***/
   
   /*
  @@ -69,6 +69,8 @@
   
   #include "apu_compat.h"
   #include "ap_config.h"
  +#include "apr_lib.h"
  +#include "apr_date.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  
  
  
  1.5   +43 -46jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_jk.dsp2001/06/07 13:54:12 1.4
  +++ mod_jk.dsp2001/10/04 13:09:42 1.5
  @@ -43,8 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D 
"_MBCS" /D "_USRDLL" /D "APACHE_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../common" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\src\include" /I 
"$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32" /D "_WIN32" /D 
"NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL" /D 
"SHARED_MODULE" /FD /c
  -# SUBTRACT CPP /Fr /YX
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I 
"$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I 
"$(APACHE2_HOME)\os\win32" /D "_WIN32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D 
"WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -54,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 
/libpath:"$(APACHE2_HOME)\src\lib\apr\Release" /libpath:"$(APACHE2_HOME)\src\CoreR"
  +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib 
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib 
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 
/libpath:"$(APACHE2_HOME)\Release" /libpath:"$(APACHE2_HOME)\srclib\apr\Release" 
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
   
   !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
   
  @@ -70,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHE_EXPORTS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../common" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\src\include" /I 
"$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32" /D "_DEBUG" /D 
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FR /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" 
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I 
"$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I 
"$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "SHARED_MODULE" /FR /YX /FD /GZ /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -80,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LIN

RE: [half-off-topic] Java Compilers

2001-10-04 Thread Aaron Mulder

On Thu, 4 Oct 2001, Deacon Marcus wrote:
> Could you give me url please?

http://java.sun.com/

(Go to the search box in the upper right and put in "dynamic event
listeners".  It's the first hit.  There's now a "new" article and an "old"
article - you want the old one.)

Aaron




DO NOT REPLY [Bug 3961] - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3961

FactoryConfigurationError on Servlet+JSP+taglib





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 08:05 ---
Created an attachment (id=641)
access /test3961/testservlet prior to view.jsp (clear work dir) to reproduce



Re: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Nick Holloway

[EMAIL PROTECTED] (Craig R. McClanahan) writes:
> Originally (back in the pre-3.2-final days), Tomcat did the equivalent of
> a RequestDispatcher.forward() to display welcome pages.  This caused
> massive problems for people who didn't understand the difference between:
> 
>   http://foo.bar/webapp
> 
> and
> 
>   http://foo.bar/webapp/
> 
> In the former case, any relative urls on the "real" welcome page are
> broken.  This caused bug reports about welcome files not working (never
> mind that using a  element in your welcome page would have fixed
> it), which led to the current behavior.

Could Tomcat not work in the way the Apache server does?

In response to the first URL (no trailing '/'), a redirect is issued
to the second URL (with trailing '/').  In response to the second URL,
an internal forward is done to the welcome page.

-- 
 `O O'  | [EMAIL PROTECTED]
// ^ \\ | http://www.pyrites.org.uk/



DO NOT REPLY [Bug 3970] New: - Cannot send more that 1 MB using multipart/form-data

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3970

Cannot send more that 1 MB using multipart/form-data

   Summary: Cannot send more that 1 MB using multipart/form-data
   Product: Tomcat 4
   Version: 4.0 Final
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Connectors
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Having tested application that upload files I found that catalina engine ( 
maybe connector ) can pass up to ~1 MB size maximum. 

If more, it fails and browser shows error.



DO NOT REPLY [Bug 3971] New: - error with catalina.bat

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3971

error with catalina.bat

   Summary: error with catalina.bat
   Product: Tomcat 4
   Version: Unknown
  Platform: PC
OS/Version: Windows 9x
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


what I downloaded :   jakarta-tomcat-4.0-20010920.zip

error in line 61,62,65, 66 of the Dos batch file: catalina.bat line 

L.61 : it's written : set _STARTJAVA=start "Catalina" "%JAVA_HOME%\bin\java"

should be :set _STARTJAVA=start "Catalina" "%JAVA_HOME%\java"  --> I removed the
bin folder because it was looking for java.exe in jdk1.3\bin\bin  The variable
%Java_Home% already contains the "bin" directory as everybody set it as : jdk1.3
\bin

For all the others lines : it's the same : it refer to %Java_home%\bin\java and 
the "bin" has to be removed because %Java_home% already include it !!

I am a newbie and very scared to go further...



DO NOT REPLY [Bug 3972] New: - JAAS Realm

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3972

JAAS Realm

   Summary: JAAS Realm
   Product: Tomcat 4
   Version: 4.0 Final
  Platform: All
OS/Version: All
Status: NEW
  Severity: Enhancement
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The Realm features of Tomcat require that I maintain my own list of users and 
passwords.  I would rather just authenticate the users against the Operating 
System.  Also, the roles of these users should come from OS group assignements.

I know the features of JAAS (which is built into Java 1.4, or an extension for 
Java 1.3) will allow you to authenticate the credentials against the Operating 
System.  Why not have a JAAS Realm?

- Greg



DO NOT REPLY [Bug 3941] - PrinWriter.flush() HttpServletResponse.flushBuffer() do not work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3941

PrinWriter.flush() HttpServletResponse.flushBuffer() do not work

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 09:21 ---
If a browser works correctly, but your client fails, then it's a client problem 
(if the flush didn't work correctly on the server side, there would be no way 
for the browser to display the data either).

In your particlar case, Catalina will return chunked output, which may cause 
the problem when using HttpURLConnection to read the data (probably the 
buffering you're talking about happens here).

You can disable chunking on the server side (at least with the current version 
of the connector) by using the allowChunking attribute (set its value to false).



Re: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread Remy Maucherat

> On Wed, 3 Oct 2001, Craig R. McClanahan wrote:
>
> > Originally (back in the pre-3.2-final days), Tomcat did the equivalent
of
> > a RequestDispatcher.forward() to display welcome pages.  This caused
> > massive problems for people who didn't understand the difference
between:
> >
> >   http://foo.bar/webapp
> >
> > and
> >
> >   http://foo.bar/webapp/
> >
> > In the former case, any relative urls on the "real" welcome page are
> > broken.  This caused bug reports about welcome files not working (never
> > mind that using a  element in your welcome page would have fixed
> > it), which led to the current behavior.
>
> Assuming I want this behaviour and I know the difference, is there a
> preferred mechanism to replace this line in DefaultServlet.java?
>
>
> redirectPath = appendParameters(request, redirectPath);
> --  response.sendRedirect(redirectPath);
> return;

Also, not doing the redirect would create lots of problems with nested
welcome pages (foo/index.html is a valid welcome page).

Remy




DO NOT REPLY [Bug 3973] New: - session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3973

session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed() 

   Summary: session.getAttribute() locks-up in
HttpSessionListener.sessionDestroyed()
   Product: Tomcat 4
   Version: 4.0 Final
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Major
  Priority: Other
 Component: Webapps
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I'm noticing some strange behaviour with a class that implements
HttpSessionListener and is registered in webapp.xml file.

When I call session.getAttribute("xxx") on a session passed into
sessionDestroyed() the thread seems to lock. No exceptions are thrown. 

I'm running tomcat 4.0 final on windows 2k. I've received the same
results on both jdk 1.3.1 and 1.4 beta.

I've simplified my class as a test case and it never makes it to the
System.out.println("attribute shown") statement.

To create and destroy the session i used two jsp pages: 

populateSession.jsp
invalidateSession.jsp 

one sets a value in the session, another
calls session.invalidate().

output from stdout.log and class definition are included bellow.

stdout.log

Create Catalina server
Starting service Tomcat-Standalone
Apache Tomcat/4.0
ServletContext Initialized
Starting service Tomcat-Apache
Apache Tomcat/4.0
Session Created 
attribute added
Session Destroyed 
 


import java.util.*;
import javax.servlet.*;
import javax.servlet.http.*;

public class LoggingController implements ServletContextListener,
HttpSessionListener
{

public LoggingController()
{
 // System.out.println("LoggingController constructed");
}

public void contextInitialized(ServletContextEvent sce)
{
System.out.println("ServletContext Initialized");
}

public void contextDestroyed(ServletContextEvent sce)
{
System.out.println("ServletContext Destroyed");
}

public void sessionCreated(HttpSessionEvent hse)
{
 System.out.println("Session Created");

 HttpSession session = hse.getSession();
 session.setAttribute("name", "scott");

 // execution makes it here ok
 System.out.println("attribute added");
}


public void sessionDestroyed(HttpSessionEvent hse)
{
 System.out.println("Session Destroyed");

 HttpSession session = hse.getSession();

 // seems to hang up on the following line
 System.out.println(session.getAttribute("name"));

 System.out.println("attribute shown");
 }
}



DO NOT REPLY [Bug 3970] - Cannot send more that 1 MB using multipart/form-data

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3970

Cannot send more that 1 MB using multipart/form-data





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 09:45 ---
Is it with a POST + the Java HTTP/1.1 connector ?
There's no special handling or special parsing for multipart/form-data.

I have been able to PUT very large bodies without any problem.



Re: welcome files being forwarded to rather than redirected to?

2001-10-04 Thread cmanolache

On Thu, 4 Oct 2001, Remy Maucherat wrote:

> Also, not doing the redirect would create lots of problems with nested
> welcome pages (foo/index.html is a valid welcome page).

Is it ? 

AFAIK no web server accepts this kind of welcome page. It's true the
spec doesn't mention what values are valid ( Is ../index.html valid ?),
but giving what is common de facto 'standard' I wouldn't interpret it 
this way.

That can be yet another incompatibility between web 
and servlets ( maybe Jon will read this - now, not after a year :-),
and make even more difficult to serve static files with apache.


Costin






DO NOT REPLY [Bug 3971] - error with catalina.bat

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3971

error with catalina.bat

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 10:49 ---
Unless I misundestand something, it's a user error. Please post user related 
questions on the tomcat-user list.

When you unpack / install the JDK, you are supposed to end up with a directory 
stucture with java.exe in $INSTALL_PATH/bin/java.exe. The JAVA_HOME variable is 
supposed to point to your installation path.



DO NOT REPLY [Bug 3972] - JAAS Realm

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3972

JAAS Realm

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||LATER



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 10:55 ---
Good idea. Contributions in this area are more than welcome.



cvs commit: jakarta-tomcat-4.0 RELEASE-PLAN-4.0.1.txt

2001-10-04 Thread remm

remm01/10/04 10:54:18

  Modified:.Tag: tomcat_40_branch RELEASE-PLAN-4.0.1.txt
  Log:
  - Bug status update.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.2   +10 -4 jakarta-tomcat-4.0/Attic/RELEASE-PLAN-4.0.1.txt
  
  Index: RELEASE-PLAN-4.0.1.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-PLAN-4.0.1.txt,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- RELEASE-PLAN-4.0.1.txt2001/10/03 23:05:00 1.1.2.1
  +++ RELEASE-PLAN-4.0.1.txt2001/10/04 17:54:18 1.1.2.2
  @@ -1,4 +1,4 @@
  -$Id: RELEASE-PLAN-4.0.1.txt,v 1.1.2.1 2001/10/03 23:05:00 remm Exp $
  +$Id: RELEASE-PLAN-4.0.1.txt,v 1.1.2.2 2001/10/04 17:54:18 remm Exp $
   
Release Plan for Apache Tomcat 4.0.1

  @@ -19,6 +19,10 @@
   
 Monday, October 15, 2001  Tomcat 4.0.1 Release
   
  +If for some reason new issues are found which need significant patches to be 
  +addressed, additional beta releases will be made, and this release plan will be
  +updated.
  +
   As usual with a mainenance release, there should be no regressions from 4.0 to
   4.0.1, and no open confirmed P1 or P2 bugs in the Bugzilla database. The 
   Apache bug database can be accessed at:
  @@ -73,12 +77,10 @@
   Jasper  3822Drive letter causes a NumberFormatException when JSP 
   compiler parses errors.
   
  -Jasper  3892Can't compile 2092.jsp.
  -
   Catalina3936WebappClassLoader does not implement getResources().
   
  -Connectors  3949Document with content-length of 0 results in resend 
  -headers.
  +Catalina3973Session.getAttribute() locks-up in 
  +HttpSessionListener.sessionDestroyed().
   
   
   Nice To Have Fixes Before Final Release:
  @@ -97,3 +99,7 @@
   
   Catalina3888WebappClassLoader: Lifecycle error : CL stopped.
   
  +Catalina3953If context is listed in server.xml then webapp servlets 
  +are loaded twice
  +
  +Catalina3970Cannot send more that 1 MB using multipart/form-data.
  
  
  



DO NOT REPLY [Bug 3971] - error with catalina.bat

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3971

error with catalina.bat





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 11:08 ---
I am not sure You did understand well.

After I installed evertything and started it said : (after trying Java_home) :
couldn't find (look closely) : jdk1.3\bin\bin\java  --> notice the two bin ??

Because the catalina.bat reference %Java_home%\bin\java  ---> so you get 
\bin\bin because %Java_home% ALREADY CONTAINS BIN

Plz understand that my Java_home is ok it's the way the batch file catalina.bat
is written --> it will append a directory called "bin" to Java_Home which 
ALREADY CONTAIN THE BIN DIRECTORY --> so it's looking for "java.exe" in a 
directory called (look closely) %Java_Home%\bin\java 

Solution 1  correct the 4 lines of the batch file to remove the "bin" directory 
(since it is already included with Java_home) 
 
OR

solution 2  --> Create a "bin" directory in my "Bin" directory and put Java.exe 
there --> so you're wrong batch file (catalina.bat) will find it when 
referencing the way it does -->



DO NOT REPLY [Bug 3971] - error with catalina.bat

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3971

error with catalina.bat





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 11:17 ---
Yes, I think I understand very well your problem, but JAVA_HOME shouldn't 
contain bin. Here, it should point to your 'jdk1.3' repository.



[PATCH] SimplePool.java

2001-10-04 Thread Schreibman, David

Here's a simple tweak that clears out references to objects that are removed
from the pool.  The current code can delay garbage collection for objects
that are removed from the pool but not returned.

The diff is against 3.3-rc1

-David



--- SimplePool.java.origThu Oct  4 10:14:51 2001
+++ SimplePool.java Thu Oct  4 10:54:08 2001
@@ -132,6 +132,7 @@
synchronized( lock ) {
if( current >= 0 ) {
item = pool[current];
+   pool[current] = null;
current -= 1;
}
if( debug > 0 ) 



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java

2001-10-04 Thread remm

remm01/10/04 11:23:28

  Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
  Log:
  - Add support for getResources (fix for bug 3936).
  
  Revision  ChangesPath
  1.20  +51 -5 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WebappClassLoader.java2001/09/28 02:33:04 1.19
  +++ WebappClassLoader.java2001/10/04 18:23:28 1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.19 2001/09/28 02:33:04 remm Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/09/28 02:33:04 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.20 2001/10/04 18:23:28 remm Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/10/04 18:23:28 $
*
* 
*
  @@ -88,6 +88,7 @@
   import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.Vector;
   import java.util.jar.JarFile;
   import java.util.jar.JarEntry;
   import java.util.jar.JarInputStream;
  @@ -123,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.19 $ $Date: 2001/09/28 02:33:04 $
  + * @version $Revision: 1.20 $ $Date: 2001/10/04 18:23:28 $
*/
   public class WebappClassLoader
   extends URLClassLoader
  @@ -941,7 +942,52 @@
   
   if (debug >= 3)
   log("findResources(" + name + ")");
  -return (super.findResources(name));
  +
  +Vector result = new Vector();
  +
  +int jarFilesLength = jarFiles.length;
  +int repositoriesLength = repositories.length;
  +
  +int i;
  +
  +// Looking at the repositories
  +for (i = 0; i < repositoriesLength; i++) {
  +try {
  +String fullPath = repositories[i] + name;
  +resources.lookup(fullPath);
  +// Note : Not getting an exception here means the resource was
  +// found
  +try {
  +result.addElement(new File(files[i], name).toURL());
  +} catch (MalformedURLException e) {
  +// Ignore
  +}
  +} catch (NamingException e) {
  +}
  +}
  +
  +// Looking at the JAR files
  +for (i = 0; i < jarFilesLength; i++) {
  +JarEntry jarEntry = jarFiles[i].getJarEntry(name);
  +if (jarEntry != null) {
  +try {
  +String jarFakeUrl = jarRealFiles[i].toURL().toString();
  +jarFakeUrl = "jar:" + jarFakeUrl + "!/" + name;
  +result.addElement(new URL(jarFakeUrl));
  +} catch (MalformedURLException e) {
  +// Ignore
  +}
  +}
  +}
  +
  +// Adding the results of a call to the superclass
  +Enumeration otherResourcePaths = super.findResources(name);
  +
  +while (otherResourcePaths.hasMoreElements()) {
  +result.addElement(otherResourcePaths.nextElement());
  +}
  +
  +return result.elements();
   
   }
   
  
  
  



DO NOT REPLY [Bug 3936] - getResources does not work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3936

getResources does not work

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 11:47 ---
Should be fixed in the 10/05/2001 nightly.



cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java

2001-10-04 Thread kinman

kinman  01/10/04 12:12:52

  Modified:jasper/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  PR: 2693, 3822
  Catch NumberFormatException when attempting to get the line number from
  javac error messages, so that the messages will be dispalyed if we guess
  wrong.  Also filter the line so that tags in strings are displayed
  correctly.
  
  Revision  ChangesPath
  1.14  +32 -21
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Compiler.java 2001/09/25 00:46:59 1.13
  +++ Compiler.java 2001/10/04 19:12:52 1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.13 2001/09/25 00:46:59 remm Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/09/25 00:46:59 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.14 2001/10/04 19:12:52 kinman Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/10/04 19:12:52 $
*
* 
* 
  @@ -311,26 +311,37 @@
   int beginColon=line.indexOf(':', 2); // Drive letter on Windows !!
   int endColon=line.indexOf(':', beginColon+1);
   
  -if (beginColon<0 || endColon<0) {
  -errorMsg.append(line);
  -errorMsg.append('\n');
  -continue;
  -}
  -
  -String nr = line.substring(beginColon+1, endColon);
  -int lineNr = Integer.parseInt( nr );
  -
  -//System.out.println("lineNr: " + lineNr);
  +if (!(beginColon<0 || endColon<0 ||
  + line.startsWith("Note: "))){ // deprecation warning
   
  -// Now do the mapping
  -String mapping = findMapping(map, lineNr);
  -if (mapping == null)
  -errorMsg.append('\n');
  -else
  -errorMsg.append(mapping);
  -errorMsg.append(line);
  +try {
  +String nr = line.substring(beginColon+1, endColon);
  +int lineNr = Integer.parseInt( nr );
  +//System.out.println("lineNr: " + lineNr);
  +
  +// Now do the mapping
  +String mapping = findMapping(map, lineNr);
  +if (mapping == null)
  +errorMsg.append('\n');
  +else
  +errorMsg.append(mapping);
  +}
  +catch (NumberFormatException ex) {
  +// If for some reason our guess at the location of the line
  +// number failed, time to give up.
  +}
  +}
  +// Replace '<' in line with "<", ">" with ">" in line
  +for (int i = 0; i < line.length(); i++) {
  +char c = line.charAt(i);
  +if (c == '<')
  +errorMsg.append("<");
  +else if (c == '>')
  +errorMsg.append(">");
  +else
  +errorMsg.append(c);
  +}
   errorMsg.append('\n');
  -
   }
   br.close();
   map.clear();
  
  
  



cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java

2001-10-04 Thread kinman

kinman  01/10/04 12:20:08

  Modified:jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Compiler.java
  Log:
  PR: 2693, 3822
  Catch NumberFormatException when attempting to get the line number from
  javac error messages, so that the messages will be dispalyed if we guess
  wrong.  Also filter the line so that tags in strings are displayed
  correctly.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.12.2.2  +32 -21
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- Compiler.java 2001/09/25 00:50:51 1.12.2.1
  +++ Compiler.java 2001/10/04 19:20:08 1.12.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.12.2.1 2001/09/25 00:50:51 remm Exp $
  - * $Revision: 1.12.2.1 $
  - * $Date: 2001/09/25 00:50:51 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.12.2.2 2001/10/04 19:20:08 kinman Exp $
  + * $Revision: 1.12.2.2 $
  + * $Date: 2001/10/04 19:20:08 $
*
* 
* 
  @@ -311,26 +311,37 @@
   int beginColon=line.indexOf(':', 2); // Drive letter on Windows !!
   int endColon=line.indexOf(':', beginColon+1);
   
  -if (beginColon<0 || endColon<0) {
  -errorMsg.append(line);
  -errorMsg.append('\n');
  -continue;
  -}
  -
  -String nr = line.substring(beginColon+1, endColon);
  -int lineNr = Integer.parseInt( nr );
  -
  -//System.out.println("lineNr: " + lineNr);
  +if (!(beginColon<0 || endColon<0 ||
  + line.startsWith("Note: "))){ // deprecation warning
   
  -// Now do the mapping
  -String mapping = findMapping(map, lineNr);
  -if (mapping == null)
  -errorMsg.append('\n');
  -else
  -errorMsg.append(mapping);
  -errorMsg.append(line);
  +try {
  +String nr = line.substring(beginColon+1, endColon);
  +int lineNr = Integer.parseInt( nr );
  +//System.out.println("lineNr: " + lineNr);
  +
  +// Now do the mapping
  +String mapping = findMapping(map, lineNr);
  +if (mapping == null)
  +errorMsg.append('\n');
  +else
  +errorMsg.append(mapping);
  +}
  +catch (NumberFormatException ex) {
  +// If for some reason our guess at the location of the line
  +// number failed, time to give up.
  +}
  +}
  +// Replace '<' in line with "<", ">" with ">" in line
  +for (int i = 0; i < line.length(); i++) {
  +char c = line.charAt(i);
  +if (c == '<')
  +errorMsg.append("<");
  +else if (c == '>')
  +errorMsg.append(">");
  +else
  +errorMsg.append(c);
  +}
   errorMsg.append('\n');
  -
   }
   br.close();
   map.clear();
  
  
  



cvs commit: jakarta-tomcat-4.0/lib jakarta-regexp-1.2.jar tomcat-ajp.jar tomcat-util.jar

2001-10-04 Thread remm

remm01/10/04 12:23:49

  Added:   lib  Tag: tomcat_40_branch jakarta-regexp-1.2.jar
tomcat-ajp.jar tomcat-util.jar
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.1   +0 -0  jakarta-tomcat-4.0/lib/jakarta-regexp-1.2.jar
  
<>
  
  
  1.1.2.1   +0 -0  jakarta-tomcat-4.0/lib/tomcat-ajp.jar
  
<>
  
  
  1.1.2.1   +0 -0  jakarta-tomcat-4.0/lib/tomcat-util.jar
  
<>
  
  



cvs commit: jakarta-tomcat-4.0/webapps build.xml

2001-10-04 Thread remm

remm01/10/04 12:24:12

  Modified:webapps  Tag: tomcat_40_branch build.xml
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.17.2.1  +3 -3  jakarta-tomcat-4.0/webapps/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- build.xml 2001/09/16 04:58:28 1.17
  +++ build.xml 2001/10/04 19:24:11 1.17.2.1
  @@ -10,9 +10,9 @@
 
   
 
  -  
  -  
  -  
  +  
  +  
  +  
   
   
 
  
  
  



cvs commit: jakarta-tomcat-4.0/jasper build.xml

2001-10-04 Thread remm

remm01/10/04 12:24:30

  Modified:jasper   Tag: tomcat_40_branch build.xml
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.22.2.2  +1 -9  jakarta-tomcat-4.0/jasper/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
  retrieving revision 1.22.2.1
  retrieving revision 1.22.2.2
  diff -u -r1.22.2.1 -r1.22.2.2
  --- build.xml 2001/09/28 04:46:41 1.22.2.1
  +++ build.xml 2001/10/04 19:24:29 1.22.2.2
  @@ -48,7 +48,6 @@
   
   
   
  -
   
   
 
  @@ -147,7 +146,6 @@
   
   
   
  -
   
 
   
  @@ -164,11 +162,6 @@
   
   
   
  -
  -
  -  
  -
  -
   
   
 
  @@ -182,7 +175,7 @@
  description="Build and deploy Jasper component">

  
  -   
  +   
 
   
   
  @@ -227,7 +220,6 @@
   
   
 
  -  
   
   
   
  
  
  



cvs commit: jakarta-tomcat-4.0 build.properties.sample build.xml tomcat.nsi

2001-10-04 Thread remm

remm01/10/04 12:24:46

  Modified:.Tag: tomcat_40_branch build.properties.sample
build.xml tomcat.nsi
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.7.2.8   +9 -8  jakarta-tomcat-4.0/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
  retrieving revision 1.7.2.7
  retrieving revision 1.7.2.8
  diff -u -r1.7.2.7 -r1.7.2.8
  --- build.properties.sample   2001/09/28 16:28:13 1.7.2.7
  +++ build.properties.sample   2001/10/04 19:24:45 1.7.2.8
  @@ -6,7 +6,7 @@
   # modules that Tomcat depends on.  Copy this file to "build.properties"
   # in the top-level source directory, and customize it as needed.
   #
  -# $Id: build.properties.sample,v 1.7.2.7 2001/09/28 16:28:13 craigmcc Exp $
  +# $Id: build.properties.sample,v 1.7.2.8 2001/10/04 19:24:45 remm Exp $
   # -
   
   
  @@ -26,18 +26,20 @@
   base.path=/usr/local
   
   
  -# - Tomcat Util -
  -tomcat-util.jar=../../jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar
  +# - Jakarta Tomcat Connectors path -
  +jakarta-tomcat-connector.home=../../jakarta-tomcat-connectors
   
   
  +# - Tomcat utils -
  +tomcat-util.jar=../lib/tomcat-util.jar
  +
  +
   # - JK 1.3 connector for Tomcat 4.0 -
  -ajp.jar=../../jakarta-tomcat-connectors/jk/build/lib/ajp.jar
  +tomcat-ajp.jar=../lib/tomcat-ajp.jar
   
   
   # - Jakarta Regular Expressions Library, version 1.2 -
  -regexp.home=${base.path}/jakarta-regexp-1.2
  -regexp.lib=${regexp.home}
  -regexp.jar=${regexp.home}/jakarta-regexp-1.2.jar
  +regexp.jar=../lib/jakarta-regexp-1.2.jar
   
   
   # - Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -
  @@ -115,5 +117,4 @@
   xerces.home=${base.path}/xerces-1_4_3
   xerces.lib=${xerces.home}
   xerces.jar=${xerces.lib}/xerces.jar
  -
   
  
  
  
  1.38.2.3  +26 -14jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.38.2.2
  retrieving revision 1.38.2.3
  diff -u -r1.38.2.2 -r1.38.2.3
  --- build.xml 2001/09/26 18:49:08 1.38.2.2
  +++ build.xml 2001/10/04 19:24:45 1.38.2.3
  @@ -18,6 +18,9 @@
 
 
   
  +  
  +  
  +  
   
   
 
  @@ -91,17 +94,16 @@
 
   
   
  -
   
   
   
   
  -
  -
   
   
   
   
  +
  +
   
   
 
  @@ -110,6 +112,7 @@
 
 
   
  +
   
 
   
  @@ -121,27 +124,39 @@
 
   
   
  +
   
 
   
  +
  +  
  +
  +
  +  
  +
   
 
   
  -
  -  
  +
  +  
   
  -
  -  
  +
  +  
  +
  +
  +  
   
   
 
   
  -
  -  
  +
  +  
   
  -
  +
  +
  +
   
  -
  +
   
 
   
  @@ -180,9 +195,6 @@
 
 
  -
  -  
  -
 
   
   
  
  
  
  1.16.2.1  +4 -7  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- tomcat.nsi2001/09/11 23:40:38 1.16
  +++ tomcat.nsi2001/10/04 19:24:45 1.16.2.1
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16 2001/09/11 23:40:38 remm Exp $
  +; $Id: tomcat.nsi,v 1.16.2.1 2001/10/04 19:24:45 remm Exp $
   
   Name "apache-tomcat-4.0"
   Caption "Apache Tomcat 4.0"
  @@ -41,8 +41,7 @@
 File LICENSE
 File /r bin
 

cvs commit: jakarta-tomcat-4.0/catalina build.xml

2001-10-04 Thread remm

remm01/10/04 12:24:54

  Modified:catalina Tag: tomcat_40_branch build.xml
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.60.2.6  +87 -58jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.60.2.5
  retrieving revision 1.60.2.6
  diff -u -r1.60.2.5 -r1.60.2.6
  --- build.xml 2001/09/28 04:46:41 1.60.2.5
  +++ build.xml 2001/10/04 19:24:54 1.60.2.6
  @@ -11,9 +11,9 @@
   
 
 
  -  
  -  
  -  
  +  
  +  
  +  
 
 
 
  @@ -35,7 +35,7 @@
   
   
   
  -
  +
 
   
 
  @@ -55,7 +55,7 @@
   
   
   
  -
  +
   
 
   
  @@ -74,6 +74,14 @@
classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
   
   
  +
  +  
  +
  +
  +  
  +
   
 
   
  +
   
   
  -
  +
   
 
   
  @@ -142,6 +153,7 @@
   
   
   
  +
   
   
   
  @@ -198,10 +210,10 @@
   
   
   
  -
  +
 
   
  -
  +
 
   
   
  @@ -268,16 +280,18 @@
   
 
   
  -
  +
 
   
  -
  +
 
   
  -
  +
 
   
  -
  +
  +  
  +
 
   
   
  @@ -307,6 +321,7 @@
   
   
   
  +
   
   
   
  @@ -323,15 +338,16 @@
   
   
   
  -
  +
   
   
  -
  +
   
   
   
   
   
  +
   
   
   
  @@ -345,14 +361,14 @@
   
   
   
  -
  +
   
   
   
   
   
  -
   
  +
   
 
   
  @@ -361,22 +377,22 @@
   
   
   
  -
  -
   
   
   
  -
  -
  +
   
   
  +
  +
  +
   
 
   
   
 
  -  
  -
  +  
  +
 
 
   
  @@ -403,17 +419,20 @@
   
   -->
 
  -  
  +  
   
 
 
   
   
 
  +  
  +
  +  
   
   
 
  -  
  +  
   
   
   
  @@ -428,7 +447,6 @@
   
   
   
  -
   
   
   
  @@ -450,13 +468,13 @@
 
   
   
  -
   
   
  -
  @@ -486,9 +504,9 @@
   
   
   
  -
  +
 
  -
  +
 
   
   
  @@ -589,11 +607,10 @@
   
   
   
  -
   
  -
  +
   
  -
  +
   
   
 
  @@ -606,7 +623,7 @@
   
 
   
  -
  +
   
   
   
  @@ -623,16 +640,16 @@
 
   
   
  -
  -
  -  
  -
  -
   
   
 
   
   
  +
  +
  +  
  +
  +
 
   
   
  @@ -643,7 +660,7 @@
   
   
  -  
  +  
   
   
   
  @@ -659,7 +676,7 @@
   
   
   
  -  
  +  
   
   
   
  @@ -676,7 +693,7 @@
   
   
   
  -  
  +  
   
   
   
  @@ -686,7 +703,7 @@
   
   
   
  -  
  +  
   
   
 
  @@ -694,14 +711,14 @@
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
   
 
  @@ -709,42 +726,42 @@
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
 
   
   
   
   
  -  
  +  
   
   
 
  @@ -752,14 +769,14 @@
   
   
   
  -  

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Response.java

2001-10-04 Thread remm

remm01/10/04 12:26:06

  Modified:catalina/src/share/org/apache/catalina Tag: tomcat_40_branch
Response.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.1   +32 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java
  
  Index: Response.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Response.java 2001/07/22 20:13:30 1.4
  +++ Response.java 2001/10/04 19:26:06 1.4.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java,v 
1.4 2001/07/22 20:13:30 pier Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/07/22 20:13:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java,v 
1.4.2.1 2001/10/04 19:26:06 remm Exp $
  + * $Revision: 1.4.2.1 $
  + * $Date: 2001/10/04 19:26:06 $
*
* 
*
  @@ -79,7 +79,7 @@
* based on the processing of a corresponding Request.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2001/07/22 20:13:30 $
  + * @version $Revision: 1.4.2.1 $ $Date: 2001/10/04 19:26:06 $
*/
   
   public interface Response {
  @@ -124,6 +124,20 @@
   
   
   /**
  + * Set the application commit flag.
  + * 
  + * @param appCommitted The new application committed flag value
  + */
  +public void setAppCommitted(boolean appCommitted);
  +
  +
  +/**
  + * Application commit flag accessor.
  + */
  +public boolean isAppCommitted();
  +
  +
  +/**
* Return the "processing inside an include" flag.
*/
   public boolean getIncluded();
  @@ -179,6 +193,20 @@
* @param stream The new output stream
*/
   public void setStream(OutputStream stream);
  +
  +
  +/**
  + * Set the suspended flag.
  + * 
  + * @param suspended The new suspended flag value
  + */
  +public void setSuspended(boolean suspended);
  +
  +
  +/**
  + * Suspended flag accessor.
  + */
  +public boolean isSuspended();
   
   
   /**
  
  
  



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java

2001-10-04 Thread remm

remm01/10/04 12:26:29

  Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpResponseStream.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.7.2.1   +38 -15
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
  
  Index: HttpResponseStream.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- HttpResponseStream.java   2001/07/22 20:25:07 1.7
  +++ HttpResponseStream.java   2001/10/04 19:26:29 1.7.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
 1.7 2001/07/22 20:25:07 pier Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/07/22 20:25:07 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
 1.7.2.1 2001/10/04 19:26:29 remm Exp $
  + * $Revision: 1.7.2.1 $
  + * $Date: 2001/10/04 19:26:29 $
*
* 
*
  @@ -131,15 +131,23 @@
*/
   public void write(int b)
   throws IOException {
  +
  +if (suspended)
  +return;
  +
   if (useChunking && !writingChunk) {
   writingChunk = true;
  -print("1\r\n");
  -super.write(b);
  -println();
  -writingChunk = false;
  +try {
  +print("1\r\n");
  +super.write(b);
  +println();
  +} finally {
  +writingChunk = false;
  +}
   } else {
   super.write(b);
   }
  +
   }
   
   
  @@ -148,17 +156,25 @@
*/
   public void write(byte[] b, int off, int len)
   throws IOException {
  +
  +if (suspended)
  +return;
  +
   if (useChunking && !writingChunk) {
   if (len > 0) {
   writingChunk = true;
  -println(Integer.toHexString(len));
  -super.write(b, off, len);
  -println();
  -writingChunk = false;
  +try {
  +println(Integer.toHexString(len));
  +super.write(b, off, len);
  +println();
  +} finally {
  +writingChunk = false;
  +}
   }
   } else {
   super.write(b, off, len);
   }
  +
   }
   
   
  @@ -168,11 +184,18 @@
*/
   public void close() throws IOException {
   
  +if (suspended)
  +throw new IOException
  +(sm.getString("responseStream.suspended"));
  +
   if (useChunking) {
   // Write the final chunk.
   writingChunk = true;
  -print("0\r\n\r\n");
  -writingChunk = false;
  +try {
  +print("0\r\n\r\n");
  +} finally {
  +writingChunk = false;
  +}
   }
   super.close();
   
  @@ -195,14 +218,14 @@
   if (!response.isChunkingAllowed() && useChunking) {
   // If we should chunk, but chunking is forbidden by the connector,
   // we close the connection
  -response.addHeader("Connection", "close");
  +response.setHeader("Connection", "close");
   } else {
   response.removeHeader("Connection", "close");
   }
   // Don't chunk is the connection will be closed
   useChunking = (useChunking && !response.isCloseCon

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpProcessor.java

2001-10-04 Thread remm

remm01/10/04 12:26:36

  Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpProcessor.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.36.2.1  +16 -8 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
  
  Index: HttpProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
  retrieving revision 1.36
  retrieving revision 1.36.2.1
  diff -u -r1.36 -r1.36.2.1
  --- HttpProcessor.java2001/09/05 00:31:50 1.36
  +++ HttpProcessor.java2001/10/04 19:26:36 1.36.2.1
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.36 2001/09/05 00:31:50 craigmcc Exp $
  - * $Revision: 1.36 $
  - * $Date: 2001/09/05 00:31:50 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.36.2.1 2001/10/04 19:26:36 remm Exp $
  + * $Revision: 1.36.2.1 $
  + * $Date: 2001/10/04 19:26:36 $
*
* 
*
  @@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.36 $ $Date: 2001/09/05 00:31:50 $
  + * @version $Revision: 1.36.2.1 $ $Date: 2001/10/04 19:26:36 $
*/
   
   final class HttpProcessor
  @@ -919,6 +919,7 @@
   private void process(Socket socket) {
   
   boolean ok = true;
  +boolean finishResponse = true;
   SocketInputStream input = null;
   OutputStream output = null;
   
  @@ -935,6 +936,8 @@
   
   while (!stopped && ok && keepAlive) {
   
  +finishResponse = true;
  +
   try {
   request.setStream(input);
   request.setResponse(response);
  @@ -966,7 +969,10 @@
   }
   }
   } catch (EOFException e) {
  +// It's very likely to be a socket disconnect on either the 
  +// client or the server
   ok = false;
  +finishResponse = false;
   } catch (ServletException e) {
   ok = false;
   try {
  @@ -1028,10 +1034,12 @@
   
   // Finish up the handling of the request
   try {
  -response.finishResponse();
  -request.finishRequest();
  -if (output != null)
  -output.flush();
  +if (finishResponse) {
  +response.finishResponse();
  +request.finishRequest();
  +if (output != null)
  +output.flush();
  +}
   } catch (IOException e) {
   ok = false;
   }
  
  
  



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java HttpResponseFacade.java ResponseBase.java ResponseFacade.java ResponseStream.java

2001-10-04 Thread remm

remm01/10/04 12:26:57

  Modified:catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpResponseBase.java
HttpResponseFacade.java ResponseBase.java
ResponseFacade.java ResponseStream.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.37.2.1  +4 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
  
  Index: HttpResponseBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
  retrieving revision 1.37
  retrieving revision 1.37.2.1
  diff -u -r1.37 -r1.37.2.1
  --- HttpResponseBase.java 2001/08/24 23:06:08 1.37
  +++ HttpResponseBase.java 2001/10/04 19:26:57 1.37.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.37 2001/08/24 23:06:08 craigmcc Exp $
  - * $Revision: 1.37 $
  - * $Date: 2001/08/24 23:06:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.37.2.1 2001/10/04 19:26:57 remm Exp $
  + * $Revision: 1.37.2.1 $
  + * $Date: 2001/10/04 19:26:57 $
*
* 
*
  @@ -101,7 +101,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.37 $ $Date: 2001/08/24 23:06:08 $
  + * @version $Revision: 1.37.2.1 $ $Date: 2001/10/04 19:26:57 $
*/
   
   public class HttpResponseBase
  
  
  
  1.2.2.1   +73 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java
  
  Index: HttpResponseFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- HttpResponseFacade.java   2001/07/22 20:25:06 1.2
  +++ HttpResponseFacade.java   2001/10/04 19:26:57 1.2.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java,v
 1.2 2001/07/22 20:25:06 pier Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/07/22 20:25:06 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java,v
 1.2.2.1 2001/10/04 19:26:57 remm Exp $
  + * $Revision: 1.2.2.1 $
  + * $Date: 2001/10/04 19:26:57 $
*
* 
*
  @@ -79,7 +79,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2001/07/22 20:25:06 $
  + * @version $Revision: 1.2.2.1 $ $Date: 2001/10/04 19:26:57 $
*/
   
   public final class HttpResponseFacade
  @@ -104,7 +104,12 @@
   
   
   public void addCookie(Cookie cookie) {
  +
  +if (isCommitted())
  +return;
  +
   ((HttpServletResponse) response).addCookie(cookie);
  +
   }
   
   
  @@ -135,59 +140,123 @@
   
   public void sendError(int sc, String msg)
   throws IOException {
  +
  +if (isCommitted())
  +throw new IllegalStateException
  +(/*sm.getString("responseBase.reset.ise")*/);
  +
  +resp.setAppCommitted(true);
  +
   ((HttpServletResponse) response).sendError(sc, msg);
  +
   }
   
   
   public void sendError(int sc)
   throws IOException {
  +
  +if (isCommitted())
  +throw new IllegalStateException
  +(/*sm.getString("responseBase.reset.ise")*/);
  +
  +resp.setAppCommitted(true);
  +
 

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java

2001-10-04 Thread remm

remm01/10/04 12:27:36

  Modified:catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContext.java
StandardWrapper.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.78.2.3  +4 -65 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.78.2.2
  retrieving revision 1.78.2.3
  diff -u -r1.78.2.2 -r1.78.2.3
  --- StandardContext.java  2001/09/26 23:17:52 1.78.2.2
  +++ StandardContext.java  2001/10/04 19:27:36 1.78.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.78.2.2 2001/09/26 23:17:52 remm Exp $
  - * $Revision: 1.78.2.2 $
  - * $Date: 2001/09/26 23:17:52 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.78.2.3 2001/10/04 19:27:36 remm Exp $
  + * $Revision: 1.78.2.3 $
  + * $Date: 2001/10/04 19:27:36 $
*
* 
*
  @@ -142,7 +142,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.78.2.2 $ $Date: 2001/09/26 23:17:52 $
  + * @version $Revision: 1.78.2.3 $ $Date: 2001/10/04 19:27:36 $
*/
   
   public class StandardContext
  @@ -311,14 +311,6 @@
   
   
   /**
  - * The special class loader created for Jasper in order to isolate
  - * its use of an XML parser from the libraries made visible to
  - * web applications.
  - */
  -private ClassLoader jasperLoader = null;
  -
  -
  -/**
* The local  EJB resource references for this web application, keyed by
* name.
*/
  @@ -815,7 +807,6 @@
   public synchronized void setLoader(Loader loader) {
   
   super.setLoader(loader);
  -jasperLoader = null;
   
   }
   
  @@ -1124,52 +1115,6 @@
   
   
   /**
  - * Return the special class loader for Jasper for this web application,
  - * creating one if required.
  - */
  -public synchronized ClassLoader getJasperLoader() {
  -
  -// Return the existing class loader (if any)
  -if (jasperLoader != null) {
  -return (jasperLoader);
  -}
  -
  -// Can we set up the corresponding Jasper class loader?
  -if (loader == null) {
  -return (null);
  -}
  -ClassLoader classLoader = loader.getClassLoader();
  -if (classLoader == null) {
  -return (null);
  -}
  -
  -// Set up the Jasper class loader
  -StandardClassLoader newLoader = new StandardClassLoader(classLoader);
  -newLoader.setDelegate(true);
  -File directory = new File(System.getProperty("catalina.home"),
  -  "jasper");
  -if (directory.exists() && directory.canRead() &&
  -directory.isDirectory()) {
  -String filenames[] = directory.list();
  -for (int i = 0; i < filenames.length; i++) {
  -if (!filenames[i].endsWith(".jar"))
  -continue;
  -File file = new File(directory, filenames[i]);
  -try {
  -URL url = new URL("file", null, file.getCanonicalPath());
  -newLoader.addRepository(url.toString());
  -} catch (IOException e) {
  -throw new IllegalArgumentException(e.toString());
  -}
  -}
  -}
  -jasperLoader = newLoader;
  -return (jasperLoader);
  -
  -}
  -
  -
  -/**

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java LocalStrings.properties LocalStrings_ja.properties StandardContextValve.java StandardHost.java StandardWrapperValve.java

2001-10-04 Thread remm

remm01/10/04 12:27:58

  Modified:catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch ApplicationDispatcher.java
LocalStrings.properties LocalStrings_ja.properties
StandardContextValve.java StandardHost.java
StandardWrapperValve.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.25.2.1  +25 -18
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
  
  Index: ApplicationDispatcher.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- ApplicationDispatcher.java2001/08/08 00:31:54 1.25
  +++ ApplicationDispatcher.java2001/10/04 19:27:58 1.25.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
 1.25 2001/08/08 00:31:54 remm Exp $
  - * $Revision: 1.25 $
  - * $Date: 2001/08/08 00:31:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
 1.25.2.1 2001/10/04 19:27:58 remm Exp $
  + * $Revision: 1.25.2.1 $
  + * $Date: 2001/10/04 19:27:58 $
*
* 
*
  @@ -92,6 +92,7 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Wrapper;
  +import org.apache.catalina.connector.ResponseFacade;
   import org.apache.catalina.core.StandardWrapper;
   import org.apache.catalina.util.InstanceSupport;
   import org.apache.catalina.util.StringManager;
  @@ -108,7 +109,7 @@
* javax.servlet.ServletResponseWrapper.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.25 $ $Date: 2001/08/08 00:31:54 $
  + * @version $Revision: 1.25.2.1 $ $Date: 2001/10/04 19:27:58 $
*/
   
   final class ApplicationDispatcher
  @@ -435,23 +436,29 @@
   // Commit and close the response before we return
   if (debug >= 1)
   log(" Committing and closing response");
  -response.flushBuffer();
  -try {
  -PrintWriter writer = response.getWriter();
  -writer.flush();
  -writer.close();
  -} catch (IllegalStateException e) {
  +
  +if (response instanceof ResponseFacade) {
  +((ResponseFacade) response).finish();
  +} else {
  +// Close anyway
  +response.flushBuffer();
   try {
  -ServletOutputStream stream = response.getOutputStream();
  -stream.flush();
  -stream.close();
  -} catch (IllegalStateException f) {
  -;
  -} catch (IOException f) {
  +PrintWriter writer = response.getWriter();
  +writer.flush();
  +writer.close();
  +} catch (IllegalStateException e) {
  +try {
  +ServletOutputStream stream = response.getOutputStream();
  +stream.flush();
  +stream.close();
  +} catch (IllegalStateException f) {
  +;
  +} catch (IOException f) {
  +;
  +}
  +} catch (IOException e) {
   ;
   }
  -} catch (IOException e) {
  -;
   }
   
   }
  
  
  
  1.37.2.1  +0 -42 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ErrorDispatcherValve.java ErrorReportValve.java LocalStrings.properties

2001-10-04 Thread remm

remm01/10/04 12:28:14

  Modified:catalina/src/share/org/apache/catalina/valves Tag:
tomcat_40_branch LocalStrings.properties
  Added:   catalina/src/share/org/apache/catalina/valves Tag:
tomcat_40_branch ErrorDispatcherValve.java
ErrorReportValve.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.4.1   +54 -0 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- LocalStrings.properties   2000/10/31 23:53:29 1.2
  +++ LocalStrings.properties   2001/10/04 19:28:13 1.2.4.1
  @@ -7,3 +7,57 @@
   requestFilterValve.next=No 'next' valve has been configured
   requestFilterValve.syntax=Syntax error in request filter pattern {0}
   valveBase.noNext=Configuration error: No 'next' valve configured
  +
  +# Error report valve
  +errorReportValve.errorReport=Error report
  +errorReportValve.statusHeader=HTTP Status {0} - {1}
  +errorReportValve.exceptionReport=Exception report
  +errorReportValve.statusReport=Status report
  +errorReportValve.message=message
  +errorReportValve.description=description
  +errorReportValve.exception=exception
  +errorReportValve.rootCause=root cause
  +
  +# HTTP status reports
  +http.100=The client may continue ({0}).
  +http.101=The server is switching protocols according to the "Upgrade" header ({0}).
  +http.201=The request succeeded and a new resource ({0}) has been created on the 
server.
  +http.202=This request was accepted for processing, but has not been completed ({0}).
  +http.203=The meta information presented by the client did not originate from the 
server ({0}).
  +http.204=The request succeeded but there is no information to return ({0}).
  +http.205=The client should reset the document view which caused this request to be 
sent ({0}).
  +http.206=The server has fulfilled a partial GET request for this resource ({0}).
  +http.207=Multiple status values have been returned ({0}).
  +http.300=The requested resource ({0}) corresponds to any one of a set of 
representations, each with its own specific location.
  +http.301=The requested resource ({0}) has moved permanently to a new location.
  +http.302=The requested resource ({0}) has moved temporarily to a new location.
  +http.303=The response to this request can be found under a different URI ({0}).
  +http.304=The requested resource ({0}) is available and has not been modified.
  +http.305=The requested resource ({0}) must be accessed through the proxy given by 
the "Location" header.
  +http.400=The request sent by the client was syntactically incorrect ({0}).
  +http.401=This request requires HTTP authentication ({0}).
  +http.402=Payment is required for access to this resource ({0}).
  +http.403=Access to the specified resource ({0}) has been forbidden.
  +http.404=The requested resource ({0}) is not available.
  +http.405=The specified HTTP method is not allowed for the requested resource ({0}).
  +http.406=The resource identified by this request is only capable of generating 
responses with characteristics not acceptable according to the request "accept" 
headers ({0}).
  +http.407=The client must first authenticate itself with the proxy ({0}).
  +http.408=The client did not produce a request within the time that the server was 
prepared to wait ({0}).
  +http.409=The request could not be completed due to a conflict with the current 
state of the resource ({0}).
  +http.410=The requested resource ({0}) is no longer available, and no forwarding 
address is known.
  +http.411=This request cannot be handled without a defined content length ({0

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader StandardLoader.java WebappClassLoader.java

2001-10-04 Thread remm

remm01/10/04 12:28:42

  Modified:catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch StandardLoader.java
WebappClassLoader.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.28.2.1  +6 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Attic/StandardLoader.java
  
  Index: StandardLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Attic/StandardLoader.java,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- StandardLoader.java   2001/07/22 20:25:10 1.28
  +++ StandardLoader.java   2001/10/04 19:28:42 1.28.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Attic/StandardLoader.java,v
 1.28 2001/07/22 20:25:10 pier Exp $
  - * $Revision: 1.28 $
  - * $Date: 2001/07/22 20:25:10 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Attic/StandardLoader.java,v
 1.28.2.1 2001/10/04 19:28:42 remm Exp $
  + * $Revision: 1.28.2.1 $
  + * $Date: 2001/10/04 19:28:42 $
*
* 
*
  @@ -116,7 +116,9 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.28 $ $Date: 2001/07/22 20:25:10 $
  + * @deprecated StandardLoader is slower and less robust than WebappLoader for
  + * loading web applications. Use WebappLoader instead.
  + * @version $Revision: 1.28.2.1 $ $Date: 2001/10/04 19:28:42 $
*/
   
   public final class StandardLoader
  
  
  
  1.15.2.4  +54 -8 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.15.2.3
  retrieving revision 1.15.2.4
  diff -u -r1.15.2.3 -r1.15.2.4
  --- WebappClassLoader.java2001/09/25 21:57:56 1.15.2.3
  +++ WebappClassLoader.java2001/10/04 19:28:42 1.15.2.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.15.2.3 2001/09/25 21:57:56 remm Exp $
  - * $Revision: 1.15.2.3 $
  - * $Date: 2001/09/25 21:57:56 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.15.2.4 2001/10/04 19:28:42 remm Exp $
  + * $Revision: 1.15.2.4 $
  + * $Date: 2001/10/04 19:28:42 $
*
* 
*
  @@ -88,6 +88,7 @@
   import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.Vector;
   import java.util.jar.JarFile;
   import java.util.jar.JarEntry;
   import java.util.jar.JarInputStream;
  @@ -123,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.15.2.3 $ $Date: 2001/09/25 21:57:56 $
  + * @version $Revision: 1.15.2.4 $ $Date: 2001/10/04 19:28:42 $
*/
   public class WebappClassLoader
   extends URLClassLoader
  @@ -552,7 +553,7 @@
   
   long lastModified =
   ((ResourceAttributes) resources.getAttributes(jar))
  -.getLastModified().getTime();
  +.getLastModified();
   
   String[] result = new String[paths.length + 1];
   for (i = 0; i < paths.length; i++) {
  @@ -700,7 +701,7 @@
   try {
   long lastModified =
   ((ResourceAttributes) resources.getAttributes(paths[i]))
  -.getL

cvs commit: jakarta-tomcat-4.0 BUILDING.txt RELEASE-PLAN-4.0.1.txt

2001-10-04 Thread remm

remm01/10/04 12:29:30

  Modified:.Tag: tomcat_40_branch BUILDING.txt
RELEASE-PLAN-4.0.1.txt
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.5.2.3   +16 -44jakarta-tomcat-4.0/BUILDING.txt
  
  Index: BUILDING.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- BUILDING.txt  2001/09/28 04:46:40 1.5.2.2
  +++ BUILDING.txt  2001/10/04 19:29:30 1.5.2.3
  @@ -1,4 +1,4 @@
  -$Id: BUILDING.txt,v 1.5.2.2 2001/09/28 04:46:40 craigmcc Exp $
  +$Id: BUILDING.txt,v 1.5.2.3 2001/10/04 19:29:30 remm Exp $
   
   
  Building The Tomcat 4.0 Servlet/JSP Container
  @@ -110,29 +110,9 @@
 pathname of the release directory.
   
   
  -(5) Download and Install the Regular Expressions Binary Distribution
  +(5) Download and Install the Servlet API Binary Distribution
   
   NOTE:  Alternatively, you can download the sources of the
  -"jakarta-regexp" subproject, and build a binary distribution yourself.
  -
  -* Download a binary distribution from:
  -
  -http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/
  -
  -  On a Windows platform, you will need:
  -jakarta-regexp-1.2.zip
  -
  -  On a Unix platform, you will need:
  -jakarta-regexp-1.2.tar.gz
  -
  -* Unpack the binary distribution into a convenient location so that the
  -  distribution resides in its own directory (conventionally named
  -  "jakarta-regexp-x.y").
  -
  -
  -(6) Download and Install the Servlet API Binary Distribution
  -
  -NOTE:  Alternatively, you can download the sources of the
   "jakarta-servletapi-4" subproject, and build a binary distribution yourself,
   or use the binary distribution that is available with binary distributions
   of Tomcat 4.0.
  @@ -151,14 +131,14 @@
 distribution resides in its own directory.
   
   
  -(7) Steps (8) - (18) are optional, but are necessary to build a complete binary
  +(6) Steps (7) - (17) are optional, but are necessary to build a complete binary
   distribution of Tomcat 4.0. Set the "full.dist" property to "on" in the
  -build.properties file (see step (18)) to build a complete distribution.
  +build.properties file (see step (17)) to build a complete distribution.
   Regular contributors to Tomcat are encouraged to use the complete build 
   option.
   
   
  -(8) Download and Install JDBC Optional Package API Binary Distribution
  +(7) Download and Install JDBC Optional Package API Binary Distribution
   
   * Download the JDBC Optional Pacakge API package (version 2.0) from:
   
  @@ -167,7 +147,7 @@
   * Place the jar in a convenient location.
   
   
  -(9) Download and Install the JMX 1.0 Reference Implementation
  +(8) Download and Install the JMX 1.0 Reference Implementation
   
   * Download the JMX Instrumentation and Agent Reference Implementation
 (version 1.0 or later) from
  @@ -178,7 +158,7 @@
 it resides in its own subdirectory.
   
   
  -(10) Download and Install the JNDI 1.2.1 Reference Implementation
  +(9) Download and Install the JNDI 1.2.1 Reference Implementation
   
   * Download the Java Naming and Directory Interface (JNDI) package,
 (version 1.2.1 or later) from
  @@ -191,19 +171,18 @@
   * You will also need the "LDAP Provider" (ldap.jar), available on the
 same download page.  Be sure that you unpack "ldap.jar" into the "lib"
 subdirectory of the JNDI directory, parallel to "jndi.jar".
  -
   
  -(11) Download and Install the Java Activation Framework 1.0.1
  +(10) Download and Install the Java Activation Framework 1.0.1
   
   * Download the Java Activation Framework package (version 1.0.1 or later) from
   
   http://java.sun.com/products/javabeans/glasgow/jaf.html
   
   * Unpack the package into a convenient location 

RE: [PATCH] SimplePool.java

2001-10-04 Thread Ignacio J. Ortega

Many Thanks David, i'll commit it ASAP..

Saludos ,
Ignacio J. Ortega


> -Mensaje original-
> De: Schreibman, David [mailto:[EMAIL PROTECTED]]
> Enviado el: jueves 4 de octubre de 2001 20:29
> Para: '[EMAIL PROTECTED]'
> Asunto: [PATCH] SimplePool.java
> 
> 
> Here's a simple tweak that clears out references to objects 
> that are removed
> from the pool.  The current code can delay garbage collection 
> for objects
> that are removed from the pool but not returned.
> 
> The diff is against 3.3-rc1
> 
> -David
> 
> 



DO NOT REPLY [Bug 3961] - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3961

FactoryConfigurationError on Servlet+JSP+taglib





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 12:51 ---
There seems to be a problem with the Jaxp jar files that ship with RC1.  If you 
download Jaxp 1.1 from java.sun.com and replace the jar files in lib/container 
with those, your example starts working.



Re: [PATCH] SimplePool.java

2001-10-04 Thread Renato Weiner

What about Tomcat 3.2.3 ? There are the same lines of
code...


--- "Schreibman, David" <[EMAIL PROTECTED]>
wrote:
> Here's a simple tweak that clears out references to
> objects that are removed
> from the pool.  The current code can delay garbage
> collection for objects
> that are removed from the pool but not returned.
> 
> The diff is against 3.3-rc1
> 
> -David
> 
> > --- SimplePool.java.origThu Oct  4 10:14:51 2001
> +++ SimplePool.java   Thu Oct  4 10:54:08 2001
> @@ -132,6 +132,7 @@
>   synchronized( lock ) {
>   if( current >= 0 ) {
>   item = pool[current];
> + pool[current] = null;
>   current -= 1;
>   }
>   if( debug > 0 ) 
> 


__
Do You Yahoo!?
NEW from Yahoo! GeoCities - quick and easy web site hosting, just $8.95/month.
http://geocities.yahoo.com/ps/info1



cvs commit: jakarta-tomcat-4.0 RELEASE-PLAN-4.0.1.txt

2001-10-04 Thread remm

remm01/10/04 12:51:23

  Modified:.Tag: tomcat_40_branch RELEASE-PLAN-4.0.1.txt
  Log:
  - More status updates.
  - List the bugs fixed.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.4   +43 -9 jakarta-tomcat-4.0/Attic/RELEASE-PLAN-4.0.1.txt
  
  Index: RELEASE-PLAN-4.0.1.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-PLAN-4.0.1.txt,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- RELEASE-PLAN-4.0.1.txt2001/10/04 19:29:30 1.1.2.3
  +++ RELEASE-PLAN-4.0.1.txt2001/10/04 19:51:23 1.1.2.4
  @@ -1,4 +1,4 @@
  -$Id: RELEASE-PLAN-4.0.1.txt,v 1.1.2.3 2001/10/04 19:29:30 remm Exp $
  +$Id: RELEASE-PLAN-4.0.1.txt,v 1.1.2.4 2001/10/04 19:51:23 remm Exp $
   
Release Plan for Apache Tomcat 4.0.1

  @@ -42,7 +42,13 @@
   
   - Support for AJP 1.3.
   - Static resource content caching.
  +
  +
  +Enhacements
  +---
  +
   - Enhanced error reporting mechanism.
  +- Enhance implementation of the filesystem access.
   
   
   Important Bug Fixes
  @@ -57,12 +63,42 @@
   - Fix consistency problems in the static resource cache.
   
   
  +Bugzilla Bugs Resolved
  +--
  +
  +2693Syntax errors in JSP source generate NumberFormatException.
  +3669Improve Jasper error reporting (stack traces).
  +3695Do not add ldap.jar to class path on JDK 1.3 or later.
  +3699A recursive function call in org.apache.naming.NamingContext.
  +3707Custom action attribute of type Object does not accept literal string 
  +value.
  +3708Ldap.jar has a questionable license.
  +3709Tyrex license is not being followed.
  +3718NEW_SPECS.txt file in src directory could confuse the inexperienced.
  +3724WebApps do not autodeploy if appBase changed under Windows.
  +3733Session serialization problem.
  +3736Incorrect PathInfo on first invocation of servlet chain.
  +3739Custom tag support error.
  +3759Conversion from String to Object doesn't work.
  +3780Documentation notes.
  +3796XML Classloader problem has crept back in.
  +3809Jar files in the wrong directories.
  +3817Classpath loading priority doesn't match docs.
  +3822Drive letter causes a NumberFormatException when JSP compile.
  +3841Incorrect state reported by EmbeddedManager.java:start().
  +3845Body content is supposed to be empty.
  +3885Server.xml ResourceParam does not match envCtx.lookup.
  +3889Documentation for "Remote Address Filter" and "Remote Host Filter" 
  +incorrect.
  +3892Can't compile 2092.jsp.
  +3910Web.xml mime type incorrect for jnlp.
  +3936GetResources does not work.
  +3949Document with content-length of 0 results in resend headers.
  +
  +
   Bugs That Must Be Addressed Before Final Release:
   
   
  -Jasper  2693Syntax errors in JSP source generate NumberFormatException
  -(likely related to 3822).
  -
   Connectors  3509Apache 1.3.20 and mod_webapp and Tomcat 4b7 HANGS
   (likely to be the same issue as 1788)
   
  @@ -74,8 +110,8 @@
   
   Jasper  3779The value of  should be URL encoded.
   
  -Jasper  3822Drive letter causes a NumberFormatException when JSP 
  -compiler parses errors.
  +Catalina3888WebappClassLoader: Lifecycle error : CL stopped (bug 
  +confirmed, but conditions to reproduce it still unclear).
   
   Catalina3973Session.getAttribute() locks-up in 
   HttpSessionListener.sessionDestroyed().
  @@ -95,9 +131,7 @@
   Unconfirmed Bugs (Awaiting Reproducible Failure Case):
   -
   
  -Catalina3888WebappClassLoader: Lifecycle error : CL stopped.
  -
   Catalina3953If context is listed in server.xml then webapp servlets 
  -are loaded twice
  +are loaded twice.
   
   Catalina3970Cannot send more that 1 MB using multipart/form-data.
  
  
  



Can't compile webapp-1.0-tc4.0 under Solaris

2001-10-04 Thread Barry Adams


 I can't compile webapp-1.0-tc4.0 under solaris (Solaris 8, sparc)

The Autoconf system doesn't seem to know much about solaris,

I managed to fix three problems as follows.

It couldn't find, sys/syslimits.h and stdint.h, so i make symbolic links
from

/usr/include/sys/syslimits.h -> /usr/include/limits.h
/usr/include/stdint.h -> /usr/include/inttypes.h

Which helped

In time.c and timestr.c, it couldn't find the symbols  tm_gmtoff
so i removed these, which help

In the locks, it couldn't find LOCK_EX or LOCK_UN, (missing from
solaris includes, so i added


#define LOCK_SH 1
#define LOCK_EX 2
#define LOCK_NB 4
#define LOCK_UN 8

to /usr/include/sys/file.h

But the DSO support won't compile either and has me stumped, here is
the offending errors from running 'make'.

make[4]: Entering directory `/software/webapp-module-1.0-tc40/apr/dso/unix'
/bin/sh /software/webapp-module-1.0-tc40/apr/libtool --silent
--mode=compile cc -g -O2   -DHAVE_CONFIG_H -DSOLARIS2=8
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT   -I../../include
-I../../include/arch -I../../include/arch/unix  -c dso.c && touch dso.lo
dso.c: In function `apr_dso_load':
dso.c:127: `NSObjectFileImage' undeclared (first use in this function)
dso.c:127: (Each undeclared identifier is reported only once
dso.c:127: for each function it appears in.)
dso.c:127: parse error before `image'
dso.c:128: `NSModule' undeclared (first use in this function)
dso.c:130: `image' undeclared (first use in this function)
dso.c:130: `NSObjectFileImageSuccess' undeclared (first use in this function)
dso.c:139: `os_handle' undeclared (first use in this function)
dso.c: In function `apr_dso_sym':
dso.c:205: `NSSymbol' undeclared (first use in this function)
dso.c:205: parse error before `symbol'
dso.c:211: `symbol' undeclared (first use in this function)
dso.c:218: warning: assignment makes pointer from integer without a cast
make[4]: *** [dso.lo] Error 1

Barry Adams












cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java

2001-10-04 Thread remm

remm01/10/04 12:28:57

  Modified:catalina/src/share/org/apache/catalina/servlets Tag:
tomcat_40_branch DefaultServlet.java
  Log:
  - Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
  response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
  mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
  able to display error pages for most errors returned from the pipeline -
  like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
  fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
  made in the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.39.2.1  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
  retrieving revision 1.39
  retrieving revision 1.39.2.1
  diff -u -r1.39 -r1.39.2.1
  --- DefaultServlet.java   2001/09/12 16:19:25 1.39
  +++ DefaultServlet.java   2001/10/04 19:28:56 1.39.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.39 2001/09/12 16:19:25 remm Exp $
  - * $Revision: 1.39 $
  - * $Date: 2001/09/12 16:19:25 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.39.2.1 2001/10/04 19:28:56 remm Exp $
  + * $Revision: 1.39.2.1 $
  + * $Date: 2001/10/04 19:28:56 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.39 $ $Date: 2001/09/12 16:19:25 $
  + * @version $Revision: 1.39.2.1 $ $Date: 2001/10/04 19:28:56 $
*/
   
   public class DefaultServlet
  @@ -2175,7 +2175,7 @@
   Date tempDate = tempAttrs.getCreationDate();
   if (tempDate != null)
   creationDate = tempDate.getTime();
  -tempDate = tempAttrs.getLastModified();
  +tempDate = tempAttrs.getLastModifiedDate();
   if (tempDate != null) {
   date = tempDate.getTime();
   httpDate = formats[0].format(tempDate);
  
  
  



...also Can't build webapp-1.0-tc4.0 on NT

2001-10-04 Thread Thom Park


mod_Webapp doesn't want to build on NT.

It's lacking a libapr.mak file and, when the libapr.dsp project is run,
tries to compile unix stuff.

Is there any way to get ahold of the build scripts that created the
downloadable
binaries for mod_webapp?

-Thom

-Original Message-
From: Barry Adams [mailto:[EMAIL PROTECTED]]
Sent: Thursday, October 04, 2001 1:09 PM
To: [EMAIL PROTECTED]
Subject: Can't compile webapp-1.0-tc4.0 under Solaris



 I can't compile webapp-1.0-tc4.0 under solaris (Solaris 8, sparc)

The Autoconf system doesn't seem to know much about solaris,

I managed to fix three problems as follows.

It couldn't find, sys/syslimits.h and stdint.h, so i make symbolic links
from

/usr/include/sys/syslimits.h -> /usr/include/limits.h
/usr/include/stdint.h -> /usr/include/inttypes.h

Which helped

In time.c and timestr.c, it couldn't find the symbols  tm_gmtoff
so i removed these, which help

In the locks, it couldn't find LOCK_EX or LOCK_UN, (missing from
solaris includes, so i added


#define LOCK_SH 1
#define LOCK_EX 2
#define LOCK_NB 4
#define LOCK_UN 8

to /usr/include/sys/file.h

But the DSO support won't compile either and has me stumped, here is
the offending errors from running 'make'.

make[4]: Entering directory `/software/webapp-module-1.0-tc40/apr/dso/unix'
/bin/sh /software/webapp-module-1.0-tc40/apr/libtool --silent
--mode=compile cc -g -O2   -DHAVE_CONFIG_H -DSOLARIS2=8
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT   -I../../include
-I../../include/arch -I../../include/arch/unix  -c dso.c && touch dso.lo
dso.c: In function `apr_dso_load':
dso.c:127: `NSObjectFileImage' undeclared (first use in this function)
dso.c:127: (Each undeclared identifier is reported only once
dso.c:127: for each function it appears in.)
dso.c:127: parse error before `image'
dso.c:128: `NSModule' undeclared (first use in this function)
dso.c:130: `image' undeclared (first use in this function)
dso.c:130: `NSObjectFileImageSuccess' undeclared (first use in this
function)
dso.c:139: `os_handle' undeclared (first use in this function)
dso.c: In function `apr_dso_sym':
dso.c:205: `NSSymbol' undeclared (first use in this function)
dso.c:205: parse error before `symbol'
dso.c:211: `symbol' undeclared (first use in this function)
dso.c:218: warning: assignment makes pointer from integer without a cast
make[4]: *** [dso.lo] Error 1

Barry Adams













cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/buf UEncoder.java

2001-10-04 Thread costin

costin  01/10/04 13:18:08

  Modified:src/facade22/org/apache/tomcat/facade
HttpServletRequestFacade.java
   src/share/org/apache/tomcat/util/buf UEncoder.java
  Log:
  getRequestURI returns an encoded request. Fix is slightly modified from what
  Bill Barker sent, I was thinking to do some optimizations ( avoid use of Writer, and
  do the encoding directly in the buffer), but given that this happens only
  when it's needed - it should be ok. Probably for 3.3.1 we can do this ( and
  the date formating which is another hotspot ).
  
  Note that we do not encode contextPath. This is against the spec, but I think
  we should leave it this way:
  - that's how it was in 3.1, 3.2, etc
  - 4.0 is also broken ( well, it returns 404 if I try any encoded char in the context
  path )
  - it can raise a large number of bugs, if users expect the contextPath to be unique
  ( with encoding - there are many ways you can encode a string, without
  even considering charsets ).
  - it would be very hard to write an app that is consistent between 3.3 and 3.2
  ( which most people use ).
  
  I don't know how other containers are doing this, but I suspect most will
  return the context path decoded - if you can find one that is not decoding the
  CP - we can reconsider this.
  
  Revision  ChangesPath
  1.29  +51 -8 
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- HttpServletRequestFacade.java 2001/09/22 00:53:47 1.28
  +++ HttpServletRequestFacade.java 2001/10/04 20:18:08 1.29
  @@ -63,6 +63,7 @@
   import org.apache.tomcat.util.res.StringManager;
   import org.apache.tomcat.util.io.FileUtil;
   import org.apache.tomcat.util.buf.DateTool;
  +import org.apache.tomcat.util.buf.UEncoder;
   import org.apache.tomcat.util.http.*;
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.facade.*;
  @@ -95,11 +96,8 @@
   ServletInputStreamFacade isFacade=new ServletInputStreamFacade();
   boolean isFacadeInitialized=false;
   BufferedReader reader;
  -DateFormat []dateFormats = {
  - new SimpleDateFormat(DateTool.RFC1123_PATTERN, Locale.US),
  - new SimpleDateFormat(DateTool.rfc1036Pattern, Locale.US),
  - new SimpleDateFormat(DateTool.asctimePattern, Locale.US)
  -};
  +DateFormat []dateFormats;
  +UEncoder uencoder;
   
   private boolean usingStream = false;
   private boolean usingReader = false;
  @@ -111,6 +109,31 @@
   HttpServletRequestFacade(Request request) {
   this.request = request;
isFacade.setRequest( request );
  + try {
  + // we may create facades more often than requests 
  + Object o=request.getNote( "req.dateFormats" );
  + if( o==null ) {
  + o=new DateFormat[] {
  + new SimpleDateFormat(DateTool.RFC1123_PATTERN, Locale.US),
  + new SimpleDateFormat(DateTool.rfc1036Pattern, Locale.US),
  + new SimpleDateFormat(DateTool.asctimePattern, Locale.US)
  + };
  + request.setNote( "req.dateFormats", o );
  + }
  + dateFormats=(DateFormat[])o;
  + o=request.getNote( "req.uencoder" );
  + if( o==null ) {
  + uencoder=new UEncoder();
  + uencoder.addSafeCharacter(';');
  + uencoder.addSafeCharacter('/');
  + request.setNote( "req.uencoder", uencoder );
  + } else {
  + uencoder=(UEncoder)o;
  + }
  + } catch( TomcatException ex ) {
  + ex.printStackTrace();
  + }
  +
   }
   
   /** Not public - is called only from FacadeManager on behalf of Request
  @@ -288,10 +311,12 @@
   }
   
   public String getPathInfo() {
  + // DECODED
   return request.pathInfo().toString();
   }
   
   public String getPathTranslated() {
  + // DECODED
// Servlet 2.2 spec differs from what Apache and
// all other web servers consider to be PATH_TRANSLATED.
// It's important not to use CGI PATH_TRANSLATED - this
  @@ -309,7 +334,8 @@
   }
   
   public String getQueryString() {
  - // unprocessed
  + // ENCODED. We don't decode the original query string,
  + // we we can return the same thing
String qS=request.queryString().toString();
if( "".equals(qS) )
return null;
  @@ -379,11 +405,22 @@
   }
   
   public String getRequestURI() {
  - if( request.unparsedURI().isNull() )
  - return request.requestURI().toString();
  + // ENCODED
  + if( request.unparsedURI().isNull() ) {
  + // unp

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java

2001-10-04 Thread costin

costin  01/10/04 13:25:05

  Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
  Log:
  Do not decode if it was alredy decoded - i.e. if tomcat+web server.
  For Http we need to decode, and also for eventual protocols that send the request
  encoded.
  
  Also, added an option ( defaulted to what we agreed ) to allow saving the 'original'
  uri. Turning it on will bring inconsistencyes between tomcat standalone and
  tomcat+web, and may be open to various security issues ( if the uri is used in any
  check or processing, many encoding tricks could be played - we've been there ).
  But it is the strict implementation of the 2.3 spec ( in the idea that 2.3 is
  backward compat. with 2.2 ).
  
  Revision  ChangesPath
  1.10  +14 -4 
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
  
  Index: DecodeInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DecodeInterceptor.java2001/09/29 04:36:35 1.9
  +++ DecodeInterceptor.java2001/10/04 20:25:05 1.10
  @@ -89,7 +89,7 @@
   
   private boolean normalize=true;
   private boolean safe=true;
  -
  +private boolean saveOriginal=false;
   public DecodeInterceptor() {
   }
   
  @@ -118,6 +118,13 @@
normalize=b;
   }
   
  +/** Save the original uri before decoding. Default is false,
  + *  for consistency among servers.
  + */
  +public void setSaveOriginal( boolean b ) {
  + saveOriginal=b;
  +}
  +
   /** Decode interceptor can reject unsafe urls. These are
   URL's containing the following escapes:
   %25 = '%'
  @@ -398,7 +405,7 @@
   }
   
   private boolean isSafeURI(MessageBytes pathMB) {
  -int start = pathMB.indexOf("%");
  +int start = pathMB.indexOf('%');
   if( start >= 0 ) {
   int end = pathMB.indexOf(";jsessionid=");
   if( end < 0 || start < end ) {
  @@ -515,11 +522,14 @@
// Decode request, save the original for the facade
   
// Already decoded
  - if( req.getNote( decodedNote ) != null )
  + if( req.getNote( decodedNote ) != null ) {
  + if( debug> 5 ) log("Already decoded " + req.getNote( decodedNote ));
return 0;
  + }
if (pathMB.indexOf('%') >= 0 || pathMB.indexOf( '+' ) >= 0) {
try {
  - req.unparsedURI().duplicate( pathMB );
  + if( saveOriginal )
  + req.unparsedURI().duplicate( pathMB );
if(debug>1 )
log( "Before " + pathMB.toString());
req.getURLDecoder().convert( pathMB );
  
  
  



cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp13Interceptor.java

2001-10-04 Thread costin

costin  01/10/04 13:27:47

  Modified:src/share/org/apache/tomcat/modules/server
Ajp13Interceptor.java
  Log:
  Let DecodeInterceptor ( and/or other modules ) know if the request was already 
decoded.
  
  I did added an option to turn this off ( for older versions of jk, or to implement
  2.3 on IIS, which seems to be the only place where it can be implemented )
  
  Revision  ChangesPath
  1.17  +27 -7 
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java
  
  Index: Ajp13Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Ajp13Interceptor.java 2001/09/20 03:43:00 1.16
  +++ Ajp13Interceptor.java 2001/10/04 20:27:47 1.17
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v
 1.16 2001/09/20 03:43:00 costin Exp $
  - * $Revision: 1.16 $
  - * $Date: 2001/09/20 03:43:00 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v
 1.17 2001/10/04 20:27:47 costin Exp $
  + * $Revision: 1.17 $
  + * $Date: 2001/10/04 20:27:47 $
*
* 
*
  @@ -81,11 +81,15 @@
   {
   private boolean tomcatAuthentication=true;
   private boolean shutDownEnable=false;
  +// true if the incloming uri is encoded.
  +private boolean decoded=true;
  +
  +private int decodedNote;
   
   public Ajp13Interceptor()
   {
   super();
  - super.setSoLinger( 100 );
  + super.setSoLinger( 100 );
super.setTcpNoDelay( true );
   }
   
  @@ -104,11 +108,24 @@
   public void setShutDownEnable(boolean b ) {
shutDownEnable=b;
   }
  +
  +public void setDecodedUri( boolean b ) {
  + decoded=b;
  +}
   
   protected void localInit() throws Exception {
ep.setConnectionHandler( this );
   }
   
  +public void engineInit( ContextManager cm )
  + throws TomcatException
  +{
  + super.engineInit( cm );
  + decodedNote=cm.getNoteId(ContextManager.REQUEST_NOTE,
  +   "req.decoded" );
  +}
  +
  +
   //  Handler implementation 
   
   public Object[] init()
  @@ -184,12 +201,15 @@
}
}
   
  -// special case - invalid AJP13 packet, error 
  -// decoding packet ...
  -// we drop the connection rigth now
  + // special case - invalid AJP13 packet, error 
  + // decoding packet ...
  + // we drop the connection rigth now
if( status != 200 )
break;
   
  + if( decoded )
  + req.setNote( decodedNote, this );
  + 
cm.service(req, res);
   
req.recycle();
  
  
  



DO NOT REPLY [Bug 3980] New: - bug in handling java.net.URL for document root?

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3980

bug in handling java.net.URL for document root?

   Summary: bug in handling java.net.URL for document root?
   Product: Tomcat 4
   Version: Nightly Build
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Using the defalt context:



I set up the default Xalan and attempt to use the XSLTSimpleServlet example to 
process a xml/xsl.  The code:

 Source xmlSource = new StreamSource(new URL("file:todo.xml").openStream());

Throws:
todo.xml (The system cannot find the file specified)
java.io.FileNotFoundException: todo.xml

i have todo.xml in webapps/examples.  If I change the statement:

Source xmlSource = new StreamSource(new URL
("file:///c:/Tomcat/webapps/examples/todo.xml").openStream());

it works, is this a problem?



DO NOT REPLY [Bug 3980] - bug in handling java.net.URL for document root?

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3980

bug in handling java.net.URL for document root?

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 14:54 ---
That's definitely something which shouldn't be filed as a bug, but posted as a 
question on tomcat-user.

Here you actually attempt to load todo.xml relative to the path where you 
started the VM (not good). Use getServletContext().getResourceAsStream
("todo.xml") instead.



RE: mod_jk & Tomcat 4.0

2001-10-04 Thread Durham David Cntr 805CSS/SCBE

You shouldn't post to both dev and users.  

Taken from: http://jakarta.apache.org/site/mail.html

Summary: Do not cross post messages. 
In other words, pick a mailing list and send your messages to that
mailing list only. Do not send your messages to multiple mailing lists.
The reason is that people may be subscribed to one list and not to the
other. Therefore, 
some people may only see half of the conversation. 




-Original Message-
From: menonv [mailto:[EMAIL PROTECTED]]
Sent: Thursday, October 04, 2001 4:54 PM
To: [EMAIL PROTECTED]; Tomcat Developer List
Subject: RE: mod_jk & Tomcat 4.0


Hello Again,
After some digging around the server.xml file I realise that
Tomcat
4.0 * does * have Apache intergation via the mod_webapp. Surprisingly
when I
downloaded and installed the Windows version, I didn't get a
mod_webapp.dll.
Did find a wrap.jar. Is that all? The documentation referred to
mod_webapp.so. Is a built so available from somewhere or do we need to
build
it?

Many thanks


Vinay

> -Original Message-
> From: menonv [SMTP:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 9:58 PM
> To:   Tomcat User List; Tomcat Developer List
> Subject:  mod_jk & Tomcat 4.0
> 
> Hello,
>   Is there a mod_jk version that is compatible with Catalina 4.0?
Is
> that something is out/being worked on? Does the new version of the
server
> have something that is the equivalent of the ajp13 connector?
> 
> Thanks
> 
> Vinay
> 
> 
> Disclaimer
> 
> This communication together with any attachments transmitted with it
> ('this E-mail') is intended only for the use of the addressee and may
> contain information which is privileged and confidential. If the
reader of
> this E-mail is not the intended recipient or the employee or agent
> responsible for delivering it to the intended recipient you are
notified
> that any use of this E-mail is prohibited. Addressees should check
this
> E-mail for viruses. The Carphone Warehouse Group PLC makes no
> representations as regards the absence of viruses in this E-mail. If
you
> have received this E-mail in error please notify our ISe Response Team
> immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> [EMAIL PROTECTED] Please then immediately destroy this E-mail and
any
> copies of it.
> 
> Please feel free to visit our website: http://www.phonehouse.com


Disclaimer

This communication together with any attachments transmitted with it
('this E-mail') is intended only for the use of the addressee and may
contain information which is privileged and confidential. If the reader
of this E-mail is not the intended recipient or the employee or agent
responsible for delivering it to the intended recipient you are notified
that any use of this E-mail is prohibited. Addressees should check this
E-mail for viruses. The Carphone Warehouse Group PLC makes no
representations as regards the absence of viruses in this E-mail. If you
have received this E-mail in error please notify our ISe Response Team
immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
[EMAIL PROTECTED] Please then immediately destroy this E-mail and any
copies of it.

Please feel free to visit our website: http://www.phonehouse.com




RE: mod_jk & Tomcat 4.0

2001-10-04 Thread menonv

Believe it also depends on the question :)

I want to get hold of mod_webapp.

If it is something a 'user' has used I could get it from him/her.

If it is something a 'developer' has developed I could get it from him/her.

Simple.

Regards

Vinay

> -Original Message-
> From: Durham David Cntr 805CSS/SCBE [SMTP:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 10:59 PM
> To:   [EMAIL PROTECTED]
> Subject:  RE: mod_jk & Tomcat 4.0
> 
> You shouldn't post to both dev and users.  
> 
> Taken from: http://jakarta.apache.org/site/mail.html
> 
> Summary: Do not cross post messages. 
> In other words, pick a mailing list and send your messages to that
> mailing list only. Do not send your messages to multiple mailing lists.
> The reason is that people may be subscribed to one list and not to the
> other. Therefore, 
> some people may only see half of the conversation. 
> 
> 
> 
> 
> -Original Message-
> From: menonv [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 4:54 PM
> To: [EMAIL PROTECTED]; Tomcat Developer List
> Subject: RE: mod_jk & Tomcat 4.0
> 
> 
> Hello Again,
>   After some digging around the server.xml file I realise that
> Tomcat
> 4.0 * does * have Apache intergation via the mod_webapp. Surprisingly
> when I
> downloaded and installed the Windows version, I didn't get a
> mod_webapp.dll.
> Did find a wrap.jar. Is that all? The documentation referred to
> mod_webapp.so. Is a built so available from somewhere or do we need to
> build
> it?
> 
> Many thanks
> 
> 
> Vinay
> 
> > -Original Message-
> > From:   menonv [SMTP:[EMAIL PROTECTED]]
> > Sent:   Thursday, October 04, 2001 9:58 PM
> > To: Tomcat User List; Tomcat Developer List
> > Subject:mod_jk & Tomcat 4.0
> > 
> > Hello,
> > Is there a mod_jk version that is compatible with Catalina 4.0?
> Is
> > that something is out/being worked on? Does the new version of the
> server
> > have something that is the equivalent of the ajp13 connector?
> > 
> > Thanks
> > 
> > Vinay
> > 
> > 
> > Disclaimer
> > 
> > This communication together with any attachments transmitted with it
> > ('this E-mail') is intended only for the use of the addressee and may
> > contain information which is privileged and confidential. If the
> reader of
> > this E-mail is not the intended recipient or the employee or agent
> > responsible for delivering it to the intended recipient you are
> notified
> > that any use of this E-mail is prohibited. Addressees should check
> this
> > E-mail for viruses. The Carphone Warehouse Group PLC makes no
> > representations as regards the absence of viruses in this E-mail. If
> you
> > have received this E-mail in error please notify our ISe Response Team
> > immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> > [EMAIL PROTECTED] Please then immediately destroy this E-mail and
> any
> > copies of it.
> > 
> > Please feel free to visit our website: http://www.phonehouse.com
> 
> 
> Disclaimer
> 
> This communication together with any attachments transmitted with it
> ('this E-mail') is intended only for the use of the addressee and may
> contain information which is privileged and confidential. If the reader
> of this E-mail is not the intended recipient or the employee or agent
> responsible for delivering it to the intended recipient you are notified
> that any use of this E-mail is prohibited. Addressees should check this
> E-mail for viruses. The Carphone Warehouse Group PLC makes no
> representations as regards the absence of viruses in this E-mail. If you
> have received this E-mail in error please notify our ISe Response Team
> immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> [EMAIL PROTECTED] Please then immediately destroy this E-mail and any
> copies of it.
> 
> Please feel free to visit our website: http://www.phonehouse.com


Disclaimer

This communication together with any attachments transmitted with it ('this E-mail') 
is intended only for the use of the addressee and may contain information which is 
privileged and confidential. If the reader of this E-mail is not the intended 
recipient or the employee or agent responsible for delivering it to the intended 
recipient you are notified that any use of this E-mail is prohibited. Addressees 
should check this E-mail for viruses. The Carphone Warehouse Group PLC makes no 
representations as regards the absence of viruses in this E-mail. If you have received 
this E-mail in error please notify our ISe Response Team immediately by telephone on + 
44 (0)20 8896 5828 or via E-mail at [EMAIL PROTECTED] Please then immediately 
destroy this E-mail and any copies of it.

Please feel free to visit our website: http://www.phonehouse.com




RE: mod_jk & Tomcat 4.0

2001-10-04 Thread Durham David Cntr 805CSS/SCBE

I didn't see anything about it depending on the question on the jakarta
sight.  Did you?

Here's another excerpt

Summary: Do not abuse resources in order to get help. 
Asking your configuration or user type of question on the developers
list because you think that you will get help more quickly by going
directly to the developers instead of to the user base is not very nice.
Chances are that doing this will actually prevent people from answering
your question because it is clear that you are trying to abuse
resources. 




-Original Message-
From: menonv [mailto:[EMAIL PROTECTED]]
Sent: Thursday, October 04, 2001 5:05 PM
To: [EMAIL PROTECTED]
Subject: RE: mod_jk & Tomcat 4.0


Believe it also depends on the question :)

I want to get hold of mod_webapp.

If it is something a 'user' has used I could get it from him/her.

If it is something a 'developer' has developed I could get it from
him/her.

Simple.

Regards

Vinay

> -Original Message-
> From: Durham David Cntr 805CSS/SCBE [SMTP:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 10:59 PM
> To:   [EMAIL PROTECTED]
> Subject:  RE: mod_jk & Tomcat 4.0
> 
> You shouldn't post to both dev and users.  
> 
> Taken from: http://jakarta.apache.org/site/mail.html
> 
> Summary: Do not cross post messages. 
> In other words, pick a mailing list and send your messages to that
> mailing list only. Do not send your messages to multiple mailing
lists.
> The reason is that people may be subscribed to one list and not to the
> other. Therefore, 
> some people may only see half of the conversation. 
> 
> 
> 
> 
> -Original Message-
> From: menonv [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 4:54 PM
> To: [EMAIL PROTECTED]; Tomcat Developer List
> Subject: RE: mod_jk & Tomcat 4.0
> 
> 
> Hello Again,
>   After some digging around the server.xml file I realise that
> Tomcat
> 4.0 * does * have Apache intergation via the mod_webapp. Surprisingly
> when I
> downloaded and installed the Windows version, I didn't get a
> mod_webapp.dll.
> Did find a wrap.jar. Is that all? The documentation referred to
> mod_webapp.so. Is a built so available from somewhere or do we need to
> build
> it?
> 
> Many thanks
> 
> 
> Vinay
> 
> > -Original Message-
> > From:   menonv [SMTP:[EMAIL PROTECTED]]
> > Sent:   Thursday, October 04, 2001 9:58 PM
> > To: Tomcat User List; Tomcat Developer List
> > Subject:mod_jk & Tomcat 4.0
> > 
> > Hello,
> > Is there a mod_jk version that is compatible with Catalina 4.0?
> Is
> > that something is out/being worked on? Does the new version of the
> server
> > have something that is the equivalent of the ajp13 connector?
> > 
> > Thanks
> > 
> > Vinay
> > 
> > 
> > Disclaimer
> > 
> > This communication together with any attachments transmitted with it
> > ('this E-mail') is intended only for the use of the addressee and
may
> > contain information which is privileged and confidential. If the
> reader of
> > this E-mail is not the intended recipient or the employee or agent
> > responsible for delivering it to the intended recipient you are
> notified
> > that any use of this E-mail is prohibited. Addressees should check
> this
> > E-mail for viruses. The Carphone Warehouse Group PLC makes no
> > representations as regards the absence of viruses in this E-mail. If
> you
> > have received this E-mail in error please notify our ISe Response
Team
> > immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> > [EMAIL PROTECTED] Please then immediately destroy this E-mail and
> any
> > copies of it.
> > 
> > Please feel free to visit our website: http://www.phonehouse.com
> 
> 
> Disclaimer
> 
> This communication together with any attachments transmitted with it
> ('this E-mail') is intended only for the use of the addressee and may
> contain information which is privileged and confidential. If the
reader
> of this E-mail is not the intended recipient or the employee or agent
> responsible for delivering it to the intended recipient you are
notified
> that any use of this E-mail is prohibited. Addressees should check
this
> E-mail for viruses. The Carphone Warehouse Group PLC makes no
> representations as regards the absence of viruses in this E-mail. If
you
> have received this E-mail in error please notify our ISe Response Team
> immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> [EMAIL PROTECTED] Please then immediately destroy this E-mail and
any
> copies of it.
> 
> Please feel free to visit our website: http://www.phonehouse.com


Disclaimer

This communication together with any attachments transmitted with it
('this E-mail') is intended only for the use of the addressee and may
contain information which is privileged and confidential. If the reader
of this E-mail is not the intended recipient or the employee or agent
responsible for delivering it to the intended recipient you are notified
that any use of this E-mail is prohibited. Addressees should c

RE: mod_jk & Tomcat 4.0

2001-10-04 Thread menonv

I give up mate! 

All the traffic seems to be us arguing over what mails should be sent to the
list!!


If I have sent the mails to both the list - my apologies. 

Its almost midnight and I want to get some sleep.

Regards

Vinay


PS: Do you have any idea about the mod_webapp thingey or are you just a
mail-list police?! 

> -Original Message-
> From: Durham David Cntr 805CSS/SCBE [SMTP:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 11:09 PM
> To:   [EMAIL PROTECTED]
> Subject:  RE: mod_jk & Tomcat 4.0
> 
> I didn't see anything about it depending on the question on the jakarta
> sight.  Did you?
> 
> Here's another excerpt
> 
> Summary: Do not abuse resources in order to get help. 
> Asking your configuration or user type of question on the developers
> list because you think that you will get help more quickly by going
> directly to the developers instead of to the user base is not very nice.
> Chances are that doing this will actually prevent people from answering
> your question because it is clear that you are trying to abuse
> resources. 
> 
> 
> 
> 
> -Original Message-
> From: menonv [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, October 04, 2001 5:05 PM
> To: [EMAIL PROTECTED]
> Subject: RE: mod_jk & Tomcat 4.0
> 
> 
> Believe it also depends on the question :)
> 
> I want to get hold of mod_webapp.
> 
> If it is something a 'user' has used I could get it from him/her.
> 
> If it is something a 'developer' has developed I could get it from
> him/her.
> 
> Simple.
> 
> Regards
> 
> Vinay
> 
> > -Original Message-
> > From:   Durham David Cntr 805CSS/SCBE
> [SMTP:[EMAIL PROTECTED]]
> > Sent:   Thursday, October 04, 2001 10:59 PM
> > To: [EMAIL PROTECTED]
> > Subject:RE: mod_jk & Tomcat 4.0
> > 
> > You shouldn't post to both dev and users.  
> > 
> > Taken from: http://jakarta.apache.org/site/mail.html
> > 
> > Summary: Do not cross post messages. 
> > In other words, pick a mailing list and send your messages to that
> > mailing list only. Do not send your messages to multiple mailing
> lists.
> > The reason is that people may be subscribed to one list and not to the
> > other. Therefore, 
> > some people may only see half of the conversation. 
> > 
> > 
> > 
> > 
> > -Original Message-
> > From: menonv [mailto:[EMAIL PROTECTED]]
> > Sent: Thursday, October 04, 2001 4:54 PM
> > To: [EMAIL PROTECTED]; Tomcat Developer List
> > Subject: RE: mod_jk & Tomcat 4.0
> > 
> > 
> > Hello Again,
> > After some digging around the server.xml file I realise that
> > Tomcat
> > 4.0 * does * have Apache intergation via the mod_webapp. Surprisingly
> > when I
> > downloaded and installed the Windows version, I didn't get a
> > mod_webapp.dll.
> > Did find a wrap.jar. Is that all? The documentation referred to
> > mod_webapp.so. Is a built so available from somewhere or do we need to
> > build
> > it?
> > 
> > Many thanks
> > 
> > 
> > Vinay
> > 
> > > -Original Message-
> > > From: menonv [SMTP:[EMAIL PROTECTED]]
> > > Sent: Thursday, October 04, 2001 9:58 PM
> > > To:   Tomcat User List; Tomcat Developer List
> > > Subject:  mod_jk & Tomcat 4.0
> > > 
> > > Hello,
> > >   Is there a mod_jk version that is compatible with Catalina 4.0?
> > Is
> > > that something is out/being worked on? Does the new version of the
> > server
> > > have something that is the equivalent of the ajp13 connector?
> > > 
> > > Thanks
> > > 
> > > Vinay
> > > 
> > > 
> > > Disclaimer
> > > 
> > > This communication together with any attachments transmitted with it
> > > ('this E-mail') is intended only for the use of the addressee and
> may
> > > contain information which is privileged and confidential. If the
> > reader of
> > > this E-mail is not the intended recipient or the employee or agent
> > > responsible for delivering it to the intended recipient you are
> > notified
> > > that any use of this E-mail is prohibited. Addressees should check
> > this
> > > E-mail for viruses. The Carphone Warehouse Group PLC makes no
> > > representations as regards the absence of viruses in this E-mail. If
> > you
> > > have received this E-mail in error please notify our ISe Response
> Team
> > > immediately by telephone on + 44 (0)20 8896 5828 or via E-mail at
> > > [EMAIL PROTECTED] Please then immediately destroy this E-mail and
> > any
> > > copies of it.
> > > 
> > > Please feel free to visit our website: http://www.phonehouse.com
> > 
> > 
> > Disclaimer
> > 
> > This communication together with any attachments transmitted with it
> > ('this E-mail') is intended only for the use of the addressee and may
> > contain information which is privileged and confidential. If the
> reader
> > of this E-mail is not the intended recipient or the employee or agent
> > responsible for delivering it to the intended recipient you are
> notified
> > that any use of this E-mail is prohibited. Addressees should check
> this
> > E-mail for viruses. The Carphone Warehouse Group PLC m

Re: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread Bill Barker

I know that Costin has strong feeling on which Jaxp version we should ship
with (I just don't remember what they are:). Does anyone else have an
opinion?
- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Thursday, October 04, 2001 12:51 PM
Subject: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
Servlet+JSP+taglib


> DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
> RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
> .
> 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=3961
>
> FactoryConfigurationError on Servlet+JSP+taglib
>
>
>
>
>
> --- Additional Comments From [EMAIL PROTECTED]  2001-10-04
12:51 ---
> There seems to be a problem with the Jaxp jar files that ship with RC1.
If you
> download Jaxp 1.1 from java.sun.com and replace the jar files in
lib/container
> with those, your example starts working.
>
>


**

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. 



DO NOT REPLY [Bug 3981] New: - Installing from jakarta-tomcat-4.0.exe: Examples don't work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3981

Installing from jakarta-tomcat-4.0.exe: Examples don't work

   Summary: Installing from jakarta-tomcat-4.0.exe: Examples don't
work
   Product: Tomcat 4
   Version: 4.0 Final
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Using JDK1.4 beta 2 on Win2k.

I downloaded and ran jakarta-tomcat-4.0.exe.  

The installer wanted to install in "D:\Program Files\Apache Tomcat 4.0", and I 
consented.

After the install, I set the proper env vars and ran .\startup.  

I set my web browser for no proxy on localhost and 127.0.0.1.

I visited the default home page, and found that I got a 404 when I clicked on 
the examples link.

Looking in the logs, it looks like it couldnat find /WEB-INF/web.xml in the 
examples directory.

I uninstalled and re-installed in D:\tomcat4.0.

This time I was able to view the examples.



RE: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread Ignacio J. Ortega

I'm not sure if the bug is actually in the Jaxp version..

I will try to reproduce it, to see what happens moving around crimson
jars..

For me seems it's in "Damn ClassLoaders" bug type.. :)

Saludos ,
Ignacio J. Ortega


> -Mensaje original-
> De: Bill Barker [mailto:[EMAIL PROTECTED]]
> Enviado el: viernes 5 de octubre de 2001 0:26
> Para: [EMAIL PROTECTED]
> Asunto: Re: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
> Servlet+JSP+taglib
> 
> 
> I know that Costin has strong feeling on which Jaxp version 
> we should ship
> with (I just don't remember what they are:). Does anyone else have an
> opinion?
> - Original Message -
> From: <[EMAIL PROTECTED]>
> To: <[EMAIL PROTECTED]>
> Sent: Thursday, October 04, 2001 12:51 PM
> Subject: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
> Servlet+JSP+taglib
> 
> 
> > DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
> > RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
> > .
> > 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=3961
> >
> > FactoryConfigurationError on Servlet+JSP+taglib
> >
> >
> >
> >
> >
> > --- Additional Comments From 
> [EMAIL PROTECTED]  2001-10-04
> 12:51 ---
> > There seems to be a problem with the Jaxp jar files that 
> ship with RC1.
> If you
> > download Jaxp 1.1 from java.sun.com and replace the jar files in
> lib/container
> > with those, your example starts working.
> >
> >
> 
> 
> **
> 
> 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. 
> 



DO NOT REPLY [Bug 3981] - Installing from jakarta-tomcat-4.0.exe: Examples don't work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3981

Installing from jakarta-tomcat-4.0.exe: Examples don't work





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 16:38 ---
I tested again, and it appears to be working ok.
My config: JDK 1.4 beta 2 and JDK 1.3 + Win2k + TC 4.0.1-dev full install in 
the default location.

To startup / shutdown Tomcat, I use the shortcuts created by the installer.
The system service works fine too.

The installer assumes that you have the right entries for your (Sun) JDK in the 
registry, in which case you can skip the setup of the env variables.

So the workaround for your problems seem to be easy.

OTOH, there may be a bug with using the .bat scripts when there's a ' ' in the 
CATALINA_HOME value. This needs to be tested (I have to admit I never tried 
that configuration).



[PATCH] SingleThreadModel Pool for TC 3.3

2001-10-04 Thread Schreibman, David

I'm submitting this with mixed feelings since the recent discussion has
shown strong opinions about the utility of the SingleThreadModel.

I was already in the middle of doing the work when all that came about so I
went ahead and finished it.  After reaping the benefits of Tomcat for a
couple of years I've been wanting to give something back.  So after a recent
post about how to help, I went into bugzilla and found this issue.  I don't
even use STM, but was somewhat familiar with the ServletHandler and figured
I could contribute here.

At a minimum, I had fun doing the work and was able to learn a bit more
about the code base.

Maybe it will be of some use to others.

Looking forward to more good stuff from this project!!

-David



--- ServletHandler.java.origThu Oct  4 15:57:50 2001
+++ ServletHandler.java Thu Oct  4 16:06:28 2001
@@ -59,7 +59,7 @@
 package org.apache.tomcat.facade;
 
 import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.collections.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -106,11 +106,18 @@
 public static final int STATE_READY=3;
 
 //  Properties 
+
+public static final String STM_POOL_SIZE = "tomcat.stmpoolsize";
 
 // extra informations - if the servlet is declared in web.xml
 private ServletInfo sw;
 
 private String servletClassName;
+
+private SimplePool stmPool; // pool of SingleThreadModel instances
+private int stmPoolSize;
+private int stmInstances;   // number of servlet instances already being pooled 
+(we create them as needed)
+
 protected Class servletClass;
 protected Servlet servlet;
 protected Context context;
@@ -153,7 +160,6 @@
return context;
 }
 
-
 public void setServletClassName( String servletClassName) {
servlet=null; // reset the servlet, if it was set
servletClass=null;
@@ -192,7 +198,6 @@
} catch( Exception ex ) {
log(context,  "Error during destroy ", ex );
}
-   
 
errorException=null;
 }
@@ -330,6 +335,14 @@
}

servlet = (Servlet)servletClass.newInstance();
+
+if (servlet instanceof SingleThreadModel) {
+   stmPoolSize = Integer.getInteger(STM_POOL_SIZE, 
+SimplePool.DEFAULT_SIZE).intValue();
+   stmPool = new SimplePool(stmPoolSize);
+   stmPool.set(servlet);
+   stmInstances++;
+   }
+
return servlet;
 }
 
@@ -348,7 +361,15 @@
log(context, "preServletDestroy", ex);
}
}
-   servlet.destroy();
+
+   if (!(servlet instanceof SingleThreadModel)) {
+   servlet.destroy();
+   } else {
+   Servlet sl = null;
+   while ((sl = (Servlet)stmPool.get()) != null) {
+   sl.destroy();
+   }
+   }
 
for( int i=0; i< cI.length; i++ ) {
try {
@@ -432,6 +453,40 @@
super.service( req, res );
 }
 
+protected void doSTMService(HttpServletRequest reqF, HttpServletResponse resF) 
+throws Exception {
+   Servlet sl = null;
+   try {
+   boolean newInstance = false;
+   if ((sl = (Servlet)stmPool.get()) == null) {
+   synchronized (this) {
+   if (stmInstances < stmPoolSize) {
+   stmInstances++;
+   newInstance = true;
+   }
+   }
+   if (newInstance) {
+   sl = (Servlet)servletClass.newInstance();
+   sl.init(getServletInfo().getServletConfig());
+   }
+
+   }
+   
+   if (sl != null) {
+   sl.service(reqF, resF);
+   } else {
+   // The pool is full, just synchronize on the initial instance.
+   // Ideally, we would the pain across all pooled instances
+   // to avoid a bottleneck on a single instance.
+   synchronized(servlet) {
+   servlet.service(reqF, resF);
+   }
+   }
+   } finally {
+   if (sl != null) {
+   stmPool.put(sl);
+   }
+   }
+}
 
 protected void doService(Request req, Response res)
throws Exception
@@ -476,10 +531,8 @@
 
try {
// We are initialized and fine
-   if (servlet instanceof SingleThreadModel) {
-   synchronized(servlet) {
-   servlet.service(reqF, resF);
-   }
+   if ( servlet instanceof SingleThreadModel ) {
+   doSTMService(reqF, resF);
} else {
servlet.service(reqF, resF);
}



Re: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/buf UEncoder.java

2001-10-04 Thread Bojan Smojver

Tested briefly against mod_jk 1.1.0 and mod_jk 1.2.0... Everything seems
to be chugging along quite fine.

Bojan



DO NOT REPLY [Bug 3981] - Installing from jakarta-tomcat-4.0.exe: Examples don't work

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3981

Installing from jakarta-tomcat-4.0.exe: Examples don't work

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 17:23 ---
Tried your deployment environment, and it worked. I'll mark the bug as 
WORKSFORME. Reopen it if you have additional details or you're still unable to 
solve the problem.

The classpath / CATALINA_HOME values are displayed:
C:\Program Files\Apache Tomcat 4.0\bin>startup.bat
Using CATALINA_BASE: C:\Program Files\Apache Tomcat 4.0
Using CATALINA_HOME: C:\Program Files\Apache Tomcat 4.0
Using CLASSPATH: C:\Program Files\Apache Tomcat 4.0
\bin\bootstrap.jar;C:\java\jdk1.4.0_b2
\lib\tools.jar;c:\Work\jsse\lib\jcert.jar;c:\Work\jsse\li
b\jnet.jar;c:\Work\jsse\jsse.jar
Using JAVA_HOME: C:\java\jdk1.4.0_b2
C:\Program Files\Apache Tomcat 4.0\bin>shutdown.bat
Using CATALINA_BASE: C:\Program Files\Apache Tomcat 4.0
Using CATALINA_HOME: C:\Program Files\Apache Tomcat 4.0
Using CLASSPATH: C:\Program Files\Apache Tomcat 4.0
\bin\bootstrap.jar;C:\java\jdk1.4.0_b2
\lib\tools.jar;c:\Work\jsse\lib\jcert.jar;c:\Work\jsse\li
b\jnet.jar;c:\Work\jsse\jsse.jar
Using JAVA_HOME: C:\java\jdk1.4.0_b2



RE: ...also Can't build webapp-1.0-tc4.0 on NT

2001-10-04 Thread Xuemei Zhang

I've tried out to build the mod_webapp.dll and libapr.dll on NT by using
msdev for source files for libapr(choose those under win32 suddir and
some common ones from unix) and using the makefiles for mod_webapp.c and
aprutil.

Some instructions here:
http://www.google.com/search?q=cache:e3Lfx7D45n8:www.ingrid.org/jajakart
a/tomcat/tomcat-4.0/src-ja/connectors/WIN32.txt+mod_webapp.dll&hl=en .

However, I cannot make it work with apache 1.3.19(20) yet. 

Good Luck!

Xuemei

-Original Message-
From: Thom Park [mailto:[EMAIL PROTECTED]]
Sent: Thursday, October 04, 2001 9:13 PM
To: [EMAIL PROTECTED]
Subject: ...also Can't build webapp-1.0-tc4.0 on NT



mod_Webapp doesn't want to build on NT.

It's lacking a libapr.mak file and, when the libapr.dsp project is run,
tries to compile unix stuff.

Is there any way to get ahold of the build scripts that created the
downloadable
binaries for mod_webapp?

-Thom

-Original Message-
From: Barry Adams [mailto:[EMAIL PROTECTED]]
Sent: Thursday, October 04, 2001 1:09 PM
To: [EMAIL PROTECTED]
Subject: Can't compile webapp-1.0-tc4.0 under Solaris



 I can't compile webapp-1.0-tc4.0 under solaris (Solaris 8, sparc)

The Autoconf system doesn't seem to know much about solaris,

I managed to fix three problems as follows.

It couldn't find, sys/syslimits.h and stdint.h, so i make symbolic links
from

/usr/include/sys/syslimits.h -> /usr/include/limits.h
/usr/include/stdint.h -> /usr/include/inttypes.h

Which helped

In time.c and timestr.c, it couldn't find the symbols  tm_gmtoff
so i removed these, which help

In the locks, it couldn't find LOCK_EX or LOCK_UN, (missing from
solaris includes, so i added


#define LOCK_SH 1
#define LOCK_EX 2
#define LOCK_NB 4
#define LOCK_UN 8

to /usr/include/sys/file.h

But the DSO support won't compile either and has me stumped, here is
the offending errors from running 'make'.

make[4]: Entering directory
`/software/webapp-module-1.0-tc40/apr/dso/unix'
/bin/sh /software/webapp-module-1.0-tc40/apr/libtool --silent
--mode=compile cc -g -O2   -DHAVE_CONFIG_H -DSOLARIS2=8
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT   -I../../include
-I../../include/arch -I../../include/arch/unix  -c dso.c && touch dso.lo
dso.c: In function `apr_dso_load':
dso.c:127: `NSObjectFileImage' undeclared (first use in this function)
dso.c:127: (Each undeclared identifier is reported only once
dso.c:127: for each function it appears in.)
dso.c:127: parse error before `image'
dso.c:128: `NSModule' undeclared (first use in this function)
dso.c:130: `image' undeclared (first use in this function)
dso.c:130: `NSObjectFileImageSuccess' undeclared (first use in this
function)
dso.c:139: `os_handle' undeclared (first use in this function)
dso.c: In function `apr_dso_sym':
dso.c:205: `NSSymbol' undeclared (first use in this function)
dso.c:205: parse error before `symbol'
dso.c:211: `symbol' undeclared (first use in this function)
dso.c:218: warning: assignment makes pointer from integer without a cast
make[4]: *** [dso.lo] Error 1

Barry Adams













Passing Env variable from Apache to Tomcat 4

2001-10-04 Thread Kashyap Vaswani

What is the way to pass Environment Varialbes from Apache 1.3 to Tomcat 4.0
? We had a way with Tomcat3.2 and mod_jk.so to specify JkEnvVar in the
httpd.conf file ?
Is there equivalent or other method for Tomcat 4 ?
Kashyap



_
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com




cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-10-04 Thread remm

remm01/10/04 17:26:01

  Modified:.Tag: tomcat_40_branch tomcat.nsi
  Log:
  - Fix merge mistake with the installer script ('shared' doesn't exist).
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.16.2.2  +7 -4  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -u -r1.16.2.1 -r1.16.2.2
  --- tomcat.nsi2001/10/04 19:24:45 1.16.2.1
  +++ tomcat.nsi2001/10/05 00:26:01 1.16.2.2
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16.2.1 2001/10/04 19:24:45 remm Exp $
  +; $Id: tomcat.nsi,v 1.16.2.2 2001/10/05 00:26:01 remm Exp $
   
   Name "apache-tomcat-4.0"
   Caption "Apache Tomcat 4.0"
  @@ -40,8 +40,9 @@
 File tomcat.ico
 File LICENSE
 File /r bin
  +  File /r classes
 File /r common
  -  File /r shared
  +  File /r lib
 File /r logs
 File /r server
 File /r work
  @@ -248,7 +249,8 @@
 File LICENSE
 File /r bin
 File /r common
  -  File /r shared
  +  File /r lib
  +  File /r classes
 File /r logs
 File /r server
 File /r work
  @@ -295,9 +297,10 @@
 Delete "$INSTDIR\tomcat.ico"
 Delete "$INSTDIR\LICENSE"
 RMDir /r "$INSTDIR\bin"
  +  RMDir /r "$INSTDIR\classes"
 RMDir /r "$INSTDIR\common"
 Delete "$INSTDIR\conf\*.dtd"
  -  RMDir /r "$INSTDIR\shared"
  +  RMDir /r "$INSTDIR\lib"
 RMDir "$INSTDIR\logs"
 RMDir /r "$INSTDIR\server"
 RMDir /r "$INSTDIR\webapps\manager"
  
  
  



Re: [PATCH] SingleThreadModel Pool for TC 3.3

2001-10-04 Thread Bojan Smojver

"Schreibman, David" wrote:
> 
> I'm submitting this with mixed feelings since the recent discussion has
> shown strong opinions about the utility of the SingleThreadModel.

STM as a concept has so many flaws that I tend to side with Jon (ie. it
should be dropped from the spec). Personally, I was dragged into it as
well, thinking that it solves real world problems. But, as we all know,
there is no such thing as free lunch. Things have to be done the hard
way (ie. one actually has to use the brain while coding).

> I was already in the middle of doing the work when all that came about so I
> went ahead and finished it.  After reaping the benefits of Tomcat for a
> couple of years I've been wanting to give something back.  So after a recent
> post about how to help, I went into bugzilla and found this issue.  I don't
> even use STM, but was somewhat familiar with the ServletHandler and figured
> I could contribute here.
> 
> At a minimum, I had fun doing the work and was able to learn a bit more
> about the code base.
> 
> Maybe it will be of some use to others.
> 
> Looking forward to more good stuff from this project!!

Thank you for your patch David. Given that TC 3.3 is close to the
release, I don't think that this patch will go into it. This has nothing
to do with the code, but rather with the fact that when things are close
to the release, all changes are more scrutinized then at other times.

But I'm sure that other 3.3 guys will also give it a look for subsequent
3.3.x releases.

Bojan



RE: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on Servlet+JSP+taglib

2001-10-04 Thread cmanolache

On Fri, 5 Oct 2001, Ignacio J. Ortega wrote:

> I'm not sure if the bug is actually in the Jaxp version..
> 
> I will try to reproduce it, to see what happens moving around crimson
> jars..
> 
> For me seems it's in "Damn ClassLoaders" bug type.. :)

I also don't think it's related with Jaxp version, and I think it should
be fixed now ( well, at least 1/2 ) :-)

The problem may be related with the fact that in 3.3RC1, by default we
don't provide any parser to the webapp - and from strange reasons jasper
will need one.

I would like to see more details ( the pages you use, config, etc ) - so
we can find out why jasper needs that and why it can't find it using it's
own classloader.

But in any case, just after 3.3RC1 I added code to make sure all webapps
that do not include a parser will get the default one. So the bug should
go away ( and wait for j-t-j for a better jasper ).

Costin




> 
> Saludos ,
> Ignacio J. Ortega
> 
> 
> > -Mensaje original-
> > De: Bill Barker [mailto:[EMAIL PROTECTED]]
> > Enviado el: viernes 5 de octubre de 2001 0:26
> > Para: [EMAIL PROTECTED]
> > Asunto: Re: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
> > Servlet+JSP+taglib
> > 
> > 
> > I know that Costin has strong feeling on which Jaxp version 
> > we should ship
> > with (I just don't remember what they are:). Does anyone else have an
> > opinion?
> > - Original Message -
> > From: <[EMAIL PROTECTED]>
> > To: <[EMAIL PROTECTED]>
> > Sent: Thursday, October 04, 2001 12:51 PM
> > Subject: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
> > Servlet+JSP+taglib
> > 
> > 
> > > DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
> > > RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
> > > .
> > > 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=3961
> > >
> > > FactoryConfigurationError on Servlet+JSP+taglib
> > >
> > >
> > >
> > >
> > >
> > > --- Additional Comments From 
> > [EMAIL PROTECTED]  2001-10-04
> > 12:51 ---
> > > There seems to be a problem with the Jaxp jar files that 
> > ship with RC1.
> > If you
> > > download Jaxp 1.1 from java.sun.com and replace the jar files in
> > lib/container
> > > with those, your example starts working.
> > >
> > >
> > 
> > 
> > **
> > 
> > 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. 
> > 
> 




Re: DO NOT REPLY [Bug 3961] - FactoryConfigurationError onServlet+JSP+taglib

2001-10-04 Thread cmanolache

On Thu, 4 Oct 2001, Bill Barker wrote:

> I know that Costin has strong feeling on which Jaxp version we should ship
> with (I just don't remember what they are:). Does anyone else have an
> opinion?

xml-xalan + xml-crimson is my favorite for now ( crimson because it's much
smaller), or xalan + xerces2 when will be available. I don't mind
xerces1 - nor any other parser.

Costin



> - Original Message -
> From: <[EMAIL PROTECTED]>
> To: <[EMAIL PROTECTED]>
> Sent: Thursday, October 04, 2001 12:51 PM
> Subject: DO NOT REPLY [Bug 3961] - FactoryConfigurationError on
> Servlet+JSP+taglib
> 
> 
> > DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
> > RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
> > .
> > 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=3961
> >
> > FactoryConfigurationError on Servlet+JSP+taglib
> >
> >
> >
> >
> >
> > --- Additional Comments From [EMAIL PROTECTED]  2001-10-04
> 12:51 ---
> > There seems to be a problem with the Jaxp jar files that ship with RC1.
> If you
> > download Jaxp 1.1 from java.sun.com and replace the jar files in
> lib/container
> > with those, your example starts working.
> >
> >
> 
> 
> **
> 
> 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. 
> 




Re: [PATCH] SingleThreadModel Pool for TC 3.3

2001-10-04 Thread cmanolache

Thanks David.

I don't like STM, but since it's part of the spec we need to support it.
And since you spent the time to write it, I think we have the duty to
check it and find a way to check it in:-). Unfortunately,
not for 3.3, it's too late. But 3.3.1 can include it.

Costin


On Thu, 4 Oct 2001, Schreibman, David wrote:

> I'm submitting this with mixed feelings since the recent discussion has
> shown strong opinions about the utility of the SingleThreadModel.
> 
> I was already in the middle of doing the work when all that came about so I
> went ahead and finished it.  After reaping the benefits of Tomcat for a
> couple of years I've been wanting to give something back.  So after a recent
> post about how to help, I went into bugzilla and found this issue.  I don't
> even use STM, but was somewhat familiar with the ServletHandler and figured
> I could contribute here.
> 
> At a minimum, I had fun doing the work and was able to learn a bit more
> about the code base.
> 
> Maybe it will be of some use to others.
> 
> Looking forward to more good stuff from this project!!
> 
> -David
> 
> 




DO NOT REPLY [Bug 3973] - session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3973

session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
Summary|session.getAttribute()  |session.getAttribute()
   |locks-up in |locks-up in
   |HttpSessionListener.sessionD|HttpSessionListener.sessionD
   |estroyed()  |estroyed()



--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 18:15 ---
Actually, what very likely happens is that an IllegalStateException is raised 
on the session.getAttribute call, since the session is invalidated (and so the 
message is never displayed). Is the exception printed out in the logs ?

HttpSession.getAttribute Javadoc:

Returns the object bound with the specified name in this session, or null if no 
object is bound under the name.
Parameters:
name - a string specifying the name of the object
Returns:
the object with the specified name
Throws:
java.lang.IllegalStateException - if this method is called on an invalidated 
session



mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

Just for fun I did this to exercise mod_jk/TC 3.3 combination:

---
ab -c 1 -n 1000 http://some/velocity/page.vm
---

This goes OK on both 1.1.0 and 1.2.0, although some requests aren't
served (probably because no more threads are available in ajp13
connector - I run a max of 50).

However, if I attempt this:

---
ab -c 5 -n 1000 http://some/velocity/page.vm
---

with mod_jk 1.1.0 or:

---
ab -c 20 -n 1000 http://some/velocity/page.vm
---

with mod_jk 1.2.0, I eventually get this in the log files:

---
2001-10-05 13:34:58 - Ajp13Interceptor: Processing connection
org.apache.tomcat.
at java.net.SocketInputStream.socketRead(Native Method)
at java.net.SocketInputStream.read(SocketInputStream.java:86)
at org.apache.tomcat.modules.server.Ajp13.readN(Ajp13.java:729)
at
org.apache.tomcat.modules.server.Ajp13.receive(Ajp13.java:763)
at
org.apache.tomcat.modules.server.Ajp13.receiveNextRequest(Ajp13.java:
at
org.apache.tomcat.modules.server.Ajp13Request.receiveNextRequest(Ajp1
at
org.apache.tomcat.modules.server.Ajp13Interceptor.processConnection(A
at
org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadP
at java.lang.Thread.run(Thread.java:484)
---

Both TC and mod_jk stay up, so I'm guessing this is normal?

Bojan



"Unsubscribe"

2001-10-04 Thread Sai Sekhar

"Unsubscribe"










--- Christopher Cain <[EMAIL PROTECTED]> wrote:
> Quoting Bojan Smojver <[EMAIL PROTECTED]>:
> 
> > Christopher Cain wrote:
> > > 
> > > I was thinking that maybe we could actually
> start running Tomcat
> > inside the
> > > kernel process itself. It worked for IIS ...
> > 
> > Where IIS stands for: Internet Infected Server.
> 
> haha ... I like that one. I'll have to remember that
> one the next time an IIS 
> worm makes the rounds. In fact, aren't we overdue
> for the next one already? 
> What time is it right now? ;-)
> 
> - Christopher
> 
> /**
>  * Pleurez, pleurez, mes yeux, et fondez vous en
> eau!
>  * La moitiƩ de ma vie a mis l'autre au tombeau.
>  *---Corneille
>  */


__
Do You Yahoo!?
NEW from Yahoo! GeoCities - quick and easy web site hosting, just $8.95/month.
http://geocities.yahoo.com/ps/info1



Re: "Unsubscribe"

2001-10-04 Thread Bojan Smojver

Try: http://jakarta.apache.org/site/mail2.html

Bojan

Sai Sekhar wrote:
> 
> "Unsubscribe"



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

Bojan Smojver wrote:

> This goes OK on both 1.1.0 and 1.2.0, although some requests aren't
> served (probably because no more threads are available in ajp13
> connector - I run a max of 50).

Has probably very little to do with it. I tried more threads, but some
requests still fail according to ab.

> ---
> ab -c 20 -n 1000 http://some/velocity/page.vm
> ---
> 
> with mod_jk 1.2.0, I eventually get this in the log files:

Actually, sometimes 1.2.0 gives the stack trace even at -c 5.

Bojan



DO NOT REPLY [Bug 3973] - session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3973

session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 20:10 ---
I'm not seeing any exceptions, which led me to post this issue. 

stderr.log is empty

bellow is the entire stdout.log file from startup to shutdown with only the
class posted in the web.xml file and two JSP pages to create and invalidate the
session. i can post the jsps if you might find them useful. as indicated in the
code, i didn't wrap the call to session.getAttribute() in a try / catch block so
I would have expected any exceptions thrown to show up here. none are listed

Create Catalina server 
Starting service Tomcat-Standalone
Apache Tomcat/4.0
ServletContext Initialised
Starting service Tomcat-Apache
Apache Tomcat/4.0
Session Created 
attribute added
Session Destroyed 
Stopping service Tomcat-Standalone 
ServletContext Destroyed
Stopping service Tomcat-Apache
Stop server complete



DO NOT REPLY [Bug 3973] - session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3973

session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 20:13 ---
No, those are some NT specific logs which capture the stdout and stderr when 
Tomcat is run as a service. The exceptions would actually go to one of the 
other logs: localhost_log or localhost_examples_log (if you put your JSPs in 
the examples webapp).



cvs commit: jakarta-tomcat build.xml

2001-10-04 Thread billbarker

billbarker01/10/04 20:13:22

  Modified:.build.xml
  Log:
  Remove the (empty) src directory, and include the snoop.jsp page in examples.
  
  As agreed in the Release Plan.
  
  Revision  ChangesPath
  1.158 +0 -2  jakarta-tomcat/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- build.xml 2001/09/23 02:13:45 1.157
  +++ build.xml 2001/10/05 03:13:22 1.158
  @@ -148,7 +148,6 @@
   
   
   
  -
   
   
   
  @@ -782,7 +781,6 @@
   
   
   
   


cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java

2001-10-04 Thread billbarker

billbarker01/10/04 20:33:29

  Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
  Log:
  Improve the handling of the saveOriginal option, by adding support for broken 
clients (e.g. telnet).
  
  If the (broken) client does a request for something like:
/myApp/servlet/myServlet/path&info
  we still give the servlet the original requested URI even though the client 
incorrectly didn't encode the request.
  
  Revision  ChangesPath
  1.11  +2 -2  
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
  
  Index: DecodeInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DecodeInterceptor.java2001/10/04 20:25:05 1.10
  +++ DecodeInterceptor.java2001/10/05 03:33:29 1.11
  @@ -526,10 +526,10 @@
if( debug> 5 ) log("Already decoded " + req.getNote( decodedNote ));
return 0;
}
  + if( saveOriginal )
  + req.unparsedURI().duplicate( pathMB );
if (pathMB.indexOf('%') >= 0 || pathMB.indexOf( '+' ) >= 0) {
try {
  - if( saveOriginal )
  - req.unparsedURI().duplicate( pathMB );
if(debug>1 )
log( "Before " + pathMB.toString());
req.getURLDecoder().convert( pathMB );
  
  
  



DO NOT REPLY [Bug 3973] - session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()

2001-10-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=3973

session.getAttribute() locks-up in HttpSessionListener.sessionDestroyed()





--- Additional Comments From [EMAIL PROTECTED]  2001-10-04 20:39 ---
found it... along with a few other exceptions, which explains other strange
behaviour i was seeing.. 

sorry for the false alarm!

i've already moved code i was planning to execute here to the valueUnbound()
method of HttpSessionBindingListener. it's a round about way to do it, but it
works... 

thanks!

localhost_log.2001-10-03.txt
---
2001-10-03 23:40:04 jsp: init
2001-10-03 23:40:04 StandardManager[] Session event listener threw exception
java.lang.IllegalStateException: getAttribute: Session already invalidated
at 
org.apache.catalina.session.StandardSession.getAttribute(StandardSession.java:900)
at
org.apache.catalina.session.StandardSessionFacade.getAttribute(StandardSessionFacade.java:171)



cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java

2001-10-04 Thread billbarker

billbarker01/10/04 20:46:55

  Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
  Log:
  Add exception handling for previous fix.
  
  Revision  ChangesPath
  1.12  +8 -2  
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
  
  Index: DecodeInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DecodeInterceptor.java2001/10/05 03:33:29 1.11
  +++ DecodeInterceptor.java2001/10/05 03:46:55 1.12
  @@ -526,8 +526,14 @@
if( debug> 5 ) log("Already decoded " + req.getNote( decodedNote ));
return 0;
}
  - if( saveOriginal )
  - req.unparsedURI().duplicate( pathMB );
  + if( saveOriginal ) {
  + try {
  + req.unparsedURI().duplicate( pathMB );
  + } catch( IOException ex ) {
  + // If it happens, do default processing
  + log( "Error copying request ",ex);
  + }
  + }
if (pathMB.indexOf('%') >= 0 || pathMB.indexOf( '+' ) >= 0) {
try {
if(debug>1 )
  
  
  



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

Bojan Smojver wrote:
> 
> Bojan Smojver wrote:
> 
> > This goes OK on both 1.1.0 and 1.2.0, although some requests aren't
> > served (probably because no more threads are available in ajp13
> > connector - I run a max of 50).
> 
> Has probably very little to do with it. I tried more threads, but some
> requests still fail according to ab.

The report claims that 'length' fails. This applies equally to JSP's and
VM's.

--
Failed requests:650
   (Connect: 0, Length: 650, Exceptions: 0)
--

Anyone knows ab good enough to tell why is this happening with TC 3.3?
Static pages from Apache do not have that problem...

Bojan



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread cmanolache

On Fri, 5 Oct 2001, Bojan Smojver wrote:

> Bojan Smojver wrote:
> > 
> > Bojan Smojver wrote:
> > 
> > > This goes OK on both 1.1.0 and 1.2.0, although some requests aren't
> > > served (probably because no more threads are available in ajp13
> > > connector - I run a max of 50).
> > 
> > Has probably very little to do with it. I tried more threads, but some
> > requests still fail according to ab.
> 
> The report claims that 'length' fails. This applies equally to JSP's and
> VM's.
> 
> --
> Failed requests:650
>(Connect: 0, Length: 650, Exceptions: 0)
> --

I think ( or guess ) that ab is checking the length of the first request,
and if following requests have different lengths it assumes it's a
failure.

Could you check if your page returns the same thing ? Very strange..

Costin




Bug 3961 [aka Jaxp version for 3.3]

2001-10-04 Thread Bill Barker

This still fails against HEAD.  It's probably not serious enough to block
the release Monday (since there is a very annoying work-around), but I
personally would prefer to ship with this one CLOSED.  However, I'm not a
Jaxp expert, so if Nacho/Costin want to weigh in, I'd appreciate the help.

I'm not inclined to change the Jaxp version without calling a vote (which
would delay the release), so if anyone can offer advice, it is very welcome.


**

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. 



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

[EMAIL PROTECTED] wrote:

> I think ( or guess ) that ab is checking the length of the first request,
> and if following requests have different lengths it assumes it's a
> failure.
> 
> Could you check if your page returns the same thing ? Very strange..

I ran the thing with -v 99 and it shows only the beginning of each page.
They all look identical, apart from the JSESSIONID cookie. And every
time there is a request, there is a response, no failures there.

The funny bit is that headers returned by Tomcat don't even include
Content-length, so how does ab conclude that the length is wrong, beats
me. But your guess is probably a good one.

Headers returned by Apache, do contain Content-length, so ab probably
has something more to work with there.

Since I can control the headers from my servlet, let my try with
Content-length. Fingers crossed...

Bojan



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

Bojan Smojver wrote:

> Since I can control the headers from my servlet, let my try with
> Content-length. Fingers crossed...

If think this can actually qualify as a bug in ab - even when I set
Content-Length header, it still says that that there are length
failures. Since jsessionid can sometimes have 10 and sometimes 11
characters and I use it on the page to encode the URL, sometimes the
pages are a byte longer...

But ab still takes into the account only the length of the very fist
page. Good news is that there is nothing wrong with TC.

Bojan

PS. What do you make of those stack traces? It looks as if mod_jk
dropped the connection and TC then goes into Exception...
---
2001-10-05 17:03:57 - Ajp13Interceptor: Processing connection
org.apache.tomcat.util.net.TcpConnection@5ec199 -
java.net.SocketException: Connection reset by peer: Connection reset by
peer
at java.net.SocketInputStream.socketRead(Native Method)
at java.net.SocketInputStream.read(SocketInputStream.java:86)
at org.apache.tomcat.modules.server.Ajp13.readN(Ajp13.java:729)
at
org.apache.tomcat.modules.server.Ajp13.receive(Ajp13.java:763)
at
org.apache.tomcat.modules.server.Ajp13.receiveNextRequest(Ajp13.java:271)
at
org.apache.tomcat.modules.server.Ajp13Request.receiveNextRequest(Ajp13Interceptor.java:277)
at
org.apache.tomcat.modules.server.Ajp13Interceptor.processConnection(Ajp13Interceptor.java:192)
at
org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java:477)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:517)
at java.lang.Thread.run(Thread.java:484
---



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread jean-frederic clere

Bojan Smojver wrote:
> 
> Bojan Smojver wrote:
> 
> > Since I can control the headers from my servlet, let my try with
> > Content-length. Fingers crossed...
> 
> If think this can actually qualify as a bug in ab - even when I set
> Content-Length header, it still says that that there are length
> failures. Since jsessionid can sometimes have 10 and sometimes 11
> characters and I use it on the page to encode the URL, sometimes the
> pages are a byte longer...
> 
> But ab still takes into the account only the length of the very fist
> page. Good news is that there is nothing wrong with TC.
> 
> Bojan
> 
> PS. What do you make of those stack traces? It looks as if mod_jk
> dropped the connection and TC then goes into Exception...
> ---
> 2001-10-05 17:03:57 - Ajp13Interceptor: Processing connection
> org.apache.tomcat.util.net.TcpConnection@5ec199 -
> java.net.SocketException: Connection reset by peer: Connection reset by
> peer
> at java.net.SocketInputStream.socketRead(Native Method)
> at java.net.SocketInputStream.read(SocketInputStream.java:86)
> at org.apache.tomcat.modules.server.Ajp13.readN(Ajp13.java:729)
> at
> org.apache.tomcat.modules.server.Ajp13.receive(Ajp13.java:763)
> at
> org.apache.tomcat.modules.server.Ajp13.receiveNextRequest(Ajp13.java:271)
> at
> 
>org.apache.tomcat.modules.server.Ajp13Request.receiveNextRequest(Ajp13Interceptor.java:277)
> at
> 
>org.apache.tomcat.modules.server.Ajp13Interceptor.processConnection(Ajp13Interceptor.java:192)
> at
> org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java:477)
> at
> org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:517)
> at java.lang.Thread.run(Thread.java:484
> ---

And in mod_jk.log file is there something?



Re: mod_jk 1.2.0/1.1.0 vs ab

2001-10-04 Thread Bojan Smojver

jean-frederic clere wrote:

> And in mod_jk.log file is there something?

Mostly something like this:

-
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
[Fri Oct 05 17:07:55 2001]  [jk_ajp_common.c (914)]: Error
ajp_process_callback - write failed
-

But those things show up even if there are no exceptions in TC. It seems
you have to run -c above 3 to 4 and at least 1000 requests. If you run
-c 10 and a 100 requests, there are no stack traces in tomcat_error.

Bojan