Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread costinm

On Tue, 21 May 2002, Remy Maucherat wrote:

 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on
 the Tomcat project. Denis has contributed patches to Jasper 2 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 performance.

+1. Nice work ! 

Costin


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




Re: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread costinm

On Tue, 21 May 2002, Anthony W. Marino wrote:

 Where/when does the linux property get set?


In your build.properties.

Hopefully we'll be able to automate this ( extract it from System 
properties ), or at least document it better.

Costin


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




RE: [VOTE] New committer: Denis Benoit

2002-05-22 Thread GOMEZ Henri

+1

Welcome on board ;)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 4:33 AM
To: [EMAIL PROTECTED]
Subject: [VOTE] New committer: Denis Benoit


I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a 
committer on
the Tomcat project. Denis has contributed patches to Jasper 2 
which brings
an impressive performance improvement when using JSP pages which rely
heavily on tags, such as the administration web application 
available in
Tomcat 4.1.x.
He appears willing to spend time to further improve Jasper 2 
performance.

He has my +1 as a committer.

Remy


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




RE: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread GOMEZ Henri

I'm working on autoconf support for jk2 which will
great build.properties.

This file could then be used by ant compile task or
good old make

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]
Sent: Tuesday, May 21, 2002 7:59 PM
To: 'Tomcat Developers List'
Subject: j-t-c/jk/native2/build.xml: if=linux


Where/when does the linux property get set?

Thank You,
Anthony

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




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Bojan Smojver

Quoting Remy Maucherat [EMAIL PROTECTED]:

 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer
 on the Tomcat project.

+1

Bojan

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




RE: JK2/Coyote Connector Testing Effort

2002-05-22 Thread GOMEZ Henri

Any ant after 1.4 should work, as well as configure ( i.e. ant is not 
the only way to build jk ).

I'm still working on autoconf support for jk2 and make files

The current ant tasks for building C work reasonably well - and
I think it's a good idea ( for some reasons I prefer to write 
logic in java rather than .sh or m4 ). However libtool/configure/make
remain a solid solution.

yep, and many people from native side of the force could find strange
to have a JDK + ant to build just native code

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




Re: [Kin-Man] Jasper compiling wrong stuff in the wrong place...

2002-05-22 Thread jean-frederic clere

Pier Fumagalli wrote:
 
 jean-frederic clere [EMAIL PROTECTED] wrote:
 
  Pier Fumagalli wrote:
 
  jean-frederic clere [EMAIL PROTECTED] wrote:
 
  Pier Fumagalli wrote:
 
  Remy Maucherat [EMAIL PROTECTED] wrote:
 
  Thanks for the report Pier. I had been wondering for AGES why the CL would
  reload the webapp randomly after accessing a JSP, telling that a bean
  class had been modified. I couldn't find a reason why it was a bug (the
  logging I added to investigate this displayed different dates which didn't
  appear bogus), but I failed to undestand why it happened.
 
  Yeah, I wonder why noone actually noticed this before... Am I the only
  idiot
  using TC4 in a secure production environment? (Meaning, chrooted JVM and
  suid execution, with access only to the work directory)?
 
  Last time I have tried this I noted that it did not work: TC tries to
  write in several places (at least conf and webapps).
 
  Conf works... I'll never give him access to my configurations directory...
  :) One trick is _never_ to put any source .java file anywhere in the WEB-INF
  directory, so that the useBean thing won't try to compile them (or at
  least, it seems to be working this way)
 
  What are you using to make chroot, setuid and co?
 
 Oh, not that hard... This works on Solaris, the trick is set up your entire
 CHROOTED environment (finding library dependancies, and that kind of crap).

I am trying to use jakarta-commons-sandbox/daemon (so that the TC runs on port
80 or 88).
Probably that adds some dependancy to the JVM...

 
 Pier
 
 #include sys/types.h
 #include unistd.h
 #include string.h
 #include errno.h
 #include stdio.h
 #include pwd.h
 
 int main(int argc, char *argv[]) {
 struct passwd *user=NULL;
 char **args=NULL;
 int x;
 
 if (argc4) {
 fprintf(stderr, Usage: %s [user] [chroot] [command]
 [...]\n,argv[0]);
 return(1);
 }
 
 if ((user=getpwnam(argv[1]))==NULL) {
 fprintf(stderr, %s cannot retrieve user \%s\
 profile\n,argv[0],argv[1]);
 return(2);
 }
 
 if (chroot(argv[2])!=0) {
 fprintf(stderr, %s cannot chroot to \%s\\n,argv[0],argv[2]);
 return(2);
 }
 
 if (setgroups(1,user-pw_gid)!=0) {
 fprintf(stderr, %s cannot set groups id\n, argv[0]);
 return(2);
 }
 
 if (setgid(user-pw_gid)!=0) {
 fprintf(stderr, %s cannot set effective group id\n, argv[0]);
 return(2);
 }
 
 if (setegid(user-pw_gid)!=0) {
 fprintf(stderr, %s cannot set real group id\n, argv[0]);
 return(2);
 }
 
 if (setuid(user-pw_uid)!=0) {
 fprintf(stderr, %s cannot set effective user id\n, argv[0]);
 return(2);
 }
 
 if (seteuid(user-pw_uid)!=0) {
 fprintf(stderr, %s cannot set real user id\n, argv[0]);
 return(2);
 }
 
 args=(char **)malloc((argc-2)*sizeof(char *));
 for (x=3; xargc; x++) args[x-3]=argv[x];
 args[argc-2]=NULL;
 
 execvp(argv[3], args);
 fprintf(stderr, %s: %s: %s\n, argv[0], argv[3], strerror(errno));
 }
 
 --
 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]




Status of JK / WAS: Status of JK2

2002-05-22 Thread GOMEZ Henri

BTW, what's the status of jk (native) ?

Did all the load-balancing patches were commited 
and did we have an updated documentation on it ?

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Friday, May 17, 2002 11:00 PM
To: Tomcat Users List
Cc: List Tomcat-Dev
Subject: Re: Status of JK2


On Fri, 17 May 2002, Anthony W. Marino wrote:

 I'm now running TC4.1.2 and want to use mod_jk2/apache2 for 
the early stages 
 of my project however I'm not certain what the issues are or 
when it might 
 become production quality or what  I see the empty 
download areas set up 
 for the various connectors which I hope is an indication of 
precompiled drops 
 soon to be available. 

Jk2 is pretty close - I am running all kind of tests, Henri is 
finishing 
the configure, Nacho got it running on IIS. 

Except for iPlanet support, most of the features are ready or pretty 
close. 

I'm only doing 'cosmetic' and bug-fixes now - plus documentations for
the new config, auto-generation of config from web.xml, etc. 

I think the release of jk2 depends only on the ammount of help we
can get with the build/testing/docs. After we're in a decent state
with the docs and the build we can release betas/milestones.


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]




RE: Status of JK2

2002-05-22 Thread GOMEZ Henri

You should have at least tomcat 3.3 / 4.x installed.

Order are (from my tomcat-connectors rpm) :


cd util
ant

cd ../jk

# build jkant
ant -Dservlet.jar=%{tomcat4dir}/common/lib/servlet.jar 
-Djunit.jar=%{javadir}/junit.jar -Dtomcat33.home=%{tomcat3dir} 
-Dtomcat40.home=%{tomcat4dir} -Dapache13.home=/usr -Dapache2.home=/usr

cd native

# build jk for Apache 1.3
ant -Dapxs13=/usr/sbin/apxs -Dapache13.home=/usr -Dapache13.include=%{ap13incdir}

# build jk for Apache 2.0
ant -Dapxs20=/usr/sbin/apxs2 -Dapache2.home=/usr -Dapache2.include=%{ap20incdir}

cd ../native2

# build jk2 for Apache 1.3
ant -Dapxs13=/usr/sbin/apxs -Dapache13.home=/usr -Dapache13.include=%{ap13incdir}

# build jk2 for Apache 2.0
ant -Dapxs20=/usr/sbin/apxs2 -Dapache2.home=/usr -Dapache2.include=%{ap20incdir} 
-Dapr.include=%{ap20incdir}
cd ..

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]
Sent: Saturday, May 18, 2002 1:08 AM
To: Tomcat Developers List; Bill Barker
Subject: Re: Status of JK2


ant all in jk dir gives me the same error:

 /mydirpath/jakarta-tomcat-connectors/jk/build.xml:100: Could 
not find file
 
/mydirpath/jakarta-tomcat-connectors/coyote/build/lib/tomcat-co
yote.jar to
 copy.


Anthony

 Try ant all.
 - Original Message -
 From: Anthony W. Marino [EMAIL PROTECTED]
 To: Tomcat Developers List [EMAIL PROTECTED]; Remy
 Maucherat [EMAIL PROTECTED]
 Sent: Friday, May 17, 2002 3:52 PM
 Subject: Re: Status of JK2


 Remy,

 The result of ant in jk dir:

 /mydirpath/jakarta-tomcat-connectors/jk/build.xml:100: Could 
not find file
 
/mydirpath/jakarta-tomcat-connectors/coyote/build/lib/tomcat-co
yote.jar to
 copy.


 Anthony

   This is what I get when I do ant:
  
   BUILD FAILED
  
   
/mydirpath/jakarta-tomcat-connectors/jk/native2/build.xml:90: Could not
 
  create
 
   task of type: so. Common solutions are to use taskdef to 
declare your
 
  task,
 
   or, if this is an optional task, to put the optional.jar 
in the lib
 
  directory
 
   of your ant installation (ANT_HOME).
  
   Any thoughts?
 
  You have to build the Java parts of JK first (go in
  jakarta-tomcat-connectors/jk, do ant), which include the 
Ant tasks.
 
  Remy


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




Re: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread Anthony W. Marino

What availability timeframe are we talking about?
Anthony

 I'm working on autoconf support for jk2 which will
 great build.properties.

 This file could then be used by ant compile task or
 good old make

 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6

 -Original Message-

 From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]

 Sent: Tuesday, May 21, 2002 7:59 PM
 To: 'Tomcat Developers List'
 Subject: j-t-c/jk/native2/build.xml: if=linux
 
 
 Where/when does the linux property get set?
 
 Thank You,
 Anthony
 
 --
 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]




RE: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread GOMEZ Henri

Not before a week or two.

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 1:51 PM
To: Tomcat Developers List; GOMEZ Henri
Subject: Re: j-t-c/jk/native2/build.xml: if=linux


What availability timeframe are we talking about?
Anthony

 I'm working on autoconf support for jk2 which will
 great build.properties.

 This file could then be used by ant compile task or
 good old make

 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6

 -Original Message-

 From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]

 Sent: Tuesday, May 21, 2002 7:59 PM
 To: 'Tomcat Developers List'
 Subject: j-t-c/jk/native2/build.xml: if=linux
 
 
 Where/when does the linux property get set?
 
 Thank You,
 Anthony
 
 --
 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]




