DO NOT REPLY [Bug 7209] - jsp expressions as tag parameters aren't parsed

2002-03-19 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=7209.
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=7209

jsp expressions as tag parameters aren't parsed





--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 09:33 ---
Thanks Craig, 

I've just been reading the spec. (properly) and was about to say the same thing.

Regards, 

James

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




Re: jk2: config

2002-03-19 Thread jean-frederic clere

[EMAIL PROTECTED] wrote:
 
 I just commited a big chunk of config changes to support
 dynamic configuration of jk2.
 
 I'm pretty happy with the new model - many new things
 will become possible.
 
 As you know, I'm usually a bit extreme regarding backward
 compatibility. Preserving it is still possible - but
 I'm now convinced it would be much better to not do so.

We could write a converter from old format to new format if too many people
complain.

 
 The current code follows a single pattern:
  [OBJECT_NAME].[PROPERTY]=value
 
 OBJECT_NAME can be either a previously defined
 object ( like 'logger', 'workerEnv', 'config' ) or
 a new object that is created when the name is first
 reached.
 
 The object is created using a factory that matches
 the prefix.
 
 Ex:
  worker.ajp13.8009.channel=socket
 
 In this case, channel is the property, and
 worker.ajp13.8009 is the object name. It'll match
 the factory for 'worker.ajp13'.
 
 No need to specify 'type' or 'worker_list' or to
 use any other constructs.
 
 The property can be set at any time - but not all
 objects and all properties support run-time
 config ( at this moment - we'll add this in time ).
 
 The whole idea is that the config is intended for
 config tools or other frontends - or at least that's
 the goal. We want to allow user configuration, but
 in order to support ajp14 and dynamic config ( like
 deployment of webapps, etc ) we need to let mod_jk
 write the config file.
 
 Axis does the same thing with the wsdl, same for
 kde, gnome, etc. The config is editable, but when
 the program runs it will manage it and save it.
 
 The main problem is that the comments may be lost,
 and any manual change done while the server
 is running will probably have the same fate.

A warning in the first lines of the file like:
+++
#   
# NOTE: This file is automatically updated by the
autoconfigure.  
# Any changes will be lost! 
#   
+++
is probably enough.

 
 Again, this is not for the first release of jk2, but
 IMHO it should follow soon.
 
 One idea I'm considering is to use the ini style
 for URIs. That is:
 
  [object_name]
  propery=value
  ...
 
 This will make the syntax much cleaner for URIs.
 It's a well-known format, used in many cases and programs
 - far better than inventing our own ( and better
  than hacking the name/value ). Of course, XML
 may be a better choice - but I won't volunteer to
 do xml processing in C :-)

If the file is handled by program it does not need to be nice: for me the
property format is enough.
And -0  for using xerces C to do that... I want to run mod_jk on EBCDIC machines
and porting xerces C is some work.
What about parsing the xml file in Java? ;-) 

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

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




DO NOT REPLY [Bug 7236] New: - Permission denied to do thread.stop

2002-03-19 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=7236.
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=7236

Permission denied to do thread.stop

   Summary: Permission denied to do thread.stop
   Product: Tomcat 3
   Version: 3.3.1 Release Candidate 1
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Blocker
  Priority: Other
 Component: Servlet
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


In Tomcat 3.3.1rc1 I am unable to stop a thread that has been created by the 
webapp (Not a Tomcat thread). I tried giving my webapp AllPermissions in 
tomcat.policy, but this had no effect.

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




DO NOT REPLY [Bug 7236] - Permission denied to do thread.stop

2002-03-19 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=7236.
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=7236

Permission denied to do thread.stop

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Priority|Other   |High

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




cvs commit: jakarta-tomcat/src/doc serverxml.html

2002-03-19 Thread larryi

larryi  02/03/19 03:48:05

  Modified:src/doc  serverxml.html
  Log:
  Document saveOriginal attribute in DecodeInterceptor.  The best we
  can do for Bugzilla #4416.
  
  Revision  ChangesPath
  1.23  +17 -1 jakarta-tomcat/src/doc/serverxml.html
  
  Index: serverxml.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- serverxml.html12 Mar 2002 04:14:49 -  1.22
  +++ serverxml.html19 Mar 2002 11:48:05 -  1.23
  @@ -4,7 +4,7 @@
   !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
   html
   head
  -  !-- $Id: serverxml.html,v 1.22 2002/03/12 04:14:49 larryi Exp $ --
  +  !-- $Id: serverxml.html,v 1.23 2002/03/19 11:48:05 larryi Exp $ --
 !-- Copyright 1999-2001 Apache Software Foundation --
 meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 
 link rel=stylesheet href=style.css
  @@ -1097,6 +1097,22 @@
 %2F ('/'), and %5C ('\').  If any are found in the URI, the request is
 considered quot;unsafequot; and a 403 Forbidden error is returned./td
   tdtrue/td
  +  /tr
  +  tr valign=top
  +tdsaveOriginal/td
  +tdIf codetrue/code, a copy of the original request URI is saved
  +  before it is decoded. This saved copy is later used as the return value
  +  HttpServletRequest.getRequestURI(). If codefalse/code, then
  +  HttpServletRequest.getRequestURI() returns a re-encoded version of the
  +  decoded request URI.  Setting this attribute to codetrue/code most
  +  closely follows the Servlet 2.2 spec.  However, codefalse/code is
  +  the default because codetrue/code can't be implemented when
  +  Tomcat is connected to Netscape Web Server 4.1 or earlier.  The original
  +  un-escaped request URI isn't made available to the connector.  Also,
  +  the IIS connector that shipped with Tomcat 3.3(a) did not support
  +  passing the original request URI, though the current one does, using
  +  the codeuri_select/code setting./td
  +tdfalse/td
 /tr
   /table
   
  
  
  

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




DO NOT REPLY [Bug 7239] New: - Manager application doesn't work on 4.0.4-B1

2002-03-19 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=7239.
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=7239

Manager application doesn't work on 4.0.4-B1

   Summary: Manager application doesn't work on 4.0.4-B1
   Product: Tomcat 4
   Version: 4.0.4 Beta 1
  Platform: PC
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I have an application that uses the rowset.jar from Sun. When I use the 
manager application in Tomcat 4.0.3 it works ok. I'm able to stop and 
start the context that is using it. Although when I load this 
application on 4.0.4-B1 and try to stop the context I get the message:

WebappClassLoader: Resource '/WEB-INF/lib/rowset.jar' is missing

And when I start the context, it fails:

FAIL - Application at context path /examples could not be started
FAIL - Encountered exception java.lang.IllegalStateException: 
standardHost.start /examples: LifecycleException:  Loader has already been 
started

I believe this is not related to the rowset.jar itself and it can happen with 
any library. 

It works in 4.0.3.

Doing some further investigation, I found out the following difference in the 
code between 4.0.3 and 4.0.4-B1:

- when calling webappclassloader, 'modified' method, it checks for the 
modified date of the jar/class by calling resources.getAttributes
- looking at the ProxyDirContext ( getAttributes method ), I found a 
difference. 
 4.0.3: it does a cacheLookup and return an entry;
 4.0.4-B1: it always returns a null. So it tries to open the File which 
doesn't exist because of the relative path that is used and says the resource 
is missing.

This change has something related to new piece of code in StandarContext  that 
releases DirContext ?

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




FW: Please add the #tomcat us.openprojects.net IRC channel

2002-03-19 Thread Pier Fumagalli

Not acked...

Pier

-- Forwarded Message
 From: Nicholas Schuetz [EMAIL PROTECTED]
 Date: Mon, 18 Mar 2002 21:38:25 -0600
 To: [EMAIL PROTECTED]
 Subject: Please add the #tomcat us.openprojects.net IRC channel
 
 Hi Remm,
 
 Just reminding you to add the #tomcat channel to the Jakarta Tomcat Website.
 
 Thank you,
 
 Nick Schuetz
 aka
 Hellaenergy
 
 

-- End of Forwarded Message


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




FW: Forbidden link

2002-03-19 Thread Pier Fumagalli

Remy... You screwed up... Set your UMASK correctly and fix permissions on
the site...

Pier


-- Forwarded Message
 From: Bradley Cloete [EMAIL PROTECTED]
 Date: Tue, 19 Mar 2002 07:52:34 +0200
 To: [EMAIL PROTECTED]
 Subject: Forbidden link
 
 Hi There,
 
 When trying to access the Tomcat 4.0 Documentation page at
 http://jakarta.apache.org/tomcat/tomcat-4.0-doc/index.html I get the following
 ...
 
 
 Forbidden
 You don't have permission to access /tomcat/tomcat-4.0-doc/index.html on this
 server.
 
 
 --
 --
 
 Apache/2.0.32 Server at jakarta.apache.org Port 80
 
 Thanks
 Regards
 
 B r a d l e y  C l o e t e
 --
 ---
 Technical: Unix Administrator - Postmaster
 Tel: +27 11 340 7200
 Fax: +27 11 340 7288
 Email: [EMAIL PROTECTED]
 --
 ---
 M-WEB Business Solutions
 Your World, Your Way
 
 Go shopping @ http://shopping.mweb.co.za
 Get your business online @ http://business.mweb.com
 
 

-- End of Forwarded Message


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




RE: jk2: config

2002-03-19 Thread GOMEZ Henri

If the file is handled by program it does not need to be nice: 
for me the
property format is enough.
And -0  for using xerces C to do that... I want to run mod_jk 
on EBCDIC machines
and porting xerces C is some work.
What about parsing the xml file in Java? ;-) 

