[PATCH] Update Tomcat version to 5 in documents

2003-09-19 Thread Kazuhiro Kazama
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 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 inc

RE: Newbie: minor submission - 4.1.27 admin webapp

2003-09-19 Thread SANTOS, DANIEL (SBCSI)
I finally figured out how to build tomcat (which was a lot of fun :) so I
could test my change and it worked great. I did not find a bug in the tomcat
admin however, only my config files. A fat-fingered entry cause an exception
in the admin tool, the problem was that I couldn't see the root exception so
troubleshooting was very difficult and the exception that was displayed was
not related at all to the problem. Once I rebuilt webapps/admin with the
below file I saw the root exception which immediately explained my config
problem and told me exactly where to go in my config files, so I highly
recommend my fix below.

Daniel

>  -Original Message-
> From: SANTOS, DANIEL (SBCSI)  
> Sent: Friday, September 19, 2003 9:38 PM
> To:   '[EMAIL PROTECTED]'
> Subject:  Newbie: minor submission - 4.1.27 admin webapp
> 
> Hi guys, I'm new here, sorry I haven't gone through all the guidelines and
> such, just flame me if I'm out of place...
> 
> I'm working on tracking down an annoying bug that is causing an
> administrative page to error out when attempting to view the database
> properties of a data source in a specific context (haven't even checked
> the bug database yet, yeesh). Anyway, I wanted to submit some changes to
> org.apache.webapp.admin.AttributeTag. The only change was to include
> relevant exceptions within the thrown JspExceptions as the root cause. I
> actually did this originally to help me track down the bug I'm trying to
> fix but I felt that the changes were appropriate to submit.
> 
>  <> 
> 
> Daniel

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

Re: [VOTE] 5.0.12 stability rating

2003-09-19 Thread Bill Barker

- Original Message - 
From: "Hans Bergsten" <[EMAIL PROTECTED]>
To: "Tomcat Developers List" <[EMAIL PROTECTED]>
Sent: Wednesday, September 17, 2003 8:18 PM
Subject: Re: [VOTE] 5.0.12 stability rating


 Remy Maucherat wrote:
 > 
 > [ ] Alpha
 > [x] Beta
 > 

I've lost the original message.  However, I've finally had time to finish
testing, so I'll go for Beta.


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]

Newbie: minor submission - 4.1.27 admin webapp

2003-09-19 Thread SANTOS, DANIEL (SBCSI)
Hi guys, I'm new here, sorry I haven't gone through all the guidelines and
such, just flame me if I'm out of place...

I'm working on tracking down an annoying bug that is causing an
administrative page to error out when attempting to view the database
properties of a data source in a specific context (haven't even checked the
bug database yet, yeesh). Anyway, I wanted to submit some changes to
org.apache.webapp.admin.AttributeTag. The only change was to include
relevant exceptions within the thrown JspExceptions as the root cause. I
actually did this originally to help me track down the bug I'm trying to fix
but I felt that the changes were appropriate to submit.

 <> 

Daniel

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

DO NOT REPLY [Bug 22833] - Generated SMAP looks wrong

2003-09-19 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=22833

Generated SMAP looks wrong

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 23:43 ---
Declaration are now properly mapped.  Thanks for reporting.

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



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

2003-09-19 Thread kinman
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.java19 Sep 2003 18:30:09 -  1.210
  +++ Generator.java19 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]



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

2003-09-19 Thread jfarcand
jfarcand2003/09/19 15:03:35

  Modified:catalina/src/share/org/apache/catalina/security