Re: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread Anthony W. Marino

Why not have it automatic and add the property as a global property in the 
relevant build files as follows:

property name=${os.name} value=${os.name} /

Then make appropriate changes to if=... (ie; Linux not linux)


The only properties that should be in the build.properties file are user 
preferences and NOT hardcore system relevant properties that can be 
ascertained with a built-in property.

Anthony



 On Tue, 21 May 2002, Anthony W. Marino wrote:
  Where/when does the linux property get set?

 In your build.properties.

 Hopefully we'll be able to automate this ( extract it from System
 properties ), or at least document it better.

 Costin



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




Re: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread Anthony W. Marino

Henri,
Check my latest response to Costin with regards to system relevant properties.

Thanks,
Anthony

 Not before a week or two.

 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6

 -Original Message-

 From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]

 Sent: Wednesday, May 22, 2002 1:51 PM
 To: Tomcat Developers List; GOMEZ Henri
 Subject: Re: j-t-c/jk/native2/build.xml: if=linux
 
 
 What availability timeframe are we talking about?
 Anthony
 
  I'm working on autoconf support for jk2 which will
  great build.properties.
 
  This file could then be used by ant compile task or
  good old make
 
  -
  Henri Gomez ___[_]
  EMAIL : [EMAIL PROTECTED](. .)
  PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
  PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
  -Original Message-
 
  From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]
 
  Sent: Tuesday, May 21, 2002 7:59 PM
  To: 'Tomcat Developers List'
  Subject: j-t-c/jk/native2/build.xml: if=linux
  
  
  Where/when does the linux property get set?
  
  Thank You,
  Anthony
  
  --
  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 9189] - Port specified in doc is incorrect

2002-05-22 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=9189.
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=9189

Port specified in doc is incorrect





--- Additional Comments From [EMAIL PROTECTED]  2002-05-22 12:19 ---
I believe RPM's for Tomcat 4 were using altered ports at one point in time so
it co-exist with Tomcat 3.  Perhaps this is where the 8180 came from.  I don't
beleive this is being done anymore.

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




Re: Status of JK2

2002-05-22 Thread Anthony W. Marino

Without putting down the fantastic efforts of all involved, however,  that 
should be a breath of fresh air.

Thanks,
Anthony

 You should have at least tomcat 3.3 / 4.x installed.

 Order are (from my tomcat-connectors rpm) :


 cd util
 ant

 cd ../jk

 # build jkant
 ant -Dservlet.jar=%{tomcat4dir}/common/lib/servlet.jar
 -Djunit.jar=%{javadir}/junit.jar -Dtomcat33.home=%{tomcat3dir}
 -Dtomcat40.home=%{tomcat4dir} -Dapache13.home=/usr -Dapache2.home=/usr

 cd native

 # build jk for Apache 1.3
 ant -Dapxs13=/usr/sbin/apxs -Dapache13.home=/usr
 -Dapache13.include=%{ap13incdir}

 # build jk for Apache 2.0
 ant -Dapxs20=/usr/sbin/apxs2 -Dapache2.home=/usr
 -Dapache2.include=%{ap20incdir}

 cd ../native2

 # build jk2 for Apache 1.3
 ant -Dapxs13=/usr/sbin/apxs -Dapache13.home=/usr
 -Dapache13.include=%{ap13incdir}

 # build jk2 for Apache 2.0
 ant -Dapxs20=/usr/sbin/apxs2 -Dapache2.home=/usr
 -Dapache2.include=%{ap20incdir} -Dapr.include=%{ap20incdir} cd ..

 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6

 -Original Message-

 From: Anthony W. Marino [mailto:[EMAIL PROTECTED]]

 Sent: Saturday, May 18, 2002 1:08 AM
 To: Tomcat Developers List; Bill Barker
 Subject: Re: Status of JK2
 
 ant all in jk dir gives me the same error:
  /mydirpath/jakarta-tomcat-connectors/jk/build.xml:100: Could
 
 not find file
 
 /mydirpath/jakarta-tomcat-connectors/coyote/build/lib/tomcat-co
 yote.jar to
 
  copy.
 
 Anthony
 
  Try ant all.
  - Original Message -
  From: Anthony W. Marino [EMAIL PROTECTED]
  To: Tomcat Developers List [EMAIL PROTECTED]; Remy
  Maucherat [EMAIL PROTECTED]
  Sent: Friday, May 17, 2002 3:52 PM
  Subject: Re: Status of JK2
 
 
  Remy,
 
  The result of ant in jk dir:
 
  /mydirpath/jakarta-tomcat-connectors/jk/build.xml:100: Could
 
 not find file
 
 /mydirpath/jakarta-tomcat-connectors/coyote/build/lib/tomcat-co
 yote.jar to
 
  copy.
 
 
  Anthony
 
This is what I get when I do ant:
   
BUILD FAILED
 
 /mydirpath/jakarta-tomcat-connectors/jk/native2/build.xml:90: Could not
 
   create
  
task of type: so. Common solutions are to use taskdef to
 
 declare your
 
   task,
  
or, if this is an optional task, to put the optional.jar
 
 in the lib
 
   directory
  
of your ant installation (ANT_HOME).
   
Any thoughts?
  
   You have to build the Java parts of JK first (go in
   jakarta-tomcat-connectors/jk, do ant), which include the
 
 Ant tasks.
 
   Remy
 
 --
 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]




RE: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Larry Isaacs

+1

Larry

 -Original Message-
 From: Remy Maucherat [mailto:[EMAIL PROTECTED]] 
 Sent: Tuesday, May 21, 2002 10:33 PM
 To: [EMAIL PROTECTED]
 Subject: [VOTE] New committer: Denis Benoit
 
 
 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as 
 a committer on
 the Tomcat project. Denis has contributed patches to Jasper 2 
 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application 
 available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 
 performance.
 
 He has my +1 as a committer.
 
 Remy
 
 
 --
 To unsubscribe, e-mail:   
 mailto:tomcat-dev- [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]




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Andy Armstrong

+1

Remy Maucherat wrote:
 
 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on
 the Tomcat project. Denis has contributed patches to Jasper 2 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 performance.
 
 He has my +1 as a committer.
 
 Remy
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

-- 
Andy Armstrong, Tagish

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




tyrex 1.0

2002-05-22 Thread jean-frederic clere

Hi,

I have noted that tyrex 0.9.7 is not available for download at ftp.exolab.org.
Won't it be time to change to tyrex 1.0?

Cheers

Jean-frederic

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




RE: tyrex 1.0

2002-05-22 Thread GOMEZ Henri

Hi,

I have noted that tyrex 0.9.7 is not available for download at 
ftp.exolab.org.
Won't it be time to change to tyrex 1.0?

yes, Tyrex is 1.0 since May 06, 2002.

Good catch JF

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




ant tasks for 3.3

2002-05-22 Thread Jason Corley


I'm trying to use Keith's ant tasks for tomcat 3.3 and I'm having some issues.  I'm 
not sure if I'm doing something wrong or if there is an incompatibility somewhere.  I 
have the tomcat 3.3a RPMs installed, and I'm using ant 1.5b1.  My build.xml (I added 
the line breaks on the CLASSPATH variable for readability -- it isn't in the actual 
file) is as follows:

project name=BuildWebSite default=jsp basedir=.

property name=CLASSPATH
value=/home/jasonc/ant/lib/ant.jar:/home/jasonc/ant/lib/optional.jar:/home/jasonc/ant/lib/tomcat-ant.jar:
/var/tomcat3/lib/common/servlet.jar:/var/tomcat3/lib/container/jasper.jar:
/var/tomcat3/lib/common/core_util.jar:/var/tomcat3/lib/common/connector_util.jar:/usr/share/java/xerces.jar/
property name=JSPC value=org.apache.tomcat.ant.Tomcat3Precompiler/
property name=TOMCAT_SPOOL value=/var/spool/tomcat3/
property name=WEB_DIR value=/var/www/html//

