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

2003-09-20 Thread glenn 
glenn   2003/09/20 21:31:33

  Modified:catalina/src/share/org/apache/catalina/startup
SecurityClassLoad.java
  Log:
  Coyote changes require a few more preloaded classes
  
  Revision  ChangesPath
  1.2   +12 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/SecurityClassLoad.java
  
  Index: SecurityClassLoad.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/SecurityClassLoad.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecurityClassLoad.java30 Dec 2001 01:58:20 -  1.1
  +++ SecurityClassLoad.java21 Sep 2003 04:31:33 -  1.2
  @@ -126,6 +126,14 @@
   (basePackage + "util.URL");
   loader.loadClass(basePackage + "util.Enumerator");
   loader.loadClass("javax.servlet.http.Cookie");
  +try {
  +
loader.loadClass("org.apache.coyote.tomcat4.CoyoteRequest$PrivilegedGetSession");
  +} catch(Throwable t) {
  +}
  +try {
  +loader.loadClass("org.apache.coyote.http11.Constants");
  +} catch(Throwable t) {
  +}
   
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 23294] - Handle IE 6.0 GET user-agent: contype as HEAD

2003-09-20 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=23294

Handle IE 6.0 GET user-agent: contype as HEAD





--- Additional Comments From [EMAIL PROTECTED]  2003-09-20 22:39 ---
I'm actually *not* requesting a mod in tomcat to accomodate IE. In fact, I'd argue 
against 
suppressing IOExceptions. The frequent broken pipes alerted me (in this case) to an 
inefficient, 
non-standard legacy behaviour (the contype multiple GET). 

I would in fact suggest that the suppression of broken pipe exceptions be configurable 
by the web 
app developer. It certainly shouldn't be a hard-coded default. Other aspects of the 
test  (like the 
detection of detail messages -- what about localization?) also weigh-in against a 
hard-coded 
option. 

I'm afraid it leaves me, the webapp developer, to handle the remapping onto HEAD 
requests, but 
that's not so onerous.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PATCH] Update Tomcat version to 5 in documents

2003-09-20 Thread Bill Barker 
Sorry, they were small, and I missed them.

Checked in now.  Thanks again!

- Original Message - 
From: "Kazuhiro Kazama" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Saturday, September 20, 2003 2:47 AM
Subject: Re: [PATCH] Update Tomcat version to 5 in documents


> From: "Bill Barker" <[EMAIL PROTECTED]>
> Subject: Re: [PATCH] Update Tomcat version to 5 in documents
> Date: Sat, 20 Sep 2003 01:00:59 -0700
> Message-ID: <[EMAIL PROTECTED]>
> > Done.  Thanks much!
>
> Thanks, Bill!
>
> But changes of mbeans-descriptor-howto.xml and realm-howto.xml aren't
> done. Could you check my changes and apply them to CVS?
>
> Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation
Laboratories
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>


This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication in 
error, please notify us immediately by e-mail and then delete all copies of this 
message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through the 
Internet is not secure. Do not send confidential or sensitive information, such as 
social security numbers, account numbers, personal identification numbers and 
passwords, to us via ordinary (unencrypted) e-mail.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/docs mbeans-descriptor-howto.xml realm-howto.xml setup.xml

2003-09-20 Thread billbarker 
billbarker2003/09/20 13:47:21

  Modified:webapps/docs mbeans-descriptor-howto.xml realm-howto.xml