SecurityClassLoad.java
  Log:
  Add missing doPrivileged block
  
  Revision  ChangesPath
  1.10  +13 -4 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
  
  Index: SecurityClassLoad.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SecurityClassLoad.java23 Jun 2003 19:22:26 -  1.9
  +++ SecurityClassLoad.java19 Sep 2003 22:03:35 -  1.10
  @@ -107,6 +107,9 @@
   loader.loadClass
   (basePackage +
"core.ContainerBase$PrivilegedAddChild");
  +loader.loadClass
  +(basePackage +
  + "core.StandardWrapper$1");
   }
   
   
  @@ -220,6 +223,12 @@
   loader.loadClass
   (basePackage +
"CoyoteResponse$1");
  +loader.loadClass
  +(basePackage +
  + "CoyoteResponse$2");
  +loader.loadClass
  +(basePackage +
  + "CoyoteResponse$3");
   }
   
   }
  
  
  

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



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-09-19 Thread jfarcand
jfarcand2003/09/19 15:03:07

  Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Add missing doPrivileged block
  
  Revision  ChangesPath
  1.9   +45 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CoyoteResponse.java   3 Sep 2003 22:10:33 -   1.8
  +++ CoyoteResponse.java   19 Sep 2003 22:03:07 -  1.9
  @@ -70,6 +70,7 @@
   import java.io.PrintWriter;
   import java.net.MalformedURLException;
   import java.security.AccessController;
  +import java.security.PrivilegedAction;
   import java.security.PrivilegedActionException;
   import java.security.PrivilegedExceptionAction;
   import java.text.SimpleDateFormat;
  @@ -905,7 +906,7 @@