target name=jsp
record name=testfile.txt action=start/
jspc srcdir=${WEB_DIR} destdir=${TOMCAT_SPOOL} classpath=${CLASSPATH} 
compiler=${JSPC}
include name=**/*.jsp/
/jspc
record name=testfile.txt action=stop/
/target

/project

The tomcat-ant.jar is Kieth's ant tasks checked out from jakarta-tomcat CVS and 
compiled using Sun JDK 1.4 RPM.  It's contents are:

Archive:  ant/lib/tomcat-ant.jar
testing: META-INF/OK
testing: META-INF/MANIFEST.MF OK
testing: org/apache/  OK
testing: org/apache/tomcat/   OK
testing: org/apache/tomcat/ant/   OK
testing: org/apache/tomcat/ant/Tomcat3JSPVersionFile.class   OK
testing: org/apache/tomcat/ant/Tomcat3Precompiler$TomcatJSPMangler.class   OK
testing: org/apache/tomcat/ant/Tomcat3Precompiler.class   OK
testing: META-INF/ant.properties   OK
No errors detected in compressed data of ant/lib/tomcat-ant.jar.

When I try to run ant I get the following output in my testfile:

BUILD FAILED

/home/jasonc/build.xml:23: java.lang.LinkageError: loader constraints violated when 
linking org/w3c/dom/Document class
at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:190)
at org.apache.tools.ant.taskdefs.Java.run(Java.java:408)
at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:163)
at org.apache.tools.ant.taskdefs.Java.execute(Java.java:108)
at 
org.apache.tomcat.ant.Tomcat3Precompiler.compile(Tomcat3Precompiler.java:123)
at org.apache.tomcat.ant.Tomcat3Precompiler.execute(Tomcat3Precompiler.java:98)
at org.apache.tools.ant.taskdefs.optional.jsp.JspC.doCompilation(JspC.java:460)
at org.apache.tools.ant.taskdefs.optional.jsp.JspC.execute(JspC.java:424)
at org.apache.tools.ant.Task.perform(Task.java:313)
at org.apache.tools.ant.Target.execute(Target.java:309)
at org.apache.tools.ant.Target.performTasks(Target.java:334)
at org.apache.tools.ant.Project.executeTarget(Project.java:1216)
at org.apache.tools.ant.Project.executeTargets(Project.java:1160)
at org.apache.tools.ant.Main.runBuild(Main.java:605)
at org.apache.tools.ant.Main.start(Main.java:195)
at org.apache.tools.ant.Main.main(Main.java:234)
--- Nested Exception ---
java.lang.LinkageError: loader constraints violated when linking org/w3c/dom/Document 
class
at 
org.apache.xerces.jaxp.DocumentBuilderFactoryImpl.newDocumentBuilder(DocumentBuilderFactoryImpl.java)
at org.apache.jasper.compiler.JspUtil.parseXMLDocJaxp(JspUtil.java)
at org.apache.jasper.compiler.JspUtil.parseXMLDoc(JspUtil.java)
at 
org.apache.jasper.compiler.TagLibraryInfoImpl.init(TagLibraryInfoImpl.java)
at 
org.apache.jasper.compiler.JspParseEventListener.handleDirective(JspParseEventListener.java)
at 
org.apache.jasper.compiler.DelegatingListener.handleDirective(DelegatingListener.java)
at org.apache.jasper.compiler.Parser$Directive.accept(Parser.java)
at org.apache.jasper.compiler.Parser.parse(Parser.java)
at org.apache.jasper.compiler.Parser.parse(Parser.java)
at org.apache.jasper.compiler.Parser.parse(Parser.java)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java)
at org.apache.jasper.JspC.parseFile(JspC.java)
at org.apache.jasper.JspC.parseFiles(JspC.java)
at org.apache.jasper.JspC.main(JspC.java)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.tools.ant.taskdefs.ExecuteJava.run(ExecuteJava.java:208)
at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:150)
at org.apache.tools.ant.taskdefs.Java.run(Java.java:408)
at 

RE: ant tasks for 3.3

2002-05-22 Thread Keith Wannamaker

Hmm, you might try taking xerces out the CLASSPATH property
if there is already one in {ant.home}/lib

I would guess there are two copies of an XML provider in
your classpath.. are you using JDK1.4?  I did a google on
this error and apparently it comes up a lot.

Keith

| -Original Message-
| From: Jason Corley [mailto:[EMAIL PROTECTED]]
| Sent: Wednesday, May 22, 2002 9:16 AM
| To: [EMAIL PROTECTED]
| Subject: ant tasks for 3.3
| 
| 
| 
| I'm trying to use Keith's ant tasks for tomcat 3.3 and I'm having some issues.  I'm 
|not sure if I'm doing something wrong 
| or if there is an incompatibility somewhere.  I have the tomcat 3.3a RPMs installed, 
|and I'm using ant 1.5b1.  My 
| build.xml (I added the line breaks on the CLASSPATH variable for readability -- it 
|isn't in the actual file) is as follows:


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




cvs commit: jakarta-tomcat-4.0/catalina/src/conf server.xml

2002-05-22 Thread jfclere

jfclere 02/05/22 07:33:16

  Modified:catalina/src/conf server.xml
  Log:
  Typo.
  
  Revision  ChangesPath
  1.59  +1 -1  jakarta-tomcat-4.0/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- server.xml6 May 2002 23:08:31 -   1.58
  +++ server.xml22 May 2002 14:33:16 -  1.59
  @@ -82,7 +82,7 @@
IP address of the remote client.
   --
   
  -!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8081 --
  +!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --
   Connector className=org.apache.coyote.tomcat4.CoyoteConnector
  port=8080 minProcessors=5 maxProcessors=75
  enableLookups=true redirectPort=8443
  
  
  

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




DO NOT REPLY [Bug 9318] New: - HttpSession getMaxInactiveInterval() throws IllegalStateException

2002-05-22 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=9318.
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=9318

HttpSession getMaxInactiveInterval() throws IllegalStateException

   Summary: HttpSession getMaxInactiveInterval() throws
IllegalStateException
   Product: Tomcat 4
   Version: 4.0.3 Final
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet  JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I'm calling session.getMaxInactiveInterval() on a session after it has been 
invalidated.

Tomcat is throwing an IllegalStateException and saying that method cannot be 
called on an invalid session.  However, the Servlet 2.3 API docs do not state 
that IllegalStateException should be thrown (as it is with many other methods 
in HttpSession) from getMaxInactiveInterval().

The reason I've run into this problem is because I'm trying to write a 
HttpSessionAttributeListener that determines if the session is being explicitly 
invalidated or if it timed out.

The Servlet 2.3 spec (section 10.7) states,

It is often useful in tracking sessions to know whether a session became 
invalid because the container timed out the session, or because a web component 
within the application called the invalidate method. The destinction may be 
determined indirectly using listeners and the HTTPSession API methods.

If I can't call getMaxInactiveInterval() on an invalidated session, how can I 
determine if the session was invalidated due to time out?  Is this a bug in 
Tomcat?  It seems so since it doesn't follow the API docs for this call.

Here is a HttpServletListner the demonstrates the problem:

import javax.servlet.http.HttpSessionListener;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSession;

public class TestListener implements HttpSessionListener {
  
  public void sessionCreated(HttpSessionEvent httpSessionEvent) {
  }
  
  public void sessionDestroyed(HttpSessionEvent httpSessionEvent) {
// ok session should be invalid here...
// lets test some assertions
// let put it in a try block to catch any exceptions
try {
  HttpSession session = httpSessionEvent.getSession();
  
  // lets make sure session is not null
  System.out.println(session == null);
  
  // ok lets try last access time
  // this SHOULD work even if session is invalid
  // javadocs say it will...
  System.out.println(session.getLastAccessedTime());
  // ta-da it does
  
  // ok if that worked then this should work too
  // javadocs do not say it throws IllegalStateException
  System.out.println(session.getMaxInactiveInterval());
  // whoops this breaks...
  // javadocs say this shouldn't happen
  // Servlet spec (10.7) implies using this method to see if
  // a session is invalid because of timeout as opposed
  // to explicit call to session.invalidate();
  
  // now, we won't get here cause the above fails
  // but just to see if the session is invalid
  // lets call something that the javadocs DO say should
  // throw IllegalStateException on an invalid session
  session.invalidate();
} catch(Exception e) {
  e.printStackTrace();
}
  }  
}

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




RE: ant tasks for 3.3

2002-05-22 Thread Jason Corley


That does make sense since the xerces.jar in my path is 1.4 and the ant 1.5b1 uses 
xerces 2.  So I took the xerces JAR out of my classpath and it spit out 
java.lang.NoClassDefFound error: org/xml/sax/SAXException.  I added the 
xmlParserAPIs.jar from the 1.5b1 ant binary distribution and I also downgraded to JDK 
1.3.1_03.  Same error. :-(  The odd thing is it seems to get about 1/4 of the way 
through the process before crapping out.
Jason

-Original Message-
From: Keith Wannamaker [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 11:31 AM
To: Tomcat Developers List
Subject: RE: ant tasks for 3.3


Hmm, you might try taking xerces out the CLASSPATH property
if there is already one in {ant.home}/lib

I would guess there are two copies of an XML provider in
your classpath.. are you using JDK1.4?  I did a google on
this error and apparently it comes up a lot.

Keith

| -Original Message-
| From: Jason Corley [mailto:[EMAIL PROTECTED]]
| Sent: Wednesday, May 22, 2002 9:16 AM
| To: [EMAIL PROTECTED]
| Subject: ant tasks for 3.3
| 
| 
| 
| I'm trying to use Keith's ant tasks for tomcat 3.3 and I'm having some issues.  I'm 
|not sure if I'm doing something wrong 
| or if there is an incompatibility somewhere.  I have the tomcat 3.3a RPMs installed, 
|and I'm using ant 1.5b1.  My 
| build.xml (I added the line breaks on the CLASSPATH variable for readability -- it 
|isn't in the actual file) is as follows:


--
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-connectors/jk/native/common Makefile.in

2002-05-22 Thread jfclere

jfclere 02/05/22 08:16:21

  Modified:jk/native/common Makefile.in
  Log:
  set CC to allow CC=gcc configure --
  
  Revision  ChangesPath
  1.8   +1 -0  jakarta-tomcat-connectors/jk/native/common/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in   16 Jan 2002 19:46:37 -  1.7
  +++ Makefile.in   22 May 2002 15:16:21 -  1.8
  @@ -8,6 +8,7 @@
   top_builddir = ..
   
   LIBTOOL = @LIBTOOL@
  +CC = @CC@
   
   OEXT=.lo
   include list.mk
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread jfclere

jfclere 02/05/22 08:30:58

  Modified:jk/native buildconf.sh
  Log:
  copy files rather than symlinking them so that the tarball works on another
  machine.
  
  Revision  ChangesPath
  1.4   +1 -1  jakarta-tomcat-connectors/jk/native/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildconf.sh  26 Oct 2001 15:33:45 -  1.3
  +++ buildconf.sh  22 May 2002 15:30:58 -  1.4
  @@ -1,7 +1,7 @@
   #!/bin/sh
   
   echo libtoolize --force --automake
  -libtoolize --force --automake
  +libtoolize --force --automake --copy
   echo automake -a --foreign -i
   automake -a --foreign -i
   echo aclocal
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread jfclere

jfclere 02/05/22 08:32:51

  Modified:jk/native buildconf.sh
  Log:
  Correct the echo ;-(
  
  Revision  ChangesPath
  1.5   +1 -1  jakarta-tomcat-connectors/jk/native/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildconf.sh  22 May 2002 15:30:58 -  1.4
  +++ buildconf.sh  22 May 2002 15:32:51 -  1.5
  @@ -1,6 +1,6 @@
   #!/bin/sh
   
  -echo libtoolize --force --automake
  +echo libtoolize --force --automake --copy
   libtoolize --force --automake --copy
   echo automake -a --foreign -i
   automake -a --foreign -i
  
  
  

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




RE: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread GOMEZ Henri

What's about your support apxs sub macro ?
 

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 5:33 PM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh


jfclere 02/05/22 08:32:51

  Modified:jk/native buildconf.sh
  Log:
  Correct the echo ;-(
  
  Revision  ChangesPath
  1.5   +1 -1  jakarta-tomcat-connectors/jk/native/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildconf.sh 22 May 2002 15:30:58 -  1.4
  +++ buildconf.sh 22 May 2002 15:32:51 -  1.5
  @@ -1,6 +1,6 @@
   #!/bin/sh
   
  -echo libtoolize --force --automake
  +echo libtoolize --force --automake --copy
   libtoolize --force --automake --copy
   echo automake -a --foreign -i
   automake -a --foreign -i
  
  
  

--
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-connectors/jk/native buildconf.sh

2002-05-22 Thread jfclere

jfclere 02/05/22 08:46:33

  Modified:jk/native buildconf.sh
  Log:
  Add the files symlinked by automake.
  
  Revision  ChangesPath
  1.6   +2 -2  jakarta-tomcat-connectors/jk/native/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buildconf.sh  22 May 2002 15:32:51 -  1.5
  +++ buildconf.sh  22 May 2002 15:46:32 -  1.6
  @@ -2,8 +2,8 @@
   
   echo libtoolize --force --automake --copy
   libtoolize --force --automake --copy
  -echo automake -a --foreign -i
  -automake -a --foreign -i
  +echo automake -a --foreign -i --copy
  +automake -a --foreign -i --copy
   echo aclocal
   #aclocal --acdir=`aclocal --print-ac-dir`
   #aclocal --acdir=/usr/local/share/aclocal
  
  
  

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




Re: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread jean-frederic clere

GOMEZ Henri wrote:
 
 What's about your support apxs sub macro ?

make -f Makefile.apxs looks broken...

 
 
 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
 -Original Message-
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, May 22, 2002 5:33 PM
 To: [EMAIL PROTECTED]
 Subject: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh
 
 
 jfclere 02/05/22 08:32:51
 
   Modified:jk/native buildconf.sh
   Log:
   Correct the echo ;-(
 
   Revision  ChangesPath
   1.5   +1 -1  jakarta-tomcat-connectors/jk/native/buildconf.sh
 
   Index: buildconf.sh
   ===
   RCS file:
 /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
   retrieving revision 1.4
   retrieving revision 1.5
   diff -u -r1.4 -r1.5
   --- buildconf.sh 22 May 2002 15:30:58 -  1.4
   +++ buildconf.sh 22 May 2002 15:32:51 -  1.5
   @@ -1,6 +1,6 @@
#!/bin/sh
 
   -echo libtoolize --force --automake
   +echo libtoolize --force --automake --copy
libtoolize --force --automake --copy
echo automake -a --foreign -i
automake -a --foreign -i
 
 
 
 
 --
 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]

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




RE: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread GOMEZ Henri

May be we could share jk2 works on autoconf to cleanup 
a little thing in jk.

I'll be to drop automake stuff and just use simple
makefiles (makefile.apxs, makefile.static, makefile.libtool)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: jean-frederic clere [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 5:56 PM
To: Tomcat Developers List
Subject: Re: cvs commit: jakarta-tomcat-connectors/jk/native
buildconf.sh


GOMEZ Henri wrote:
 
 What's about your support apxs sub macro ?

make -f Makefile.apxs looks broken...

 
 
 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
 -Original Message-
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, May 22, 2002 5:33 PM
 To: [EMAIL PROTECTED]
 Subject: cvs commit: jakarta-tomcat-connectors/jk/native 
buildconf.sh
 
 
 jfclere 02/05/22 08:32:51
 
   Modified:jk/native buildconf.sh
   Log:
   Correct the echo ;-(
 
   Revision  ChangesPath
   1.5   +1 -1  
jakarta-tomcat-connectors/jk/native/buildconf.sh
 
   Index: buildconf.sh
   
===
   RCS file:
 /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
   retrieving revision 1.4
   retrieving revision 1.5
   diff -u -r1.4 -r1.5
   --- buildconf.sh 22 May 2002 15:30:58 -  1.4
   +++ buildconf.sh 22 May 2002 15:32:51 -  1.5
   @@ -1,6 +1,6 @@
#!/bin/sh
 
   -echo libtoolize --force --automake
   +echo libtoolize --force --automake --copy
libtoolize --force --automake --copy
echo automake -a --foreign -i
automake -a --foreign -i
 
 
 
 
 --
 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]

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




Re: cvs commit: jakarta-tomcat-connectors/jk/native buildconf.sh

2002-05-22 Thread jean-frederic clere

GOMEZ Henri wrote:
 
 May be we could share jk2 works on autoconf to cleanup
 a little thing in jk.

I am just trying to fix what is not working.
I think it is better to spend time on jk2.

 
 I'll be to drop automake stuff and just use simple
 makefiles (makefile.apxs, makefile.static, makefile.libtool)
 
 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
 -Original Message-
 From: jean-frederic clere [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, May 22, 2002 5:56 PM
 To: Tomcat Developers List
 Subject: Re: cvs commit: jakarta-tomcat-connectors/jk/native
 buildconf.sh
 
 
 GOMEZ Henri wrote:
 
  What's about your support apxs sub macro ?
 
 make -f Makefile.apxs looks broken...
 
 
 
  -
  Henri Gomez ___[_]
  EMAIL : [EMAIL PROTECTED](. .)
  PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
  PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
  -Original Message-
  From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
  Sent: Wednesday, May 22, 2002 5:33 PM
  To: [EMAIL PROTECTED]
  Subject: cvs commit: jakarta-tomcat-connectors/jk/native
 buildconf.sh
  
  
  jfclere 02/05/22 08:32:51
  
Modified:jk/native buildconf.sh
Log:
Correct the echo ;-(
  
Revision  ChangesPath
1.5   +1 -1
 jakarta-tomcat-connectors/jk/native/buildconf.sh
  
Index: buildconf.sh
  
 ===
RCS file:
  /home/cvs/jakarta-tomcat-connectors/jk/native/buildconf.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildconf.sh 22 May 2002 15:30:58 -  1.4
+++ buildconf.sh 22 May 2002 15:32:51 -  1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
  
-echo libtoolize --force --automake
+echo libtoolize --force --automake --copy
 libtoolize --force --automake --copy
 echo automake -a --foreign -i
 automake -a --foreign -i
  
  
  
  
  --
  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]
 
 --
 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]

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




cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.apxs.in

2002-05-22 Thread jfclere

jfclere 02/05/22 09:26:44

  Modified:jk/native/apache-2.0 Makefile.apxs.in
  Log:
  Typo.
  
  Revision  ChangesPath
  1.4   +1 -1  jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.apxs.in  29 Jun 2001 20:47:01 -  1.3
  +++ Makefile.apxs.in  22 May 2002 16:26:44 -  1.4
  @@ -6,7 +6,7 @@
   APXSLDFLAGS=@APXSLDFLAGS@
   APXSCFLAGS=@APXSCFLAGS@
   
  -JK=../common
  +JK=../common/
   JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
   JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
   JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
  
  
  

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




Re: j-t-c/jk/native2/build.xml: if=linux

2002-05-22 Thread costinm

On Wed, 22 May 2002, Anthony W. Marino wrote:

 Why not have it automatic and add the property as a global property in the 
 relevant build files as follows:
 
 property name=${os.name}   value=${os.name} /
 
 Then make appropriate changes to if=... (ie; Linux not linux)

That would work, good idea. I'm don't like too much using substitution in 
the property name - I would rather use the condition tasks.

( I can't believe I didn't think about this... )

Costin
 


 
 
 The only properties that should be in the build.properties file are user 
 preferences and NOT hardcore system relevant properties that can be 
 ascertained with a built-in property.


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




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Kin-Man Chung

+1

Welcome!  And looking forward to working more with you on Jasper performance!

 Date: Tue, 21 May 2002 19:33:27 -0700
 From: Remy Maucherat [EMAIL PROTECTED]
 Subject: [VOTE] New committer: Denis Benoit
 To: [EMAIL PROTECTED]
 MIME-version: 1.0
 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2600.
 Content-transfer-encoding: 7bit
 X-Priority: 3
 X-MSMail-priority: Normal
 Delivered-to: mailing list [EMAIL PROTECTED]
 Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm
 X-Antivirus: nagoya (v4198 created Apr 24 2002)
 X-Spam-Rating: localhost.apache.org 1.6.2 0/1000/N
 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
 List-Post: mailto:[EMAIL PROTECTED]
 List-Subscribe: mailto:[EMAIL PROTECTED]
 List-Unsubscribe: mailto:[EMAIL PROTECTED]
 List-Help: mailto:[EMAIL PROTECTED]
 List-Id: Tomcat Developers List tomcat-dev.jakarta.apache.org
 
 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on
 the Tomcat project. Denis has contributed patches to Jasper 2 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 performance.
 
 He has my +1 as a committer.
 
 Remy
 
 
 --
 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]




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Amy Roh

+1

Amy


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




DO NOT REPLY [Bug 9321] New: - TldLocationsCache logs informational message as warning

2002-05-22 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=9321.
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=9321

TldLocationsCache logs informational message as warning

   Summary: TldLocationsCache logs informational message as warning
   Product: Tomcat 4
   Version: 4.1.2
  Platform: All
OS/Version: All
Status: NEW
  Severity: Minor
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If jasper is being used in a situation where there is no web.xml file, the
org.apache.jasper.compiler.TldLocationsCache will always warn about a missing
WEB-INF/web.xml file.

This is a distracting message, and seems more informational than warn level.  I
don't believe the spec requires that a JSP engine have access to a web.xml file
yet (but I could be wrong).

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




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Bill Barker

+1
- Original Message -
From: Remy Maucherat [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Tuesday, May 21, 2002 7:33 PM
Subject: [VOTE] New committer: Denis Benoit


 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer
on
 the Tomcat project. Denis has contributed patches to Jasper 2 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 performance.

 He has my +1 as a committer.

 Remy


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




Re: [VOTE] New committer: Denis Benoit

2002-05-22 Thread Manveen Kaur


+1

--Manveen


On Tue, 21 May 2002, Remy Maucherat wrote:

 I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on
 the Tomcat project. Denis has contributed patches to Jasper 2 which brings
 an impressive performance improvement when using JSP pages which rely
 heavily on tags, such as the administration web application available in
 Tomcat 4.1.x.
 He appears willing to spend time to further improve Jasper 2 performance.
 
 He has my +1 as a committer.
 
 Remy
 
 
 --
 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]




NT service problem

2002-05-22 Thread Harsha Yalagach

Hi,
I have installed Apache HTTP Server Version 1.3  also Tomcat 3.2.1.

Tomcat is working smoothly as standalone with out any problems.

No Problems with Apache HTTP Server also.

I have installed JServ module and I am able to link HTTP Server with JSP
container. I am able to run JSP pages with out any problems.

Then I installed jk_nt_service, and this also is working smoothly. As per
instructions I have started Tomcat first and later Apache and normal JSP
pages work smoothly. But if i try to execute JSP pages that contain JDBC
querries it doesnt work. In jvm.stdout I get the following entries
Exceptionjava.sql.SQLException: General error. Can anyone please tell me
why this is happening and a solution for this.

Thanks in Advance.

Harsha Yalagach


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




DO NOT REPLY [Bug 9326] New: - Long URLs for JSPs cause HTTP 404/500 errors

2002-05-22 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=9326.
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=9326

Long URLs for JSPs cause HTTP 404/500 errors

   Summary: Long URLs for JSPs cause HTTP 404/500 errors
   Product: Tomcat 3
   Version: 3.2.3 Final
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


While testing one of our applications we noticed that whenever we tried to hit
any of the JSP files in a particular directory, we always got 404 errors - even
though the files were definitely there. We tried moving those same JSP files to
other directories - in some directories they worked fine, in others we got 404
errors, an in still others we got 500 errors telling us Tomcat was unable to
create the .class file. Same thing when we moved JSPs that worked in other
directories into the directory where we originally noticed the problem - some
still worked, some always gave 404 errors, some gave 500 errors.

It took us several days to debug this, but we were finally able to determine
that it was the length of the JSP URLs that was causing the problem. Or more
precisely, the length of the filenames of the .java and .class files that Tomcat
produces when compiling the JSPs.

When Tomcat tries to compile the following JSP (with full path from the
application root, application name was osdm-address):

en.us/prompts/default_dm/address/56789012345.jsp

The filename of the .class file that it attempts to compile (cut and pasted this
directly from the HTTP 500 error message) is:

C:\Program Files\Apache
Group\jakarta-tomcat-3.2.3\work\localhost_8080%2Fosdm-address\en_0005fus\prompts\d_00025fault_0005fdm\address\_0002fen_0002eus_0002fprompts_0002fdefault_0005fdm_0002faddress_0002f_00035_00036_00037_00038_00039_00030_00031_00032_00033_00034_00035_0002ejsp56789012345_jsp_0.class

This is longer than 255 characters, which is the NTFS limit for file names.

I suspect that the 404 error occurs when the intermediate .java filename is too
long, and the 500 error occurs when the final .class filename is too long. Or
something like that, my experimentation shows extremely long URLs lead to 404
errors, whereas somewhat shorter URLs lead to the 500 error.

You should note that we had previously tested this same application on JRun and
found everything worked fine. Reason being that JRun uses a different naming
scheme for these temporary files, one which results in shorter filenames. The
difference is in the way non-alphabetic characters like '/' or '_' that may
appear in the original URL are converted. JRun just replaces all
non-alphanumeric characters with an underscore. Tomcat, on the other hand, seems
to convert all non-alphabetic characters (including digits) into an underscore
followed by a 5-character hex representation of the ASCII value for that
character. That can add up to a lot of characters pretty quick if your URL has a
lot of non-alphabetic characters!

Obviously there is a work-around - to simplify our directory structure, shorten
the directory and file names we're using, and/or try to eliminate non-alphabetic
characters from directory and file names. But it seems like that shouldn't be
necessary, I think the length and format of our URLs is quite reasonable. At the
very least, even if you decide not to allow longer path/filenames, you should
make sure that when the max is exceeded the error messages produced by Tomcat
are more verbose and explain exactly why the JSP cannot be loaded, rather than
just producing generic 404 or 500 errors.

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




DO NOT REPLY [Bug 9326] - Long URLs for JSPs cause HTTP 404/500 errors

2002-05-22 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=9326.
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=9326

Long URLs for JSPs cause HTTP 404/500 errors

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2002-05-22 19:19 ---
This is fixed in both 3.3 and 4.x

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

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




startup.bat problem

2002-05-22 Thread Durham David Cntr 805CSS/SCBE

Not sure if this is a problem on all win32 systems, but the startup.bat does not work 
on most all the win32 systems I install it on with out a modification.

This is the line that needs to be changed:

call %TOMCAT_HOME%\bin\tomcat start %1 %2 %3 %4 %5 %6 %7 %8 %9

It should be changed to:

call %TOMCAT_HOME%\bin\tomcat.bat start %1 %2 %3 %4 %5 %6 %7 %8 %9

The problem is that on most systems, not sure if this is environment related, the call 
to tomcat actually executes tomcat.exe not tomcat.bat as it should.







David Durham
AMC Communications Group, SCBE 
NCI Information Systems, Inc.
Scott AFB, IL
618.256.5264 

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




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

2002-05-22 Thread remm

remm02/05/22 15:17:23

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  - Add back the code specific to the ServerLifecycleListener.
Otherwise, it wouldn't be part of the generated server.xml.
  
  Revision  ChangesPath
  1.26  +35 -35
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- StandardServer.java   21 May 2002 01:36:36 -  1.25
  +++ StandardServer.java   22 May 2002 22:17:23 -  1.26
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
 1.25 2002/05/21 01:36:36 remm Exp $
  - * $Revision: 1.25 $
  - * $Date: 2002/05/21 01:36:36 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
 1.26 2002/05/22 22:17:23 remm Exp $
  + * $Revision: 1.26 $
  + * $Date: 2002/05/22 22:17:23 $
*
* 
*
  @@ -132,7 +132,7 @@
* (but not required) when deploying and starting Catalina.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.25 $ $Date: 2002/05/21 01:36:36 $
  + * @version $Revision: 1.26 $ $Date: 2002/05/22 22:17:23 $
*/
   
   public final class StandardServer
  @@ -192,7 +192,6 @@
   org.apache.catalina.core.StandardContextValve,
   org.apache.catalina.core.StandardEngineValve,
   org.apache.catalina.core.StandardHostValve,
  -org.apache.catalina.mbeans.ServerLifecycleListener,
   org.apache.catalina.startup.ContextConfig,
   org.apache.catalina.startup.EngineConfig,
   org.apache.catalina.startup.HostConfig,
  @@ -202,6 +201,13 @@
   };
   
   
  +/**
  + * ServerLifecycleListener classname.
  + */
  +private static String SERVER_LISTENER_CLASS_NAME = 
  +org.apache.catalina.mbeans.ServerLifecycleListener;
  +
  +
   //  Constructor
   
   
  @@ -1040,11 +1046,10 @@
   listeners = new LifecycleListener[0];
   }
   for (int i = 0; i  listeners.length; i++) {
  -/*
  -  if (listeners[i] instanceof ServerLifecycleListener) {
  -  continue;
  -  }
  -*/
  +if (listeners[i].getClass().getName().equals
  +(SERVER_LISTENER_CLASS_NAME)) {
  +continue;
  +}
   storeListener(writer, indent + 2, listeners[i]);
   }
   }
  @@ -1094,11 +1099,10 @@
   LifecycleListener listeners[] =
   ((Lifecycle) context).findLifecycleListeners();
   for (int i = 0; i  listeners.length; i++) {
  -/*
  -  if (listeners[i] instanceof ServerLifecycleListener) {
  -  continue;
  -  }
  -*/
  +if (listeners[i].getClass().getName().equals
  +(SERVER_LISTENER_CLASS_NAME)) {
  +continue;
  +}
   storeListener(writer, indent + 2, listeners[i]);
   }
   }
  @@ -1238,11 +1242,10 @@
   LifecycleListener listeners[] =
   ((Lifecycle) dcontext).findLifecycleListeners();
   for (int i = 0; i  listeners.length; i++) {
  -/*
  -  if (listeners[i] instanceof ServerLifecycleListener) {
  -  continue;
  -  }
  -*/
  +if (listeners[i].getClass().getName().equals
  +(SERVER_LISTENER_CLASS_NAME)) {
  +continue;
  +}
   storeListener(writer, indent + 2, listeners[i]);
   }
   }
  @@ -1398,11 +1401,10 @@
   LifecycleListener listeners[] =
   ((Lifecycle) engine).findLifecycleListeners();
   for (int i = 0; i  listeners.length; i++) {
  -/*
  -  if (listeners[i] instanceof ServerLifecycleListener) {
  -  continue;
  -  }
  -*/
  +if (listeners[i].getClass().getName().equals
  +(SERVER_LISTENER_CLASS_NAME)) {
  +continue;
  +}
   storeListener(writer, indent + 2, listeners[i]);
   }
   }
  @@ -1538,11 +1540,10 @@
   LifecycleListener 

cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers CcCompiler.java

2002-05-22 Thread costin

costin  02/05/22 16:34:53

  Modified:jk/jkant/java/org/apache/jk/ant/compilers CcCompiler.java
  Log:
  Hpux doesn't support -W.
  ( or at least it has a different meaning ).
  
  Long term - we should start using includeset defineset flagset
  like in ant-contrib cc tasks, it's much easier to do this in the xml
  file.
  
  Revision  ChangesPath
  1.9   +4 -1  
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java
  
  Index: CcCompiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CcCompiler.java   12 Jan 2002 05:33:03 -  1.8
  +++ CcCompiler.java   22 May 2002 23:34:53 -  1.9
  @@ -123,7 +123,10 @@
   }
   
   if( optWgcc ) {
  - cmd.createArgument().setValue(-W);
  + if( ! HP-UX.equalsIgnoreCase( System.getProperty( os.name )) ) {
  +// HP-UX uses -W for some other things
  +cmd.createArgument().setValue(-W);
  +}
   
   if( cc!= null  cc.indexOf( gcc ) = 0 ) {
   //cmd.createArgument().setValue(-Wall);
  
  
  

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




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

2002-05-22 Thread remm

remm02/05/22 16:35:52

  Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
  Log:
  - Fix the timing of the call to JarEntry.getCertificates(). Very subtle bug overall.
Thanks to Michael Eriksson Michael.Eriksson at bauer-partner.com for
the explanation and the patch.
  - Fixes bug 7578.
  
  Revision  ChangesPath
  1.39  +10 -5 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- WebappClassLoader.java16 May 2002 01:06:29 -  1.38
  +++ WebappClassLoader.java22 May 2002 23:35:52 -  1.39
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.38 2002/05/16 01:06:29 remm Exp $
  - * $Revision: 1.38 $
  - * $Date: 2002/05/16 01:06:29 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.39 2002/05/22 23:35:52 remm Exp $
  + * $Revision: 1.39 $
  + * $Date: 2002/05/22 23:35:52 $
*
* 
*
  @@ -145,7 +145,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.38 $ $Date: 2002/05/16 01:06:29 $
  + * @version $Revision: 1.39 $ $Date: 2002/05/22 23:35:52 $
*/
   public class WebappClassLoader
   extends URLClassLoader
  @@ -1764,7 +1764,6 @@
   } catch (MalformedURLException e) {
   return null;
   }
  -entry.certificates = jarEntry.getCertificates();
   contentLength = (int) jarEntry.getSize();
   try {
   entry.manifest = jarFiles[i].getManifest();
  @@ -1806,6 +1805,12 @@
   }
   
   entry.binaryContent = binaryContent;
  +
  +// The certificates are only available after the JarEntry 
  +// associated input stream has been fully read
  +if (jarEntry != null) {
  +entry.certificates = jarEntry.getCertificates();
  +}
   
   }
   
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml

2002-05-22 Thread costin

costin  02/05/22 16:40:02

  Modified:jk/native2 build.xml
  Log:
  Added IIS to the build targets ( if detected ). We'll look for MSVC, as the
  required headers are included - you don't need IIS to compile the DLL ( and
  I think it'll work with the personal web server as well, probably any ISAPI
  server with a bit more work ).
  
  Added detection for solaris and hpux.
  
  Few more tweaks.
  
  As soon as I have some time I'll integrate the ant types that are used
  in the cc-tasks ( that would be a good first step into merging, if we
  use the same DTD that's already a big step forward ). This will allow
  us to specify the includes, flags, etc only once.
  
  I got it to compile on a Windows, I still have few problems with solaris
  and HPUX.  More targets are wellcomed - also someone should test on netware.
  After we merge the syntax with cc-tasks ( on sourceforge/ant-contrib ) we
  might be able to support all the compilers they support and more
  environments.
  
  Revision  ChangesPath
  1.28  +47 -113   jakarta-tomcat-connectors/jk/native2/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml 22 May 2002 21:26:22 -  1.27
  +++ build.xml 22 May 2002 23:40:02 -  1.28
  @@ -63,58 +63,60 @@
   
 !--  Targets  --
   
  -  target name=main depends=init,apache20,apache13,jni
  +  target name=main depends=init,apache20,apache13,jni,iis
 /target
   
 target name=all depends=jkant,init,apache20,apache13,jni
 /target
   
 target name=guess.env 
  -echo message=build.properties ${os.arch}.${os.name} /
   taskdef resource=META-INF/ant.tasks 
 classpathref=jkant /
   
  -available property=HAS_APR file=${apr.include}/apr.h /
  +echo message=build.properties ${os.arch}.${os.name} /
  +
  +!-- What servers do we have ? --
   available property=apache13.detect 
  file=${apache13.home}/bin/htpasswd /
   available property=apache2.detect 
  file=${apache2.home} /
   available property=iis.detect 
  -   file=${iis.home} /
  +   file=${mssdk.home} /
   available property=iplanet.detect 
  file=${iplanet.home} /
  +echo message=Apache2 ${apache2.home} ${apache2.detect} /
  +echo message=Apache13 ${apache13.home} ${apache13.detect} /
  +echo message=IIS ${iis.home} ${iis.detect} /
  +echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
  +echo message= /
   
  +!-- What OS ( it'll determine the includes ) --
   condition property=linux
  equals arg1=${os.name} arg2=Linux/
   /condition
  +condition property=solaris
  +   equals arg1=${os.name} arg2=SunOS/
  +/condition
   condition property=win32
 os family=windows/
   /condition
   condition property=hpux
  -  equals arg1=${os.name} arg2=???/
  +  equals arg1=${os.name} arg2=HP-UX/
   /condition
  -condition property=solaris
  -  equals arg1=${os.name} arg2=???/
  -/condition
  -
   !-- I believe they are using cross-compilation, so checking the os.name
doesn't help. We'll check if the NDK is installed instead --
   condition property=netware
 available file=novellndk.home /
   /condition
   
  -echo message=Apache2 ${apache2.home} ${apache2.detect} /
  -echo message=Apache13 ${apache13.home} ${apache13.detect} /
  -echo message=IIS ${iis.home} ${iis.detect} /
  -echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
  -echo message= /
  -echo message=Linux:${linux} Win32:${win32} Netware:${netware} /
  +echo message=Linux:${linux} Win32:${win32} Netware:${netware} 
Solaris:${solaris} HPUX:${hpux} /
 /target
   
 target name=init.win32 if=win32 
   property name=build.compiler.base location=${mssdk.home} /
   property name=build.compiler.cc location=${mssdk.home}/bin/cl /
   property name=build.compiler.ld location=${mssdk.home}/bin/link /
  +echo message=MSDEV compiler: ${mssdk.home} /
 /target
   
 target name=init.netware if=netware 
  @@ -122,6 +124,8 @@
   property name=build.compiler.cc 
location=${build.compiler.base}/bin/mwccnlm /
   property name=build.compiler.ld 
location=${build.compiler.base}/bin/mwldnlm /
   property name=novelllibc.dir location=${novellndk.home}/libc /
  +echo message=MWCC compiler: ${mw.home} /
  +echo message=NDK: ${novellndk.home} /
 /target
   
 target name=init depends=guess.env,init.win32,init.netware 
  @@ -171,6 +175,7 @@
   include name=${java.home}/../include/linux if=linux /
   include name=${java.home}/../include/hp-ux if=hpux /
   include 

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config.c

2002-05-22 Thread costin

costin  02/05/22 16:40:36

  Modified:jk/native2/common jk_config.c
  Log:
  Stupid mistake...
  
  Revision  ChangesPath
  1.20  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_config.c
  
  Index: jk_config.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jk_config.c   18 May 2002 22:34:01 -  1.19
  +++ jk_config.c   22 May 2002 23:40:36 -  1.20
  @@ -58,7 +58,7 @@
   /***
* Description: General purpose config object *
* Author:  Gal Shachor [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.19 $   *
  + * Version: $Revision: 1.20 $   *
***/
   
   #include jk_global.h
  @@ -268,7 +268,7 @@
   if( strcmp( name, name ) == 0 ) {
   return JK_OK;
   }
  -if( strcmp( name, ver  ) == 0 ) {
  +if( strcmp( name, ver ) == 0 ) {
   mbean-ver=atol(val);
   return JK_OK;
   }
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_apache2.h

2002-05-22 Thread costin

costin  02/05/22 16:42:32

  Modified:jk/native2/include jk_pool.h
   jk/native2/common jk_pool_apr.c
   jk/native2/server/apache2 jk_apache2.h
  Log:
  The pool must be constructed before anything else, so we need to add a declaration
  for the constructor ( we can't use env and factories ). I also added JK_METHOD
  and made few changes ( mostly to get the windwos build )
  
  Revision  ChangesPath
  1.7   +4 -1  jakarta-tomcat-connectors/jk/native2/include/jk_pool.h
  
  Index: jk_pool.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_pool.h 21 Feb 2002 11:15:51 -  1.6
  +++ jk_pool.h 22 May 2002 23:42:32 -  1.7
  @@ -58,7 +58,7 @@
   /***
* Description: Memory Pool object header file *
* Author:  Gal Shachor [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.6 $   *
  + * Version: $Revision: 1.7 $   *
***/
   #ifndef _JK_POOL_H
   #define _JK_POOL_H
  @@ -160,6 +160,9 @@
   XXX move this to the factory
*/
   int jk2_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent, 
int size );
  +
  +int JK_METHOD jk2_pool_apr_create( struct jk_env *env, struct jk_pool **newPool,
  +   struct jk_pool *parent, void *aprPool );
   
   
   #ifdef __cplusplus
  
  
  
  1.5   +3 -4  jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c
  
  Index: jk_pool_apr.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_pool_apr.c 16 May 2002 23:48:27 -  1.4
  +++ jk_pool_apr.c 22 May 2002 23:42:32 -  1.5
  @@ -80,8 +80,6 @@
   */
   
   
  -int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
  -apr_pool_t *aprPool );
   /** Nothing - apache will take care ??
*/
   static void jk2_pool_apr_close(jk_env_t *env, jk_pool_t *p)
  @@ -173,10 +171,11 @@
   }
   
   
  -int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
  -apr_pool_t *aprPool)
  +int JK_METHOD jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t 