setup.xml
  Log:
  Change version from TC 4 to TC 5
  
  Submitted By: Kazuhiro Kazama [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.2   +1 -1  jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml
  
  Index: mbeans-descriptor-howto.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mbeans-descriptor-howto.xml   3 Feb 2003 23:17:08 -   1.1
  +++ mbeans-descriptor-howto.xml   20 Sep 2003 20:47:21 -  1.2
  @@ -15,7 +15,7 @@
   
   
   
  -Tomcat 4 uses JMX MBeans as the technology for implementing 
  +Tomcat 5 uses JMX MBeans as the technology for implementing 
   manageability of Tomcat.
   
   The descriptions of JMX MBeans for Catalina are in the 
  
  
  
  1.9   +3 -3  jakarta-tomcat-catalina/webapps/docs/realm-howto.xml
  
  Index: realm-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/realm-howto.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- realm-howto.xml   7 May 2003 15:55:39 -   1.8
  +++ realm-howto.xml   20 Sep 2003 20:47:21 -  1.9
  @@ -347,7 +347,7 @@
   
   Introduction
   
  -DataSourceRealm is an implementation of the Tomcat 4
  +DataSourceRealm is an implementation of the Tomcat 5
   Realm interface that looks up users in a relational database
   accessed via a JNDI named JDBC DataSource.  There is substantial configuration
   flexibility that lets you adapt to existing table and column names, as long
  @@ -391,7 +391,7 @@
   for information on how to configure a JNDI named JDBC DataSource.
   Set up a  element, as described below, in your
   $CATALINA_HOME/conf/server.xml file.
  -Restart Tomcat 4 if it is already running.
  +Restart Tomcat 5 if it is already running.
   
   
   Realm Element Attributes
  @@ -492,7 +492,7 @@
   DataSourceRealm operates according to the following rules:
   
   When a user attempts to access a protected resource for the first time,
  -Tomcat 4 will call the authenticate() method of this
  +Tomcat 5 will call the authenticate() method of this
   Realm.  Thus, any changes you have made to the database
   directly (new users, changed passwords or roles, etc.) will be immediately
   reflected.
  
  
  
  1.6   +1 -1  jakarta-tomcat-catalina/webapps/docs/setup.xml
  
  Index: setup.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/setup.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- setup.xml 3 Sep 2003 09:48:16 -   1.5
  +++ setup.xml 20 Sep 2003 20:47:21 -  1.6
  @@ -110,7 +110,7 @@
   The file $CATALINA_HOME/bin/jsvc/native/tomcat.sh can be 
  used as a template for starting Tomcat automatically at boot time from 
  /etc/init.d.  The file is currently setup for running 
  -   Tomcat4.1.x, so it is necessary to edit it and change the classname 
  +   Tomcat 4.1.x, so it is necessary to edit it and change the classname 
  from BootstrapService to Bootstrap.
 
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] 5.0.12 stability rating

2003-09-20 Thread Amy Roh 
> 
> [ ] Alpha
> [X] Beta
> 

Amy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 23294] - Handle IE 6.0 GET user-agent: contype as HEAD

2003-09-20 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=23294

Handle IE 6.0 GET user-agent: contype as HEAD

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX



--- Additional Comments From [EMAIL PROTECTED]  2003-09-20 18:20 ---
No browser specific workarounds will be added.
5.0.x should never log the IOException, and that's all that will be done to
address this issue.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 23294] New: - Handle IE 6.0 GET user-agent: contype as HEAD

2003-09-20 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=23294

Handle IE 6.0 GET user-agent: contype as HEAD

   Summary: Handle IE 6.0 GET user-agent: contype as HEAD
   Product: Tomcat 5
   Version: 5.0.0
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Enhancement
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Chris Rolfe <[EMAIL PROTECTED]> reports that IE 6.0 uses
  GET
  user-agent: 
contype
insteat of
  HEAD

He correctly complains that this causes extraneous load on the 
server and  bandwidth consumption. If his report is correct Tomcat could sumulate a 
HEAD request 
(although I'm in doubt what would be best to supply instead of user-agent in such a 
case: probably 
omit this header or, as we know it's a IE, probably generate smth?) if user-agent is 
contype?

Here's the original message by Chris Rolfe <[EMAIL PROTECTED]>

Here's a 
followup to:
>Subject: DefaultServlet throws a LOT of broken pipe exceptions on mp3s.

---
I 
found the cause of my java.io.IOException "Broken pipe" errors.

IE 6 is sending two GET 
requests for each .mp3 file. I haven't tested the
behavior on IE 5.x or other plugin-handled mime 
types.

The first GET sets the request header:

user-agent = contype

and is a Microsoft 
(ie, non-standard) attempt at data-sniffing intended to
get just the header information. 
Tomcat 4.x starts sending the content data,
but IE resets/drops the connection after 30-50k 
(100-500 ms), generating a
"Broken pipe" exception.

IE then sends a second request for the 
content using:

user-agent=Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)

