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

2003-09-02 Thread ecarmich
ecarmich2003/09/01 16:22:56

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
  Log:
  Set Node.startMark correctly in JSP document nodes created from character data.
  This fixes incorrect SMAPping of template text nodes containing line feeds, and 
incorrect
  error reporting for unparseable EL expression nodes.
  
  Revision  ChangesPath
  1.70  +50 -18
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
  
  Index: JspDocumentParser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- JspDocumentParser.java1 Sep 2003 00:17:35 -   1.69
  +++ JspDocumentParser.java1 Sep 2003 23:22:56 -   1.70
  @@ -115,6 +115,18 @@
   
   private Locator locator;
   
  +//Mark representing the start of the current element.  Note
  +//that locator.getLineNumber() and locator.getColumnNumber()
  +//return the line and column numbers for the character
  +//immediately _following_ the current element.  The underlying
  +//XMl parser eats white space that is not part of character
  +//data, so for Nodes that are not created from character data,
  +//this is the best we can do.  But when we parse character data,
  +//we get an accurate starting location by starting with startMark
  +//as set by the previous element, and updating it as we advance
  +//through the characters.
  +private Mark startMark;
  +
   // Flag indicating whether we are inside DTD declarations
   private boolean inDTD;
   
  @@ -287,7 +299,7 @@
   locator);
   }
   
  -Mark start =
  +startMark =
   new Mark(path, locator.getLineNumber(), locator.getColumnNumber());
   
   if (attrs != null) {
  @@ -353,7 +365,7 @@
   nonTaglibAttrs,
   nonTaglibXmlnsAttrs,
   taglibAttrs,
  -start,
  +startMark,
   current);
   } else {
   node =
  @@ -364,7 +376,7 @@
   nonTaglibAttrs,
   nonTaglibXmlnsAttrs,
   taglibAttrs,
  -start,
  +startMark,
   current);
   if (node == null) {
   node =
  @@ -374,7 +386,7 @@
   nonTaglibAttrs,
   nonTaglibXmlnsAttrs,
   taglibAttrs,
  -start,
  +startMark,
   current);
   }
   }
  @@ -417,21 +429,31 @@
   if ((current instanceof Node.JspText)
   || (current instanceof Node.NamedAttribute)
   || !isAllSpace) {
  -Mark start =
  -new Mark(
  -path,
  -locator.getLineNumber(),
  -locator.getColumnNumber());
  +
  +int line = startMark.getLineNumber();
  +int column = startMark.getColumnNumber();
   
   CharArrayWriter ttext = new CharArrayWriter();
   int limit = offset + len;
   int lastCh = 0;
   for (int i = offset; i  limit; i++) {
   int ch = buf[i];
  +if (ch == '\n') {
  +column = 1;
  +line++;
  +} else {
  +column++;
  +}
   if (lastCh == '$'  ch == '{') {
   if (ttext.size()  0) {
  -new Node.TemplateText(ttext.toString(), start, current);
  +new Node.TemplateText(
  +ttext.toString(),
  +startMark,
  +current);
   ttext = new CharArrayWriter();
  +//We subtract two from the column number to
  +//account for the '${' that we've already parsed
  +startMark = new Mark(path, line, column - 2);
   }
   // following ${ to first unquoted }
   i++;
  @@ -448,6 +470,12 @@
   
   }
   ch = buf[i];
  +if (ch == '\n') {
  +column = 1;
  +line++;
  +} else {
  +column++;
  +}
   if (lastCh == '\\'  (singleQ || doubleQ)) {
   ttext.write(ch);
 

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

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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

  Component|Jasper  |Jasper 2



--- Additional Comments From [EMAIL PROTECTED]  2003-09-01 22:47 ---
It's Jasper2, apparently.

The second error message I got is presumably from this code in
org.apache.jasper.compiler.Parser:

try {
tagHandlerClass
= ctxt.getClassLoader().loadClass(tagInfo.getTagClassName());
} catch (Exception e) {
err.jspError(start, jsp.error.unable.loadclass, shortTagName,
 prefix);
}

so generator is just the name of my custom tag (which explains why I didn't
find a single hit for unable to load class generator in Google or the Apache
Bugzilla :) ... and it makes perfect sense that the classloader didn't find
this nested class by the nonstandard name syntax OuterClass.NestedClass
(instead of the standard OuterClass$NestedClass syntax).

So the point remains that a nested class breaks JSP compilation if given with
the $ syntax, and breaks classloader lookup if given with the . syntax. So
nested classes are not usable as tag handlers, at least as of version 4.1.24.

The root of this problem is that nested classes in Java have different names
at compile time and at runtime. The fix is presumably to add logic to the JSP
source file generation, replacing all dollar signs in tag-handler classnames
with dots.

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



DO NOT REPLY [Bug 21967] - Custom tags defining scripting variables but not always

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21967.
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=21967

Custom tags defining scripting variables but not always





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 00:05 ---
This is very likely the same issue raised against Tomcat 5 in Bugzilla Bug 
21390.  It's currently under consideration by the spec team (for JSP 2.0, at 
least; I don't know if JSP 1.2 or Tomcat 4 will be changed).  See that 
Bugzilla ticket for an excellent update from Kin-Man on the current thinking.

If you have thoughts you'd like to share with the spec team, you can send them 
to [EMAIL PROTECTED] (JSP 1.2) or [EMAIL PROTECTED] (JSP 
2.0).

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



cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java JkMain.java

2003-09-02 Thread billbarker
billbarker2003/09/01 17:17:40

  Modified:jk/java/org/apache/jk/server JkCoyoteHandler.java
JkMain.java
  Log:
  Adding accessors so that the JkCoyote connectors can play nice with the admin webapp.
  
  Revision  ChangesPath
  1.43  +6 -2  
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
  
  Index: JkCoyoteHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- JkCoyoteHandler.java  30 Jul 2003 02:25:53 -  1.42
  +++ JkCoyoteHandler.java  2 Sep 2003 00:17:40 -   1.43
  @@ -132,9 +132,13 @@
   if( value instanceof String )
   this.setProperty( name, (String)value );
   }
  -
  +
  +/**
  + * Retrieve config info.
  + * Primarily for use with the admin webapp.
  + */   
   public Object getAttribute( String name ) {
  -return null;
  +return getJkMain().getProperty(name);
   }
   
   /** The adapter, used to call the connector 
  
  
  
  1.41  +14 -1 
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
  
  Index: JkMain.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- JkMain.java   2 Jul 2003 06:30:23 -   1.40
  +++ JkMain.java   2 Sep 2003 00:17:40 -   1.41
  @@ -188,7 +188,20 @@
   saveProperties();
   }
   }
  -
  +/**
  + * Retrieve a property.
  + */
  +public Object getProperty(String name) {
  +String alias = (String)replacements.get(name);
  +Object result = null;
  +if(alias != null) {
  +result = props.get(alias);
  +}
  +if(result == null) {
  +result = props.get(name);
  +}
  +return result;
  +}
   /**
* Set the codechannelClassName/code that will used to connect to
* httpd.
  
  
  

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



DO NOT REPLY [Bug 22866] - Scanning of Struts 1.1 struts.jar is throwing exception leading to native JVM crash

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22866.
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=22866

Scanning of Struts 1.1 struts.jar is throwing exception leading to native JVM crash

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-01 21:44 ---
Well, I hate Sun 1.2 and 1.3 VMs on Linux (they need workarounds or they are
unreliable; look at the release notes !). Use IBM 1.3 or 1.4, or Sun 1.4.1 or
1.4.2 (I'd rather use IBM, though).

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



Re: [5.0.10] New build ?

2003-09-02 Thread Bill Barker

- Original Message - 
From: Remy Maucherat [EMAIL PROTECTED]
To: Tomcat Developers List [EMAIL PROTECTED]
Sent: Monday, September 01, 2003 5:58 AM
Subject: [5.0.10] New build ?


 I think releasing a new build at the end of this week would be a good
 idea, given that most issues with 5.0.9 have been resolved.

 The remaining issues I can think of:

 * commons-daemon: Needs a 1.0 release (any volunteers ?); needs polish
 (display of log items in the console could probably be nicer, bug 18220).

Sort of running before you can walk here ;-).  Daemon needs to graduate from
the sandbox before it can have a release.

The console does need work.  At the moment it appears to be (trying to :)
assume that you are using log4j with a format something like %r [%t]: %c %p
%m%n.  In general, it's a hard problem, since all that it is doing is
grabbing stdout/stderr and attempting to display it in the GUI.  The other
problem with the console is that it never rolls-off (so the more you log,
the more memory the process consumes).

Bug #18220 is simply not implemented for the new ListView control.  It's not
hard to do however.  As much as I hate Windows GUI programming, If I get
some free time at work I can probably look into implementing it.


 * Schema validation issues: I still have issues validating jsp-examples,
 even with Xerces 2.1; anyone else experiencing this ? (Jean-François
 cannot reproduce this) By release time, we'd want to ship a newer
 Xerces, so the underlying issue would need to be fixed if possible.

 * Classloader leaks in some situations after a reload (ex: reload the
 admin webapp, tested on Windows / JDK 1.4.2). There doesn't seem to be
 any reference leak, and yet the classloader is not getting GCed, so I'm
 puzzled. Anyone can help me debug this ?

 * More bugfixes :)

 * Anything else ?

 Remy


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

double format

2003-09-02 Thread Paul Wallace
Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



RE: double format

2003-09-02 Thread John Bettiol
BigDecimal?

Or am I on  drugs?

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:23 PM
To: [EMAIL PROTECTED]
Subject: double format


Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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



DO NOT REPLY [Bug 19801] - Request dispatcher does not set empty javax.servlet.include request attributes

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19801.
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=19801

Request dispatcher does not set empty javax.servlet.include request attributes





--- Additional Comments From [EMAIL PROTECTED]  2003-09-01 09:47 ---
Can anyone comment on this, please ?

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



RE: how's the jsp page compile into servlet

2003-09-02 Thread Sriram N
Manish:

Tomcat is actually made up of a number of different units of funtionality. 
The Tomcat that you see is actually made up of
Catalina - provides the servlet services
Jasper - the JSP Page compiler
Conectors - provides HTTP services and integration with web servers such as
IIS, Apache, etc.
Valves - For other internal features and for implementing the Servlet API.

If you check the default web.xml, you will find a servlet that handles requests
for JSP pages.

When you ask for a JSP Page
a. The JSP servlet receives this request.
b. It checks for a class corresponding to the JSP page.
c. If such a class does not exists, the JSP page is converted in to Java
source. (I think the JSP if first converted into XML, I'm not sure about
this...)
If the class exists, and it is older than the JSP Page, the JSP page is
converted to Java source again.
d. This Java source is then compiled to generate a .class file. you will find
both the java source and the .class file in the work directory within tomcat.
e. A Classloader for this specific JSP Class is created; It loads the JSP class
and serves the request.

I do not recall what exactly happens in case the JSP class is already present.

I strongly urge you to download the tomcat source and explore it - you will
learn a lot. I know that it has changed my life and how I look at Open source.

-- Sriram
Business Development.
Object Edge Software India Pvt. Ltd.

--- Schalk [EMAIL PROTECTED] wrote:
 Manish
 
 As far as I know, and anyone please correct me on this if I am wrong, this
 is handled by the internal compiler within Tomcat and the .class is placed
 within web application scope.
 
 You can register a .jsp to act as a servlet and call it as if it is one. For
 instance on our website we include our footer.jsp like this.
 
 First add the following code to your web.xml:
 servlet
 servlet-namefooter/servlet-name
 descriptionCopyright footer for www.volume4.co.za/description
 jsp-file/includes/footer.jsp/jsp-file
  /servlet
 
 You can now call it from anywhere within your webapps simply as
 /servlet/footer, for instance jsp:include page=/servlet/footer
 flush=true/
 
 Hope this helps.
 
 Kind Regards
 Schalk Neethling
 Volume4.Development.Multimedia.Branding
 emotionalize.conceptualize.visualize.realize
 Tel: +27125468436
 Fax: +27125468436
 email:[EMAIL PROTECTED]
 web: www.volume4.co.za
  
 
 :: -Original Message-
 :: From: manish pandey [mailto:[EMAIL PROTECTED]
 :: Sent: Monday, September 01, 2003 9:28 AM
 :: To: [EMAIL PROTECTED]
 :: Subject: how's the jsp page compile into servlet
 :: 
 :: hello sir ,
 ::   i am new in ur list. i would like to answer that
 :: how's a jsp page covert into a servlet and where is
 :: the .class file store in webapplication . and how a
 :: web.xml find these servlet name and servlet class name
 :: .plese
 ::  tell me the internal details about application server
 :: 
 :: wating ur
 :: reply
 :: manish
 :: 
 :: 
 :: __
 :: Do you Yahoo!?
 :: Yahoo! SiteBuilder - Free, easy-to-use web site design software
 :: http://sitebuilder.yahoo.com
 :: 
 :: -
 :: 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 you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com

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



RE: double format

2003-09-02 Thread Paul Wallace
Obviously I am, I now have a value with approx 30 decimal points. What
method formats to ii.dd ?

Paul.

BigDecimal?

Or am I on  drugs?

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:23 PM
To: [EMAIL PROTECTED]
Subject: double format


Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for
the
sole use of that intended addressee.  If you are not the intended
addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and
any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy
can be
accessed from our website: www.virginblue.com.au 



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



RE: double format

2003-09-02 Thread John Bettiol
I meant I was on drugs.. I never post to anything.. And I guessed I as going
to post wrong..

You can do something linke 

BigDecimal bleh =  new BigDecimal(12345.678);
BigDecimal blah = bleh.setScale(2, BigDecimal.ROUND_HALF_DOWN);

Or something...

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:46 PM
To: Tomcat Developers List
Subject: RE: double format


Obviously I am, I now have a value with approx 30 decimal points. What
method formats to ii.dd ?

Paul.

BigDecimal?

Or am I on  drugs?

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:23 PM
To: [EMAIL PROTECTED]
Subject: double format


Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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



RE: double format

2003-09-02 Thread John Bettiol
Sorry for spamming..

I am not really on drugs.. I just cannot write a coherent sentence.

:)

-Original Message-
From: John Bettiol [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:50 PM
To: 'Tomcat Developers List'
Subject: RE: double format


I meant I was on drugs.. I never post to anything.. And I guessed I as going
to post wrong..

You can do something linke 

BigDecimal bleh =  new BigDecimal(12345.678);
BigDecimal blah = bleh.setScale(2, BigDecimal.ROUND_HALF_DOWN);

Or something...

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:46 PM
To: Tomcat Developers List
Subject: RE: double format


Obviously I am, I now have a value with approx 30 decimal points. What
method formats to ii.dd ?

Paul.

BigDecimal?

Or am I on  drugs?

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:23 PM
To: [EMAIL PROTECTED]
Subject: double format


Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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


The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for the
sole use of that intended addressee.  If you are not the intended addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy can be
accessed from our website: www.virginblue.com.au 



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



RE: double format

2003-09-02 Thread Paul Wallace

That's sorted..thanks. 
I'll have some of what you're having..

Paul.

I meant I was on drugs.. I never post to anything.. And I guessed I as
going
to post wrong..

You can do something linke 

BigDecimal bleh =  new BigDecimal(12345.678);
BigDecimal blah = bleh.setScale(2, BigDecimal.ROUND_HALF_DOWN);

Or something...

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:46 PM
To: Tomcat Developers List
Subject: RE: double format


Obviously I am, I now have a value with approx 30 decimal points. What
method formats to ii.dd ?

Paul.

BigDecimal?

Or am I on  drugs?

-Original Message-
From: Paul Wallace [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 2 September 2003 2:23 PM
To: [EMAIL PROTECTED]
Subject: double format


Hi all,

A simple one for most..how do I enforce a double primitive
format? E.g 00.00, or to enforce 2 and only 2 decimal points?

 

Thanks

 

Paul.



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for
the
sole use of that intended addressee.  If you are not the intended
addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and
any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy
can be
accessed from our website: www.virginblue.com.au 



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



The content of this e-mail, including any attachments is a confidential
communication between Virgin Blue and the intended addressee and is for
the
sole use of that intended addressee.  If you are not the intended
addressee,
any use, interference with, disclosure or copying of this material is
unauthorized and prohibited.  If you have received this e-mail in error
please contact the sender immediately and then delete the message and
any
attachment(s).  Virgin Blue respects your privacy. Our privacy policy
can be
accessed from our website: www.virginblue.com.au 



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



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

2003-09-02 Thread ecarmich
ecarmich2003/09/01 22:50:47

  Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  Expand wildcard imports
  Remove unused imports
  Remove tabs
  
  Revision  ChangesPath
  1.202 +3044 
-2823jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java.diff?r1=1.201r2=1.202
  
  

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



RE: [5.0.10] New build ?

2003-09-02 Thread Mladen Turk

 From: Bill Barker
 
 The console does need work.  At the moment it appears to be 
 (trying to :) assume that you are using log4j with a format 
 something like %r [%t]: %c %p %m%n.  In general, it's a 
 hard problem, since all that it is doing is grabbing 
 stdout/stderr and attempting to display it in the GUI.

Like you said, it tries to parse the stdout/stderr (as best as I figured
the output message formats).
The cleanest solution would be to use some standard in those if
possible. 
The parses tries to determine the log message type
(INFO/WARNING/ERROR/SEVERE),
and the class name of the message.

If this is too complicated we can always set the 'ac_use_lview' variable
to zero, and use the simple ListView,
without multiple columns, and message type icons.

 The other problem with the console is that it never rolls-off (so 
 the more you log, the more memory the process consumes).


I'll check that, but AFAIK the ListView is limited to 32K items and
after that it should roll-off.
Not sure that is the case, but I'll make that #defined.
 
 Bug #18220 is simply not implemented for the new ListView 
 control.  It's not hard to do however.  As much as I hate 
 Windows GUI programming, If I get some free time at work I 
 can probably look into implementing it.
 

I'll try to copy/paste if you don't beet me ;).

MT.


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



Re: [5.0.10] New build ?

2003-09-02 Thread Remy Maucherat
Mladen Turk wrote:
From: Bill Barker

The console does need work.  At the moment it appears to be 
(trying to :) assume that you are using log4j with a format 
something like %r [%t]: %c %p %m%n.  In general, it's a 
hard problem, since all that it is doing is grabbing 
stdout/stderr and attempting to display it in the GUI.
Like you said, it tries to parse the stdout/stderr (as best as I figured
the output message formats).
The cleanest solution would be to use some standard in those if
possible. 
The parses tries to determine the log message type
(INFO/WARNING/ERROR/SEVERE),
and the class name of the message.

If this is too complicated we can always set the 'ac_use_lview' variable
to zero, and use the simple ListView,
without multiple columns, and message type icons.
I'm pretty sure the fancy example I saw used a JNI logger. Parsing the 
output is of course very complex ...
Maybe support could be added for the JDK 1.4 logger.
There's also another problem: the severity is sometimes 
internationalized :-(

If the format of the first log entry is not recognized, maybe it could 
switch automatically to listview.

If that's too complex, forget it :)

The other problem with the console is that it never rolls-off (so 
the more you log, the more memory the process consumes).
I'll check that, but AFAIK the ListView is limited to 32K items and
after that it should roll-off.
Not sure that is the case, but I'll make that #defined.
That would be a nice feature :)

Remy

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


DO NOT REPLY [Bug 22866] - Scanning of Struts 1.1 struts.jar is throwing exception leading to native JVM crash

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22866.
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=22866

Scanning of Struts 1.1 struts.jar is throwing exception leading to native JVM crash

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 10:38 ---
IBM 1.3.1, 1.4.1 and Sun 1.4.1 and 1.4.2 still throw errors albeit different
ones - the IBM one does not crash the JVM. A lot of our apps must use 1.3.1
right now due to third party dependencies. Can you take a look at the IBM 1.3.1
trace below, and offer any ideas? 

catalina.out

Starting service Tomcat-Standalone
Apache Tomcat/4.1
[ERROR] Digester - -End event threw exception java.lang.reflect.InvocationTa
rgetExceptionjava.lang.reflect.InvocationTargetException: java.lang.Internal
Error: jzentry == 0
at java.util.zip.ZipFile$2.nextElement(ZipFile.java:318)
at java.util.jar.JarFile$1.nextElement(JarFile.java:242)
at org.apache.catalina.startup.ContextConfig.tldScanJar(ContextConfig
.java:909)
at org.apache.catalina.startup.ContextConfig.tldScan(ContextConfig.ja
va:868)
at org.apache.catalina.startup.ContextConfig.start(ContextConfig.java
:647)
at org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextCo
nfig.java:243)
at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(Lifec
ycleSupport.java:166)
at org.apache.catalina.core.StandardContext.start(StandardContext.jav
a:3568)
at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerB
ase.java:821)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java
:807)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:5
79)
at org.apache.catalina.core.StandardHostDeployer.addChild(StandardHos
tDeployer.java:700)
at java.lang.reflect.Method.invoke(Native Method)
at org.apache.commons.beanutils.MethodUtils.invokeMethod(MethodUtils.
java:252)
at org.apache.commons.digester.SetNextRule.end(SetNextRule.java:256)
at org.apache.commons.digester.Rule.end(Rule.java:276)
at org.apache.commons.digester.Digester.endElement(Digester.java:1058
)
at org.apache.xerces.parsers.AbstractSAXParser.endElement(Unknown Sou
rce)
at org.apache.xerces.impl.XMLDocumentFragmentScannerImpl.scanEndEleme
nt(Unknown Source)
at org.apache.xerces.impl.XMLDocumentFragmentScannerImpl$FragmentCont
entDispatcher.dispatch(Unknown Source)(Compiled Code)
at org.apache.xerces.impl.XMLDocumentFragmentScannerImpl.scanDocument
(Unknown Source)
at org.apache.xerces.parsers.XML11Configuration.parse(Unknown Source)
at org.apache.xerces.parsers.DTDConfiguration.parse(Unknown Source)
at org.apache.xerces.parsers.XMLParser.parse(Unknown Source)
at org.apache.xerces.parsers.AbstractSAXParser.parse(Unknown Source)
at org.apache.commons.digester.Digester.parse(Digester.java:1567)
at org.apache.catalina.core.StandardHostDeployer.install(StandardHost
Deployer.java:385)
at org.apache.catalina.core.StandardHost.install(StandardHost.java:80
3)
at org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfi
g.java:442)
at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:
399)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:718)
at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.j
ava:358)
at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(Lifec
ycleSupport.java:166)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:11
96)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:738)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:11
88)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:
347)
at org.apache.catalina.core.StandardService.start(StandardService.jav
a:497)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:
2190)
at org.apache.catalina.startup.Catalina.start(Catalina.java:512)
at org.apache.catalina.startup.Catalina.execute(Catalina.java:400)
at org.apache.catalina.startup.Catalina.process(Catalina.java:180)
at java.lang.reflect.Method.invoke(Native Method)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:203)

admin.log
-
2003-09-02 10:30:59 StandardContext[/admin]: Starting
2003-09-02 10:30:59 

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

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 10:43 ---
Created an attachment (id=8031)
Log snippet showing the error message from JSP compilation

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 09:57 ---
You're not giving enough details on the original error. Obviously declaring
OuterClass.NestedClass in the TLD is wrong: the actual classname is
OuterClass$NestedClass. So you shouldn't do that, that won't get you anywhere.

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



DO NOT REPLY [Bug 21711] - Error when compiling a JSP that uses a TLD 1.1

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21711.
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=21711

Error when compiling a JSP that uses a TLD 1.1





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 09:00 ---
yes that's a good news... thanks a lot.

i agree that my bug report was invalid... the point is that before riunning my 
app on tc5, i didn't knew that my tld was not spec compliant: no app server 
ever complain about that (tc 3.x/4.x, websphere 3.5 - 5, weblogic 5.1 -- 8, 
orion, etc.).

so that's a good news for our customer that may want to benefit from tc5 
improvments over tc4!

however, we've alreday modified our tld for our next version ;)

thanks again.

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 10:50 ---
I've attached a logfile taken from JBoss server.log, showing the error.

I do know that A.B is not the (runtime) classname of the class :) but it is a
valid compile-time name (and A$B isn't). My JSP page was breaking at compile
time because of the A$B syntax in source code. So it wasn't a very dumb attempt.

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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

   Severity|Normal  |Major
  Component|Jasper 2|Jasper2
Product|Tomcat 4|Tomcat 5
Version|4.1.24  |5.0.9



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 12:12 ---
The bug is with the code generator (I assume doing a replace('$', '.') on the
tag classname would solve the problem there; I can't see any side effect), as
the error log indicates.

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



DO NOT REPLY [Bug 20029] - catalina.sh - command stop -force not working

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20029.
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=20029

catalina.sh - command stop -force not working

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
  Component|Unknown |Native:Integration
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 12:26 ---
Since I don't see how this can work well in all situations (except if we add a
new command which would just kill Tomcat - not that good an idea IMO), I'm
willing to make the change. We'll see how it works in practice ...

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



DO NOT REPLY [Bug 18220] - Copy Paste doesn't work (Apache Service Monitor)

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18220.
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=18220

Copy  Paste doesn't work (Apache Service Monitor)

[EMAIL PROTECTED] changed:

   What|Removed |Added

  Component|Unknown |Native:Integration
Version|5.0.1   |5.0.9

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



cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-09-02 Thread remm
remm2003/09/02 05:23:13

  Modified:catalina/src/bin catalina.sh
  Log:
  - The -force part was never executed. Tradeoff: the script will no longer
return right away.
  - Bug 20029: submitted by Christian Brensing.
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- catalina.sh   31 Jul 2003 15:03:04 -  1.7
  +++ catalina.sh   2 Sep 2003 12:23:13 -   1.8
  @@ -244,7 +244,7 @@
   elif [ $1 = stop ] ; then
   
 shift
  -  exec $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
  +  $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
   -Dcatalina.base=$CATALINA_BASE \
   -Dcatalina.home=$CATALINA_HOME \
  
  
  

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



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

2003-09-02 Thread remm
remm2003/09/02 06:28:36

  Modified:webapps/docs changelog.xml
  Log:
  - Changelog update (no release yet, of course, it's just that I don't want to have
to do a huge update later this week).
  - Typo fixes, submitted by Yann Cebron (?).
  
  Revision  ChangesPath
  1.17  +284 -35   jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- changelog.xml 21 Aug 2003 09:54:52 -  1.16
  +++ changelog.xml 2 Sep 2003 13:28:36 -   1.17
  @@ -13,6 +13,255 @@
   
   body
   
  +section name=Tomcat 5.0.10 (remm)
  +
  +  subsection name=General
  +
  +changelog
  +
  +  update
  +  JSP 2.0 specification updates, submitted by Mark Roth (kinman)
  +  /update
  +  update
  +  Servlet 2.4 schema update, submitted by Yutaka Yoshida (jfarcand)
  +  /update
  +  update
  +  Get ready for using JSR 160 RI (JMX Remote 1.0): copy additional, 
  +  optional, JMX binaries (remm)
  +  /update
  +  update
  +  Replace MX4J 1.1.1 with the Sun JMX 1.2 RI (remm)
  +  /update
  +
  +/changelog
  +
  +  /subsection
  +
  +  subsection name=Catalina
  +
  +changelog
  +
  +  add
  +  Add sessions and serverinfo tasks, submitted by Vivek Chopra (remm)
  +  /add
  +  fix
  +  Minor optimization: Avoid scanning duplicate JARs for TLDs (luehe)
  +  /fix
  +  update
  +  Expose the new connector properties in JMX (amyroh)
  +  /update
  +  fix
  +  Big JDBCRealm cleanup: fix for bug7116/bug, bug10623/bug,
  +  bug11929/bug, bug8091/bug, and make authenticate synchronized 
  +  since there are race conditions between the connection being opened, 
  +  used and exceptions occuring (funkman)
  +  /fix
  +  fix
  +  Simplifying the code by hiding the arrayCopy (billbarker)
  +  /fix
  +  fix
  +  bug22691/bug: Wrap getCanonicalFile in a try/catch (remm)
  +  /fix
  +  fix
  +  Reenable validation, using Xerces 2.1 instead of Xerces 2.5 (remm)
  +  /fix
  +  fix
  +  bug22698/bug: Restore RealmBase.main(), allowing to compute digests
  +  (remm)
  +  /fix
  +  fix
  +  bug22546/bug: Fix small filter extension mapping bug, where if the 
  +  extension of the request starts with the tested path, it would have 
  +  been matched (remm)
  +  /fix
  +  fix
  +  bug22695/bug: don't check for session validity when activating and 
  +  passivating (remm)
  +  /fix
  +  fix
  +  Do not create a new Subject everytime a Servlet/Filter is invoked, 
  +  associate the same Subject to the AccessControlContext (jfarcand)
  +  /fix
  +  update
  +  When saving server.xml, don't save the value of properties which have 
  +  their default values (remm)
  +  /update
  +  fix
  +  Release all logs associated with this CL when stopping the CL, and avoid
  +  NPE in toString after stop (remm)
  +  /fix
  +  fix
  +  Avoid references leak: ckean up and recycle all thread local resources, 
  +  and reset the context CL after invoking the pipeline (remm)
  +  /fix
  +  fix
  +  The request dispatcher should also not log a client abort exception
  +  (remm)
  +  /fix
  +  fix
  +  When saving server.xml, don't print the className if it's one of the 
  +  standard implementations, and add some fields to the exception list
  +  (remm)
  +  /fix
  +  fix
  +  Null out the reference to the resources when stopping the classloader
  +  (remm)
  +  /fix
  +  fix
  +  Don't save the config file attribute, as it is always useless, and don't
  +  indent context confug files (remm)
  +  /fix
  +  update
  +  Allow overriding the Host's unpackWARs using a new unpackWAR attribute on
  +  the Context element (remm)
  +  /update
  +  fix
  +  Include the patInfo when a relative path is used to get a request 
  +  dispatcher, submitted by Mark Thomas (remm)
  +  /fix
  +
  +/changelog
  +
  +  /subsection
  +
  +  subsection name=Cluster
  +
  +changelog
  +
  +  fix
  +  Set dirty flag gets set on setMaxInactiveInterval (fhanik)
  +  /fix
  +
  +/changelog
  +
  +  /subsection
  +
  +  subsection name=Coyote
  +
  +changelog
  +
  +  fix
  +  Also consider last element in comma-separated protocols list, or the 
  +  case where the list contains a single element and no commas (luehe)
  +  /fix
  +  fix
  +  Implement getAttribute(key) in the protocol (amyroh)
  +  /fix
  +  fix
  +  Make certain that we are still in an https session before looking for 
  +  

RE: [5.0.10] New build ?

2003-09-02 Thread Shapira, Yoav

Howdy,

 * commons-daemon: Needs a 1.0 release (any volunteers ?); needs
polish
 (display of log items in the console could probably be nicer, bug
18220).

Sort of running before you can walk here ;-).  Daemon needs to graduate
from
the sandbox before it can have a release.

Should we propose this promotion on commons-dev?  I think the need for a
stable dependency for tomcat 5 is enough to make a commons-proper
component out of commons-daemon, no?

Yoav Shapira



This e-mail, including any attachments, is a confidential business communication, and 
may contain information that is confidential, proprietary and/or privileged.  This 
e-mail is intended only for the individual(s) to whom it is addressed, and may not be 
saved, copied, printed, disclosed or used by anyone else.  If you are not the(an) 
intended recipient, please immediately delete this e-mail from your computer system 
and notify the sender.  Thank you.


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



Re: [5.0.10] New build ?

2003-09-02 Thread Remy Maucherat
Shapira, Yoav wrote:
Should we propose this promotion on commons-dev?  I think the need for a
stable dependency for tomcat 5 is enough to make a commons-proper
component out of commons-daemon, no?
+1.

Remy



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


cvs commit: jakarta-servletapi-5/jsr154/src/share/javax/servlet/http LocalStrings_ja.properties

2003-09-02 Thread remm
remm2003/09/02 07:09:32

  Modified:jsr154/src/share/javax/servlet LocalStrings_ja.properties
   jsr154/src/share/javax/servlet/http
LocalStrings_ja.properties
  Log:
  - Update Japanese translation, submitted by Kazuhiro Kazama.
  
  Revision  ChangesPath
  1.2   +2 -5  
jakarta-servletapi-5/jsr154/src/share/javax/servlet/LocalStrings_ja.properties
  
  Index: LocalStrings_ja.properties
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/LocalStrings_ja.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings_ja.properties13 Aug 2002 16:21:42 -  1.1
  +++ LocalStrings_ja.properties2 Sep 2003 14:09:31 -   1.2
  @@ -1,9 +1,6 @@
   # Default localized string information
  -# Localized for Locale en_US
  +# Localized for Locale ja_JP
   
  -# err.not_iso8859_1=Not an ISO 8859-1 character: {0}
  -err.not_iso8859_1=\u6587\u5b57 {0} \u306f ISO 8859-1 
\u6587\u5b57\u30bb\u30c3\u30c8\u306e\u6587\u5b57\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
  -# value.true=true
  +err.not_iso8859_1=ISO 8859-1 
\u306e\u6587\u5b57\u3067\u306f\u3042\u308a\u307e\u305b\u3093: {0}
   value.true=true
  -# value.false=false
   value.false=false
  
  
  
  1.2   +8 -16 
jakarta-servletapi-5/jsr154/src/share/javax/servlet/http/LocalStrings_ja.properties
  
  Index: LocalStrings_ja.properties
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/http/LocalStrings_ja.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings_ja.properties13 Aug 2002 16:21:45 -  1.1
  +++ LocalStrings_ja.properties2 Sep 2003 14:09:31 -   1.2
  @@ -1,21 +1,13 @@
   # Default localized string information
  -# Localized for Locale en_US
  +# Localized for Locale ja_JP
   
  -# err.cookie_name_is_token=Cookie name {0} is a reserved token
  -err.cookie_name_is_token=cookie \u540d {0} 
\u306f\u4e88\u7d04\u3055\u308c\u305f\u30c8\u30fc\u30af\u30f3\u3067\u3059\u3002
  -# err.io.negativelength=Negative Length given in write method
  
-err.io.negativelength=\u66f8\u304d\u8fbc\u307f\u30e1\u30bd\u30c3\u30c9\u3067\u8ca0\u306e\u9577\u3055\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002
  -# err.io.short_read=Short Read
  +err.cookie_name_is_token=\u30af\u30c3\u30ad\u30fc\u540d \{0}\ 
\u306f\u4e88\u7d04\u6e08\u306e\u30c8\u30fc\u30af\u30f3\u3067\u3059\u3002
  
+err.io.negativelength=write\u30e1\u30bd\u30c3\u30c9\u306b\u8ca0\u306e\u9577\u3055\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002
   
err.io.short_read=\u8aad\u307f\u8fbc\u307f\u304c\u3059\u3050\u306b\u7d42\u308f\u308a\u307e\u3057\u305f\u3002
   
  -# http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not 
supported by the Servlet API 
  -http.method_not_implemented=\u30e1\u30bd\u30c3\u30c9 {0} \u306f RFC 2068 
\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
 API 
\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  +http.method_not_implemented=\u30e1\u30bd\u30c3\u30c9 {0} \u306fRFC 
2068\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8API\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
   
  -# http.method_get_not_supported=HTTP method GET is not supported by this URL
  -http.method_get_not_supported=HTTP \u306e GET 
\u30e1\u30bd\u30c3\u30c9\u306f\u3053\u306e URL 
\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  -# http.method_post_not_supported=HTTP method POST is not supported by this URL
  -http.method_post_not_supported=HTTP \u306e POST 
\u30e1\u30bd\u30c3\u30c9\u306f\u3053\u306e URL 
\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  -# http.method_put_not_supported=HTTP method PUT is not supported by this URL
  -http.method_put_not_supported=HTTP \u306e PUT 
\u30e1\u30bd\u30c3\u30c9\u306f\u3053\u306e URL 
\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  -# http.method_delete_not_supported=Http method DELETE is not supported by this URL
  -http.method_delete_not_supported=HTTP \u306e DELETE 
\u30e1\u30bd\u30c3\u30c9\u306f\u3053\u306e URL 
\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  
+http.method_get_not_supported=HTTP\u306eGET\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  
+http.method_post_not_supported=HTTP\u306ePOST\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  

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

2003-09-02 Thread remm
remm2003/09/02 07:09:47

  Modified:catalina/src/share/org/apache/catalina/authenticator
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/core
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/loader
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/logger
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/realm
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/servlets
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/session
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/startup
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/users
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/util
LocalStrings_ja.properties
   catalina/src/share/org/apache/catalina/valves
LocalStrings_ja.properties
   catalina/src/share/org/apache/coyote/tomcat5
LocalStrings_ja.properties
   catalina/src/share/org/apache/naming
LocalStrings_ja.properties
   catalina/src/share/org/apache/naming/resources
LocalStrings_ja.properties
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_ja.properties
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
LocalStrings_ja.properties
  Log:
  - Update Japanese translation, submitted by Kazuhiro Kazama.
  
  Revision  ChangesPath
  1.3   +4 -4  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_ja.properties.diff?r1=1.2r2=1.3
  
  
  1.4   +35 -31
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties.diff?r1=1.3r2=1.4
  
  
  1.3   +3 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_ja.properties.diff?r1=1.2r2=1.3
  
  
  1.2   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LocalStrings_ja.properties.diff?r1=1.1r2=1.2
  
  
  1.4   +5 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties.diff?r1=1.3r2=1.4
  
  
  1.5   +4 -4  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties.diff?r1=1.4r2=1.5
  
  
  1.4   +13 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties.diff?r1=1.3r2=1.4
  
  
  1.3   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties.diff?r1=1.2r2=1.3
  
  
  1.2   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/LocalStrings_ja.properties.diff?r1=1.1r2=1.2
  
  
  1.2   +7 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/LocalStrings_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/LocalStrings_ja.properties.diff?r1=1.1r2=1.2
  
  
  1.2   +5 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_ja.properties
  
  

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security LocalStrings_ja.properties

2003-09-02 Thread remm
remm2003/09/02 07:10:11

  Added:   catalina/src/share/org/apache/catalina/security
LocalStrings_ja.properties
  Log:
  - Update Japanese translation, submitted by Kazuhiro Kazama.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security/LocalStrings_ja.properties
  
  Index: LocalStrings_ja.properties
  ===
  
SecurityUtil.doAsPrivilege=PrivilegedExceptionAction\u30d6\u30ed\u30c3\u30af\u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
  
  
  
  

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



cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/res LocalStrings_ja.properties

2003-09-02 Thread remm
remm2003/09/02 07:11:53

  Modified:coyote/src/java/org/apache/coyote/tomcat4
LocalStrings_ja.properties
   http11/src/java/org/apache/coyote/http11
LocalStrings_ja.properties
   jk/java/org/apache/ajp/tomcat4 LocalStrings_ja.properties
   naming/src/org/apache/naming/res LocalStrings_ja.properties
  Log:
  - Update Japanese translation, submitted by Kazuhiro Kazama.
  
  Revision  ChangesPath
  1.3   +8 -8  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/LocalStrings_ja.properties
  
  Index: LocalStrings_ja.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/LocalStrings_ja.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings_ja.properties4 Mar 2003 17:26:32 -   1.2
  +++ LocalStrings_ja.properties2 Sep 2003 14:11:53 -   1.3
  @@ -3,8 +3,8 @@
   # CoyoteConnector
   #
   
  
-coyoteConnector.alreadyInitialized=\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059
  
-coyoteConnector.alreadyStarted=\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
  
+coyoteConnector.alreadyInitialized=\u30b3\u30cd\u30af\u30bf\u306f\u65e2\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059
  
+coyoteConnector.alreadyStarted=\u30b3\u30cd\u30af\u30bf\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
   
coyoteConnector.notStarted=Coyote\u30b3\u30cd\u30af\u30bf\u306f\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
   
coyoteConnector.protocolHandlerDestroyFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u5ec3\u68c4\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
 {0}
   
coyoteConnector.protocolHandlerInitializationFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
 {0}
  @@ -15,24 +15,24 @@
   # CoyoteAdapter
   #
   
  
-coyoteAdapter.service=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30b3\u30cd\u30af\u30bf\u3067\u4f8b\u5916\u307e\u305f\u306f\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
  
+coyoteAdapter.service=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30b3\u30cd\u30af\u30bf\u3067\u4f8b\u5916\u53c8\u306f\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
   
   #
   # CoyoteResponse
   #
   
  
-coyoteResponse.getOutputStream.ise=getWriter()\u306f\u3053\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u306b\u5bfe\u3057\u3066\u3059\u3067\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
  
-coyoteResponse.getWriter.ise=getOutputStream()\u306f\u3053\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u306b\u5bfe\u3057\u3066\u3059\u3067\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
  
+coyoteResponse.getOutputStream.ise=getWriter()\u306f\u3053\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u306b\u5bfe\u3057\u3066\u65e2\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
  
+coyoteResponse.getWriter.ise=getOutputStream()\u306f\u3053\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u306b\u5bfe\u3057\u3066\u65e2\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
   
coyoteResponse.resetBuffer.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u5f8c\u3067\u30d0\u30c3\u30d5\u30a1\u3092\u30ea\u30bb\u30c3\u30c8\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
   
coyoteResponse.sendError.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u5f8c\u3067sendError()\u3092\u547c\u3073\u51fa\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
   
coyoteResponse.sendRedirect.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u5f8c\u3067sendRedirect()\u3092\u547c\u3073\u51fa\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
  
-coyoteResponse.setBufferSize.ise=\u30c7\u30fc\u30bf\u304c\u3059\u3067\u306b\u66f8\u304d\u8fbc\u307e\u308c\u305f\u5f8c\u3067\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
  
+coyoteResponse.setBufferSize.ise=\u30c7\u30fc\u30bf\u304c\u65e2\u306b\u66f8\u304d\u8fbc\u307e\u308c\u305f\u5f8c\u3067\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
   
   #
   # CoyoteRequest
   #
   
  
-coyoteRequest.getInputStream.ise=getReader()\u306f\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5bfe\u3057\u3066\u3059\u3067\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
  
-coyoteRequest.getReader.ise=getInputStream()\u306f\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5bfe\u3057\u3066\u3059\u3067\u306b\u547c\u3073\u51fa\u3055\u308c\u3066\u3044\u307e\u3059
  

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_ja.properties

2003-09-02 Thread remm
remm2003/09/02 07:12:04

  Modified:jasper2/src/share/org/apache/jasper/resources
messages_ja.properties
  Log:
  - Update Japanese translation, submitted by Kazuhiro Kazama.
  
  Revision  ChangesPath
  1.46  +115 -70   
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
  
  Index: messages_ja.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- messages_ja.properties15 Aug 2003 00:06:10 -  1.45
  +++ messages_ja.properties2 Sep 2003 14:12:04 -   1.46
  @@ -11,6 +11,10 @@
   jsp.message.scratch.dir.is=JSP\u30a8\u30f3\u30b8\u30f3\u306eScratchdir: {0}
   jsp.message.parent_class_loader_is=\u89aa\u30af\u30e9\u30b9\u30ed\u30fc\u30c0: {0}
   jsp.message.dont.modify.servlets=\u91cd\u8981: 
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
  
+jsp.error.nojavac=\n\nJSP\u306e\u305f\u3081\u306e\u751f\u6210\u3055\u308c\u305f\u30bd\u30fc\u30b9\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u3059\u308bJava\u30b3\u30f3\u30d1\u30a4\u30e9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\
  
+\n\u901a\u5e38\u306f\u3053\u308c\u306fJDK\u304b\u3089$JAVA_HOME/lib/tools.jar\u3092Tomcat\u30b5\u30fc\u30d0\u306ecommon/lib\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\
  
+\n\u306b\u624b\u3067\u30b3\u30d4\u30fc\u3057\u3066\uff0cTomcat\u3092\u518d\u8d77\u52d5\u3059\u308c\u3070\u89e3\u6c7a\u3055\u308c\u307e\u3059\u3002\
  
+\n\u5225\u306eJava\u30b3\u30f3\u30d1\u30a4\u30e9\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u305d\u306e\u8a2d\u5b9a\u3068\u30a2\u30af\u30bb\u30b9\u30d1\u30b9\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
   jsp.error.not.impl.comments=\u5185\u90e8\u30a8\u30e9\u30fc: 
Comments\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
   jsp.error.not.impl.directives=\u5185\u90e8\u30a8\u30e9\u30fc: 
Directives\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
   jsp.error.not.impl.declarations=\u5185\u90e8\u30a8\u30e9\u30fc: 
Declarations\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
  @@ -29,21 +33,40 @@
   
jsp.error.usebean.prohibited.as.session=\u4ee5\u524d\u306b\u5b9a\u7fa9\u3057\u305fJSP\u6307\u793a\u5b50\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u3001session
 bean {0} \u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093:
   jsp.error.usebean.not.both=useBean: 
class\u5c5e\u6027\u3068beanName\u5c5e\u6027\u306e\u4e21\u65b9\u3092\u540c\u6642\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093:
   jsp.error.usebean.bad.type.cast=useBean ({0}): type ({1}) \u306fclass ({2}) 
\u304b\u3089\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093
  
-jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
 {0} 
(\page\\u3001\request\\u3001\session\\u307e\u305f\u306f\application\\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
  
+jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
 {0} 
(\page\\u3001\request\\u3001\session\\u53c8\u306f\application\\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
   
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
   jsp.warning.bad.type=\u8b66\u544a: 
.class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
   
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
  -#Page directive: invalid value for pageEncoding
  -jsp.error.page.invalid.contenttype=Page\u6307\u793a\u5b50: 
contentType\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.session=Page\u6307\u793a\u5b50: 
session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.buffer=Page\u6307\u793a\u5b50: 
buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.autoflush=Page\u6307\u793a\u5b50: 
autoFlush\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.isthreadsafe=Page\u6307\u793a\u5b50: 
isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.info=Page\u6307\u793a\u5b50: 
info\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.invalid.iserrorpage=Page\u6307\u793a\u5b50: 
isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
  -jsp.error.page.defafteruse.language=Page\u6307\u793a\u5b50: 
scriptlet\u306e\u5f8c\u3067language\u5c5e\u6027\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
  

DO NOT REPLY [Bug 22869] New: - under liveDeploy a webapp may throw an exception on restart. if some files are soft links

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22869.
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=22869

under liveDeploy a webapp may throw an exception on restart. if some files are soft 
links

   Summary: under liveDeploy a webapp may throw an exception on
restart. if some files are soft links
   Product: Tomcat 4
   Version: 4.1.27
  Platform: All
OS/Version: Other
Status: NEW
  Severity: Minor
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


With the allowLinking set to true for example:

Context path= docBase=../blah
Resources className=org.apache.naming.resources.FileDirContext  
allowLinking=true/
/Context

Then if the web.xml is touch the subsequest restart of the webapp will
throw.
Reason: During the stop the FileDirContext.release() method is called.
resetting allowLinking to false (via StandardContext.resourcesStop() method)
Once restarted any links are not followed and the system startup will fail.

Solution: ? clearer semantics on what stopping means. Should 
release() be split into two methods release() and reset(). Currently
I've just commented-out the resetting of the allowLinking and caseSesitive
flags.

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



[PATCH] Bug 22823 Minor documentation update

2003-09-02 Thread Mark Thomas
Patch for bug 22823 is below. Need to make sure that 
http://jakarta.apache.org/tomcat/tomcat-4.1-doc/README.txt is also updated.

Whilst looking at this I noticed that the nightly build directory is empty. Is 
this correct or has it moved? Either way the readme should be updated to 
reflect the current status of the nightly builds as well.

Mark

Index: README.txt
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/README.txt,v
retrieving revision 1.20
diff -u -r1.20 README.txt
--- README.txt  8 Jan 2003 03:50:26 -   1.20
+++ README.txt  1 Sep 2003 17:51:25 -
@@ -59,8 +59,15 @@

 Release Builds of Tomcat 4.1 are created and released periodically, and
 announced to the interested mailing lists.  Each release build resides in its
-own directories.  For example, the Tomcat 4.1.18 release is available at:
+own directories.

-Binary: 
 http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.1.18/bin/
-Source:  http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.1.1  
8/src/
+The latest release may be found at:
+http://www.apache.org/dist/jakarta/tomcat-4/binaries/
+
+Previous releases may be found at:
+http://jakarta.apache.org/builds/jakarta-tomcat-4.0/archives/
+
+For example, the Tomcat 4.1.18 release is available at:
+Binary: 
 http://jakarta.apache.org/builds/jakarta-tomcat-4.0/archives/v4.1.18/bin/
+Source: 
 http://jakarta.apache.org/builds/jakarta-tomcat-4.0/archives/v4.1.18/src/
 


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



DO NOT REPLY [Bug 21225] - Tag Lib is not working properly with TomCat 4.1.24 but its working fine on TomCat 4.0.3

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21225.
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=21225

Tag Lib is not working properly with TomCat 4.1.24 but its working fine on TomCat 4.0.3





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 18:37 ---
Try to disable TagPooling in $TOMCAT_INSTALL/conf/web.xml (a new feature for 
4.1.x) to see if the tag then works again. Otherwise, please provide a complete 
example with the sources of the tag(s).

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



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

2003-09-02 Thread remm
remm2003/09/02 11:47:54

  Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
  Log:
  - Deploy descriptors even if deployOnStartup is false, as they should be considered
as if they were part of server.xml (IMO).
  
  Revision  ChangesPath
  1.23  +12 -4 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- HostConfig.java   17 Aug 2003 08:32:53 -  1.22
  +++ HostConfig.java   2 Sep 2003 18:47:54 -   1.23
  @@ -1006,6 +1006,14 @@
   
   if (host.getDeployOnStartup()) {
   deployApps();
  +} else {
  +// Deploy descriptors anyway (it should be equivalent to being
  +// part of server.xml)
  +File configBase = configBase();
  +if (configBase.exists()  configBase.isDirectory()) {
  +String configFiles[] = configBase.list();
  +deployDescriptors(configBase, configFiles);
  +}
   }
   
   }
  
  
  

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



DO NOT REPLY [Bug 20991] - Connection Pool : Datasource cannot retrieve connection.

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20991.
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=20991

Connection Pool : Datasource cannot retrieve connection.





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 17:12 ---
This happens whenever the ValidationQuery is empty.
It keeps on connecting and trying to send this query.
There should be a check at this point to avoid sending a validation
query that contains something like /\ *;\ */

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



DO NOT REPLY [Bug 22039] - client-side javascript, struts, frames, multi-action function

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22039.
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=22039

client-side javascript, struts, frames, multi-action function

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 18:17 ---
This is not likely a bug with Tomcat, bug rather a browser/JS/Struts issue. 
Please verify this problem exists *only* when using Tomcat as server before 
reopening.

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



DO NOT REPLY [Bug 22058] - incorrect JSP compilation

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22058.
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=22058

incorrect JSP compilation

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 18:23 ---
The codes generated from the latest nightly build does not contain a reference
to _jspx_push_body_count_b_forEach_0 in invoke0, and the page was successfully
compiled, so I consider this bug fixed.  You can verify that with 5.0.9.

However at request tim, I did get a ClassCastException on
templater.jsp.tag.FileTag.doTag(FileTag.java:20)

  TemplatePageContext ctx = (TemplatePageContext) getJspContext();

but that's in your code.

Next time you should provide a war file; that'll let me get to debugging
quicker.

Also, you should use jstl 1.1 instead of jstl 1.0.

-
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 JspFactoryImpl.java

2003-09-02 Thread luehe
luehe   2003/09/02 13:41:00

  Modified:jasper2/src/share/org/apache/jasper/runtime
JspFactoryImpl.java
  Log:
  Fixed Bugtraq 4863026 (JSP error page mechanism fails intermittently
  to display contents of error page)
  
  Problem was caused by the fact that one of the tests in the suite
  (JspFactoryTest.jsp) released a custom page context (of type
  com.sun.ts.tests.jsp.common.util.SimpleContext), like this:
  
SimpleContext context = new SimpleContext();
factory.releasePageContext(context);
  
  The implementation of
  org.apache.jasper.runtime.JspFactoryImpl.releasePageContext would add
  the page context back to the pool of page contexts. Page contexts
  would be retrieved from the pool as follows:
  
pc = (PageContextImpl) pool.get()
  
  Clearly, if the page context returned was an instance of
  com.sun.ts.tests.jsp.common.util.SimpleContext, the above assignment
  would result in a ClassCastException.
  
  The fix is to return only those page contexts that are instances of
  org.apache.jasper.runtime.PageContextImpl to the pool, since we don't
  have any control over the implementation of custom page contexts
  
  Revision  ChangesPath
  1.4   +6 -6  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
  
  Index: JspFactoryImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspFactoryImpl.java   22 Jan 2003 21:13:51 -  1.3
  +++ JspFactoryImpl.java   2 Sep 2003 20:41:00 -   1.4
  @@ -139,12 +139,12 @@
   try {
PageContext pc;
if( USE_POOL ) {
  - pc=(PageContextImpl)pool.get();
  +pc = (PageContext) pool.get();
if( pc == null ) {
pc= new PageContextImpl(this);
}
} else {
  - pc =  new PageContextImpl(this);
  + pc = new PageContextImpl(this);
}
pc.initialize(servlet, request, response, errorPageURL, 
 needsSession, bufferSize, autoflush);
  @@ -158,7 +158,7 @@
   
   private void internalReleasePageContext(PageContext pc) {
   pc.release();
  - if( USE_POOL) {
  + if (USE_POOL  (pc instanceof PageContextImpl)) {
pool.put( pc );
}
   }
  
  
  

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



DO NOT REPLY [Bug 22848] - [PATCH] Fix typos/grammar in changelog.html

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22848.
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=22848

[PATCH] Fix typos/grammar in changelog.html

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 13:41 ---
I have applied you patch. Thanks.

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 20:48 ---
This probably needs clarification from the spec.

By doing a replace('$', '.'), we are assuming that any class name containing a
'$' is reference to an inner class, but this is not necessarily so.  I can
certainly define $foo to be my (non-inner) tag handler class.

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



[PATCH] CGI Servlet bugs

2003-09-02 Thread Mark Thomas
Below is a patch for bug 22857, bug 22858 and one additional issue I found 
whilst looking at the other issues. I am concerned that the patch may only work 
on windows platforms and would appreciate it if someone with non-Windows 
knowledge could review this patch.

I have included TC5 and TC4 patches.

Mark

Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali  
na/servlets/CGIServlet.java,v
retrieving revision 1.5
diff -u -r1.5 CGIServlet.java
--- catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 22 Nov 2002 
22:26:08 -  1.5
+++ catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2 Sep 2003 
20:31:03 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {

 /*
  * This method is slightly ugly; c'est la vie.
@@ -1109,7 +1109,9 @@
 }
 }

-command = sCGIFullPath;
+File fCGIFullPath = new File(sCGIFullPath);
+command = fCGIFullPath.getCanonicalPath();
+
 envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks

 this.env = envp;
@@ -1550,17 +1552,19 @@

 //create query arguments
 Enumeration paramNames = params.keys();
-StringBuffer cmdAndArgs = new StringBuffer(command);
+StringBuffer cmdAndArgs = new StringBuffer(\ + command + \);
 if (paramNames != null  paramNames.hasMoreElements()) {
 cmdAndArgs.append( );
 while (paramNames.hasMoreElements()) {
 String k = (String) paramNames.nextElement();
 String v = params.get(k).toString();
 if ((k.indexOf(=)  0)  (v.indexOf(=)  0)) {
+cmdAndArgs.append(\);
 cmdAndArgs.append(k);
 cmdAndArgs.append(=);
 v = java.net.URLEncoder.encode(v);
 cmdAndArgs.append(v);
+cmdAndArgs.append(\);
 cmdAndArgs.append( );
 }
 }
@@ -1573,11 +1577,9 @@
 env.put(CONTENT_LENGTH, new Integer(contentLength));
 }*/

-if (command.endsWith(.pl) || command.endsWith(.cgi)) {
 StringBuffer perlCommand = new StringBuffer(perl );
 perlCommand.append(cmdAndArgs.toString());
 cmdAndArgs = perlCommand;
-}

 rt = Runtime.getRuntime();
 proc = rt.exec(cmdAndArgs.toString(), hashToStringArray(env), wd);



Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/se  
rvlets/CGIServlet.java,v
retrieving revision 1.11
diff -u -r1.11 CGIServlet.java
--- catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 4 Dec 2002 
21:09:07 -  1.11
+++ catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2 Sep 2003 
19:31:10 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {

 /*
  * This method is slightly ugly; c'est la vie.
@@ -1114,7 +1114,9 @@
 }
 }

-command = sCGIFullPath;
+File fCGIFullPath = new File(sCGIFullPath);
+command = fCGIFullPath.getCanonicalPath();
+
 envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks

 this.env = envp;
@@ -1555,17 +1557,19 @@

 //create query arguments
 Enumeration paramNames = params.keys();
-

DO NOT REPLY [Bug 22857] New: - Spaces in Tomcat install directory name causes CGI failure

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22857.
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=22857

Spaces in Tomcat install directory name causes CGI failure 

   Summary: Spaces in Tomcat install directory name causes CGI
failure
   Product: Tomcat 4
   Version: 4.0.4 Final
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlets:CGI
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If the Tomcat default install directory is used on Windows (NT/W2k/XP) the 
default name causes CGI scripts not to function. 
The default install name for Tomcat is:
drive:\Program Files\Apache Tomcat 4.0\
In our case the install name is:
drive:\soft\AR2\Apache Tomcat 4.0\

If a CGI script that uses Perl is used within this installation the result from 
the CGI is output on the web page. The result on the web page is:
Can't open perl script drive:\soft\AR2\Apache: No such file or directory

The message contains the installation directory name for Tomcat up to the first 
blank character. 
The CGI path name once evaluated by Tomcat is:
drive:\soft\AR2\Apache Tomcat 4.0\webapps\adaptive\WEB-INF\Cgi\exp.cgi

There does not seem to be a way to change this behaviour in the standard Tomcat 
product.

Other information is available on request. I have the CGI script and all the 
log files.

Thank you

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



cvs commit: jakarta-servletapi-5/jsr154/src/share/javax/servlet/http HttpServletResponseWrapper.java HttpServletResponse.java HttpSessionBindingEvent.java Cookie.java

2003-09-02 Thread remm
remm2003/09/02 14:14:10

  Modified:jsr152/src/share/javax/servlet/jsp/tagext
TryCatchFinally.java TagSupport.java
BodyTagSupport.java
   jsr154/src/share/javax/servlet ServletResponse.java
FilterConfig.java ServletRequest.java
ServletResponseWrapper.java ServletContext.java
ServletRequestWrapper.java
   jsr152/src/share/javax/servlet/jsp/el ELException.java
Expression.java ELParseException.java
ExpressionEvaluator.java
   jsr154/src/share/javax/servlet/http
HttpServletResponseWrapper.java
HttpServletResponse.java
HttpSessionBindingEvent.java Cookie.java
  Log:
  - Fix bad imports (thanks to Eclipse). Let me know if I broke something.
  
  Revision  ChangesPath
  1.3   +0 -1  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TryCatchFinally.java
  
  Index: TryCatchFinally.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TryCatchFinally.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TryCatchFinally.java  29 Jan 2003 21:42:13 -  1.2
  +++ TryCatchFinally.java  2 Sep 2003 21:14:10 -   1.3
  @@ -55,7 +55,6 @@

   package javax.servlet.jsp.tagext;
   
  -import javax.servlet.jsp.*;
   
   
   /**
  
  
  
  1.5   +4 -8  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java
  
  Index: TagSupport.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TagSupport.java   8 Nov 2002 21:30:21 -   1.4
  +++ TagSupport.java   2 Sep 2003 21:14:10 -   1.5
  @@ -54,16 +54,12 @@
*/
   package javax.servlet.jsp.tagext;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -
  -import javax.servlet.*;
  -
  -import java.io.Writer;
   import java.io.Serializable;
  -
  -import java.util.Hashtable;
   import java.util.Enumeration;
  +import java.util.Hashtable;
  +
  +import javax.servlet.jsp.JspException;
  +import javax.servlet.jsp.PageContext;
   
   /**
* A base class for defining new tag handlers implementing Tag.
  
  
  
  1.4   +2 -8  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java
  
  Index: BodyTagSupport.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BodyTagSupport.java   29 Oct 2002 01:18:12 -  1.3
  +++ BodyTagSupport.java   2 Sep 2003 21:14:10 -   1.4
  @@ -54,14 +54,8 @@
*/
   package javax.servlet.jsp.tagext;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -
  -import javax.servlet.*;
  -
  -import java.io.Writer;
  -
  -import java.util.Hashtable;
  +import javax.servlet.jsp.JspException;
  +import javax.servlet.jsp.JspWriter;
   
   /**
* A base class for defining tag handlers implementing BodyTag.
  
  
  
  1.5   +0 -1  
jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletResponse.java
  
  Index: ServletResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletResponse.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletResponse.java  18 Aug 2003 16:50:33 -  1.4
  +++ ServletResponse.java  2 Sep 2003 21:14:10 -   1.5
  @@ -62,7 +62,6 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.io.UnsupportedEncodingException;
   import java.util.Locale;
   
   
  
  
  
  1.3   +0 -1  
jakarta-servletapi-5/jsr154/src/share/javax/servlet/FilterConfig.java
  
  Index: FilterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/FilterConfig.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilterConfig.java 18 Aug 2003 16:50:33 -  1.2
  +++ FilterConfig.java 2 Sep 2003 21:14:10 -   1.3
  @@ -62,7 +62,6 @@
   package javax.servlet;
   
   
  -import java.util.Iterator;
   import java.util.Enumeration;
   
 /** 
  
  
  
  1.7   +0 -1  
jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequest.java
  
  Index: ServletRequest.java
  

DO NOT REPLY [Bug 22858] - CGI scripts without a file suffix causes Error=193

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22858.
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=22858

CGI scripts without a file suffix causes Error=193

[EMAIL PROTECTED] changed:

   What|Removed |Added

Product|Tomcat 4|Tomcat 5
Version|4.0.4 Final |Nightly Build



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 21:20 ---
Confirmed. This is also an issue with TC5.

The CGI servlet includes a test for .pl and .cgi. Any other suffix 
(including none) will fail.

I have posted patches for TC4 and TC5 to the tomcat-dev list. The patches are 
tested with XP and should work with NT/2000.

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



DO NOT REPLY [Bug 22858] New: - CGI scripts without a file suffix causes Error=193

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22858.
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=22858

CGI scripts without a file suffix causes Error=193

   Summary: CGI scripts without a file suffix causes Error=193
   Product: Tomcat 4
   Version: 4.0.4 Final
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlets:CGI
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If you create or use a Perl CGI script that does not use a file suffix 
(IE. .cgi) then the CGI servlet within Tomcat generates error=193. 

The solution is to rename the CGI with a .cgi file extension. Making this 
change though requires that all HTML pages that refer to the CGI must be 
changed to reference the new CGI file name. 

The CGI script without a file extension works correctly in Apache.

The path references have been modified.
The error log output is:
In the log file localhost_log.date.txt:
2003-08-14 11:42:23 cgi: findCGI: path=/xml-mg-search, drive:\soft\AR2\Apache 
Tomcat 4.0\webapps\ROOT\WEB-INF/cgi
2003-08-14 11:42:23 cgi: findCGI: currentLoc=drive:\soft\AR2\Apache Tomcat 4.0
\webapps\ROOT\WEB-INF\cgi
2003-08-14 11:42:23 cgi: findCGI: currentLoc=drive:\soft\AR2\Apache Tomcat 4.0
\webapps\ROOT\WEB-INF\cgi
2003-08-14 11:42:23 cgi: findCGI: FOUND cgi at Drive:\soft\AR2\Apache Tomcat 
4.0\webapps\ROOT\WEB-INF\cgi\xml-mg-search
2003-08-14 11:42:23 cgi: findCGI calc: name=xml-mg-search, 
path=Drive:\soft\AR2\Apache Tomcat 4.0\webapps\ROOT\WEB-INF\cgi\xml-mg-
search, scriptname=/cgi-bin\xml-mg-search, cginame=\xml-mg-search
2003-08-14 11:42:23 cgi: runCGI(envp=[{HTTP_USER_AGENT=Java1.3.1_05, 
REQUEST_METHOD=GET, AUTH_TYPE=, SERVER_NAME=localhost, SERVER_SOFTWARE=TOMCAT, 
HTTP_HOST=localhost, GATEWAY_INTERFACE=CGI/1.1, 
X_TOMCAT_SCRIPT_PATH=Drive:\soft\AR2\Apache Tomcat 4.0\webapps\ROOT\WEB-
INF\cgi\xml-mg-search, REMOTE_ADDR=127.0.0.1, SERVER_PROTOCOL=HTTP/1.1, 
PATH_INFO=, REMOTE_HOST=localhost, QUERY_STRING=cgi=http%3A%2F%2Flocalhost%
2Fcgi-bin%2Fxml-mg-searchsid=0app=%2Fadaptivelaf=%
2FBBLxsl=search.xslclslist=vc=Gu006UREP40d013CodingSchemess003RSMr010RSM_Obje
ct%
3AV02aa3dquery=visay=0x=0pa=Gu006UREP40d013CodingSchemess003RSMr010RSM_O
bject%3AV02aa69attrlist=rid=CodingSchemesbs=10mgdb=CodingSchemes, 
HTTP_CONNECTION=keep-alive, SERVER_PORT=80, CONTENT_TYPE=, CONTENT_LENGTH=, 
HTTP_ACCEPT=text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2, 
SCRIPT_NAME=/cgi-bin\xml-mg-search, REMOTE_USER=, REMOTE_IDENT=}], 
command=Drive:\soft\AR2\Apache Tomcat 4.0\webapps\ROOT\WEB-INF\cgi\xml-mg-
search)
2003-08-14 11:42:23 StandardWrapperValve[cgi]: Servlet.service() for servlet 
cgi threw exception
java.io.IOException: CreateProcess: Drive:\soft\AR2\Apache Tomcat 4.0
\webapps\ROOT\WEB-INF\cgi\xml-mg-search cgi=http%253A%252F%252Flocalhost%
252Fcgi-bin%252Fxml-mg-search sid=0 app=%252Fadaptive laf=%252FBBL 
xsl=search.xsl clslist= vc=Gu006UREP40d013CodingSchemess003RSMr010RSM_Object%
253AV02aa3d query=visa y=0 x=0 
pa=Gu006UREP40d013CodingSchemess003RSMr010RSM_Object%253AV02aa69 attrlist= 
rid=CodingSchemes bs=10 mgdb=CodingSchemes error=193
at java.lang.Win32Process.create(Native Method)
at java.lang.Win32Process.init(Win32Process.java:61)
at java.lang.Runtime.execInternal(Native Method)
at java.lang.Runtime.exec(Runtime.java:546)
at java.lang.Runtime.exec(Runtime.java:413)
at org.apache.catalina.servlets.CGIServlet$CGIRunner.run
(CGIServlet.java:1585)
at org.apache.catalina.servlets.CGIServlet.doGet(CGIServlet.java:635)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:740)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter
(ApplicationFilterChain.java:247)
at org.apache.catalina.core.ApplicationFilterChain.doFilter
(ApplicationFilterChain.java:193)
at org.apache.catalina.core.StandardWrapperValve.invoke
(StandardWrapperValve.java:243)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943)
at org.apache.catalina.core.StandardContextValve.invoke
(StandardContextValve.java:190)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943)
at 

DO NOT REPLY [Bug 22857] - Spaces in Tomcat install directory name causes CGI failure

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22857.
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=22857

Spaces in Tomcat install directory name causes CGI failure

[EMAIL PROTECTED] changed:

   What|Removed |Added

Product|Tomcat 4|Tomcat 5
Summary|Spaces in Tomcat install|Spaces in Tomcat install
   |directory name causes CGI   |directory name causes CGI
   |failure |failure
Version|4.0.4 Final |Nightly Build



--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 21:16 ---
Confirmed. This is also an issue with TC5.

The problem is that the space character is used to delimit parameters passed 
to the perl interpreter. If the path to the perl script includes a space then 
the interpreter assumes the path is shorter than it really is.

I have posted proposed patches for TC4 and TC5 that work with Windows XP and 
should work with NT and 2000 to the tomcat-dev list.

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



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger FileLogger.java LoggerBase.java

2003-09-02 Thread remm
remm2003/09/02 14:22:06

  Modified:catalina/src/share/org/apache/coyote/tomcat5
OutputBuffer.java CoyoteRequestFacade.java
CoyoteWriter.java CoyoteServerSocketFactory.java
CoyoteInputStream.java CoyoteAdapter.java
InputBuffer.java CoyoteOutputStream.java
CoyoteConnector.java CoyoteResponse.java
CoyoteResponseFacade.java
   catalina/src/share/org/apache/naming ResourceLinkRef.java
ContextAccessController.java ResourceRef.java
NamingContextBindingsEnumeration.java
StringManager.java JndiPermission.java
NamingContextEnumeration.java ResourceEnvRef.java
TransactionRef.java EjbRef.java
   catalina/src/share/org/apache/catalina/startup
ContextRuleSet.java SetDocBaseRule.java
Bootstrap.java TldRuleSet.java
ClassLoaderFactory.java NamingRuleSet.java
EngineConfig.java UserConfig.java
ContextConfig.java Tool.java EngineRuleSet.java
HostRuleSet.java TldConfig.java HostConfig.java
Embedded.java
   catalina/src/share/org/apache/catalina/ant UndeployTask.java
ResourcesTask.java JMXQueryTask.java
SessionsTask.java InstallTask.java ReloadTask.java
StartTask.java ValidatorTask.java DeployTask.java
ListTask.java StopTask.java RolesTask.java
ServerinfoTask.java JMXSetTask.java RemoveTask.java
   catalina/src/share/org/apache/catalina/session
StandardSession.java StandardSessionFacade.java
FileStore.java StoreBase.java JDBCStore.java
ManagerBase.java
   catalina/src/share/org/apache/catalina/ssi SSIConfig.java
ResponseIncludeWrapper.java SSIFlastmod.java
SSIExec.java SSICommand.java SSIProcessor.java
SSIInclude.java SSIServletExternalResolver.java
SSIMediator.java SSIServlet.java
ByteArrayServletOutputStream.java
SSIExternalResolver.java
   catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java RoleMBean.java
StandardContextMBean.java StandardServiceMBean.java
ContextResourceLinkMBean.java UserMBean.java
MBeanFactory.java StandardEngineMBean.java
GroupMBean.java DefaultContextMBean.java
ContextEnvironmentMBean.java StandardHostMBean.java
ContextResourceMBean.java MBeanUtils.java
NamingResourcesMBean.java
   catalina/src/share/org/apache/naming/resources
WARDirContext.java BaseDirContext.java
ProxyDirContext.java
DirContextURLStreamHandler.java
RecyclableNamingEnumeration.java
ResourceAttributes.java
DirContextURLStreamHandlerFactory.java
FileDirContext.java
   catalina/src/share/org/apache/catalina/users
MemoryGroup.java MemoryUserDatabaseFactory.java
MemoryRole.java AbstractRole.java
AbstractGroup.java MemoryUser.java
   catalina/src/share/org/apache/catalina/connector
HttpResponseFacade.java HttpRequestFacade.java
ResponseFacade.java RequestFacade.java
   catalina/src/share/org/apache/naming/resources/jndi
Handler.java
   catalina/src/share/org/apache/catalina/loader
StandardClassLoader.java WebappLoader.java
WebappClassLoader.java
   catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java RequestFilterValve.java
PersistentValve.java AccessLogValve.java
JDBCAccessLogValve.java RequestDumperValve.java
ValveBase.java ExtendedAccessLogValve.java
   catalina/src/share/org/apache/catalina/authenticator
DigestAuthenticator.java SSLAuthenticator.java
NonLoginAuthenticator.java SavedRequest.java
SingleSignOn.java FormAuthenticator.java
AuthenticatorBase.java
   catalina/src/share/org/apache/catalina/core

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper MappingData.java

2003-09-02 Thread remm
remm2003/09/02 14:34:39

  Modified:util/java/org/apache/tomcat/util/log SystemLogHandler.java
LogManager.java CommonLogHandler.java
LogHandler.java Log.java CaptureLog.java
   util/java/org/apache/tomcat/util/collections
MultiMapValuesEnumeration.java
MultiMapNamesEnumeration.java MultiMap.java
   util/java/org/apache/tomcat/util/net
TcpConnectionHandler.java SSLImplementation.java
SSLSupport.java TcpConnection.java
   util/java/org/apache/tomcat/util/buf UTF8Decoder.java
UEncoder.java DateTool.java UDecoder.java
ByteChunk.java CharChunk.java B2CConverter.java
TimeStamp.java C2BConverter.java
   util/java/org/apache/tomcat/util/threads Expirer.java
Reaper.java ThreadPoolRunnable.java
ThreadPoolMX.java
   util/java/org/apache/tomcat/util/net/jsse
JSSE13SocketFactory.java JSSESupport.java
JSSE14Support.java JSSEImplementation.java
JSSESocketFactory.java JSSE14SocketFactory.java
   coyote/src/java/org/apache/coyote RequestInfo.java
Response.java
   util/java/org/apache/tomcat/util/handler TcHandlerCtx.java
HandlerManager.java TcHandler.java
   util/java/org/apache/tomcat/util/http HttpMessages.java
AcceptLanguage.java ContentType.java
MimeHeaders.java Cookies.java Parameters.java
   util/java/org/apache/tomcat/util/compat Jdk14Compat.java
   http11/src/java/org/apache/coyote/http11 Constants.java
Http11Protocol.java
   util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java
   util/java/org/apache/tomcat/util/http/mapper
MappingData.java
  Log:
  - Fix bad imports (thanks to Eclipse). Let me know if I broke something.
  
  Revision  ChangesPath
  1.3   +1 -9  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
  
  Index: SystemLogHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/SystemLogHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SystemLogHandler.java 26 Jun 2002 12:36:00 -  1.2
  +++ SystemLogHandler.java 2 Sep 2003 21:34:37 -   1.3
  @@ -56,16 +56,8 @@
*/ 
   package org.apache.tomcat.util.log;
   
  -import java.io.ByteArrayOutputStream;
  -import java.io.Writer;
  -import java.io.PrintStream;
  -import java.io.PrintWriter;
  -import java.io.FileWriter;
  -import java.io.File;
  -import java.io.OutputStreamWriter;
   import java.io.IOException;
  -import java.io.StringWriter;
  -
  +import java.io.PrintStream;
   import java.util.Hashtable;
   import java.util.Stack;
   
  
  
  
  1.4   +2 -3  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogManager.java
  
  Index: LogManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogManager.java   12 Jul 2002 17:58:45 -  1.3
  +++ LogManager.java   2 Sep 2003 21:34:37 -   1.4
  @@ -56,9 +56,8 @@
*/ 
   package org.apache.tomcat.util.log;
   
  -import java.io.*;
  -import java.lang.reflect.*;
  -import java.util.*;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
   
   
   /**
  
  
  
  1.3   +2 -11 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java
  
  Index: CommonLogHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommonLogHandler.java 4 Mar 2003 18:21:47 -   1.2
  +++ CommonLogHandler.java 2 Sep 2003 21:34:37 -   1.3
  @@ -56,18 +56,9 @@
*/ 
   package org.apache.tomcat.util.log;
   
  -import org.apache.tomcat.util.log.*;
  -import java.io.Writer;
  -import java.io.PrintWriter;
  -import java.io.FileWriter;
  -import java.io.File;
  -import java.io.OutputStreamWriter;
  -import java.io.IOException;
  -import java.io.StringWriter;
  +import java.util.Hashtable;
   
  -import java.util.*;
  -
  -import org.apache.commons.logging.*;
  +import org.apache.commons.logging.LogFactory;
   
   /**
*  Log using common-logging.
  
  
 

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

2003-09-02 Thread remm
remm2003/09/02 14:40:00

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java JspConfig.java
Localizer.java ErrorDispatcher.java JspReader.java
Validator.java TagFileProcessor.java
ServletWriter.java Parser.java
TldLocationsCache.java BeanRepository.java
TagLibraryInfoImpl.java Node.java
ParserController.java
   jasper2/src/share/org/apache/jasper/servlet
JspServletWrapper.java JasperLoader.java
JspCServletContext.java JspServlet.java
   jasper2/src/share/org/apache/jasper/runtime
JspContextWrapper.java PageContextImpl.java
HttpJspBase.java JspFragmentHelper.java
JspRuntimeLibrary.java
ServletResponseWrapperInclude.java
BodyContentImpl.java PerThreadTagHandlerPool.java
   jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java
   jasper2/src/share/org/apache/jasper Constants.java JspC.java
Options.java
   jasper2/src/share/org/apache/jasper/util
SystemLogHandler.java
   jasper2/src/share/org/apache/jasper/compiler/tagplugin
TagPluginContext.java
  Log:
  - Fix bad imports (thanks to Eclipse). Let me know if I broke something.
  
  Revision  ChangesPath
  1.16  +8 -12 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JspRuntimeContext.java23 Jun 2003 19:35:59 -  1.15
  +++ JspRuntimeContext.java2 Sep 2003 21:39:58 -   1.16
  @@ -64,31 +64,27 @@
   import java.io.File;
   import java.io.FileNotFoundException;
   import java.io.FilePermission;
  -import java.io.IOException;
  -import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
   import java.security.CodeSource;
  -import java.security.Policy;
   import java.security.PermissionCollection;
  -import java.util.Iterator;
  -import java.util.List;
  +import java.security.Policy;
   import java.util.Collections;
   import java.util.HashMap;
  +import java.util.Iterator;
   import java.util.Map;
   
   import javax.servlet.ServletContext;
   import javax.servlet.jsp.JspFactory;
   
  -import org.apache.jasper.JasperException;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.apache.jasper.Constants;
   import org.apache.jasper.JspCompilationContext;
   import org.apache.jasper.Options;
   import org.apache.jasper.runtime.JspFactoryImpl;
   import org.apache.jasper.security.SecurityClassLoad;
   import org.apache.jasper.servlet.JspServletWrapper;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
* Class for tracking JSP compile time file dependencies when the
  
  
  
  1.13  +6 -7  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
  
  Index: JspConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JspConfig.java27 Aug 2003 00:47:19 -  1.12
  +++ JspConfig.java2 Sep 2003 21:39:58 -   1.13
  @@ -61,18 +61,17 @@
   
   package org.apache.jasper.compiler;
   
  -import java.util.Vector;
   import java.io.InputStream;
   import java.util.Iterator;
  +import java.util.Vector;
   
   import javax.servlet.ServletContext;
   
  -import org.apache.jasper.Constants;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.apache.jasper.JasperException;
   import org.apache.jasper.xmlparser.ParserUtils;
   import org.apache.jasper.xmlparser.TreeNode;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
* Handles the jsp-config element in WEB_INF/web.xml.  This is used
  
  
  
  1.3   +5 -7  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java
  
  Index: Localizer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java,v
  retrieving revision 1.2
  retrieving revision 

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

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 22:11 ---
Yes, apparently it is breaking it, and not by accident.

http://developer.java.sun.com/developer/bugParade/bugs/4887861.html says:

jdk 1.4.2 does not allow the use of $ to refer to inner classes anymore.
We have fixed the code generator to address this.

http://developer.java.sun.com/developer/bugParade/bugs/4894381.html says:

JDK 1.4.2 does not allow to generate field type for setters and getters
for the inner classes as user-defined serializable CMP field types with
'$' as returned from getClass().getName(). Added code that replaces '$'
with '.' for the user-defined serializable CMP field types (blob but not
byte[]).

So apparently they have made this decision consciously in JDK 1.4.2, even
though it seems to contradict the JLS.

Sun's own workaround in Sun ONE app server was to replace '$' with '.' ...
I would move for Tomcat to do the same.

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



Re: [PATCH] CGI Servlet bugs

2003-09-02 Thread Jeff Tulley
I see a few possible issues.
1) Don't append \, instead use File.separatorChar
2) is case sensitivity an issue where you are doing the
command.endsWith(.pl) || command.endsWith(.cgi) commands?
  It seems like getCanonicalPath will, on some platforms, return the
exact case of the file as it is on disk.  I thought Windows does that.
(Well, Sun's JVM 1.3.1 on Windows I think is the exact one, I think).

Jeff Tulley  ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com

 [EMAIL PROTECTED] 9/2/03 2:51:27 PM 
Below is a patch for bug 22857, bug 22858 and one additional issue I
found 
whilst looking at the other issues. I am concerned that the patch may
only work 
on windows platforms and would appreciate it if someone with
non-Windows 
knowledge could review this patch.

I have included TC5 and TC4 patches.

Mark

Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali
 
na/servlets/CGIServlet.java,v
retrieving revision 1.5
diff -u -r1.5 CGIServlet.java
---
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 22
Nov 2002 
22:26:08 -  1.5
+++
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2
Sep 2003 
20:31:03 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws
IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean setCGIEnvironment(HttpServletRequest req)
throws 
IOException {

 /*
  * This method is slightly ugly; c'est la vie.
@@ -1109,7 +1109,9 @@
 }
 }

-command = sCGIFullPath;
+File fCGIFullPath = new File(sCGIFullPath);
+command = fCGIFullPath.getCanonicalPath();
+
 envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks

 this.env = envp;
@@ -1550,17 +1552,19 @@

 //create query arguments
 Enumeration paramNames = params.keys();
-StringBuffer cmdAndArgs = new StringBuffer(command);
+StringBuffer cmdAndArgs = new StringBuffer(\ + command
+ \);
 if (paramNames != null  paramNames.hasMoreElements()) {
 cmdAndArgs.append( );
 while (paramNames.hasMoreElements()) {
 String k = (String) paramNames.nextElement();
 String v = params.get(k).toString();
 if ((k.indexOf(=)  0)  (v.indexOf(=)  0))
{
+cmdAndArgs.append(\);
 cmdAndArgs.append(k);
 cmdAndArgs.append(=);
 v = java.net.URLEncoder.encode(v);
 cmdAndArgs.append(v);
+cmdAndArgs.append(\);
 cmdAndArgs.append( );
 }
 }
@@ -1573,11 +1577,9 @@
 env.put(CONTENT_LENGTH, new
Integer(contentLength));
 }*/

-if (command.endsWith(.pl) || command.endsWith(.cgi)) {
 StringBuffer perlCommand = new StringBuffer(perl );
 perlCommand.append(cmdAndArgs.toString());
 cmdAndArgs = perlCommand;
-}

 rt = Runtime.getRuntime();
 proc = rt.exec(cmdAndArgs.toString(),
hashToStringArray(env), wd);



Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/se
 
rvlets/CGIServlet.java,v
retrieving revision 1.11
diff -u -r1.11 CGIServlet.java
---
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 4
Dec 2002 
21:09:07 -  1.11
+++
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2
Sep 2003 
19:31:10 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws
IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean 

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

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 22:32 ---
Ah, I'm probably wrong there ... the JLS does allow identifiers to contain '$',
and javac still allows that. But javac no longer allows you to work with the
assumption that a compiled nested class B in a top-level class A will be called
A$B ... and the JLS never allowed us to make that assumption in the first place.

So I shouldn't be attempting to refer to this class with the A$B syntax. What,
then, is the correct way to refer to it? Must I use A.B syntax? I guess so,
according to JLS Section 6.7, Fully Qualified Names and Canonical Names:

A member class or member interface M of another class C has a fully
qualified name if and only if C has a fully qualified name. In that
case, the fully qualified name of M consists of the fully qualified
name of C, followed by ., followed by the simple name of M.

But presumably the only bug here is that using this correct A.B syntax is
failing with the abovementioned error: Unable to load class generator
(where generator is just the tagname, which is placed in this error
message instead of the classname registered for that tag, probably by
mistake -- I guess that's a little extra bug here :) )

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



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

2003-09-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22833.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 03:50 ---
The JSR-45 spec says:

Each LineInfo has the form: 'InputStartLine # LineFileID , RepeatCount : 
OutputStartLine , OutputLineIncrement' where all but 'InputStartLine : 
OutputStartLine' are optional If absent LineFileID defaults to the most 
recent value (initially zero).

In other words LineFileID is only required when it differs from the LineFileID 
of the previous LineInfo.  To the best of my knowledge Jasper is consistent 
with that.

You're absolutely right that Jasper should SMAP JSP declarations, but doesn't.

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 22:41 ---
Personally, I would choose to do a replace '$' - '.' in the generated source. I
don't see anyone willingly using '$' in a tagfile classname, except if it's an
inner class ;-)

-
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-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22867.
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





--- Additional Comments From [EMAIL PROTECTED]  2003-09-02 13:43 ---
Even though this bug's product/version designation has been changed to Tomcat5,
it is still present in the Tomcat 4.1 branch, and should be fixed there as well
... assuming there are any more releases on that branch.

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



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

2003-09-02 Thread amyroh
amyroh  2003/09/02 15:44:32

  Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
  Log:
  Apply patch for bug 22857 and bug 22858 submitted by Mark Thomas [EMAIL PROTECTED] 
and fix obvious indentation errors.
  
  Revision  ChangesPath
  1.7   +23 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
  
  Index: CGIServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CGIServlet.java   2 Sep 2003 21:22:05 -   1.6
  +++ CGIServlet.java   2 Sep 2003 22:44:32 -   1.7
  @@ -357,7 +357,7 @@
   //Wrapper wrapper = (Wrapper) getServletConfig();
   //context = (Context) wrapper.getParent();
   
  -context = config.getServletContext();
  +context = config.getServletContext();
   if (debug = 1) {
   //log(init: Associated with Context ' + context.getPath() + ');
   }
  @@ -429,10 +429,10 @@
   out.println(libcontextPath/b =  +
  req.getContextPath());
   Cookie cookies[] = req.getCookies();
  -if (cookies!=null) {
  -for (int i = 0; i  cookies.length; i++)
  +if (cookies!=null) {
  +for (int i = 0; i  cookies.length; i++)
   out.println(libcookie/b  + cookies[i].getName() + =  
+cookies[i].getValue());
  -}
  +}
   Enumeration headers = req.getHeaderNames();
   while (headers.hasMoreElements()) {
   String header = (String) headers.nextElement();
  @@ -567,8 +567,6 @@
   out.println(/ul);
   out.println(hr);
   
  -
  -
   }
   
   
  @@ -743,7 +741,7 @@
*
*/
   protected CGIEnvironment(HttpServletRequest req,
  - ServletContext context) {
  + ServletContext context) throws IOException {
   setupFromContext(context);
   setupFromRequest(req);
   
  @@ -939,7 +937,7 @@
* @return   true if environment was set OK, false if there
*   was a problem and no environment was set
*/
  -protected boolean setCGIEnvironment(HttpServletRequest req) {
  +protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {
   
   /*
* This method is slightly ugly; c'est la vie.
  @@ -1092,8 +1090,8 @@
   //NOOP per CGI specification section 11.2
   } else if(HOST.equalsIgnoreCase(header)) {
   String host = req.getHeader(header);
  -int idx =  host.indexOf(:);
  -if(idx  0) idx = host.length();
  +int idx =  host.indexOf(:);
  +if(idx  0) idx = host.length();
   envp.put(HTTP_ + header.replace('-', '_'),
host.substring(0, idx));
   } else {
  @@ -1102,7 +1100,9 @@
   }
   }
   
  -command = sCGIFullPath;
  +File fCGIFullPath = new File(sCGIFullPath);
  +command = fCGIFullPath.getCanonicalPath();
  +
   envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks
   
   this.env = envp;
  @@ -1543,17 +1543,19 @@
   
   //create query arguments
   Enumeration paramNames = params.keys();
  -StringBuffer cmdAndArgs = new StringBuffer(command);
  +StringBuffer cmdAndArgs = new StringBuffer(\ + command + \);
   if (paramNames != null  paramNames.hasMoreElements()) {
   cmdAndArgs.append( );
   while (paramNames.hasMoreElements()) {
   String k = (String) paramNames.nextElement();
   String v = params.get(k).toString();
   if ((k.indexOf(=)  0)  (v.indexOf(=)  0)) {
  +cmdAndArgs.append(\);
   cmdAndArgs.append(k);
   cmdAndArgs.append(=);
   v = java.net.URLEncoder.encode(v);
   cmdAndArgs.append(v);
  +cmdAndArgs.append(\);
   cmdAndArgs.append( );
   }
   }
  @@ -1566,11 +1568,11 @@
   env.put(CONTENT_LENGTH, new Integer(contentLength));
   }*/
   
  -if (command.endsWith(.pl) || command.endsWith(.cgi)) {
  +//if (command.endsWith(.pl) || command.endsWith(.cgi)) {
   StringBuffer perlCommand = new StringBuffer(perl );
   perlCommand.append(cmdAndArgs.toString());
   cmdAndArgs = perlCommand;
  -   

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

2003-09-02 Thread amyroh
amyroh  2003/09/02 15:44:54

  Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
  Log:
  Back port patch.
  
  Revision  ChangesPath
  1.12  +22 -19
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
  
  Index: CGIServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CGIServlet.java   4 Dec 2002 21:09:07 -   1.11
  +++ CGIServlet.java   2 Sep 2003 22:44:54 -   1.12
  @@ -364,7 +364,7 @@
   //Wrapper wrapper = (Wrapper) getServletConfig();
   //context = (Context) wrapper.getParent();
   
  -context = config.getServletContext();
  +context = config.getServletContext();
   if (debug = 1) {
   //log(init: Associated with Context ' + context.getPath() + ');
   }
  @@ -436,10 +436,10 @@
   out.println(libcontextPath/b =  +
  req.getContextPath());
   Cookie cookies[] = req.getCookies();
  -if (cookies!=null) {
  -for (int i = 0; i  cookies.length; i++)
  +if (cookies!=null) {
  +for (int i = 0; i  cookies.length; i++)
   out.println(libcookie/b  + cookies[i].getName() + =  
+cookies[i].getValue());
  -}
  +}
   Enumeration headers = req.getHeaderNames();
   while (headers.hasMoreElements()) {
   String header = (String) headers.nextElement();
  @@ -750,7 +750,7 @@
*
*/
   protected CGIEnvironment(HttpServletRequest req,
  - ServletContext context) {
  + ServletContext context) throws IOException {
   setupFromContext(context);
   setupFromRequest(req);
   
  @@ -946,7 +946,7 @@
* @return   true if environment was set OK, false if there
*   was a problem and no environment was set
*/
  -protected boolean setCGIEnvironment(HttpServletRequest req) {
  +protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {
   
   /*
* This method is slightly ugly; c'est la vie.
  @@ -1104,8 +1104,8 @@
   //NOOP per CGI specification section 11.2
   } else if(HOST.equalsIgnoreCase(header)) {
   String host = req.getHeader(header);
  -int idx =  host.indexOf(:);
  -if(idx  0) idx = host.length();
  +int idx =  host.indexOf(:);
  +if(idx  0) idx = host.length();
   envp.put(HTTP_ + header.replace('-', '_'),
host.substring(0, idx));
   } else {
  @@ -1114,7 +1114,8 @@
   }
   }
   
  -command = sCGIFullPath;
  +File fCGIFullPath = new File(sCGIFullPath);
  +command = fCGIFullPath.getCanonicalPath();
   envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks
   
   this.env = envp;
  @@ -1555,17 +1556,19 @@
   
   //create query arguments
   Enumeration paramNames = params.keys();
  -StringBuffer cmdAndArgs = new StringBuffer(command);
  +StringBuffer cmdAndArgs = new StringBuffer(\ + command + \);
   if (paramNames != null  paramNames.hasMoreElements()) {
   cmdAndArgs.append( );
   while (paramNames.hasMoreElements()) {
   String k = (String) paramNames.nextElement();
   String v = params.get(k).toString();
   if ((k.indexOf(=)  0)  (v.indexOf(=)  0)) {
  +cmdAndArgs.append(\);
   cmdAndArgs.append(k);
   cmdAndArgs.append(=);
   v = java.net.URLEncoder.encode(v);
   cmdAndArgs.append(v);
  +cmdAndArgs.append(\);
   cmdAndArgs.append( );
   }
   }
  @@ -1578,11 +1581,11 @@
   env.put(CONTENT_LENGTH, new Integer(contentLength));
   }*/
   
  -if (command.endsWith(.pl) || command.endsWith(.cgi)) {
  +//if (command.endsWith(.pl) || command.endsWith(.cgi)) {
   StringBuffer perlCommand = new StringBuffer(perl );
   perlCommand.append(cmdAndArgs.toString());
   cmdAndArgs = perlCommand;
  -}
  +//}
   
   rt = Runtime.getRuntime();
   proc = rt.exec(cmdAndArgs.toString(), hashToStringArray(env), wd);
  
  
  


Re: [PATCH] CGI Servlet bugs

2003-09-02 Thread Jeff Tulley
Oh, ignore my item #2, I didn't see that you were DELETING the
command.endsWith stuff, not adding it.

Still, I think the item number one - not assuming the separator is a
\ is needed for OS portability, right?  It looks like this was just
committed as-is, not using File.separator or File.separatorChar

Amy?  (I may just be missing something here)

Jeff Tulley  ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com

 [EMAIL PROTECTED] 9/2/03 2:51:27 PM 
Below is a patch for bug 22857, bug 22858 and one additional issue I
found 
whilst looking at the other issues. I am concerned that the patch may
only work 
on windows platforms and would appreciate it if someone with
non-Windows 
knowledge could review this patch.

I have included TC5 and TC4 patches.

Mark

Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali
 
na/servlets/CGIServlet.java,v
retrieving revision 1.5
diff -u -r1.5 CGIServlet.java
---
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 22
Nov 2002 
22:26:08 -  1.5
+++
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2
Sep 2003 
20:31:03 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws
IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean setCGIEnvironment(HttpServletRequest req)
throws 
IOException {

 /*
  * This method is slightly ugly; c'est la vie.
@@ -1109,7 +1109,9 @@
 }
 }

-command = sCGIFullPath;
+File fCGIFullPath = new File(sCGIFullPath);
+command = fCGIFullPath.getCanonicalPath();
+
 envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks

 this.env = envp;
@@ -1550,17 +1552,19 @@

 //create query arguments
 Enumeration paramNames = params.keys();
-StringBuffer cmdAndArgs = new StringBuffer(command);
+StringBuffer cmdAndArgs = new StringBuffer(\ + command
+ \);
 if (paramNames != null  paramNames.hasMoreElements()) {
 cmdAndArgs.append( );
 while (paramNames.hasMoreElements()) {
 String k = (String) paramNames.nextElement();
 String v = params.get(k).toString();
 if ((k.indexOf(=)  0)  (v.indexOf(=)  0))
{
+cmdAndArgs.append(\);
 cmdAndArgs.append(k);
 cmdAndArgs.append(=);
 v = java.net.URLEncoder.encode(v);
 cmdAndArgs.append(v);
+cmdAndArgs.append(\);
 cmdAndArgs.append( );
 }
 }
@@ -1573,11 +1577,9 @@
 env.put(CONTENT_LENGTH, new
Integer(contentLength));
 }*/

-if (command.endsWith(.pl) || command.endsWith(.cgi)) {
 StringBuffer perlCommand = new StringBuffer(perl );
 perlCommand.append(cmdAndArgs.toString());
 cmdAndArgs = perlCommand;
-}

 rt = Runtime.getRuntime();
 proc = rt.exec(cmdAndArgs.toString(),
hashToStringArray(env), wd);



Index: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/se
 
rvlets/CGIServlet.java,v
retrieving revision 1.11
diff -u -r1.11 CGIServlet.java
---
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 4
Dec 2002 
21:09:07 -  1.11
+++
catalina/src/share/org/apache/catalina/servlets/CGIServlet.java 2
Sep 2003 
19:31:10 -
@@ -750,7 +750,7 @@
  *
  */
 protected CGIEnvironment(HttpServletRequest req,
- ServletContext context) {
+ ServletContext context) throws
IOException {
 setupFromContext(context);
 setupFromRequest(req);

@@ -946,7 +946,7 @@
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
  */
-protected boolean setCGIEnvironment(HttpServletRequest req) {
+protected boolean setCGIEnvironment(HttpServletRequest req)
throws 
IOException {


Re: [PATCH] CGI Servlet bugs

2003-09-02 Thread Amy Roh
Jeff Tulley wrote:
Still, I think the item number one - not assuming the separator is a
\ is needed for OS portability, right?  It looks like this was just
committed as-is, not using File.separator or File.separatorChar
You need to use File.separator for escaping double quote on different OS?

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


Re: [PATCH] CGI Servlet bugs

2003-09-02 Thread Jeff Tulley
Ah,  once again I'm up in the night.  *big sheepish grin*

I run at 1600x1200, and the double set of quotes looked like one quote.
 I guess my clue should have been that you would've put \\ for a
single backslash.

Sorry!  I saw the mention of a need for a review by those who deal with
other OS's and I got carried away, I guess.  :)

I'll go back to something else now

Jeff Tulley  ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com

 [EMAIL PROTECTED] 9/2/03 5:47:32 PM 
Jeff Tulley wrote:
 Still, I think the item number one - not assuming the separator is a
 \ is needed for OS portability, right?  It looks like this was
just
 committed as-is, not using File.separator or File.separatorChar

You need to use File.separator for escaping double quote on different
OS?


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



[Patch] Multiple user patterns in JNDIRealm

2003-09-02 Thread Jeff Tulley
In the current JNDIRealm implementation, you can either have it find(and
authenticate) users via a search or through a user pattern.  Using the
subtree search has security ramifications  -- either you have to grant
public browse access to all containers in the directory where your user
objects are, or you need to grant a particular user those browse rights,
and then place that username and password in server.xml in plaintext. 
Using the user pattern, however if you want to do context-less login,
you are limited to only being able to authenticate users from one
container.

This patch extends the userPattern attribute so that it can have
multiple values.  Backwards compatibility is completely maintained.  The
notation for adding in multiple patterns is to surround each of them in
parentheses, for instance (cn={0},o=myorg)(cn={0},ou=users,o=myorg). 
Standard LDAP OR search syntax also works,
(|(cn={0},o=myorg)(cn={0},ou=users,o=myorg)).  I chose parentheses
because of its similarity to LDAP's search syntax, and also for the fact
that semicolons and commas are used to separate path components, and
colons are valid characters in the directory path.  Parentheses are
valid characters as well, but will be escaped if they are part of an
actual name.  The current syntax of cn={0},o=myorg, no parentheses,
still works.

The use case exactly then is if you want to provide context-less login
in multiple containers without the security ramifications of doing the
sub-tree LDAP search.

I've included some unit test code as well, testing the parsing of the
user pattern.  I attached that file in its entirety since it is new. 
Also attached -- a patch to build.xml to add in support for this unit
test code, and a patch to the realm-howto JNDIRealm section.

I would like this added into the 4.1 branch if possible, since I think
it fills a hole there.

Thanks,


Jeff Tulley  ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.132
diff -u -r1.132 build.xml
--- build.xml   12 Mar 2003 21:38:05 -  1.132
+++ build.xml   28 Aug 2003 21:39:12 -
@@ -979,7 +979,7 @@
   !--  TEST: Execute Unit Tests == --
   target name=test if=junit.present
description=Run all unit test cases
-   depends=build-tests,test-dir-context,test-util
+   depends=build-tests,test-dir-context,test-realm,test-util
   /target
 
   target name=test-dir-context if=junit.present
@@ -1004,6 +1004,16 @@
 /java
 delete file=${test.webapp.war}/
 
+  /target
+
+  target name=test-realm if=junit.present
+
+echo message=Running Realm tests/
+java classname=${test.runner} fork=yes
+failonerror=${test.failonerror}
+  arg value=org.apache.catalina.realm.JNDIRealmTestCase/
+  classpath refid=test.classpath/
+/java
   /target
 
   target name=test-util if=junit.present

/*
 * $Header: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java
 * $Revision: 1 $
 * $Date: 2003/08/27 00:54:26 $
 *
 * 
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2003 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *notice, this list of conditions and the following disclaimer in
 *the documentation and/or other materials provided with the
 *distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *any, must include the following acknowlegement:
 *   This product includes software developed by the
 *Apache Software Foundation (http://www.apache.org/).
 *Alternately, this acknowlegement may appear in the software itself,
 *if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names The Jakarta Project, Tomcat, and Apache Software
 *Foundation must not be used to endorse or promote products derived
 *from this software without prior written permission. For written
 *permission, please contact [EMAIL PROTECTED]
 *
 * 5. Products derived from this software may not be called Apache
 *nor may Apache appear in their names without prior written
 *permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS 

error building tomcat 4.1.27 from source on solaris

2003-09-02 Thread Ziying Sherwin

We tried to install tomcat 4.1.27 on our Solaris 2.8 platform using j2sdk 1.4.0. 
Unfortunately, the installation does not go very smoothly. After installed lots of
required packages like jmx, jaxp, we finally started tomcat build. The compilation 
failed with the following error messages:

build-only:
[javac] Compiling 79 source files to /src/tomcat_4.1.27/jasper/build/shared/classes
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java:71:
 package javax.servlet does not exist
[javac] import javax.servlet.ServletException;
[javac]  ^
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java:66:
 package javax.servlet does not exist
[javac] import javax.servlet.ServletConfig;
[javac]  ^
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java:67:
 package javax.servlet does not exist
[javac] import javax.servlet.ServletContext;
[javac]  ^
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java:73:
 package javax.servlet does not exist
[javac] import javax.servlet.RequestDispatcher;
[javac]  ^
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java:74:
 package javax.servlet does not exist
[...]
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java:105:
 cannot resolve symbol
[javac] symbol  : class ExpressionEvaluatorImpl  
[javac] location: class org.apache.jasper.compiler.JspUtil
[javac] private static ExpressionEvaluatorImpl expressionEvaluator
[javac]^
[javac] 
/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java:627:
 cannot resolve symbol
[javac] symbol  : class FunctionMapper  
[javac] location: class org.apache.jasper.compiler.JspUtil
[javac]FunctionMapper functionMapper,
[javac]^
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -deprecation for details.
[javac] 100 errors

BUILD FAILED
file:/src/tomcat_4.1.27/jakarta-tomcat-jasper/jasper2/build.xml:127: Compile failed; 
see the compiler error output for details.

There is no mentioning of jasper in the BUILDING.txt file. We downloaded the source
code from cvs tree. Is jasper required by tomcat build? If not, is there anyway to 
disable it? Or how can we build jasper from source? Any help will be appreciated.

Ziying Sherwin





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