Hi Jf,

Did you have expat ready on your boxes ?

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




DO NOT REPLY [Bug 7236] - Permission denied to do thread.stop

2002-03-19 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=7236.
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=7236

Permission denied to do thread.stop





--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 13:08 ---
Did you tried in your web app URL or file path give the permission:  

permission java.lang.RuntimePermission stopThread;

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




DO NOT REPLY [Bug 7236] - Permission denied to do thread.stop

2002-03-19 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=7236.
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=7236

Permission denied to do thread.stop





--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 13:15 ---
You will need to supply a test case that shows your problem before this can be
addressed.

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




DO NOT REPLY [Bug 4668] - File download over http corrupt

2002-03-19 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=4668.
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=4668

File download over http corrupt





--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 13:41 ---
thanks for looking at it. There must be something wrong with our network it 
works fine when access the page from my computer at home. Very strange.

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




DO NOT REPLY [Bug 7239] - Manager application doesn't work on 4.0.4-B1

2002-03-19 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=7239.
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=7239

Manager application doesn't work on 4.0.4-B1

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 13:58 
---


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

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




DO NOT REPLY [Bug 6982] - stop + start of the context makes weird things

2002-03-19 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=6982.
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=6982

stop + start of the context makes weird things

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]



--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 13:58 
---
*** Bug 7239 has been marked as a duplicate of this bug. ***

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




DO NOT REPLY [Bug 7177] - Apache/mod_jk/Tomcat Connectivity Problem

2002-03-19 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=7177.
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=7177

Apache/mod_jk/Tomcat Connectivity Problem





--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 16:36 ---
Still getting a mess of errors.  It appears as though when apache starts and 
stops processors, the connectivity between apache and tomcat is compromised.
I'm not sure, however.

[Mon Mar 18 21:37:03 2002]  [jk_ajp_common.c (1146)]: In 
jk_endpoint_t::service, ajp_get_reply failed in send loop 2
[Mon Mar 18 21:37:06 2002]  [jk_uri_worker_map.c (566)]: In 
jk_uri_worker_map_t::map_uri_to_worker, wrong parameters
[Mon Mar 18 21:37:06 2002]  [jk_uri_worker_map.c (566)]: In 
jk_uri_worker_map_t::map_uri_to_worker, wrong parameters
[Mon Mar 18 21:37:07 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:37:21 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:37:29 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:37:52 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:37:54 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:37:57 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:38:05 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:38:13 2002]  [jk_uri_worker_map.c (566)]: In 
jk_uri_worker_map_t::map_uri_to_worker, wrong parameters
[Mon Mar 18 21:38:13 2002]  [jk_uri_worker_map.c (566)]: In 
jk_uri_worker_map_t::map_uri_to_worker, wrong parameters
[Mon Mar 18 21:38:39 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:38:47 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:38:56 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:39:18 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed
[Mon Mar 18 21:39:18 2002]  [jk_ajp_common.c (932)]: Error 
ajp_process_callback - write failed

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




[PATCH] Typo in catalina.bat

2002-03-19 Thread Christopher Elkins

Hi, all.

The patch below fixes a typo in catalina.bat.

-- 
Christopher Elkins


Index: catalina.bat
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
retrieving revision 1.25
diff -u -r1.25 catalina.bat
--- catalina.bat11 Feb 2002 20:26:24 -  1.25
+++ catalina.bat19 Mar 2002 16:57:33 -
@@ -87,7 +87,7 @@
 
 if not %1 == jpda goto noJpda
 set JPDA=jpda
-if not %JPDA_ADDRESS% ==  got gotJpdaAddress
+if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
 set JPDA_ADDRESS=jdbconn
 :gotJpdaAddress
 shift

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




Re: JTC/JK2/Coyote logos

2002-03-19 Thread Stefan Bodewig

On Sun, 17 Mar 2002, GOMEZ Henri [EMAIL PROTECTED] wrote:

 May be Stephan and Conor could give us the list of artists ?

http://cvs.apache.org/viewcvs/jakarta-ant/docs/Attic/logos.html
lists them, the corresponding images (if you want to see them 8-) can
be found in the Attic as well
http://cvs.apache.org/viewcvs/jakarta-ant/docs/images/Attic/.

Stefan

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




Modified bugzilla categories

2002-03-19 Thread Remy Maucherat

I've modified the bugzilla components for TC 4, adding a few (Servlet  JSP
API, admin webapp, JK 2, Catalina modules, CGI, SSI, WebDAV), and
categorizing more explicitely the rest (for ex, all connector related
components are prefixed with Connector:).

If it's not ok, let me know.

Remy


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




[PATCH] Allow configurable JPDA transport in catalina.bat

2002-03-19 Thread Christopher Elkins

Hi, all.

The patch below allows the JPDA transport used in jpda start to be set via
an environment variable. Unfortunately, not all debuggers support the shared
memory transport (e.g., JSwat), so these changes make it possible to use
the socket transport without having to modify catalina.bat locally.

Moreover, this patch cleans up the slightly inaccurate comment for
JPDA_ADDRESS and includes my previous patch to fix a typo (with the subject
[PATCH] Typo in catalina.bat).

-- 
Christopher Elkins


Index: catalina.bat
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
retrieving revision 1.25
diff -u -r1.25 catalina.bat
--- catalina.bat11 Feb 2002 20:26:24 -  1.25
+++ catalina.bat19 Mar 2002 17:20:17 -
@@ -27,7 +27,10 @@
 rem   (JSSE) installation, whose JAR files will be added to the
 rem   system class path used to start Tomcat.
 rem
-rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
+rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
+rem   command is executed. The default is dt_shmem.
+rem
+rem   JPDA_ADDRESS(Optional) JPDA address used when the jpda start
 rem   command is executed. The default is jdbconn.
 rem
 rem $Id: catalina.bat,v 1.25 2002/02/11 20:26:24 patrickl Exp $
@@ -87,7 +90,10 @@
 
 if not %1 == jpda goto noJpda
 set JPDA=jpda