which 
completes.

[see Microsoft Knowledge Base Articles: KB 293792, KB 254337, KB 
310388.
Note: KB 310388 describes a fix for multiple posts in IE 6 SP1 (service pack
1). Tests 
from an IE 6 SP1 client however still demonstrate the multiple
GETs.  

I'm still trying to 
determine if the broken pipe GET is the cause of the
unreliable caching behaving I'm seeing in IE 
6 (symptom: IE 6 clients are
downloading about 10x vs. Netscape/Safari clients; few if any 
304
responses). 

---

So, two questions for the karmically kind:

1) Any bright ideas on 
a workaround for the user-agent: contype GET? At
present it's double-banging my server for 100-
200k files. Is there a context
level mechanism for filtering, ie, blocking, requests based on 
headers?

2) Is this more properly a development issue? I see workarounds in the
4.1.27 and 
5.x source to ignore "Broken pipe" exceptions and the multiple
GET is apparently  rooted in 
kludges from browser 4.x days -- but I got no
hits for "user-agent contype" in a google of the tomcat 
archives.

Cheers,
Chris

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 18902] - Content Type set to "text/plain" when none explicitly assigned in the servlet

2003-09-20 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=18902

Content Type set to "text/plain" when none explicitly assigned in the servlet





--- Additional Comments From [EMAIL PROTECTED]  2003-09-20 13:56 ---
This was fixed in 5 according to
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18202 but does seem to still
exist in the coyote_10 branch according to source.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 23290] New: - Documentation Typo

2003-09-20 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=23290

Documentation Typo

   Summary: Documentation Typo
   Product: Tomcat 5
   Version: 5.0.0
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Webapps:Documentation
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


In tomcat-docs/building.xml, 
"Ealier releases would also work, ..."
should be
"Earlier releases would also work, ..."

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Format for Help Files

2003-09-20 Thread Thorsten Kamann 
Hello,

I'm working at the ManagerApplication to make it designable for the 
Corporate Identity.

Now I want translate the 2 Help Files into the German language. I've 
seen that in the Tomcat Docs the help sources are XML. Now I want to 
know is there a documentation about the XML-Format for those Help Files?
How manage I Help-Files for multiple languages? For every language a 
separate file?

Thanks in advance
Thorsten
--
Thorsten Kamann
Email: [EMAIL PROTECTED]
ICQ: 40746578
Yahoo: ThorQue
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PATCH] Update Tomcat version to 5 in documents

2003-09-20 Thread Kazuhiro Kazama 
From: "Bill Barker" <[EMAIL PROTECTED]>
Subject: Re: [PATCH] Update Tomcat version to 5 in documents
Date: Sat, 20 Sep 2003 01:00:59 -0700
Message-ID: <[EMAIL PROTECTED]>
> Done.  Thanks much!

Thanks, Bill!

But changes of mbeans-descriptor-howto.xml and realm-howto.xml aren't
done. Could you check my changes and apply them to CVS?

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


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PATCH] Update Tomcat version to 5 in documents

2003-09-20 Thread Bill Barker 
Done.  Thanks much!

- Original Message - 
From: "Kazuhiro Kazama" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Friday, September 19, 2003 10:59 PM
Subject: [PATCH] Update Tomcat version to 5 in documents


> Hi,
>
> This is a patch which changes Tomcat version strings from "Tomcat 4"
> to "Tomcat 5" in documents (html-manager-howto.xml, manager-howto.xml
> and mbeans-descriptor-howto.xml).
>
> Could anyone apply this patch to CVS?
>
> Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation
Laboratories
>
>