*parent,
  +   void *aprPoolV)
   {
   jk_pool_t *_this;
  +apr_pool_t *aprPool=(apr_pool_t *)aprPoolV;
   
   _this=(jk_pool_t *)apr_palloc(aprPool, sizeof( jk_pool_t ));
   *newPool = _this;
  
  
  
  1.8   +1 -5  jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
  
  Index: jk_apache2.h
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_apache2.h  14 May 2002 20:44:21 -  1.7
  +++ jk_apache2.h  22 May 2002 23:42:32 -  1.8
  @@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat 
* Author:  Gal Shachor [EMAIL PROTECTED]   
* Henri Gomez [EMAIL PROTECTED]
  - * Version: $Revision: 1.7 $   
  + * Version: $Revision: 1.8 $   
*/
   
   #include jk_global.h
  @@ -84,10 +84,6 @@
   int JK_METHOD jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
  jk_bean_t *result,
  const char *type, const char *name);
  -
  -/* Temp. - we should use the factory ( we may need few changes ) */
  -int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
  - apr_pool_t *aprPool);
   
   
   
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c

2002-05-22 Thread costin

costin  02/05/22 16:44:23

  Modified:jk/native2/server/apache2 mod_jk2.c
  Log:
  Remove printfs.
  
  I tested apache2 with
   Location
 JkSet group lb
   /Location,
  seem to work fine ( with Apache doing the mapping ). No time for ab tests
  now.
  
  Revision  ChangesPath
  1.25  +8 -11 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_jk2.c 17 May 2002 00:31:55 -  1.24
  +++ mod_jk2.c 22 May 2002 23:44:23 -  1.25
  @@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor [EMAIL PROTECTED]   *
* Henri Gomez [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.24 $   *
  + * Version: $Revision: 1.25 $   *
***/
   
   /*
  @@ -236,14 +236,11 @@
   jk_uriEnv_t *new = (jk_uriEnv_t *)apr_pcalloc(p,sizeof(jk_uriEnv_t));
   
   
  -/* XXX */
  -fprintf(stderr, XXX Merged dir config %p %p %s %s\n,
  -base, new, base-uri, add-uri);
  +if( base-mbean-debug  0 ) {
  +fprintf(stderr, mod_jk2:mergeDirConfig() Merged dir config %p %p %s %s\n,
  +base, new, base-uri, add-uri);
  +}
   
  -/* if( add-webapp == NULL ) { */
  -/* add-webapp=base-webapp; */
  -/* } */
  -
   return add;
   }
   
  @@ -627,9 +624,9 @@
* but that's too complex for now.
*/
   if( uriEnv!= NULL  uriEnv-workerName != NULL) {
  -env-l-jkLog(env, env-l, JK_LOG_INFO, 
  -  PerDir mapping  %s=%s\n,
  -  r-uri, uriEnv-workerName);
  +if( uriEnv-mbean-debug  0 )
  +env-l-jkLog(env, env-l, JK_LOG_INFO, 
  +  PerDir mapping  %s=%s\n,r-uri, uriEnv-workerName);
   
   ap_set_module_config( r-request_config, jk2_module, uriEnv );
   r-handler=JK_HANDLER;
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp

2002-05-22 Thread costin

costin  02/05/22 16:47:15

  Modified:jk/native2/server/isapi isapi.dsp
  Log:
  Nacho - I changed the name to APACHE2_HOME ( instead of 20 ) to be consistent
  with the other dsp and files.
  
  Also check in with CRLF, so it will work.
  
  Revision  ChangesPath
  1.10  +328 -328  jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
  
  Index: isapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- isapi.dsp 18 May 2002 22:46:49 -  1.9
  +++ isapi.dsp 22 May 2002 23:47:14 -  1.10
  @@ -1,328 +1,328 @@
  -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  -# ** DO NOT EDIT **
  -
  -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102
  -
  -CFG=isapi - Win32 Debug
  -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
  -!MESSAGE use the Export Makefile command and run
  -!MESSAGE 
  -!MESSAGE NMAKE /f isapi.mak.
  -!MESSAGE 
  -!MESSAGE You can specify a configuration when running NMAKE
  -!MESSAGE by defining the macro CFG on the command line. For example:
  -!MESSAGE 
  -!MESSAGE NMAKE /f isapi.mak CFG=isapi - Win32 Debug
  -!MESSAGE 
  -!MESSAGE Possible choices for configuration are:
  -!MESSAGE 
  -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library)
  -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library)
  -!MESSAGE 
  -
  -# Begin Project
  -# PROP AllowPerConfigDependencies 0
  -# PROP Scc_ProjName 
  -# PROP Scc_LocalPath 
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
  -!IF  $(CFG) == isapi - Win32 Release
  -
  -# PROP BASE Use_MFC 0
  -# PROP BASE Use_Debug_Libraries 0
  -# PROP BASE Output_Dir Release
  -# PROP BASE Intermediate_Dir Release
  -# PROP BASE Target_Dir 
  -# PROP Use_MFC 0
  -# PROP Use_Debug_Libraries 0
  -# PROP Output_Dir Release
  -# PROP Intermediate_Dir Release
  -# PROP Ignore_Export_Lib 0
  -# PROP Target_Dir 
  -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D 
_MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I 
$(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D ISAPI_EXPORTS /YX /FD /c
  -# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
  -# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
  -# ADD BASE RSC /l 0xc0a /d NDEBUG
  -# ADD RSC /l 0x409 /d NDEBUG
  -BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  -LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
  -# ADD LINK32 libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib 
wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll 
/libpath:$(APACHE20_HOME)\lib
  -
  -!ELSEIF  $(CFG) == isapi - Win32 Debug
  -
  -# PROP BASE Use_MFC 0
  -# PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir Debug
  -# PROP BASE Intermediate_Dir Debug
  -# PROP BASE Target_Dir 
  -# PROP Use_MFC 0
  -# PROP Use_Debug_Libraries 1
  -# PROP Output_Dir Debug
  -# PROP Intermediate_Dir Debug
  -# PROP Ignore_Export_Lib 0
  -# PROP Target_Dir 
  -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I 
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include 
/I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c
  -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32
  -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
  -# ADD BASE RSC /l 0xc0a /d _DEBUG
  -# ADD RSC /l 0x409 /d _DEBUG
  -BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  -LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug 
/machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept 
/libpath:$(APACHE20_HOME)\lib
  -# SUBTRACT LINK32 /nodefaultlib
  -
  -!ENDIF 
  -
  -# Begin Target
  -
  -# Name isapi - Win32 Release
  -# Name isapi - Win32 Debug
  -# Begin Group Source Files
  -
  -# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
  -# Begin Source File
  -
  -SOURCE=.\isapi.def
  -# End Source File
  -# Begin Source File
  -
  

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

2002-05-22 Thread costin

costin  02/05/22 16:48:18

  Modified:jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Added few #ifdefs to make it compile with my version of MSVC ( probably
  an old one ).
  
  Nacho - let me know if it brakes your build ( but it shouldn't )
  
  Revision  ChangesPath
  1.18  +33 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_isapi_plugin.c 19 May 2002 21:44:23 -  1.17
  +++ jk_isapi_plugin.c 22 May 2002 23:48:17 -  1.18
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor [EMAIL PROTECTED]   *
* Author:  Larry Isaacs [EMAIL PROTECTED]   *
* Author:  Ignacio J. Ortega [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.17 $   *
  + * Version: $Revision: 1.18 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -161,13 +161,21 @@
   if (pVer-dwFilterVersion  http_filter_revision) {
   pVer-dwFilterVersion = http_filter_revision;
   }
  +
  +#ifdef SF_NOTIFY_AUTH_COMPLETE
   
   pVer-dwFlags = SF_NOTIFY_ORDER_HIGH| 
   SF_NOTIFY_SECURE_PORT   | 
   SF_NOTIFY_NONSECURE_PORT|
   SF_NOTIFY_PREPROC_HEADERS   |
   SF_NOTIFY_AUTH_COMPLETE;
  -
  +#else
  + pVer-dwFlags = SF_NOTIFY_ORDER_HIGH| 
  +SF_NOTIFY_SECURE_PORT   | 
  +SF_NOTIFY_NONSECURE_PORT|
  +SF_NOTIFY_PREPROC_HEADERS;   
  +#endif
  +
   strcpy(pVer-lpszFilterDesc, VERSION_STRING);
   
   if (!is_inited) {
  @@ -212,11 +220,18 @@
}
   }
   }
  +#ifdef SF_NOTIFY_AUTH_COMPLETE
   if (is_inited 
(((SF_NOTIFY_PREPROC_HEADERS == dwNotificationType)  !iis5) ||
  ((SF_NOTIFY_AUTH_COMPLETE   == dwNotificationType)   iis5)
  )
)
  +#else
  + if (is_inited 
  + (((SF_NOTIFY_PREPROC_HEADERS == dwNotificationType)  !iis5) 
  +   )
  + )
  +#endif
{ 
   char uri[INTERNET_MAX_URL_LENGTH]; 
   char snuri[INTERNET_MAX_URL_LENGTH]=/;
  @@ -233,15 +248,22 @@
   DWORD szHost = sizeof(Host);
   DWORD szTranslate = sizeof(Translate);
   
  - if (iis5) {
  - 
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-GetHeader;
  - 
SetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-SetHeader;
  - 
AddHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-AddHeader;
  - } else {
  - 
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-GetHeader;
  - 
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-SetHeader;
  - 
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-AddHeader;
  - }
  +#ifdef SF_NOTIFY_AUTH_COMPLETE
  + if (iis5) {
  + 
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-GetHeader;
  + 
SetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-SetHeader;
  + 
AddHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-AddHeader;
  + } else {
  + 
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-GetHeader;
  + 
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-SetHeader;
  + 
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-AddHeader;
  + }
  +#else
  + 
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-GetHeader;
  + 
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-SetHeader;
  + 
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-AddHeader;
  +#endif
  +
   
   
   env-l-jkLog(env, env-l,  JK_LOG_DEBUG, 
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/conf jk2.properties

2002-05-22 Thread costin

costin  02/05/22 16:49:18

  Modified:jk/conf  jk2.properties
  Log:
  Added a sample property with the location of the native code, in in-process mode.
  
  Revision  ChangesPath
  1.8   +1 -0  jakarta-tomcat-connectors/jk/conf/jk2.properties
  
  Index: jk2.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jk2.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk2.properties6 May 2002 22:48:56 -   1.7
  +++ jk2.properties22 May 2002 23:49:18 -  1.8
  @@ -12,3 +12,4 @@
   # Just to check if the the config  is working
   shm.file=${jkHome}/work/jk2.shm
   
  +apr.jniModeSo=/opt/apache2/modules/mod_jk2.so
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java

2002-05-22 Thread costin

costin  02/05/22 16:50:03

  Modified:jk/java/org/apache/jk/apr AprImpl.java
  Log:
  Remove the hardcoded path, make it configurable. Still have to test it.
  
  Revision  ChangesPath
  1.15  +29 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
  
  Index: AprImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AprImpl.java  9 May 2002 00:12:00 -   1.14
  +++ AprImpl.java  22 May 2002 23:50:02 -  1.15
  @@ -21,6 +21,12 @@
   // Handlers for native callbacks
   Hashtable jkHandlers=new Hashtable();
   
  +// Name of the so used in inprocess mode 
  +String jniModeSo;
  +// name of the so used by java. If not set we'll loadLibrary(jkjni ),
  +// if set we load( nativeSo )
  +String nativeSo;
  +
   public AprImpl() {
   aprSingleton=this;
   }
  @@ -49,6 +55,19 @@
   jkHandlers.put( type, cb );
   }
   
  +/** Name of the so used in inprocess mode
  + */
  +public void setJniModeSo(String jniModeSo ) {
  +this.jniModeSo=jniModeSo;
  +}
  +
  +/** name of the so used by java. If not set we'll loadLibrary(jkjni ),
  +if set we load( nativeSo )
  +*/
  +public void setNativeSo( String nativeSo ) {
  +this.nativeSo=nativeSo;
  +}
  +
   //  Apr generic utils 
   /** Initialize APR
*/
  @@ -190,10 +209,12 @@
   }
   
   static boolean jniMode=false;
  +
   
   public static void jniMode() {
   jniMode=true;
   }
  +
   
   /** This method of loading the libs doesn't require setting
*   LD_LIBRARY_PATH. Assuming a 'right' binary distribution,
  @@ -217,8 +238,8 @@
  VMs.
   */
   try {
  -System.out.println(Loading mod_jk.so);
  -System.load( /opt/apache2/modules/mod_jk2.so );
  +System.out.println(Loading  + jniModeSo);
  +System.load( jniModeSo );
   } catch( Throwable ex ) {
   // ignore
   ex.printStackTrace();
  @@ -246,7 +267,12 @@
 }
   */
   try {
  -System.loadLibrary( jkjni );
  +if( nativeSo == null ) {
  +// This will load libjkjni.so or jkjni.dll in LD_LIBRARY_PATH
  +System.loadLibrary( jkjni );
  +} else {
  +System.load( nativeSo );
  +}
   } catch( Throwable ex ) {
   ok=false;
   throw ex;
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java

2002-05-22 Thread costin

costin  02/05/22 16:51:11

  Modified:jk/java/org/apache/jk/common ChannelSocket.java
  Log:
  Added ( unused ) BUFFERED_WRITE.  When 4.x and 3.x will support the CLIENT_FLUSH
  notification we'll get some 10-20% speed improvements.
  
  Revision  ChangesPath
  1.14  +24 -1 
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ChannelSocket.java14 May 2002 20:45:19 -  1.13
  +++ ChannelSocket.java22 May 2002 23:51:11 -  1.14
  @@ -107,6 +107,13 @@
   int linger=100;
   int socketTimeout;
   
  +/* Turning this to true will reduce the latency with about 20%.
  +   But it requires changes in tomcat to make sure client-requested
  +   flush() is honored ( on my test, I got 367-433 RPS and
  +   52-35ms average time with a simple servlet )
  +*/
  +static final boolean BUFFER_WRITE=false;
  +
   ThreadPool tp=new ThreadPool();
   
   /*  Tcp socket options  */
  @@ -190,7 +197,11 @@
   s.setSoTimeout( socketTimeout );
   
   InputStream is=new BufferedInputStream(s.getInputStream());
  -OutputStream os= s.getOutputStream();
  +OutputStream os;
  +if( BUFFER_WRITE )
  +os = new BufferedOutputStream( s.getOutputStream());
  +else
  +os = s.getOutputStream();
   ep.setNote( isNote, is );
   ep.setNote( osNote, os );
   }
  @@ -289,6 +300,16 @@
   return len;
   }
   
  +public int flush( Msg msg, MsgContext ep)
  +throws IOException
  +{
  +if( BUFFER_WRITE ) {
  +OutputStream os=(OutputStream)ep.getNote( osNote );
  +os.flush();
  +}
  +return 0;
  +}
  +
   public int receive( Msg msg, MsgContext ep )
   throws IOException
   {
  @@ -451,6 +472,8 @@
   return receive( msg, ep );
   case JkHandler.HANDLE_SEND_PACKET:
   return send( msg, ep );
  +case JkHandler.HANDLE_FLUSH:
  +return flush( msg, ep );
   }
   
   return next.invoke( msg, ep );
  
  
  

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




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