*
* @param cookie Cookie to be added
*/
  -public void addCookie(Cookie cookie) {
  +public void addCookie(final Cookie cookie) {
   
   if (isCommitted())
   return;
  @@ -916,11 +917,25 @@
   
   cookies.add(cookie);
   
  -StringBuffer sb = new StringBuffer();
  -ServerCookie.appendCookieValue
  -(sb, cookie.getVersion(), cookie.getName(), cookie.getValue(),
  - cookie.getPath(), cookie.getDomain(), cookie.getComment(), 
  - cookie.getMaxAge(), cookie.getSecure());
  +final StringBuffer sb = new StringBuffer();
  +if (System.getSecurityManager() != null) {
  +AccessController.doPrivileged(new PrivilegedAction() {
  +public Object run(){
  +ServerCookie.appendCookieValue
  +(sb, cookie.getVersion(), cookie.getName(), 
  + cookie.getValue(), cookie.getPath(), 
  + cookie.getDomain(), cookie.getComment(), 
  + cookie.getMaxAge(), cookie.getSecure());
  +return null;
  +}
  +});
  +} else {
  +ServerCookie.appendCookieValue
  +(sb, cookie.getVersion(), cookie.getName(), cookie.getValue(),
  + cookie.getPath(), cookie.getDomain(), cookie.getComment(), 
  + cookie.getMaxAge(), cookie.getSecure());
  +}
  +
   // the header name is Set-Cookie for both "old" and v.1 ( RFC2109 )
   // RFC2965 is not supported by browsers and the Servlet spec
   // asks for 2109.
  @@ -1305,7 +1320,7 @@
*
* @param location Absolute URL to be validated
*/
  -protected boolean isEncodeable(String location) {
  +protected boolean isEncodeable(final String location) {
   
   if (location == null)
   return (false);
  @@ -1315,13 +1330,30 @@
   return (false);
   
   // Are we in a valid session that is not using cookies?
  -HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
  -HttpSession session = hreq.getSession(false);
  +final HttpServletRequest hreq = 
  +(HttpServletRequest) request.getRequest();
  +final HttpSession session = hreq.getSession(false);
   if (session == null)
   return (false);
   if (hreq.isRequestedSessionIdFromCookie())
   return (false);
  +
  +if (System.getSecurityManager() != null) {
  +return ((Boolean)
  +AccessController.doPrivileged(new PrivilegedAction() {
  +
  +public Object run(){
  +return new Boolean(doIsEncodeable(hreq, session, location));
  +}
  +})).booleanValue();
  +} else {
  +return doIsEncodeable(hreq, session, location);
  +}
  +}
   
  +private boolean doIsEncodeable(HttpServletRequest hreq, 
  +   HttpSession session,
  +   String location){
   // Is this a valid absolute URL?
   URL url = null;
   try {
  
  
  

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



Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Amy Roh
> Local deploys do not copy the WAR over.

So local deploy is *not* persistant until we implement to save config.  This
is what I was referring to.

> I'm talking about the "Upload a WAR" which will copy the WAR to the
appBase.

I know this one works.  :-)

> (please, don't always try to use the only situation which causes trouble)

I'm not.  It's your favorite sqe folks.  ;-)

> (please vote to my lame ballots)

Okie.  X-)


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



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/security SecurityClassLoad.java

2003-09-19 Thread jfarcand
jfarcand2003/09/19 14:24:48

  Modified:jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
   jasper2/src/share/org/apache/jasper/security
SecurityClassLoad.java
  Log:
  Package protect the class properly.
  
  Revision  ChangesPath
  1.54  +425 -249  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
  
  Index: PageContextImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- PageContextImpl.java  19 Sep 2003 19:29:15 -  1.53
  +++ PageContextImpl.java  19 Sep 2003 21:24:47 -  1.54
  @@ -254,150 +254,228 @@
attributes.clear();
   }
   
  -public Object getAttribute(String name) {
  +public Object getAttribute(final String name) {
  +
  +if (name == null) {
  +throw new NullPointerException(
  +Localizer.getMessage("jsp.error.attribute.null_name"));
  +}
  +
  +if (System.getSecurityManager() != null){
  +return AccessController.doPrivileged(new PrivilegedAction(){
  +public Object run(){
  +return doGetAttribute(name);
  +}
  +});
  +} else {
  +return doGetAttribute(name);
  +}
   
  - if (name == null) {
  - throw new NullPointerException(
  - Localizer.getMessage("jsp.error.attribute.null_name"));
  - }
  - return attributes.get(name);
   }
   
  -public Object getAttribute(String name, int scope) {
  +private Object doGetAttribute(String name){
  +return attributes.get(name);
  +}
   
  - if (name == null) {
  - throw new NullPointerException(
  - Localizer.getMessage("jsp.error.attribute.null_name"));
  - }
  +public Object getAttribute(final String name, final int scope) {
   
  - switch (scope) {
  - case PAGE_SCOPE:
  - return attributes.get(name);
  -
  - case REQUEST_SCOPE:
  - return request.getAttribute(name);
  -
  - case SESSION_SCOPE:
  - if (session == null) {
  - throw new IllegalStateException(
  - Localizer.getMessage("jsp.error.page.noSession"));
  - }
  - return session.getAttribute(name);
  +if (name == null) {
  +throw new NullPointerException(
  +Localizer.getMessage("jsp.error.attribute.null_name"));
  +}
   
  - case APPLICATION_SCOPE:
  - return context.getAttribute(name);
  +if (System.getSecurityManager() != null){
  +return AccessController.doPrivileged(new PrivilegedAction(){
  +public Object run(){
  +return doGetAttribute(name, scope);
  +}
  +});
  +} else {
  +return doGetAttribute(name, scope);
  +}
   
  - default:
  - throw new IllegalArgumentException("Invalid scope");
  - }
   }
   
  -public void setAttribute(String name, Object attribute) {
  +private Object doGetAttribute(String name, int scope){
  +switch (scope) {
  +case PAGE_SCOPE:
  +return attributes.get(name);
  +
  +case REQUEST_SCOPE:
  +return request.getAttribute(name);
  +
  +case SESSION_SCOPE:
  +if (session == null) {
  +throw new IllegalStateException(
  +Localizer.getMessage("jsp.error.page.noSession"));
  +}
  +return session.getAttribute(name);
   
  - if (name == null) {
  - throw new NullPointerException(
  - Localizer.getMessage("jsp.error.attribute.null_name"));
  - }
  +case APPLICATION_SCOPE:
  +return context.getAttribute(name);
   
  - if (attribute != null) {
  - attributes.put(name, attribute);
  - } else {
  - removeAttribute(name, PAGE_SCOPE);
  - }
  +default:
  +throw new IllegalArgumentException("Invalid scope");
  +}
   }
   
  -public void setAttribute(String name, Object o, int scope) {
  +public void setAttribute(final String name, final Object attribute) {
   
  - if (name == null) {
  - throw new NullPointerException(
  - Localizer.getMessage("jsp.error.attribute.null_name"));
  - }
  +if (name == null) {
  +throw new NullPointerException(
  +Localizer.getMessage("jsp.error.attribute.null_name"));
  +}
   
  - if (o != null) {
  - switch (sco

Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Remy Maucherat
Amy Roh wrote:

Of course. It corresponds to using the deploy task.
After deploying, the WAR should be in the host appBase.


I might be on crack again but my WAR doesn't get copied over to the host
appBase (webapps).  If I set unpackWARs to true the war gets unpacked into
its directory under webapps.
Local deploys do not copy the WAR over. So, as with TC 4.1, you have to 
save the config if you want it persisted (the difference with TC 4.1 is 
that if unpackWAR is true, then it is also used for webapps deployed 
through the manager, which causes the automagic persistence after 
restart). There's not much choice here ... Maybe save the context file 
(and only that) automatically by using the Server.storeContext thingie 
in case of a local deploy (reminder: the save-to-XML needs to be 
refactored).

I'm talking about the "Upload a WAR" which will copy the WAR to the appBase.

(please, don't always try to use the only situation which causes trouble)
(please vote to my lame ballots)
Remy



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


Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Amy Roh

> Of course. It corresponds to using the deploy task.
> After deploying, the WAR should be in the host appBase.

I might be on crack again but my WAR doesn't get copied over to the host
appBase (webapps).  If I set unpackWARs to true the war gets unpacked into
its directory under webapps.

Amy


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



Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Remy Maucherat
Amy Roh wrote:

Amy Roh wrote:

Deployed webapps don't survive restart if Host unpackWARs is set to
false.

Is this expected behavior?
It works fine for me.


Are you using HTMLManager?
Of course. It corresponds to using the deploy task.
After deploying, the WAR should be in the host appBase.
Remy



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


Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Amy Roh
> Amy Roh wrote:
> > Deployed webapps don't survive restart if Host unpackWARs is set to
false.
> > Is this expected behavior?
>
> It works fine for me.

Are you using HTMLManager?

Amy
>
> If you're using "install" then don't, I've deprecated it (it's been
> confusing people), and "deploy" should be used instead. If you want to
> "save" after an install, then use the admin's commit.
>
> Remy


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



Re: Manager deploy when unpackWARs = false

2003-09-19 Thread Remy Maucherat
Amy Roh wrote:
Deployed webapps don't survive restart if Host unpackWARs is set to false.
Is this expected behavior?
It works fine for me.

If you're using "install" then don't, I've deprecated it (it's been 
confusing people), and "deploy" should be used instead. If you want to 
"save" after an install, then use the admin's commit.

Remy

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


Manager deploy when unpackWARs = false

2003-09-19 Thread Amy Roh
Deployed webapps don't survive restart if Host unpackWARs is set to false.
Is this expected behavior?

Thanks,
Amy


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



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java

2003-09-19 Thread jfarcand
jfarcand2003/09/19 12:29:15

  Modified:jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
  Log:
  Add missing doPrivileged block.
  
  Revision  ChangesPath
  1.53  +21 -8 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
  
  Index: PageContextImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- PageContextImpl.java  2 Sep 2003 21:39:59 -   1.52
  +++ PageContextImpl.java  19 Sep 2003 19:29:15 -  1.53
  @@ -64,6 +64,7 @@
   import java.io.IOException;
   import java.io.Writer;
   import java.security.AccessController;
  +import java.security.PrivilegedAction;
   import java.security.PrivilegedActionException;
   import java.security.PrivilegedExceptionAction;
   import java.util.Enumeration;
  @@ -399,12 +400,24 @@
return 0;
   }
   
  -public Object findAttribute(String name) {
  +public Object findAttribute(final String name) {
  +if (name == null) {
  +throw new NullPointerException(
  +Localizer.getMessage("jsp.error.attribute.null_name"));
  +}
   
  - if (name == null) {
  - throw new NullPointerException(
  - Localizer.getMessage("jsp.error.attribute.null_name"));
  - }
  +if (System.getSecurityManager() != null){
  +return AccessController.doPrivileged(new PrivilegedAction(){
  +public Object run(){
  +return doFindAttribute(name);
  +}
  +});
  +} else {
  +return doFindAttribute(name);
  +}
  +}
  +
  +private Object doFindAttribute(String name){
   
   Object o = attributes.get(name);
   if (o != null)
  
  
  

-
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-19 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-19 19:19 ---
I don't have time at this moment to confirm or fix but if the description is
correct, this is a spec compliance bug.

SRV.5.2 Headers
"Servlet programmers are responsible for ensuring that the Content-Type
header is appropriately set in the response object for the content the servlet is
generating. The HTTP 1.1 specification does not require that this header be set in
an HTTP response. Servlet containers must not set a default content type when the
servlet programmer does not set the type."

-
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-19 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

[EMAIL PROTECTED] changed:

   What|Removed |Added

Version|4.1.24  |4.1.27

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



DO NOT REPLY [Bug 22867] - Tag handlers can't be inner/nested classes

2003-09-19 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=22867

Tag handlers can't be inner/nested classes

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 18:50 ---
The decision is to use binary names, e.g. Outer$Inner.  I have fixed Jasper in
Tomcat 5 to accept that.  Let me know if it does not work for you.

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



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

2003-09-19 Thread kinman
kinman  2003/09/19 11:30:10

  Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspUtil.java
  Log:
  - When a tag handler class is an inner class, it is specified in the TLD
in binary form (Outer$Inner).  It needs to be converted to canonical
form (Outer.Inner) when generating Java files.
  
  Revision  ChangesPath
  1.210 +21 -15
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.209
  retrieving revision 1.210
  diff -u -r1.209 -r1.210
  --- Generator.java18 Sep 2003 23:12:39 -  1.209
  +++ Generator.java19 Sep 2003 18:30:09 -  1.210
  @@ -1048,7 +1048,7 @@
   if (beanInfo.checkVariable(name)) {
   // Bean is defined using useBean, introspect at compile time
   Class bean = beanInfo.getBeanType(name);
  -String beanName = bean.getName();
  +String beanName = JspUtil.getCanonicalName(bean);
   java.lang.reflect.Method meth =
   JspRuntimeLibrary.getReadMethod(bean, property);
   String methodName = meth.getName();
  @@ -2121,21 +2121,23 @@
   declareScriptingVars(n, VariableInfo.AT_BEGIN);
   saveScriptingVars(n, VariableInfo.AT_BEGIN);
   
  -out.printin(tagHandlerClass.getName());
  +String tagHandlerClassName =
  +JspUtil.getCanonicalName(tagHandlerClass);
  +out.printin(tagHandlerClassName);
   out.print(" ");
   out.print(tagHandlerVar);
   out.print(" = ");
   if (isPoolingEnabled) {
   out.print("(");
  -out.print(tagHandlerClass.getName());
  +out.print(tagHandlerClassName);
   out.print(") ");
   out.print(n.getTagHandlerPoolName());
   out.print(".get(");
  -out.print(tagHandlerClass.getName());
  +out.print(tagHandlerClassName);
   out.println(".class);");
   } else {
   out.print("new ");
  -out.print(tagHandlerClass.getName());
  +out.print(tagHandlerClassName);
   out.println("();");
   }
   
  @@ -2333,12 +2335,14 @@
   declareScriptingVars(n, VariableInfo.AT_BEGIN);
   saveScriptingVars(n, VariableInfo.AT_BEGIN);
   
  -out.printin(tagHandlerClass.getName());
  +String tagHandlerClassName =
  +JspUtil.getCanonicalName(tagHandlerClass);
  +out.printin(tagHandlerClassName);
   out.print(" ");
   out.print(tagHandlerVar);
   out.print(" = ");
   out.print("new ");
  -out.print(tagHandlerClass.getName());
  +out.print(tagHandlerClassName);
   out.println("();");
   
   generateSetters(n, tagHandlerVar, handlerInfo, true);
  @@ -2853,16 +2857,17 @@
   }
   
   if (propEditorClass != null) {
  +String className = JspUtil.getCanonicalName(c);
   return "("
  -+ c.getName()
  ++ className
   + 
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
  -+ c.getName()
  ++ className
   + ".class, \""
   + attrName
   + "\", "
   + quoted
   + ", "
  -+ propEditorClass.getName()
  ++ JspUtil.getCanonicalName(propEditorClass)
   + ".class)";
   } else if (c == String.class) {
   return quoted;
  @@ -2901,10 +2906,11 @@
   } else if (c == Object.class) {
   return "new String(" + quoted + ")";
   } else {
  +String className = JspUtil.getCanonicalName(c);
   return "("
  -+ c.getName()
  ++ className
   + 
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromPropertyEditorManager("
  -+ c.getName()
  ++ className
   + ".class, \""
   + attrName
   + "\", "
  
  
  
  1.45  +28 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java
  
  Index: JspUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/s

DO NOT REPLY [Bug 23277] New: - webDAV doesn't install when examples are deselected from installer

2003-09-19 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=23277

webDAV doesn't install when examples are deselected from installer

   Summary: webDAV doesn't install when examples are deselected from
installer
   Product: Tomcat 4
   Version: 4.1.27
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Installable Packages
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Deselecting "examples" from the installer options causes the webDAV servlets 
not to install.  I toggled off "documentation", "NT services", "examples", etc. 
for seperate installations, and the "webDAV" directory and all of the webdav 
resources appear to install properly with the exception of when "examples" is 
deselected.  If this is by design, then it is unintutive.

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



[5.0.12] Monday

2003-09-19 Thread Remy Maucherat
As there has been the legal minimum of binding votes, I will announce 
5.0.12 beta on Monday, unless the voting goes bad or a major regression 
is found in the build.

Remy



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


DO NOT REPLY [Bug 23276] - Coyote Connector Compression does not work under JDK 1.4.0_01

2003-09-19 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=23276

Coyote Connector Compression does not work under JDK 1.4.0_01





--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 16:08 ---
Doing so is very bad for performance, though. Obviously, the only good thing
performance wise would be to have non JDK provided GZ compression code.
I'm ok with your patch for compatibility, but you should upgrade to a better JDK.

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



DO NOT REPLY [Bug 23276] - Coyote Connector Compression does not work under JDK 1.4.0_01

2003-09-19 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=23276

Coyote Connector Compression does not work under JDK 1.4.0_01





--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 16:04 ---
Created an attachment (id=8294)
Patch to GzipOutputFilter

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



DO NOT REPLY [Bug 23276] New: - Coyote Connector Compression does not work under JDK 1.4.0_01

2003-09-19 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=23276

Coyote Connector Compression does not work under JDK 1.4.0_01

   Summary: Coyote Connector Compression does not work under JDK
1.4.0_01
   Product: Tomcat 4
   Version: 4.1.27
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Connector:Coyote HTTP/1.1
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If you try to use the coyote connector with compression enabled 
(compression="force") under JDK 1.4.0, you will get no output and FIXME will 
be written to standard output.

In GzipOutputFilter, the write(int) method of the FakeOutputStream is not 
implemented (it just writes FIXME to standard out).  Under JDK 1.4.0_01, all 
the writes use write(int) instead of the implemented write(byte[], int, int).

I'll attach a patch to fix this.

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



error pages

2003-09-19 Thread Arjan Gerritsen
Hi , the next question is bothering me:

I want to have custom error pages for my webapp.

Well this works:

(web.xml of Tomcat)

 500
 /server_error.html


 404
 /file_not_found.html

But this is for all the webapps on that Tomcat server. I want to specify a 
spefic one for one application. Whene i put that conf. code in the web.xml 
of my webapp it doesn't work. Anyone who can help me?

Regards,
Arjan.
_
Chatten met je online vrienden via MSN Messenger. http://messenger.msn.nl/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


DO NOT REPLY [Bug 19312] - Bug in log() of StandardWrapperValve.java in Tomcat 4.1.24

2003-09-19 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=19312

Bug in log() of StandardWrapperValve.java in Tomcat 4.1.24

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]



--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 14:20 ---
*** Bug 21834 has been marked as a duplicate of this bug. ***

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



DO NOT REPLY [Bug 21834] - Endless recursion in log() method if Logger is not set

2003-09-19 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=21834

Endless recursion in log() method if Logger is not set

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 14:20 ---


*** This bug has been marked as a duplicate of 19312 ***

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



cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java

2003-09-19 Thread remm
remm2003/09/19 07:17:24

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
ManagerServlet.java
  Log:
  - Allow undeploying webapps when docBase isn't in the host appBase: their
context file will be removed, but the docBase will not be removed.
  
  Revision  ChangesPath
  1.10  +16 -15
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ManagerServlet.java   7 Sep 2003 18:47:14 -   1.9
  +++ ManagerServlet.java   19 Sep 2003 14:17:24 -  1.10
  @@ -1389,10 +1389,9 @@
   docBaseDir = new File(appBaseDir, docBase);
   }
   String docBasePath = docBaseDir.getCanonicalPath();
  +boolean deleteDir = true;
   if (!docBasePath.startsWith(deployedPath)) {
  -writer.println(sm.getString("managerServlet.noDocBase",
  -displayPath));
  -return;
  +deleteDir = false;
   }
   
   // Remove this web application and its associated docBase
  @@ -1406,14 +1405,16 @@
   }
   boolean dir = docBaseDir.isDirectory();
   deployer.remove(path, true);
  -if (dir) {
  -undeployDir(docBaseDir);
  -// Delete the WAR file
  -File docBaseWar = new File(docBasePath + ".war");
  -docBaseWar.delete();
  -} else {
  -// Delete the WAR file
  -docBaseDir.delete();
  +if (deleteDir) {
  +if (dir) {
  +undeployDir(docBaseDir);
  +// Delete the WAR file
  +File docBaseWar = new File(docBasePath + ".war");
  +docBaseWar.delete();
  +} else {
  +// Delete the WAR file
  +docBaseDir.delete();
  +}
   }
   File docBaseXml = new File(context.getConfigFile());
   docBaseXml.delete();
  
  
  

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



RE: cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.2.txt

2003-09-19 Thread Larry Isaacs
+1,  Thanks.

Larry

-Original Message-
From: Henri Gomez [mailto:[EMAIL PROTECTED] 
Sent: Thursday, September 18, 2003 4:49 AM
To: Tomcat Developers List
Subject: Re: cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.2.txt


Larry Isaacs a écrit :

> Hi Henri,
> 
> The software I work on in my day job has finally reached "lockdown". 
> Only documentation tasks remain.  I'll try to get up to speed with 
> with where things stand and begin working on a release plan this week.  
> Sorry for the long delay.

Ok, what do you think about imports cleanup ?

Could I start commit it ?

BTW, I could do the same also for JTC if everybody agree ;)




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


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



DO NOT REPLY [Bug 23192] - getRemoteUser() returns null with Authorization header

2003-09-19 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=23192

getRemoteUser() returns null with Authorization header





--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 11:27 ---
Yes I think you are right, apparently this is not supported in J2EE. I also did 
some testing in Websphere and it behaves exactly the same way. I guess I will 
have to implement my own security by accessing the username/password from the 
Authorization header and/or JSESSIONID. I don't see any other way but to re-
implement basically all the declarative security model in my application.

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



DO NOT REPLY [Bug 23267] New: - Manger remove of context deployed as defult webapp gets NPE

2003-09-19 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=23267

Manger remove of context deployed as defult webapp  gets NPE

   Summary: Manger remove of context deployed as defult webapp  gets
NPE
   Product: Tomcat 4
   Version: 4.1.27
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I install a default webapp with manager install command using a context descriptor.
 is defined with unpackWARs="false" autoDeploy="true" liveDeploy="false".

If i install with