> Index: webapps/docs/html-manager-howto.xml
> ===
> RCS file:
/home/cvspublic/jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml,
v
> retrieving revision 1.4
> diff -c -u -r1.4 html-manager-howto.xml
> --- webapps/docs/html-manager-howto.xml 17 Aug 2003 11:16:02 - 1.4
> +++ webapps/docs/html-manager-howto.xml 20 Sep 2003 05:51:34 -
> @@ -117,7 +117,7 @@
>  Encountered exception
>  
>  An exception was encountered trying to start the web application.
> -Check the Tomcat 4 logs for the details.
> +Check the Tomcat 5 logs for the details.
>  
>  Invalid context path was specified
>  
> @@ -157,7 +157,7 @@
>  Encountered exception
>  
>  An exception was encountered trying to stop the web application.
> -Check the Tomcat 4 logs for the details.
> +Check the Tomcat 5 logs for the details.
>  
>  Invalid context path was specified
>  
> @@ -205,7 +205,7 @@
>  Encountered exception
>  
>  An exception was encountered trying to restart the web
application.
> -Check the Tomcat 4 logs for the details.
> +Check the Tomcat 5 logs for the details.
>  
>  Invalid context path was specified
>  
> @@ -494,7 +494,7 @@
>  Encountered exception
>  
>  An exception was encountered trying to start the new web
application.
> -Check the Tomcat 4 logs for the details, but likely explanations
include
> +Check the Tomcat 5 logs for the details, but likely explanations
include
>  problems parsing your /WEB-INF/web.xml file, or missing
>  classes encountered when initializing application event listeners and
>  filters.
> Index: webapps/docs/manager-howto.xml
> ===
> RCS file:
/home/cvspublic/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v
> retrieving revision 1.8
> diff -c -u -r1.8 manager-howto.xml
> --- webapps/docs/manager-howto.xml 17 Aug 2003 11:16:02 - 1.8
> +++ webapps/docs/manager-howto.xml 20 Sep 2003 05:51:34 -
> @@ -55,10 +55,10 @@
>  to deploy a new web application, or undeploy an existing one, without
having
>  to shut down and restart the entire container.  In addition, you can
request
>  an existing application to reload itself, even if you have not declared
it
> -to be reloadable in the Tomcat 4 server
> +to be reloadable in the Tomcat 5 server
>  configuration file.
>
> -To support these capabilities, Tomcat 4 includes a web application
> +To support these capabilities, Tomcat 5 includes a web application
>  (installed by default on context path /manager) that
supports
>  the following functions:
>  
> @@ -121,7 +121,7 @@
>  
>  
>
> -Future versions of Tomcat 4 will include administrative functionality
that
> +Future versions of Tomcat 5 will include administrative functionality
that
>  is presented in (at least) the following forms:
>  
>  As web services, so that Tomcat administration can be easily
integrated
> @@ -138,9 +138,9 @@
>
>  
>  The description below uses the variable name $CATALINA_HOME
> -to refer to the directory into which you have installed Tomcat 4,
> +to refer to the directory into which you have installed Tomcat 5,
>  and is the base directory against which most relative paths are
> -resolved.  However, if you have configured Tomcat 4 for multiple
> +resolved.  However, if you have configured Tomcat 5 for multiple
>  instances by setting a CATALINA_BASE directory, you should use
>  $CATALINA_BASE instead of $CATALINA_HOME for each of these
>  references.
> @@ -164,7 +164,7 @@
>  
>  MemoryRealm - If you have not customized your
>  $CATALINA_HOME/conf/server.xml to select a different
one,
> -Tomcat 4 defaults to an XML-format file stored at
> +Tomcat 5 defaults to an XML-format file stored at
>  $CATALINA_HOME/conf/tomcat-users.xml, which can be
>  edited with any text editor.  This file contains an XML
>   for each individual user, which might
> @@ -329,7 +329,7 @@
>  Encountered exception
>  
>  An exception was encountered trying to start the new web
application.
> -Check the Tomcat 4 logs for the details, but likely explanations
include
> +Check the Tomcat 5 logs for the details, but likely explanations
include
>  problems parsing you

cvs commit: jakarta-tomcat-catalina/webapps/docs manager-howto.xml