-if not %JPDA_ADDRESS% ==  got gotJpdaAddress
+if not %JPDA_TRANSPORT% ==  goto gotJpdaTransport
+set JPDA_TRANSPORT=dt_shmem
+:gotJpdaTransport
+if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
 set JPDA_ADDRESS=jdbconn
 :gotJpdaAddress
 shift
@@ -174,10 +180,10 @@
 goto end
 :doJpda
 if not %SECURITY_POLICY_FILE% ==  goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
+-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
+%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
+-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
+-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 :doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
+-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
+%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
+-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
+-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
+-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 
 :end

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




cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat

2002-03-19 Thread patrickl

patrickl02/03/19 09:36:45

  Modified:catalina/src/bin catalina.bat
  Log:
  Patch to fix typo
  Submitted by: Christopher Elkins
  
  Revision  ChangesPath
  1.26  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- catalina.bat  11 Feb 2002 20:26:24 -  1.25
  +++ catalina.bat  19 Mar 2002 17:36:45 -  1.26
  @@ -30,7 +30,7 @@
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   rem   command is executed. The default is jdbconn.
   rem
  -rem $Id: catalina.bat,v 1.25 2002/02/11 20:26:24 patrickl Exp $
  +rem $Id: catalina.bat,v 1.26 2002/03/19 17:36:45 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -87,7 +87,7 @@
   
   if not %1 == jpda goto noJpda
   set JPDA=jpda
  -if not %JPDA_ADDRESS% ==  got gotJpdaAddress
  +if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
   set JPDA_ADDRESS=jdbconn
   :gotJpdaAddress
   shift
  
  
  

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




cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat

2002-03-19 Thread patrickl

patrickl02/03/19 09:37:42

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.bat
  Log:
  Patch to fix typo
  Submitted by:  Christopher Elkins
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.18.2.5  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.18.2.4
  retrieving revision 1.18.2.5
  diff -u -r1.18.2.4 -r1.18.2.5
  --- catalina.bat  30 Jan 2002 18:10:39 -  1.18.2.4
  +++ catalina.bat  19 Mar 2002 17:37:42 -  1.18.2.5
  @@ -30,7 +30,7 @@
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   rem   command is executed. The default is jdbconn.
   rem
  -rem $Id: catalina.bat,v 1.18.2.4 2002/01/30 18:10:39 patrickl Exp $
  +rem $Id: catalina.bat,v 1.18.2.5 2002/03/19 17:37:42 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -87,7 +87,7 @@
   
   if not %1 == jpda goto noJpda
   set JPDA=jpda
  -if not %JPDA_ADDRESS% ==  got gotJpdaAddress
  +if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
   set JPDA_ADDRESS=jdbconn
   :gotJpdaAddress
   shift
  
  
  

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




Re: [PATCH] Typo in catalina.bat

2002-03-19 Thread Patrick Luby

Christopher,

Good catch. I just committed your patch to the HEAD and tomcat_40_branch
branches.

Patrick

Christopher Elkins wrote:
 
 Hi, all.
 
 The patch below fixes a typo in catalina.bat.
 
 --
 Christopher Elkins
 
 Index: catalina.bat
 ===
 RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
 retrieving revision 1.25
 diff -u -r1.25 catalina.bat
 --- catalina.bat11 Feb 2002 20:26:24 -  1.25
 +++ catalina.bat19 Mar 2002 16:57:33 -
 @@ -87,7 +87,7 @@
 
  if not %1 == jpda goto noJpda
  set JPDA=jpda
 -if not %JPDA_ADDRESS% ==  got gotJpdaAddress
 +if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
  set JPDA_ADDRESS=jdbconn
  :gotJpdaAddress
  shift
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

-- 
_
Patrick Luby  Email: [EMAIL PROTECTED]
Sun Microsystems  Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
_

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




cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat

2002-03-19 Thread patrickl

patrickl02/03/19 10:10:56

  Modified:catalina/src/bin catalina.bat
  Log:
  Make JDPA transport configurable
  Submitted by: Christopher Elkins
  
  Revision  ChangesPath
  1.27  +9 -3  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- catalina.bat  19 Mar 2002 17:36:45 -  1.26
  +++ catalina.bat  19 Mar 2002 18:10:56 -  1.27
  @@ -27,10 +27,13 @@
   rem   (JSSE) installation, whose JAR files will be added to the
   rem   system class path used to start Tomcat.
   rem
  +rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +rem   command is executed. The default is dt_shmem.
  +rem
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   rem   command is executed. The default is jdbconn.
   rem
  -rem $Id: catalina.bat,v 1.26 2002/03/19 17:36:45 patrickl Exp $
  +rem $Id: catalina.bat,v 1.27 2002/03/19 18:10:56 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -87,6 +90,9 @@
   
   if not %1 == jpda goto noJpda
   set JPDA=jpda
  +if not %JPDA_TRANSPORT% ==  goto gotJpdaTransport
  +set JPDA_TRANSPORT=dt_shmem
  +:gotJpdaTransport
   if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
   set JPDA_ADDRESS=jdbconn
   :gotJpdaAddress
  @@ -174,10 +180,10 @@
   goto end
   :doJpda
   if not %SECURITY_POLICY_FILE% ==  goto doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   
   :end
  
  
  

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




cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat

2002-03-19 Thread patrickl

patrickl02/03/19 10:14:10

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.bat
  Log:
  Make JDPA transport configurable
  Submitted by:   Christopher Elkins
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.18.2.6  +10 -4 jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.18.2.5
  retrieving revision 1.18.2.6
  diff -u -r1.18.2.5 -r1.18.2.6
  --- catalina.bat  19 Mar 2002 17:37:42 -  1.18.2.5
  +++ catalina.bat  19 Mar 2002 18:14:10 -  1.18.2.6
  @@ -27,10 +27,13 @@
   rem   (JSSE) installation, whose JAR files will be added to the
   rem   system class path used to start Tomcat.
   rem
  +rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +rem   command is executed. The default is dt_shmem.
  +rem
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   rem   command is executed. The default is jdbconn.
   rem
  -rem $Id: catalina.bat,v 1.18.2.5 2002/03/19 17:37:42 patrickl Exp $
  +rem $Id: catalina.bat,v 1.18.2.6 2002/03/19 18:14:10 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -85,8 +88,11 @@
   set DEBUG_OPTS=
   set JPDA=
   
  -if not %1 == jpda goto noJpda
  +if not %1 == jpda goto noJpda
   set JPDA=jpda
  +if not %JPDA_TRANSPORT% ==  goto gotJpdaTransport
  +set JPDA_TRANSPORT=dt_shmem
  +:gotJpdaTransport
   if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
   set JPDA_ADDRESS=jdbconn
   :gotJpdaAddress
  @@ -174,10 +180,10 @@
   goto end
   :doJpda
   if not %SECURITY_POLICY_FILE% ==  goto doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   
   :end
  
  
  

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




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

2002-03-19 Thread patrickl

patrickl02/03/19 10:21:14

  Modified:catalina/src/bin catalina.sh
  Log:
  Add JPDA_TRANSPORT environment variable
  
  Revision  ChangesPath
  1.28  +8 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- catalina.sh   18 Mar 2002 17:37:51 -  1.27
  +++ catalina.sh   19 Mar 2002 18:21:14 -  1.28
  @@ -22,6 +22,9 @@
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
   #   stop, or run command is executed.
   #
  +#   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +#   command is executed. The default is dt_socket.
  +#
   #   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   #   command is executed. The default is 8000.
   #
  @@ -29,7 +32,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.27 2002/03/18 17:37:51 patrickl Exp $
  +# $Id: catalina.sh,v 1.28 2002/03/19 18:21:14 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -107,11 +110,14 @@
   echo Using JAVA_HOME:   $JAVA_HOME
   
   if [ $1 = jpda ] ; then
  +  if [ -z $JPDA_TRANSPORT ]; then
  +JPDA_TRANSPORT=dt_socket
  +  fi
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
 if [ -z $JPDA_OPTS ]; then
  -JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
  +JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
 shift
  
  
  

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