2002-05-22 Thread costin

costin  02/05/22 16:52:13

  Modified:jk/java/org/apache/jk/common ChannelJni.java
   jk/java/org/apache/jk/core JkHandler.java
   jk/java/org/apache/jk/server JkCoyoteHandler.java
  Log:
  Added the FLUSH code.
  
  That shouldn't change any of the existing behaviors.
  
  Revision  ChangesPath
  1.10  +1 -1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
  
  Index: ChannelJni.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ChannelJni.java   10 May 2002 00:01:44 -  1.9
  +++ ChannelJni.java   22 May 2002 23:52:13 -  1.10
  @@ -163,7 +163,7 @@
   case JkHandler.HANDLE_SEND_PACKET:
   return send( msg, ep );
   }
  -// Default is FORWARD
  +// Default is FORWARD - called from C 
   try {
   // first, we need to get an endpoint. It should be
   // per/thread - and probably stored by the C side.
  
  
  
  1.7   +1 -0  
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java
  
  Index: JkHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JkHandler.java17 Apr 2002 22:27:18 -  1.6
  +++ JkHandler.java22 May 2002 23:52:13 -  1.7
  @@ -85,6 +85,7 @@
   // will be merged ).
   public static final int HANDLE_RECEIVE_PACKET   = 10;
   public static final int HANDLE_SEND_PACKET  = 11;
  +public static final int HANDLE_FLUSH= 12;
   
   public void setWorkerEnv( WorkerEnv we ) {
   this.wEnv=we;
  
  
  
  1.22  +8 -0  
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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JkCoyoteHandler.java  16 May 2002 18:57:39 -  1.21
  +++ JkCoyoteHandler.java  22 May 2002 23:52:13 -  1.22
  @@ -291,6 +291,11 @@
   } else if( actionCode==ActionCode.ACTION_RESET ) {
   if( log.isInfoEnabled() )
   log.info(RESET  );
  +} else if( actionCode==ActionCode.ACTION_CLIENT_FLUSH ) {
  +org.apache.coyote.Response res=(org.apache.coyote.Response)param;
  +MsgContext ep=(MsgContext)res.getNote( epNote );
  +ep.setType( JkHandler.HANDLE_FLUSH );
  +ep.getSource().invoke( null, ep );
   } else if( actionCode==ActionCode.ACTION_CLOSE ) {
   if( log.isDebugEnabled() )
   log.debug(CLOSE  );
  @@ -303,6 +308,9 @@
   msg.appendByte( 1 );
   
   ep.setType( JkHandler.HANDLE_SEND_PACKET );
  +ep.getSource().invoke( msg, ep );
  +
  +ep.setType( JkHandler.HANDLE_FLUSH );
   ep.getSource().invoke( msg, ep );
   } else if( actionCode==ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
   
  
  
  

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




DO NOT REPLY [Bug 9334] New: - Intermittent parsing error in Ajp13Request

2002-05-22 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=9334.
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=9334

Intermittent parsing error in Ajp13Request

   Summary: Intermittent parsing error in Ajp13Request
   Product: Tomcat 4
   Version: 4.0.3 Final
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Connector:JK/AJP (deprecated)
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hi,

We use Tomcat 4.0.3, with Apache 1.3.24 and mod_jk, all in a loadbalanced 
setup. We experience an intermittent bug in Tomcat that I fixed by changing the 
server code. I would like to describe the problem in the following by hoping 
someone can tell me what this is about.

The problem is in the Ajp13Processor class. Once a processor is taken from the 
pool the AJP details are read with 

status = ajp13.receiveNextRequest(ajpRequest);

Then later it is assigned to the supposedly recycled Ajp13Request from the 
previous use

// set up request
request.setAjpRequest(ajpRequest);

So far so good. What happens for us is that at least 5 times every minute (up 
to 20-30 times) the flag parsed in Ajp13Request (the request instance 
variable of the Ajp13Processor class) is suddenly set to true!

This causes the following problem. The incoming query string is not parsed 
anymore because the request thinks it had done this already. Therefore in our 
code when we use getParam() methods they all return null or an empty map. 
This of course means ours servlets assume that no parameters have been provided 
and they do whatever they should do in this case - which of course fails what 
the customer expects.

What I did to quickly fix this problem is to add the following lines into 
Ajp13Request.java

void setAjpRequest(BaseRequest ajp) throws UnsupportedEncodingException {
// XXX make this guy wrap AjpRequest so
// we're more efficient (that's the whole point of
// all of the MessageBytes in AjpRequest)

/** @todo DEBUG */
if (parsed == true) {
  parsed = false;
  System.err.println(!!! parsed was true in recycled request !!!);
}
/** @todo DEBUG */

setMethod(ajp.method().toString());
setProtocol(ajp.protocol().toString());


Note the DEBUG lines above, when I detect that, although the request should 
have been recycled, that the parsed flag is already set before even anything 
is assigned to it I reset the flag to false and everything is working fine. 
The error message I print out above is the one that shows up in our 
catalina.out the specified number of times (see above).

I then went on and added this to the HttpRequestBase.java

public void setQueryString(String query) {

/** @todo DEBUG */
if (parsed) {
  System.err.println(### reassigned query string ###\nqueryString:  +
  queryString + \nnew value:  + query);
}
/** @todo DEBUG */

this.queryString = query;

}

Although this should never happen - or am I wrong here - this is what I see in 
the catalina.out

### reassigned query string ###
queryString: null
new value: wl_srclang=ESwl_trglang=FRwl_gloss=7wl_text=Provinc%
EDa+de+la+direcci%F3n+destino+de+la+mercanc%EDa
!!! parsed was true in recycled request !!!


Clearly, the request gets some values assigned twice somehow. But what puzzles 
me is that parsed is only set to true when someone calls any of the 
getParameter() methods. But because userland code hasn't been executed so 
far this is impossible. This all happens within a single thread and within two 
classes of Tomcat source code. What is going on?

I also had some debug code in the recycle method to check - assuming that 
recycle is called fine - if everything gets cleared, including the parsed 
flag. This shows the correct behaviour during all my testing, ie. everything is 
cleared fine. Also I wrapped the call to recycle in Ajp13Request with a 
try/catch to see if maybe an error is thrown that would prevent a recycle 
being called - again, I never had any errors showing up at this point. Also 
when dumping the values from the request instance it looks like it is always 
cleared correctly; I have never seen some sort of left overs from a previous 
request, so recycling the request does not seem to be the issue.

The only explanation I have so far is that somehow 
HttpRequestBase.parseParameters is called before the BaseRequest values (from 
the Ajp13 connection) are assigned to it. But having one single thread running 
through the Ajp13Processor and no trace of someone calling getParam(), how 
whould that 

Coyote/JK2 CVS Download of Changes

2002-05-22 Thread Anthony W. Marino

Is cvs state (changes) ok to download at this point or what time tonight 
(USA EST)?

Thanks,
Anthony

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




Re: [PATCH] Stack based finallies in Generator.java

2002-05-22 Thread Denis Benoit

Hi Kin-Man!

Here's take two of the stack based finally.  The first version had a very
nasty bug, the stacks variables were declared by mistake as field variables,
so the JSP was not thread safe!  This version properly declares the stack
variables as local variables to the _jsp_service() method.

By the way, I wish to thank everybody for the confidence they have put
in me in the vote.  I will try hard to meet the expectations.  I consider
myself very lucky to be able to cooperate with some of the very talented 
people in Tomcat.

Thanks!


Index: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.14
diff -c -r1.14 Generator.java
*** jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java  
 15 May 2002 20:42:03 -  1.14
--- jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java  
 23 May 2002 01:26:18 -
***
*** 94,102 
  private JspCompilationContext ctxt;
  private boolean breakAtLF;
  private PageInfo pageInfo;
! private FinallyApplyer finallies;
! private int tryBit;
! private Stack tryStack;
  
  /**
   * @param s the input string
--- 94,100 
  private JspCompilationContext ctxt;
  private boolean breakAtLF;
  private PageInfo pageInfo;
! private int maxTagNesting;
  
  /**
   * @param s the input string
***
*** 227,232 
--- 225,240 
  out.println();
  }
  
+   // Class fields declarations
+   
+   maxTagNesting = pageInfo.getMaxTagNesting();
+   if (maxTagNesting = 0) {
+   out.printil(private static final int RELEASE_ACTION = 0;);
+   out.printil(private static final int POP_AND_RELEASE_ACTION = 1;);
+   out.println();
+   out.println();
+   }
+ 
// Constructor (empty so far) here
  
// Method used to get compile time include file dependencies
***
*** 238,255 
  out.println();
  out.println();
  
- out.printil(private void addTagToVector(java.util.Vector tags, int index, 
Object tag) {);
- out.pushIndent();
- out.printil(if (index + 1  tags.size()));
- out.pushIndent();
- out.printil(tags.setSize(index + 1););
- out.popIndent();
- out.printil(tags.setElementAt(tag, index););
- out.popIndent();
- out.printil(});
- out.println();
- out.println();
- 
// Now the service method
out.printin(public void );
out.print  (serviceMethodName);
--- 246,251 
***
*** 272,279 
out.printil(ServletConfig config = null;);
out.printil(JspWriter out = null;);
out.printil(Object page = this;);
! out.printil(java.util.BitSet bitmask = new java.util.BitSet(););
! out.printil(java.util.Vector tags = new java.util.Vector(););
  
out.printil(try {);
out.pushIndent();
--- 268,287 
out.printil(ServletConfig config = null;);
out.printil(JspWriter out = null;);
out.printil(Object page = this;);
! 
!   // pseudo Finally state stack objects
! if (maxTagNesting = 0) {
! String depth = Integer.toString(maxTagNesting + 1);
! out.printil(int   finallyStackIndex = -1;);
! out.printin(int[] finallyStackActions = new int[);
! out.print(depth);
! out.println(];);
! out.printin(javax.servlet.jsp.tagext.Tag[] finallyStackTags = new 
javax.servlet.jsp.tagext.Tag[);
! out.print(depth);
! out.println(];);
! out.println();
! out.println();
! }
  
out.printil(try {);
out.pushIndent();
***
*** 982,997 
  out.pushIndent();
  } else {
  out.printil(// try {);
! out.printin(bitmask.set();
! Integer tryBitVal = new Integer(tryBit++);
! tryStack.push(tryBitVal);
! out.print(tryBitVal.toString());
! out.println(););
! out.printin(addTagToVector(tags, );
! out.print(tryBitVal.toString());
! out.print(, );
  out.print(tagHandlerVar);
! out.println(););
  }
out.printin(int );
out.print(tagEvalVar);
--- 990,999 
  out.pushIndent();
  } else {
  out.printil(// try {);
! out.printil(finallyStackActions[++finallyStackIndex] = 
RELEASE_ACTION;);
! out.printin(finallyStackTags[finallyStackIndex] = );