2003-09-20 Thread billbarker 
billbarker2003/09/20 00:49:48

  Modified:webapps/docs manager-howto.xml
  Log:
  Change Tomcat v4 to Tomcat v5.
  
  Submitted By: Kazuhiro Kazama [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.9   +18 -18jakarta-tomcat-catalina/webapps/docs/manager-howto.xml
  
  Index: manager-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- manager-howto.xml 17 Aug 2003 11:16:02 -  1.8
  +++ manager-howto.xml 20 Sep 2003 07:49:48 -  1.9
  @@ -55,10 +55,10 @@
   to deploy a new web application, or undeploy an existing one, without having
   to shut down and restart the entire container.  In addition, you can request
   an existing application to reload itself, even if you have not declared it
  -to be reloadable in the Tomcat 4 server
  +to be reloadable in the Tomcat 5 server
   configuration file.
   
  -To support these capabilities, Tomcat 4 includes a web application
  +To support these capabilities, Tomcat 5 includes a web application
   (installed by default on context path /manager) that supports
   the following functions:
   
  @@ -94,7 +94,7 @@
   configuration. Here is an example:
   
   
  + docBase="/usr/local/kinetic/tomcat5/server/webapps/manager">
   
   
   
  @@ -121,7 +121,7 @@
   
   
   
  -Future versions of Tomcat 4 will include administrative functionality that
  +Future versions of Tomcat 5 will include administrative functionality that
   is presented in (at least) the following forms:
   
   As web services, so that Tomcat administration can be easily integrated
  @@ -138,9 +138,9 @@
   
   
   The description below uses the variable name $CATALINA_HOME
  -to refer to the directory into which you have installed Tomcat 4,
  +to refer to the directory into which you have installed Tomcat 5,
   and is the base directory against which most relative paths are
  -resolved.  However, if you have configured Tomcat 4 for multiple
  +resolved.  However, if you have configured Tomcat 5 for multiple
   instances by setting a CATALINA_BASE directory, you should use
   $CATALINA_BASE instead of $CATALINA_HOME for each of these
   references.
  @@ -164,7 +164,7 @@
   
   MemoryRealm - If you have not customized your
   $CATALINA_HOME/conf/server.xml to select a different one,
  -Tomcat 4 defaults to an XML-format file stored at
  +Tomcat 5 defaults to an XML-format file stored at
   $CATALINA_HOME/conf/tomcat-users.xml, which can be
   edited with any text editor.  This file contains an XML
    for each individual user, which might
  @@ -201,7 +201,7 @@
   an example of restricting access to the localhost by IP address:
   
   
  + docBase="/usr/local/kinetic/tomcat5/server/webapps/manager">

   
  @@ -329,7 +329,7 @@
   Encountered exception
   
   An exception was encountered trying to start the new web application.
  -Check the Tomcat 4 logs for the details, but likely explanations include
  +Check the Tomcat 5 logs for the details, but likely explanations include
   problems parsing your /WEB-INF/web.xml file, or missing
   classes encountered when initializing application event listeners and
   filters.
  @@ -513,7 +513,7 @@
   Encountered exception
   
   An exception was encountered trying to start the new web application.
  -Check the Tomcat 4 logs for the details, but likely explanations include
  +Check the Tomcat 5 logs for the details, but likely explanations include
   problems parsing your /WEB-INF/web.xml file, or missing
   classes encountered when initializing application event listeners and
   filters.
  @@ -597,7 +597,7 @@
   Encountered exception
   
   An exception was encountered trying to restart the web application.
  -Check the Tomcat 4 logs for the details.
  +Check the Tomcat 5 logs for the details.
   
   Invalid context path was specified
   
  @@ -641,7 +641,7 @@
   Encountered exception
   
   An exception was encountered trying to enumerate the system properties.
  -Check the Tomcat 4 logs for the details.
  +Check the Tomcat 5 logs for the details.
   
   
   
  @@ -686,7 +686,7 @@
   Encountered exception
   
   An exception was encountered trying to enumerate the global JNDI
  -resources.  Check the Tomcat 4 logs for the details.
  +resources.  Check the Tomcat 5 logs for

cvs commit: jakarta-tomcat-catalina/webapps/docs html-manager-howto.xml

2003-09-20 Thread billbarker 
billbarker2003/09/20 00:45:51

  Modified:webapps/docs html-manager-howto.xml
  Log:
  Replacing Tomcat v4 with Tomcat v5.
  
  Submitted by: Kazuhiro Kazama [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.5   +4 -4  jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml
  
  Index: html-manager-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- html-manager-howto.xml17 Aug 2003 11:16:02 -  1.4
  +++ html-manager-howto.xml20 Sep 2003 07:45:51 -  1.5
  @@ -117,7 +117,7 @@
   Encountered exception

   An exception was encountered trying to start the web application.
  -Check the Tomcat 4 logs for the details.
  +Check the Tomcat 5 logs for the details.
  
   Invalid context path was specified

  @@ -157,7 +157,7 @@
   Encountered exception

   An exception was encountered trying to stop the web application.
  -Check the Tomcat 4 logs for the details.
  +Check the Tomcat 5 logs for the details.
  
   Invalid context path was specified

  @@ -205,7 +205,7 @@
   Encountered exception

   An exception was encountered trying to restart the web application.
  -Check the Tomcat 4 logs for the details.
  +Check the Tomcat 5 logs for the details.
  
   Invalid context path was specified

  @@ -494,7 +494,7 @@
   Encountered exception
   
   An exception was encountered trying to start the new web application.
  -Check the Tomcat 4 logs for the details, but likely explanations include
  +Check the Tomcat 5 logs for the details, but likely explanations include
   problems parsing your /WEB-INF/web.xml file, or missing
   classes encountered when initializing application event listeners and
   filters.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java

2003-09-20 Thread Eric Carmichael 
This SMAPs all declaration nodes, including the ones tacked on to the root node by 
ELFunctionMapper.java.  So for instance the SMAP for jsp2/el/functions.jsp from the 
jsp-examples webapp ends with

43,6:120
1,3:10
1,5:13

thus SMAPping 

  <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>

to

  static private org.apache.jasper.runtime.ProtectedFunctionMapper _jspx_fnmap_0;
  static private org.apache.jasper.runtime.ProtectedFunctionMapper _jspx_fnmap_1;

and

  static {
_jspx_fnmap_0= 
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction("my:reverse", 
jsp2.examples.el.Functions.class, "reverse", new Class[] {java.lang.String.class});
_jspx_fnmap_1= 
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction("my:countVowels", 
jsp2.examples.el.Functions.class, "numVowels", new Class[] {java.lang.String.class});
  }

which is clearly wrong.

Eric

- Original Message - 
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Friday, September 19, 2003 4:38 PM
Subject: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java


> kinman  2003/09/19 16:38:09
> 
>   Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
>   Log:
>   - Make sure scriptlet declarations get properly mapped.  This fixes 22833
>   
>   Revision  ChangesPath
>   1.211 +7 -6  
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
>   
>   Index: Generator.java
>   ===
>   RCS file: 
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
>   retrieving revision 1.210
>   retrieving revision 1.211
>   diff -u -r1.210 -r1.211
>   --- Generator.java 19 Sep 2003 18:30:09 - 1.210
>   +++ Generator.java 19 Sep 2003 23:38:08 - 1.211
>   @@ -196,9 +196,7 @@
> */
>public void visit(Node.PageDirective n) throws JasperException {
>
>   -if (!getServletInfoGenerated) {
>   -getServletInfoGenerated = true;
>   -} else {
>   +if (getServletInfoGenerated) {
>return;
>}
>
>   @@ -206,6 +204,7 @@
>if (info == null)
>return;
>
>   +getServletInfoGenerated = true;
>out.printil("public String getServletInfo() {");
>out.pushIndent();
>out.printin("return ");
>   @@ -217,8 +216,10 @@
>}
>
>public void visit(Node.Declaration n) throws JasperException {
>   +n.setBeginJavaLine(out.getJavaLine());
>out.printMultiLn(new String(n.getText()));
>out.println();
>   +n.setEndJavaLine(out.getJavaLine());
>}
>
>// Custom Tags may contain declarations from tag plugins.
>   
>   
>   
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
>

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java Node.java SmapStratum.java SmapUtil.java

2003-09-20 Thread Eric Carmichael 
cal/cal1.jsp from the jsp-examples webapp starts like this:



 

Before this commit, cal1.jsp's SMAP started like this:

*L
1,2:41
3:42
4:42
5:42
6:43,2

Now it starts like this:

*L
1,2:41
6:43,2

I think the reason lines 3, 4, and 5 aren't being SMAPped is that you only add 
LineInfos inside "if (breakAtLF || count < 0) {".  This adds LineInfos when the output 
line advances, but not when the input line alone advances.  To SMAP template text 
fully, you have to add a LineInfo every time the line number advances in the input 
file or the output file.

Eric


- Original Message - 
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Tuesday, September 16, 2003 10:46 AM
Subject: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java 
Node.java SmapStratum.java SmapUtil.java


> kinman  2003/09/16 10:46:44
> 
>   Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
> Node.java SmapStratum.java SmapUtil.java
>   Log:
>   - For template texts that generate multiple Java lines, addidtional mapping
> informantion are kept in the TemplateText node, to aide SMAP generation.
>   
>   Revision  ChangesPath
>   1.208 +23 -14
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
>   
>   Index: Generator.java
>   ===
>   RCS file: 
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
>   retrieving revision 1.207
>   retrieving revision 1.208
>   diff -u -r1.207 -r1.208
>   --- Generator.java 15 Sep 2003 13:43:54 - 1.207
>   +++ Generator.java 16 Sep 2003 17:46:43 - 1.208
>   @@ -1867,21 +1867,25 @@
>return;
>}
>
>   -if (ctxt.getOptions().genStringAsCharArray()) {
>   -if (textSize <= 3) {
>   -   // Spcial case small text strings
>   -   n.setBeginJavaLine(out.getJavaLine());
>   -   out.printil("out.write(" + quote(text.charAt(0)) + ");");
>   -   if (textSize > 1) {
>   -   out.printil("out.write(" + quote(text.charAt(1)) + ");");
>   +if (textSize <= 3) {
>   +   // Special case small text strings
>   +   n.setBeginJavaLine(out.getJavaLine());
>   +   int lineInc = 0;
>   +   for (int i = 0; i < textSize; i++) {
>   +   char ch = text.charAt(i);
>   +   out.printil("out.write(" + quote(ch) + ");");
>   +   if (i > 0) {
>   +   n.addSmap(lineInc);
>   }
>   -   if (textSize > 2) {
>   -   out.printil("out.write(" + quote(text.charAt(2)) + ");");
>   +   if (ch == '\n') {
>   +   lineInc++;
>   }
>   -   n.setEndJavaLine(out.getJavaLine());
>   -   return;
>   }
>   +   n.setEndJavaLine(out.getJavaLine());
>   +   return;
>   +   }
>
>   +if (ctxt.getOptions().genStringAsCharArray()) {
>   // Generate Strings as char arrays, for performance
>ServletWriter caOut;
>if (charArrayBuffer == null) {
>   @@ -1915,6 +1919,7 @@
>StringBuffer sb = new StringBuffer("out.write(\"");
>int initLength = sb.length();
>int count = JspUtil.CHUNKSIZE;
>   +int srcLine = 0; // relative to starting srouce line
>for (int i = 0; i < text.length(); i++) {
>char ch = text.charAt(i);
>--count;
>   @@ -1930,6 +1935,7 @@
>break;
>case '\n' :
>sb.append('\\').append('n');
>   +srcLine++;
>
>if (breakAtLF || count < 0) {
>// Generate an out.write() when see a '\n' in template
>   @@ -1940,6 +1946,9 @@
>}
>sb.setLength(initLength);
>count = JspUtil.CHUNKSIZE;
>   +
>   +// add a Smap for this line
>   +n.addSmap(srcLine);
>}
>break;
>case '\t' : // Not sure we need this
>   
>   
>   
>   1.77  +24 -4 
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
>   
>   Index: Node.java
>   ===
>   RCS file: 
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
>   retrieving revision 1.76
>   retrieving revision 1.77
>   d