Re: Tomcat source in IDE

2002-03-19 Thread Jose M. Palomar

I'm using Forte CE 3.0 with Tomcat sources without any problem. Did you
tried to download the CVS source?

You could import the sources using the CVS module of Forte and to build it
use the ANT module too ;).

For me works.
-
Jose M. Palomar
www.talika.org
- Original Message -
From: bhai [EMAIL PROTECTED]
To: Tomcat Developers List [EMAIL PROTECTED]
Sent: Monday, March 18, 2002 10:06 PM
Subject: Tomcat source in IDE


 Hello,

 I am trying to study tomcat source and i tried to import it in Eclipse and
 Forte but obvioulsy there are some directory heirachies that cause the IDE
 to throw an error.

 My question is that are there any articles out there for importing tomcat
 source into an IDE and then compiling/building the source from there
 (integrating ant with the IDE? )

 Please guide me in the right direction.

 Thanks.

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




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




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

2002-03-19 Thread patrickl

patrickl02/03/19 10:24:36

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.sh
  Log:
  Add JPDA_TRANSPORT environment variable
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.20.2.3  +8 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.20.2.2
  retrieving revision 1.20.2.3
  diff -u -r1.20.2.2 -r1.20.2.3
  --- catalina.sh   18 Mar 2002 17:39:15 -  1.20.2.2
  +++ catalina.sh   19 Mar 2002 18:24:36 -  1.20.2.3
  @@ -22,6 +22,9 @@
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
   #   stop, or run command is executed.
   #
  +#   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +#   command is executed. The default is dt_socket.
  +#
   #   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   #   command is executed. The default is 8000.
   #
  @@ -29,7 +32,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.20.2.2 2002/03/18 17:39:15 patrickl Exp $
  +# $Id: catalina.sh,v 1.20.2.3 2002/03/19 18:24:36 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -107,11 +110,14 @@
   echo Using JAVA_HOME:   $JAVA_HOME
   
   if [ $1 = jpda ] ; then
  +  if [ -z $JPDA_TRANSPORT ]; then
  +JPDA_TRANSPORT=dt_socket
  +  fi
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
 if [ -z $JPDA_OPTS ]; then
  -JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
  +JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
 shift
  
  
  

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




Re: [PATCH] Allow configurable JPDA transport in catalina.bat

2002-03-19 Thread Patrick Luby

Christopher,

I have committed this patch and have ported it to the catalina.sh script for
Unix platforms as well.

Patrick

Christopher Elkins wrote:
 
 Hi, all.
 
 The patch below allows the JPDA transport used in jpda start to be set via
 an environment variable. Unfortunately, not all debuggers support the shared
 memory transport (e.g., JSwat), so these changes make it possible to use
 the socket transport without having to modify catalina.bat locally.
 
 Moreover, this patch cleans up the slightly inaccurate comment for
 JPDA_ADDRESS and includes my previous patch to fix a typo (with the subject
 [PATCH] Typo in catalina.bat).
 
 --
 Christopher Elkins
 
 Index: catalina.bat
 ===
 RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
 retrieving revision 1.25
 diff -u -r1.25 catalina.bat
 --- catalina.bat11 Feb 2002 20:26:24 -  1.25
 +++ catalina.bat19 Mar 2002 17:20:17 -
 @@ -27,7 +27,10 @@
  rem   (JSSE) installation, whose JAR files will be added to the
  rem   system class path used to start Tomcat.
  rem
 -rem   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
 +rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
 +rem   command is executed. The default is dt_shmem.
 +rem
 +rem   JPDA_ADDRESS(Optional) JPDA address used when the jpda start
  rem   command is executed. The default is jdbconn.
  rem
  rem $Id: catalina.bat,v 1.25 2002/02/11 20:26:24 patrickl Exp $
 @@ -87,7 +90,10 @@
 
  if not %1 == jpda goto noJpda
  set JPDA=jpda
 -if not %JPDA_ADDRESS% ==  got gotJpdaAddress
 +if not %JPDA_TRANSPORT% ==  goto gotJpdaTransport
 +set JPDA_TRANSPORT=dt_shmem
 +:gotJpdaTransport
 +if not %JPDA_ADDRESS% ==  goto gotJpdaAddress
  set JPDA_ADDRESS=jdbconn
  :gotJpdaAddress
  shift
 @@ -174,10 +180,10 @@
  goto end
  :doJpda
  if not %SECURITY_POLICY_FILE% ==  goto doSecurityJpda
 -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  goto end
  :doSecurityJpda
 -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=dt_shmem,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% 
-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS% -classpath %CLASSPATH% 
-Djava.security.manager -Djava.security.policy==%SECURITY_POLICY_FILE% 
-Dcatalina.base=%CATALINA_BASE% -Dcatalina.home=%CATALINA_HOME% 
-Djava.io.tmpdir=%CATALINA_TMPDIR% %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  goto end
 
  :end
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

-- 
_
Patrick Luby  Email: [EMAIL PROTECTED]
Sun Microsystems  Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
_

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




Re: config

2002-03-19 Thread costinm

On Mon, 18 Mar 2002, Bill Barker wrote:

 I can see that this is going to make life difficult for ApacheConfig.  Yes,
 hopefully we can deprecate it soon.  But in the mean time, I'd personally
 prefer that the port is a property of the worker.ajp13.  So your example
 would be:
 worker.ajp13.channel=socket
 worker.ajp13.port=8009

ApacheConfig is likely to change into JkConfig - we'll have almost
nothing in httpd.conf, and nothing specific to apache ( except 
the experimental Location, which I hope to implement using the
config APIs in apache2 - the only purpose is to take advantage of the
native apache mapper and framework ).

Right now there's no 'magic' in jk2, but as soon as things are stable
I'll start adding it - setting the port on the worker is easy, and
more.

If we use a new default name ( jk2.properties ? ) and 
default location ( ${ServerRoot}/conf/jk2.properties ), the only
change in httpd.conf will be including mod_jk.so ( and we can
 clearly recommend puting mod_jk.so in modules/,
like all other modules )

But in the general case, I want to keep the 'channel.socket' and 
'worker.ajp13' separated, and use code in the setter to simplify the 
configuration without mixing up the real objects.

 I can't see that many people will do manual changes without at least doing
 apachectl graceful.  As long as that works, I can't see much of a problem
 here (at least in the real world).

There's a small problem here. If you use a management application 
or ajp14 to automatically deploy apps - the config file will
change on disk. If you edit it manually at the same time - not
good :-). 

You can continue to edit it manually, and it's easy to code 
something in the status ( or conf ) worker to reload jk2.properties
gracefully - without even restarting the server. ( you don't 
want to restart apache every time a worker is added/removed ).

 It's not that bad. If you allow in C++ (and on non-performance critical
 paths I don't see why not), then it's just http://xml.apache.org/xerces-c/
 And, no, I'm not volunteering either.

Expat is included in apache, but I don't want to increase complexity 
without a good reason. Reading is not the big concern here - we'll
also have to write it, and keep code simple.

I would rather spend the time writing a jk_config_ldap - that would
much more sense given the target ( farms of workers and servers, etc ).  
But that would require more work on tomcat as well to make it get
config from a directory service ( quite easy to do, if we had time ).

Propeties are good as 'common ground' because they force us to 
keep things simple. As soon as we add XML, people may use entities,
includes, etc.

Costin


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




DO NOT REPLY [Bug 7255] New: - Bug in automatically generated code (servlet code)

2002-03-19 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=7255.
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=7255

Bug in automatically generated code (servlet code)

   Summary: Bug in automatically generated code (servlet code)
   Product: Tomcat 4
   Version: 4.0.2 Final
  Platform: Macintosh
OS/Version: MacOS X
Status: NEW
  Severity: Blocker
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


upon requesting a page from tomcat4.0.2 I get the following error:

type Exception report

message Internal Server Error

description The server encountered an internal error (Internal Server Error) that 
prevented it from fulfilling this request.

exception

org.apache.jasper.JasperException: Unable to compile class for JSP
/Users/lhelldor/jakarta-tomcat-4.0.2/work/localhost/_/COM/en/registration/logic/action_0005flogin_0005ffor_0005fpage$jsp.java:256:
 Incompatible type for method. Explicit cast needed to convert java.lang.Throwable to 
java.lang.Exception.
if (pageContext != null) pageContext.handlePageException(t);
 ^
1 error
(backtrace follows)

on examination of action_0005flogin_0005ffor_0005fpage$jsp.java I found the following 
code in it, obviously automatically generated:


// end

} catch (Throwable t) {
if (out != null  out.getBufferSize() != 0)
out.clearBuffer();
if (pageContext != null) pageContext.handlePageException(t);
} finally {
if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);
}
}
}

while it should read:


// end

} catch (Throwable t) {
if (out != null  out.getBufferSize() != 0)
out.clearBuffer();
if (pageContext != null) pageContext.handlePageException((Exception)t);
} finally {
if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);
}
}
}

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




DO NOT REPLY [Bug 6560] - naming-factory.jar from Tomcat 4.0.2 RPM not complete

2002-03-19 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=6560.
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=6560

naming-factory.jar from Tomcat 4.0.2 RPM not complete

[EMAIL PROTECTED] changed:

   What|Removed |Added

Version|4.0.2 Final |4.0.3 Final



--- Additional Comments From [EMAIL PROTECTED]  2002-03-19 19:10 ---
Version 4.0.3 of the RPMs also has this problem.

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




cvs commit: jakarta-tomcat-4.0/webapps/admin/logger loggers.jsp

2002-03-19 Thread manveen

manveen 02/03/19 10:35:28

  Added:   webapps/admin/logger loggers.jsp
  Log:
  jsp for displaying list of loggers
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-4.0/webapps/admin/logger/loggers.jsp
  
  Index: loggers.jsp
  ===
  !-- Standard Struts Entries --
  %@ page language=java %
  %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean %
  %@ taglib uri=/WEB-INF/struts-html.tld prefix=html %
  %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic %
  %@ taglib uri=/WEB-INF/controls.tld prefix=controls %
  
  html:html locale=true
  
  %@ include file=../users/header.jsp %
  
  !-- Body --
  body bgcolor=white
  
  !--Form --
  
  html:errors/
  
  html:form method=post action=/DeleteLoggers
  
table width=100% border=0 cellspacing=0 cellpadding=0
  tr bgcolor=7171A5
td width=81% 
  div class=page-title-text align=left
bean:message key=actions.loggers.delete/
  /div
/td
td width=19% 
  div align=right
  controls:actions
controls:action selected=true
  bean:message key=actions.available.actions/
/controls:action
controls:action
  -
/controls:action
  /controls:actions
  /div
/td
  /tr
/table
  
  %@ include file=../buttons.jsp %
br
  
%-- Loggers List --%
  
table class=back-table border=0 cellspacing=0 cellpadding=1
   width=100%
  trtd 
  
table class=front-table border=1
 cellspacing=0 cellpadding=0 width=100%
  
  tr class=header-row
tddiv align=left class=table-header-text
  bean:message key=actions.delete/
/div/td
tddiv align=left class=table-header-text
  bean:message key=host.name/
/div/td
  /tr
  
  logic:iterate name=loggersList id=logger
tr class=line-row
  tddiv align=left class=table-normal-textnbsp;
html:multibox property=loggers
  value=%= logger.toString() %/
  /div/td
  tddiv align=left class=table-normal-textnbsp;
html:link page='%= /EditLogger.do?select= + 
   java.net.URLEncoder.encode(logger.toString()) %'
  controls:attribute name=logger attribute=className/
/html:link
  /div/td
/tr
  /logic:iterate
  
/table
  
  /td/tr
/table
  
  %@ include file=../buttons.jsp %
  
br
  /html:form
  
  pnbsp;/p
  /body
  /html:html
  
  
  

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




Re: Modified bugzilla categories

2002-03-19 Thread Pier Fumagalli

Remy Maucherat [EMAIL PROTECTED] wrote:

 I've modified the bugzilla components for TC 4, adding a few (Servlet  JSP
 API, admin webapp, JK 2, Catalina modules, CGI, SSI, WebDAV), and
 categorizing more explicitely the rest (for ex, all connector related
 components are prefixed with Connector:).
 
 If it's not ok, let me know.

Just ran the sanity checks on BugZilla... All is good...

Pier


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




cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteProcessor.java CoyoteRequest.java

2002-03-19 Thread remm

remm02/03/19 12:34:41

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteProcessor.java CoyoteRequest.java
  Log:
  - Switch over to the optimized j-t-c/util code for cookie parsing.
  
  Revision  ChangesPath
  1.17  +34 -28
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java
  
  Index: CoyoteProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CoyoteProcessor.java  16 Mar 2002 05:31:12 -  1.16
  +++ CoyoteProcessor.java  19 Mar 2002 20:34:41 -  1.17
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
 1.16 2002/03/16 05:31:12 remm Exp $
  - * $Revision: 1.16 $
  - * $Date: 2002/03/16 05:31:12 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
 1.17 2002/03/19 20:34:41 remm Exp $
  + * $Revision: 1.17 $
  + * $Date: 2002/03/19 20:34:41 $
*
* 
*
  @@ -85,6 +85,8 @@
   
   import org.apache.tomcat.util.buf.ByteChunk;
   import org.apache.tomcat.util.buf.MessageBytes;
  +import org.apache.tomcat.util.http.Cookies;
  +import org.apache.tomcat.util.http.ServerCookie;
   
   import org.apache.coyote.ActionCode;
   import org.apache.coyote.ActionHook;
  @@ -117,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.16 $ $Date: 2002/03/16 05:31:12 $
  + * @version $Revision: 1.17 $ $Date: 2002/03/19 20:34:41 $
*/
   
   final class CoyoteProcessor
  @@ -415,7 +417,7 @@
   }
   
   parseHost();
  -parseCookies();
  +parseCookies(req);
   
   }
   
  @@ -518,33 +520,37 @@
* but a conversion to Catalina own cookies would then be needed, which 
* would take away most if not all of the performance benefit.
*/
  -protected void parseCookies() {
  +protected void parseCookies(Request req) {
   
  -Enumeration values = request.getHeaders(cookie);
  -while (values.hasMoreElements()) {
  -String value = values.nextElement().toString();
  -Cookie cookies[] = RequestUtil.parseCookieHeader(value);
  -for (int i = 0; i  cookies.length; i++) {
  -if (cookies[i].getName().equals
  -(Globals.SESSION_COOKIE_NAME)) {
  -// Override anything requested in the URL
  -if (!request.isRequestedSessionIdFromCookie()) {
  -// Accept only the first session id cookie
  -request.setRequestedSessionId(cookies[i].getValue());
  -request.setRequestedSessionCookie(true);
  -request.setRequestedSessionURL(false);
  -if (debug = 1)
  -log( Requested cookie session id is  +
  -((HttpServletRequest) request.getRequest())
  -.getRequestedSessionId());
  -}
  +Cookies serverCookies = req.getCookies();
  +int count = serverCookies.getCookieCount();
  +if (count = 0)
  +return;
  +
  +Cookie[] cookies = new Cookie[count];
  +
  +for (int i = 0; i  count; i++) {
  +ServerCookie scookie = serverCookies.getCookie(i);
  +if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) {
  +// Override anything requested in the URL
  +if (!request.isRequestedSessionIdFromCookie()) {
  +// Accept only the first session id cookie
  +request.setRequestedSessionId
  +(scookie.getValue().toString());
  +request.setRequestedSessionCookie(true);
  +request.setRequestedSessionURL(false);
  +if (debug = 1)
  +log( Requested cookie session id is  +
  +((HttpServletRequest) request.getRequest())
  +.getRequestedSessionId());
   }
  -if (debug = 1)
  -log( Adding cookie  + cookies[i].getName() + = +
  -cookies[i].getValue());
  -request.addCookie(cookies[i]);
   }
  +Cookie cookie = new Cookie(scookie.getName().toString(),
  +   scookie.getValue().toString());
  +cookies[i] = cookie;
   }
  +
  +request.setCookies(cookies);
   
   }
   
  

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml

2002-03-19 Thread amyroh

amyroh  02/03/19 13:14:54

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
  Log:
  Add removeManager() and removeRealm().
  
  Revision  ChangesPath
  1.15  +100 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MBeanFactory.java 18 Mar 2002 20:25:15 -  1.14
  +++ MBeanFactory.java 19 Mar 2002 21:14:54 -  1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.14 2002/03/18 20:25:15 amyroh Exp $
  - * $Revision: 1.14 $
  - * $Date: 2002/03/18 20:25:15 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.15 2002/03/19 21:14:54 amyroh Exp $
  + * $Revision: 1.15 $
  + * $Date: 2002/03/19 21:14:54 $
*
* 
*
  @@ -76,6 +76,8 @@
   import org.apache.catalina.Engine;
   import org.apache.catalina.Host;
   import org.apache.catalina.Logger;
  +import org.apache.catalina.Manager;
  +import org.apache.catalina.Realm;
   import org.apache.catalina.Server;
   import org.apache.catalina.ServerFactory;
   import org.apache.catalina.Service;
  @@ -111,7 +113,7 @@
* codeorg.apache.catalina.core.StandardServer/code component./p
*
* @author Amy Roh
  - * @version $Revision: 1.14 $ $Date: 2002/03/18 20:25:15 $
  + * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
*/
   
   public class MBeanFactory extends BaseModelMBean {
  @@ -235,8 +237,13 @@
   Server server = ServerFactory.getServer();
   Service service = server.findService(pname.getKeyProperty(service));
   Engine engine = (Engine) service.getContainer();
  -Host host = (Host) engine.findChild(pname.getKeyProperty(host));
  -host.addDefaultContext(context);
  +String hostName = pname.getKeyProperty(host);
  +if (hostName == null) { //if DefaultContext is nested in Engine
  +engine.addDefaultContext(context);
  +} else {// if DefaultContext is nested in Host
  +Host host = (Host) engine.findChild(hostName);
  +host.addDefaultContext(context);
  +}
   
   // Return the corresponding MBean name
   ManagedBean managed = registry.findManagedBean(DefaultContext);
  @@ -1053,6 +1060,93 @@
   }
   
   
  +/**
  + * Remove an existing Manager.
  + *
  + * @param name MBean Name of the comonent to remove
  + *
  + * @exception Exception if a component cannot be removed
  + */
  +public void removeManager(String name) throws Exception {
  +
  +// Acquire a reference to the component to be removed
  +ObjectName oname = new ObjectName(name);
  +String serviceName = oname.getKeyProperty(service);
  +String hostName = oname.getKeyProperty(host);
  +String contextName = oname.getKeyProperty(path);
  +Server server = ServerFactory.getServer();
  +Service service = server.findService(serviceName);
  +Engine engine = (Engine) service.getContainer();
  +Host host = (Host) engine.findChild(hostName);
  +Context context = (Context) host.findChild(contextName);
  +
  +// Remove this component from its parent component
  +context.setManager(null);
  +
  +}
  +
  +
  +/**
  + * Remove an existing Realm.
  + *
  + * @param name MBean Name of the comonent to remove
  + *
  + * @exception Exception if a component cannot be removed
  + */
  +public void removeRealm(String name) throws Exception {
  +
  +// Acquire a reference to the component to be removed
  +ObjectName oname = new ObjectName(name);
  +String serviceName = oname.getKeyProperty(service);
  +String hostName = oname.getKeyProperty(host);
  +String path = oname.getKeyProperty(path);
  +Server server = ServerFactory.getServer();
  +Service service = server.findService(serviceName);
  +StandardEngine engine = (StandardEngine) service.getContainer();
  +if (hostName == null) { // if realm's container is Engine
  +Realm realm = engine.getRealm();
  +Container container = realm.getContainer();
  +if (container instanceof StandardEngine) {
  +String sname =
  +((StandardEngine)container).getService().getName();
  +if (sname.equals(serviceName)) {
  +

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml

2002-03-19 Thread amyroh

amyroh  02/03/19 13:36:56

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
  Log:
  Add createWebappLoader() and removeLoader().
  
  Revision  ChangesPath
  1.16  +75 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- MBeanFactory.java 19 Mar 2002 21:14:54 -  1.15
  +++ MBeanFactory.java 19 Mar 2002 21:36:56 -  1.16
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.15 2002/03/19 21:14:54 amyroh Exp $
  - * $Revision: 1.15 $
  - * $Date: 2002/03/19 21:14:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.16 2002/03/19 21:36:56 amyroh Exp $
  + * $Revision: 1.16 $
  + * $Date: 2002/03/19 21:36:56 $
*
* 
*
  @@ -75,6 +75,7 @@
   import org.apache.catalina.DefaultContext;
   import org.apache.catalina.Engine;
   import org.apache.catalina.Host;
  +import org.apache.catalina.Loader;
   import org.apache.catalina.Logger;
   import org.apache.catalina.Manager;
   import org.apache.catalina.Realm;
  @@ -91,6 +92,7 @@
   import org.apache.catalina.core.StandardHost;
   import org.apache.catalina.core.StandardServer;
   import org.apache.catalina.core.StandardService;
  +import org.apache.catalina.loader.WebappLoader;
   import org.apache.catalina.logger.FileLogger;
   import org.apache.catalina.logger.SystemErrLogger;
   import org.apache.catalina.logger.SystemOutLogger;
  @@ -113,7 +115,7 @@
* codeorg.apache.catalina.core.StandardServer/code component./p
*
* @author Amy Roh
  - * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
  + * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
*/
   
   public class MBeanFactory extends BaseModelMBean {
  @@ -199,7 +201,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
   ((StandardContext)context).addValve(accessLogger);
   } else if (tname.equals(Engine)) {
   ((StandardEngine)engine).addValve(accessLogger);
  @@ -277,7 +279,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
   context.setLogger(fileLogger);
   } else if (tname.equals(Engine)) {
   engine.setLogger(fileLogger);
  @@ -384,7 +386,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
   context.setRealm(realm);
   } else if (tname.equals(Engine)) {
   engine.setRealm(realm);
  @@ -425,7 +427,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
   context.setRealm(realm);
   } else if (tname.equals(Engine)) {
   engine.setRealm(realm);
  @@ -466,7 +468,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
   context.setRealm(realm);
   } else if (tname.equals(Engine)) {
   engine.setRealm(realm);
  @@ -507,7 +509,7 @@
   if (tname.equals(StandardContext)) {
   Host host = (Host) engine.findChild(pname.getKeyProperty(host));
   Context context =
  -(Context) host.findChild(pname.getKeyProperty(context));
  +(Context) host.findChild(pname.getKeyProperty(path));
 

DO NOT REPLY [Bug 5250] - Load balancing workers do not correctly handle Cookies conformant with RFC 2965

2002-03-19 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=5250.
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=5250

Load balancing workers do not correctly handle Cookies conformant with RFC 2965

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||LATER



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 00:10 ---
I'm LATERing this one relative to Tomcat 3.3.1.  It will be addressed in
jakarta-tomcat-connectors, if it hasn't already.

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




DO NOT REPLY [Bug 6369] - jk_nt_service.exe does not set exit code

2002-03-19 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=6369.
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=6369

jk_nt_service.exe does not set exit code

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||LATER



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 00:13 ---
I'm LATERing this one relative to Tomcat 3.3.1.  It will be addressed in
jakarta-tomcat-connectors.

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




DO NOT REPLY [Bug 6557] - isapi_redirector can not handle post request from netscape 4.7x

2002-03-19 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=6557.
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=6557

isapi_redirector can not handle post request from netscape 4.7x

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||LATER



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 00:21 ---
I regret not having the time to look more into this, and need to LATER this
one relative to Tomcat 3.3.1.  I will try to address this in
jakarta-tomcat-connectors.  A test case that we can use to duplicate the
problem would be helpful.

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




DO NOT REPLY [Bug 7026] - AutoDeploy works bad

2002-03-19 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=7026.
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=7026

AutoDeploy works bad

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||LATER



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 01:42 ---
I'll assume there is a problem the is a restart problem related to Tomcat or
the connector, but a test case will be needed to investigate further.  Will
address this after Tomcat 3.3.1.

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




DO NOT REPLY [Bug 6723] - 'taglib' is not a valid directive under IIS4

2002-03-19 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=6723.
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=6723

'taglib' is not a valid directive under IIS4

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 00:42 ---
There isn't enough detail to attempt to duplicate.  I am assuming that
the error was reported by the browser, perhaps because JSP source was being
served rather than the intended JSP output.

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




DO NOT REPLY [Bug 6643] - Tom 3.3a or 3.31b1 : URLRewriting POST == 404 error

2002-03-19 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=6643.
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=6643

Tom 3.3a or 3.31b1 : URLRewriting POST == 404 error

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX



--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 03:19 ---
I agree with Bill that getRequestDispatcher() accepts paths within the
web application which should not include the ;jsessionid URL parameter.
This would be inappropriate for the reference inplementation.

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




cvs commit: jakarta-tomcat/src/etc/jk uriworkermap.properties

2002-03-19 Thread larryi

larryi  02/03/19 19:24:00

  Modified:src/etc/jk uriworkermap.properties
  Log:
  Bring this example file up to date.
  
  Revision  ChangesPath
  1.2   +27 -8 jakarta-tomcat/src/etc/jk/uriworkermap.properties
  
  Index: uriworkermap.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/uriworkermap.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- uriworkermap.properties   9 Sep 2000 23:21:20 -   1.1
  +++ uriworkermap.properties   20 Mar 2002 03:24:00 -  1.2
  @@ -1,14 +1,33 @@
   
   #
  -# Simple worker configuration file
  +# Simple uriworkermap configuration file
   #
   
  -# Mount the servlet context to the ajp12 worker
  -/servlet/*=ajp12
  -
  -# Mount the examples context to the ajp12 worker
  -/examples/*=ajp12
  +# Mount the examples context to the ajp13 worker.
  +# Forwards all requests for this context to Tomcat.
  +/examples=ajp13
  +/examples/*=ajp13
   
   # Advanced mount of the examples context
  -# /examples/*.jsp=ajp12
  -# /examples/servlet/*=ajp12
  +# Forwards only JSP page and servlet requests for
  +# this context to Tomcat.
  +# Requires additional manual configuration of IIS to
  +# successfully serve static content in this context.
  +#
  +# Note: ApacheConfig will do a much more complete
  +# job of generating this kind of configuration
  +# if forwardAll is set false.
  +# 
  +# /examples/*.jsp=ajp13
  +# /examples/servlet/*=ajp13
  +
  +# Really advanced mount of the root context.
  +# Forwards only JSP page and servlet requests for
  +# this context to Tomcat.
  +# To work properly, merging of IIS's default virtual
  +# directory and Tomcat's ROOT web application is 
  +# required.
  +# 
  +#/*.jsp ajp13
  +#/servlet/*=ajp13
  +
  
  
  

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




cvs commit: jakarta-tomcat/src/etc/jk obj.conf

2002-03-19 Thread larryi

larryi  02/03/19 19:33:24

  Modified:src/etc/jk obj.conf
  Log:
  Bring this example file more up to date.
  
  Revision  ChangesPath
  1.2   +12 -4 jakarta-tomcat/src/etc/jk/obj.conf
  
  Index: obj.conf
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/obj.conf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- obj.conf  9 Sep 2000 23:21:20 -   1.1
  +++ obj.conf  20 Mar 2002 03:33:24 -  1.2
  @@ -12,7 +12,7 @@
   #
   # Assign contexts to Tomcat
   #
  -NameTrans fn=assign-name from=/servlet/* name=servlet
  +NameTrans fn=assign-name from=/examples name=servlet
   NameTrans fn=assign-name from=/examples/* name=servlet
   #
   # Advanced context configuration
  @@ -20,6 +20,14 @@
   # NameTrans fn=assign-name from=/examples/jsp/*.jsp name=servlet
   # NameTrans fn=assign-name from=/examples/servlet/* name=servlet
   # NameTrans fn=pfx2dir from=/examples dir=d:/tomcat/examples
  +#
  +# Really advanced context configuration
  +#
  +# Requires some form of merging betweem the Netscape's root
  +# directory and Tomcat's ROOT web application.
  +#
  +# NameTrans fn=assign-name from=/*.jsp name=servlet
  +# NameTrans fn=assign-name from=/servlet/* name=servlet
   
   NameTrans fn=pfx2dir from=/ns-icons dir=d:/web-servers/ent3.6/ns-icons
   NameTrans fn=pfx2dir from=/mc-icons dir=d:/web-servers/ent3.6/ns-icons
  @@ -50,15 +58,15 @@
   
   Object name=servlet
   #
  -# Pass the request to the ajp12 worker
  +# Pass the request to the ajp13 worker
   #
   ObjectType fn=force-type type=text/plain
  -Service fn=jk_service worker=ajp12
  +Service fn=jk_service worker=ajp13
   
   #
   # Pass the request to the jni worker
   #
  -# Service fn=jk_service worker=ajp12
  +# Service fn=jk_service worker=inprocess
   #
   /Object
   
  
  
  

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




DO NOT REPLY [Bug 7177] - Apache/mod_jk/Tomcat Connectivity Problem

2002-03-19 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=7177.
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=7177

Apache/mod_jk/Tomcat Connectivity Problem





--- Additional Comments From [EMAIL PROTECTED]  2002-03-20 03:48 ---
I recently spent alot of time finding and solving problems on a high volume
Apache - mod_jk - AJP - Tomcat site.

I recommend you review my comments for bug 5181 regarding JVM tuning, etc.

I also see AJP/mod_jk socket errors once in a while.  On the order of 20-60
per day on a production system that handles 20k-50k requests per day.

I don't know if this is a bug or not.

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




tomcat+jdk1.4+ssl problem

2002-03-19 Thread Rams

Hi all,
l am working on SSL. 
l was using jsse1.0.2, Tomcat 3.2.1 and Jdk1.3 on Windows NT 4.0. With this
SSL was working fine.

When l shifted to jdk1.4, Tomcat is not running. lt throws this error:

-
[Service Control] java.lang.NoSuchMethodError
[Service Control]   at
com.sun.net.ssl.internal.ssl.X509TrustManagerImpl.a(DashoA6275)
[Service Control]   at
com.sun.net.ssl.internal.ssl.X509TrustManagerImpl.init(DashoA6275)
[Service Control]   at
com.sun.net.ssl.internal.ssl.TrustManagerFactoryImpl.engineInit(DashoA6275)
[Service Control]   at
javax.net.ssl.TrustManagerFactory.init(DashoA6275)
[Service Control]   at
com.sun.net.ssl.TrustManagerFactorySpiWrapper.engineInit(DashoA6275)
[Service Control]   at
com.sun.net.ssl.TrustManagerFactory.init(DashoA6275)
[Service Control]   at
org.apache.tomcat.net.SSLSocketFactory.initProxy(SSLSocketFactory.java:177)
[Service Control]   at
org.apache.tomcat.net.SSLSocketFactory.createSocket(SSLSocketFactory.java:11
8)
[Service Control]   at
org.apache.tomcat.service.PoolTcpEndpoint.startEndpoint(PoolTcpEndpoint.java
:239)
[Service Control]   at
org.apache.tomcat.service.PoolTcpConnector.start(PoolTcpConnector.java:188)
[Service Control]   at
org.apache.tomcat.core.ContextManager.start(ContextManager.java:527)
[Service Control]   at
org.jboss.tomcat.TomcatEntry.execute(TomcatEntry.java:327)
[Service Control]   at
org.jboss.tomcat.TomcatEntry.init(TomcatEntry.java:72)
[Service Control]   at
org.jboss.tomcat.EmbeddedTomcatService.startService(EmbeddedTomcatService.ja
va:69)
[Service Control]   at
org.jboss.util.ServiceMBeanSupport.start(ServiceMBeanSupport.java:93)
[Service Control]   at java.lang.reflect.Method.invoke(Native Method)
[Service Control]   at
com.sun.management.jmx.MBeanServerImpl.invoke(MBeanServerImpl.java:1628)
[Service Control]   at
com.sun.management.jmx.MBeanServerImpl.invoke(MBeanServerImpl.java:1523)
[Service Control]   at
org.jboss.util.ServiceControl.start(ServiceControl.java:97)
[Service Control]   at java.lang.reflect.Method.invoke(Native Method)
[Service Control]   at
com.sun.management.jmx.MBeanServerImpl.invoke(MBeanServerImpl.java:1628)
[Service Control]   at
com.sun.management.jmx.MBeanServerImpl.invoke(MBeanServerImpl.java:1523)
[Service Control]   at org.jboss.Main.init(Main.java:203)
[Service Control]   at org.jboss.Main$1.run(Main.java:107)
[Service Control]   at
java.security.AccessController.doPrivileged(Native Method)
[Service Control]   at org.jboss.Main.main(Main.java:103)


ls this a bug of jsse.jar's came along with jdk1.4 or of Tomcat's?

ln one of the mails, u said tomcat is running with jdk1.4.
lf so, where am i going wrong?

ur help is appreciated

regards
Rams




winmail.dat
Description: application/ms-tnef

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


Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml

2002-03-19 Thread


- Original Message - 
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, March 20, 2002 6:36 AM
Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans 
MBeanFactory.java mbeans-descriptors.xml


 amyroh  02/03/19 13:36:56
 
   Modified:catalina/src/share/org/apache/catalina/mbeans
 MBeanFactory.java mbeans-descriptors.xml
   Log:
   Add createWebappLoader() and removeLoader().
   
   Revision  ChangesPath
   1.16  +75 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
   
   Index: MBeanFactory.java
   ===
   RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v

   retrieving revision 1.15
   retrieving revision 1.16
   diff -u -r1.15 -r1.16
   --- MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
   +++ MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
   @@ -1,7 +1,7 @@
/*
   - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.15 2002/03/19 21:14:54 amyroh Exp $
   - * $Revision: 1.15 $
   - * $Date: 2002/03/19 21:14:54 $
   + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.16 2002/03/19 21:36:56 amyroh Exp $
   + * $Revision: 1.16 $
   + * $Date: 2002/03/19 21:36:56 $
 *
 * 
 *
   @@ -75,6 +75,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
   +import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
   @@ -91,6 +92,7 @@
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
   +import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemErrLogger;
import org.apache.catalina.logger.SystemOutLogger;
   @@ -113,7 +115,7 @@
 * codeorg.apache.catalina.core.StandardServer/code component./p
 *
 * @author Amy Roh
   - * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
   + * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
 */

public class MBeanFactory extends BaseModelMBean {
   @@ -199,7 +201,7 @@
if (tname.equals(StandardContext)) {
Host host = (Host) engine.findChild(pname.getKeyProperty(host));
Context context =
   -(Context) host.findChild(pname.getKeyProperty(context));
   +(Context) host.findChild(pname.getKeyProperty(path));
((StandardContext)context).addValve(accessLogger);
} else if (tname.equals(Engine)) {
((StandardEngine)engine).addValve(accessLogger);
   @@ -277,7 +279,7 @@
if (tname.equals(StandardContext)) {
Host host = (Host) engine.findChild(pname.getKeyProperty(host));
Context context =
   -(Context) host.findChild(pname.getKeyProperty(context));
   +(Context) host.findChild(pname.getKeyProperty(path));
context.setLogger(fileLogger);
} else if (tname.equals(Engine)) {
engine.setLogger(fileLogger);
   @@ -384,7 +386,7 @@
if (tname.equals(StandardContext)) {
Host host = (Host) engine.findChild(pname.getKeyProperty(host));
Context context =
   -(Context) host.findChild(pname.getKeyProperty(context));
   +(Context) host.findChild(pname.getKeyProperty(path));
context.setRealm(realm);
} else if (tname.equals(Engine)) {
engine.setRealm(realm);
   @@ -425,7 +427,7 @@
if (tname.equals(StandardContext)) {
Host host = (Host) engine.findChild(pname.getKeyProperty(host));
Context context =
   -(Context) host.findChild(pname.getKeyProperty(context));
   +(Context) host.findChild(pname.getKeyProperty(path));
context.setRealm(realm);
} else if (tname.equals(Engine)) {
engine.setRealm(realm);
   @@ -466,7 +468,7 @@
if (tname.equals(StandardContext)) {
Host host = (Host) engine.findChild(pname.getKeyProperty(host));
Context context =
   -(Context) host.findChild(pname.getKeyProperty(context));
   +(Context) host.findChild(pname.getKeyProperty(path));

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

2002-03-19 Thread billbarker

billbarker02/03/19 21:33:27

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  Add support for MaxKeepAliveRequests like in Apache httpd.
  
  This is primarily a protection against DoS attacks.  With this enabled, we 
eventually gracefully drop a Keep-Alive connection for greedy clients.  By default, 
this is currently disabled (so no change in the behavior).  It needs to be set by the 
Adaptor to have any effect.
  
  Revision  ChangesPath
  1.11  +26 -0 
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Http11Processor.java  15 Mar 2002 19:02:58 -  1.10
  +++ Http11Processor.java  20 Mar 2002 05:33:27 -  1.11
  @@ -200,6 +200,11 @@
   = org.apache.commons.logging.LogFactory.getLog(Http11Processor.class);
   
   
  +/**
  + * Maximum number of Keep-Alive requests to honor.
  + */
  +protected int maxKeepAliveRequests=-1;
  +
   // - Public Methods
   
   
  @@ -262,6 +267,22 @@
   
   
   /**
  + * Set the maximum number of Keep-Alive requests to honor.
  + * This is to safeguard from DoS attacks.  Setting to a negative
  + * value disables the check.
  + */
  +public void setMaxKeepAliveRequests(int mkar) {
  +maxKeepAliveRequests = mkar;
  +}
  +
  +/**
  + * Return the number of Keep-Alive requests that we will honor.
  + */
  +public int getMaxKeepAliveRequests() {
  +return maxKeepAliveRequests;
  +}
  +
  +/**
* Process pipelined HTTP requests using the specified input and output
* streams.
* 
  @@ -281,6 +302,8 @@
   error = false;
   keepAlive = true;
   
  +int keepAliveLeft=maxKeepAliveRequests;
  +
   while (started  !error  keepAlive) {
   
   try {
  @@ -298,6 +321,9 @@
   
   // Setting up filters, and parse some request headers
   prepareRequest();
  +
  +if(maxKeepAliveRequests  0  --keepAliveLeft == 0)
  +keepAlive=false;
   
   // Process the request in the adapter
   if (!error) {
  
  
  

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