cvs commit: jakarta-tomcat-connectors/webapp/docs building.xml index.xml style.xsl

2002-05-04 Thread pier 

pier02/05/04 20:30:42

  Modified:webapp   build.xml
   webapp/docs building.xml index.xml style.xsl
  Log:
  Some more documentation in index.xml.
  Fixed little hole in the stylesheet not translating  tags,
  Updated the build.xml file since javadoc gets executed _all_
  the time.
  
  Revision  ChangesPath
  1.5   +2 -2  jakarta-tomcat-connectors/webapp/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml 5 May 2002 02:24:26 -   1.4
  +++ build.xml 5 May 2002 03:30:42 -   1.5
  @@ -3,7 +3,7 @@
   
   
   
   
  @@ -203,7 +203,7 @@
   
 
   
  -  
   
 
  
  
  
  1.2   +3 -2  jakarta-tomcat-connectors/webapp/docs/building.xml
  
  Index: building.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/building.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- building.xml  5 May 2002 01:58:22 -   1.1
  +++ building.xml  5 May 2002 03:30:42 -   1.2
  @@ -28,8 +28,9 @@
 Multi-threaded support has now been added since the multi threaded 
 environment is now available also under UNIX based operating systems via 
 Apache 2.0, therefore the only things left to do are a little bit of 
  -  porting (not much, since the WebApp module is based on the , which does 
  -  most of the job for you) and a lot of testing.
  +  porting (not much, since the WebApp module is based on the 
  +  http://apr.apache.org/";>Apache Portable Runtime
  +  library, which does most of the job for you) and a lot of testing.
   
   
   
  
  
  
  1.3   +62 -3 jakarta-tomcat-connectors/webapp/docs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml 5 May 2002 02:24:26 -   1.2
  +++ index.xml 5 May 2002 03:30:42 -   1.3
  @@ -10,7 +10,29 @@
 What is the WebApp Module
   
   
  -
  +
  +  Do you remember the old times of mod_jserv? Maybe you're too
  +  young, but I do pretty well. At that time, the amazing Apache
  +  JServ servlet container didn't have an HTTP stack per se, but
  +  rather relied on the Apache 1.2 and 1.3 web server to have clients
  +  accessing it.
  +
  +
  +
  +  And this is when a "module" came into the picture: a module such
  +  as mod_jserv or the WebApp module connects the HTTP
  +  stack of the front end web-server(s) with one or more instances of
  +  a servlet container in the back end.
  +
  +
  +
  +  The WebApp module does exactly that, it's not finished (it might
  +  never will), but it works, and it works pretty damn good. Plus (this
  +  comes for free), we tried very hard to keep the internals clean and
  +  well-designed, so that it will be so easy for anyone to simply provide
  +  patches in case of bugs (yes, there are some!).
  +
  +
 
   
 
  @@ -18,7 +40,24 @@
 Why should I use the WebApp Module?
   
   
  -
  +
  +  Because we say so? Not kidding, but it's really up to you, there are
  +  several alternatives to "do the job", when we started this project
  +  all of them were (in our not-so-humble-opinion), a pile of crap.
  +
  +
  +
  +  Lately there have been some improvements on those alternatives, and
  +  probably, if you're wondering why you want to try out WebApp, you should
  +  really stop reading now, and go and download something else.
  +
  +
  +
  +  If instead you're an adventurous geek who's up for a challenge, skip
  +  the rest of this document and go to the 
  +  section, there's where the fun starts.
  +
  +
 
   
   
  @@ -27,7 +66,27 @@
 Are there alternative ways to connect Apache and Tomcat?
   
   
  -
  +
  +  It would NOT be fair not to talk about our lovely (???) competitors,
  +  of course, otherwise someone might even start calling us names, so,
  +  in brief, you can use the following alternatives:
  +
  +
  +
  +  Tomcat's internal HTTP stack and mod_proxy, which is not that
  +  bad, but slow, well, of course Tomcat didn't have 8/9 years of C
  +  routine optimization like the Apache Web Server, but it's quite good.
  +  The only disadvantage I see is that it looks pretty ridiculous to
  +  parse an HTTP request to generate it again (exactly the same), and
  +  to parse again the response to send it back unchanged

cvs commit: jakarta-tomcat-connectors/webapp/docs index.xml style.xsl

2002-05-04 Thread pier 

pier02/05/04 19:24:26

  Modified:webapp   build.xml
   webapp/docs index.xml style.xsl
  Log:
  Java API documentation as well.
  
  Revision  ChangesPath
  1.4   +7 -6  jakarta-tomcat-connectors/webapp/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 5 May 2002 02:02:17 -   1.3
  +++ build.xml 5 May 2002 02:24:26 -   1.4
  @@ -3,7 +3,7 @@
   
   
   
   
  @@ -127,7 +127,7 @@
   
   
   
  -
  +
   
   
   
  @@ -188,10 +188,10 @@
  description="Clean and compile all components"/>
   
   
  -  
  +  
   
 
   
  -  
  +  
   
 
   
  
  
  
  1.2   +30 -4 jakarta-tomcat-connectors/webapp/docs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml 5 May 2002 01:58:22 -   1.1
  +++ index.xml 5 May 2002 02:24:26 -   1.2
  @@ -1,7 +1,33 @@
   
   
  -
  -  
  -  
  -  
  +
  +  
  +The WebApp Module for the Apache Web Server
  +  
  +
  +  
  +
  +  What is the WebApp Module
  +
  +
  +
  +  
  +
  +  
  +
  +  Why should I use the WebApp Module?
  +
  +
  +
  +  
  +
  +
  +  
  +
  +  Are there alternative ways to connect Apache and Tomcat?
  +
  +
  +
  +  
  +
   
  
  
  
  1.2   +32 -11jakarta-tomcat-connectors/webapp/docs/style.xsl
  
  Index: style.xsl
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/style.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- style.xsl 5 May 2002 01:58:22 -   1.1
  +++ style.xsl 5 May 2002 02:24:26 -   1.2
  @@ -160,6 +160,25 @@
   
 
   
  +
  +
  +
  +  
  +
  +  Java API 
Documentation
  +
  +  
  +
  +
  +  
  +
  +  C API Documentation
  +
  +  
  +
 
   
   
  @@ -192,17 +211,19 @@
 
   
 
  -
  -  
  -
  -  
  -
  -  
  -
  -
  -
  -  
  -
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +  
  +  
  +
  +  
  +
   
   
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/webapp build.xml

2002-05-04 Thread pier 

pier02/05/04 19:02:17

  Modified:webapp   build.xml
  Log:
  Added the "docs" target to build.xml (still have to modify it A LOT).
  This file is a mess.
  
  Revision  ChangesPath
  1.3   +20 -2 jakarta-tomcat-connectors/webapp/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml 31 Jan 2002 18:47:43 -  1.2
  +++ build.xml 5 May 2002 02:02:17 -   1.3
  @@ -3,7 +3,7 @@
   
   
   
   
  @@ -203,6 +203,24 @@
   
 
   
  +  
  +
  +  
  +
  +
  +
  +  
  +
  +
  +
  +  
  +
  +
   
   
   
  @@ -226,4 +244,4 @@
 
   
   
  -
  \ No newline at end of file
  +
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/webapp/docs/images corner.gif jakarta.gif pixel.gif webapp.gif

2002-05-04 Thread pier 

pier02/05/04 18:58:22

  Added:   webapp/docs building.xml cvs.xml index.xml menu.idx
style.css style.xsl
   webapp/docs/images corner.gif jakarta.gif pixel.gif
webapp.gif
  Log:
  Added new documentation in XML.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/webapp/docs/building.xml
  
  Index: building.xml
  ===
  
  
  

  Building the WebApp Module

  

  
Note for Microsoft Windows operating system users
  
  
  
Nope, the WebApp module still doesn't run under Windows and currently 
any Microsoft operating system is not supported. Since the past 
release, though, many improvements were made, and we had positive repors 
that the WebApp module actually tries to work also in that environment.
  
  
  
The effort to bring WebApp under Microsoft Windows lacks of active 
developers, people (like you) who have access to this set of 
operating systems (from Windows 98 to XP), have access to their 
development tools and can make the difference.
  
  
  
Multi-threaded support has now been added since the multi threaded 
environment is now available also under UNIX based operating systems via 
Apache 2.0, therefore the only things left to do are a little bit of 
porting (not much, since the WebApp module is based on the , which does 
most of the job for you) and a lot of testing.
  
  
  
You will be more than welcome to join the effort.
  

  

  
Getting a hold on the sources: tarball or CVS?
  
  
  

  

  
What other software you need to have to build the module
  
  
  

  
  
  
  
  
  1.1  jakarta-tomcat-connectors/webapp/docs/cvs.xml
  
  Index: cvs.xml
  ===
  
  
  

  How to download the WebApp sources from CVS

  

  
Setting up your CVS work environment
  
  
  
First of all set up your CVSROOT environment variable and log in onto 
our CVS server. When prompted for a password, you can enter anoncvs:
  
  
  
if you're using CSH/TCSH
setenv CVSROOT :pserver:[EMAIL PROTECTED]:/home/cvspublic

  
if you're using SH/BASH
CVSROOT=":pserver:[EMAIL PROTECTED]:/home/cvspublic
export CVSROOT

  
and then log in on the CVS server
cvs login
(Logging in to [EMAIL PROTECTED])
CVS password: anoncvs

  
  

  You then have to check out the sources of the WebApp module, those 
  reside in the jakarta-tomcat-connectors repository, under the 
  webapp directory. To check the sources out, do:

  

  cvs checkout jakarta-tomcat-connectors/webapp
  cvs server: Updating jakarta-tomcat-connectors/webapp
  U jakarta-tomcat-connectors/webapp/.cvsignore
  
  U jakarta-tomcat-connectors/webapp/support/wa_version.m4
  cvs server: Updating webapplib
  
  
  and let's move them into a more accessible location
  mv jakarta-tomcat-connectors/webapp webapp
  rm -rf jakarta-tomcat-connectors
  
  
  then it's always better to clean up the checked out structure
  cd webapp
  cvs update -APd
  cvs server: Updating .
  cvs server: Updating apache-1.3
  
  cvs server: Updating support
  cvs server: Updating webapplib
  cd ..
  

  

  

  
Dealing with the Apache Portable Runtime sources
  
  
  
Perfect. Now, if you're building the WebApp module for Apache 2.0, you 
won't need to check out the Apache Portable Runtime library, since it is 
already included into the web server distribution. If, instead, you are 
building the WebApp module for Apache 1.3, you need to obtain a 
copy of APR, and you can do that checking out a copy of their CVS 
repository (namedly, apr):
  
  
  
cvs checkout apr
cvs server: Updating apr
U apr/.cvsignore

U apr/user/win32/groupinfo.c
U apr/user/win32/userinfo.c
mv apr jakarta-tomcat-connectors/webapp
and let's clean up this directory structure as well
cd apr
cvs update -APd
cvs server: Updating .
cvs server: Updating atomic

cvs server: Updating user/unix
cvs server: Updating user/win32
cd ..

  
  

  

  
All that AutoConf magic
  
  
  
Great, now, for semplicity's sake we can move the APR directory in the 
WebApp module directory, as it is in all pre-rolled source distribution 
tarballs

cvs commit: jakarta-tomcat-connectors/webapp/docs/images - New directory

2002-05-04 Thread pier 

pier02/05/04 18:57:46

  jakarta-tomcat-connectors/webapp/docs/images - New directory

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/webapp/docs build-u.html index.html license.html style.css warp.html

2002-05-04 Thread pier 

pier02/05/04 18:57:01

  Removed: webapp/docs build-u.html index.html license.html style.css
warp.html
  Log:
  Scrapping out old documentation.

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: jk_lb_worker.c patch

2002-05-04 Thread costinm 

Hi Mathias,

I think we understand your use case, it is not very uncommon.
In fact, as I mentioned few times, it is the 'main' use
case for Apache ( multi-process ) when using the JNI worker.
In this case Apache acts as a 'natural' load-balancer, with 
requests going to various processes ( more or less randomly ).
As in your case, requests without a session should allways go
to the worker that is in the same process.

The main reason for using '0' for the "local" worker is that
in jk2 I want to switch from float to int - there is no reason
( AFAIK ) to do all the float computation, even a short int
will be enough for the purpose of implementing a round-roubin
with weitghs.

BTW, one extension I'm trying to make is support for multiple
local workers - I'm still thining on how to do that. This will
cover the case of few big boxes, each with several tomcat 
instances ( if you have many G of RAM and many processors, sometimes
is better to run more VMs instead of a single large process ) 
In this case you still want some remote tomcats, for failover,
but most load should go to the local workers.

For jk2 I already fixed the selection of the 'recovering' worker,
after timeout the worker will go through normal selection instead
of beeing automatically chosen.

For jk1 - I'm waiting for patches :-) I wouldn't do a big change -
the current fix seemed like a good one. 

I agree that changing the meaning of 0 may be confusing ( is it
documented ? my workers.properties says it should never be used ).
We can fix that by using an additional flag - and not using 
special values.

Another special note - Jk2 will also support 'gracefull shutdown',
that means your case ( replacing a webapp ) will be handled
in a different way. You should be able to add/remove workers
without restarting apache ( and I hope mostly automated ). 

Let me know what you think - with patches if possible :-)

Costin

> The setup I use is the following, a load balancer (Alteon) is in front
> of several Apache servers, each hosted on a machine which also hosts a
> Tomcat.
> Let's call those Apache servers A1, A2 and A3 and the associated Tomcat
> servers T1, T2 and T3.
> 
> I have been using Paul's patch which I modified so the lb_value field of
> fault tolerant workers would not be changed to a value other than INF.
> 
> The basic setup is that Ai can talk to all Tj, but for requests not
> associated with a session, Ti will be used unless it is unavailable.
> Sessions belonging to Tk will be correctly routed. The load balancing
> worker definition is different for all three Ai, the lbfactor is set to
> 0 for workers connecting to Tk for all k != i and set to 1.0 for the
> worker connecting to Ti.
> 
> This setup allows to have sticky sessions independently of the Apache
> handling the request, which is a good thing since the Alteon cannot
> extract the ';jsessionid=.' part from the URL in a way which allows
> the dispatching of the requests to the proper Ai (the cookie is dealed
> with correctly though).
> 
> This works perfectly except when we roll out a new release of our
> webapps. In this case it would be ideal to be able to make the load
> balancer ignore one Apache server, deploy the new version of the webapp
> on this server, and switch this server back on and the other two off so
> the service interruption would be as short as possible for the
> customers. The immediate idea, if Ai/Ti is to be the first server to
> have the new webapp, is to stop Ti so Ai will not be selected by the
> load balancer. This does not work, indeed with Paul's patch Ti is the
> preferred server BUT if Ti fails then another Tk will be selected by Ai,
> therefore the load balancer will never declare Ai failed (even though we
> managed to make it behave like this by specifying a test URL which
> includes a jvmroute to Ti, but this uses lots of slb groups on the
> alteon) and it will continue to send requests to it.
> 
> Bernd's patch allows Ai to reject requests if Ti is stopped, the load
> balancer will therefore quickly declare Ai inactive and will stop send
> it requests, thus allowing to roll out the new webapp very easily, just
> set up the new webapp, restart Ti, restart Ai, and as soon as the load
> balancer sees Ai, shut down the other two Ak, the current sessions will
> still be routed to the old webapp, and the new sessions will see the new
> version. When there are no more sessions on the old version, shut down
> Tk (k != i) and deploy the new webapp.
> 
> My remark concerning the possible selection of recovering workers prior
> to the local worker (one with lb_value set to 0) deals with the load
> balancer not being able in this case to declare Ai inactive.
> 
> I hope I have been clear enough, and that everybody got the point, if
> not I'd be glad to explain more thoroughly.
> 
> Mathias.
> 
> Paul Frieden wrote:
> > 
> > Hello,
> > 
> > I'm afraid that I am no longer subscribed to the devel list.  I would be
> > happy to add my advice for this issu

Upcoming Tomcat 4.x releases

2002-05-04 Thread Remy Maucherat 

- As voted last week, Apache Tomcat 4.0.4 Beta 3 will be released on 5/6 or
5/7. The plan is to try to follow with a 4.0.4 Final within two weeks.
- The Apache Tomcat 4.1.1 milestone will be released between 5/6 amd 5/8,
and will be "feature complete" (by that, I mean the admin webapp is feature
complete, mostly ;-) ). I hope it will be stable enough to be considered a
beta. Most of the new components seem to be working very well so far (Jasper
2, Coyote).

Comments ?

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: jk_lb_worker.c patch

2002-05-04 Thread Mathias Herberts 

Hi,

I included the thread that started via email so the list can follow on.

The setup I use is the following, a load balancer (Alteon) is in front
of several Apache servers, each hosted on a machine which also hosts a
Tomcat.
Let's call those Apache servers A1, A2 and A3 and the associated Tomcat
servers T1, T2 and T3.

I have been using Paul's patch which I modified so the lb_value field of
fault tolerant workers would not be changed to a value other than INF.

The basic setup is that Ai can talk to all Tj, but for requests not
associated with a session, Ti will be used unless it is unavailable.
Sessions belonging to Tk will be correctly routed. The load balancing
worker definition is different for all three Ai, the lbfactor is set to
0 for workers connecting to Tk for all k != i and set to 1.0 for the
worker connecting to Ti.

This setup allows to have sticky sessions independently of the Apache
handling the request, which is a good thing since the Alteon cannot
extract the ';jsessionid=.' part from the URL in a way which allows
the dispatching of the requests to the proper Ai (the cookie is dealed
with correctly though).

This works perfectly except when we roll out a new release of our
webapps. In this case it would be ideal to be able to make the load
balancer ignore one Apache server, deploy the new version of the webapp
on this server, and switch this server back on and the other two off so
the service interruption would be as short as possible for the
customers. The immediate idea, if Ai/Ti is to be the first server to
have the new webapp, is to stop Ti so Ai will not be selected by the
load balancer. This does not work, indeed with Paul's patch Ti is the
preferred server BUT if Ti fails then another Tk will be selected by Ai,
therefore the load balancer will never declare Ai failed (even though we
managed to make it behave like this by specifying a test URL which
includes a jvmroute to Ti, but this uses lots of slb groups on the
alteon) and it will continue to send requests to it.

Bernd's patch allows Ai to reject requests if Ti is stopped, the load
balancer will therefore quickly declare Ai inactive and will stop send
it requests, thus allowing to roll out the new webapp very easily, just
set up the new webapp, restart Ti, restart Ai, and as soon as the load
balancer sees Ai, shut down the other two Ak, the current sessions will
still be routed to the old webapp, and the new sessions will see the new
version. When there are no more sessions on the old version, shut down
Tk (k != i) and deploy the new webapp.

My remark concerning the possible selection of recovering workers prior
to the local worker (one with lb_value set to 0) deals with the load
balancer not being able in this case to declare Ai inactive.

I hope I have been clear enough, and that everybody got the point, if
not I'd be glad to explain more thoroughly.

Mathias.

Paul Frieden wrote:
> 
> Hello,
> 
> I'm afraid that I am no longer subscribed to the devel list.  I would be
> happy to add my advice for this issue, but I don't have time to keep up
> with the entire devel list.  If there is anything I can do, please just
> mail me directly.
> 
> I chose to use the value 0 for a worker because it used the inverse of
> the value specified.  The value 0 then resulted in essentially infinite
> preference.  I used that approach purely because it was the smallest
> change possible, and the least likely to change the expected behavior
> for anybody else.  The path of least astonishment and whatnot.  I would
> be concerned about changing the current behavior now, because people
> probably want a drop in replacement.  If there is going to be a change
> in the algorithm and behavior, a different approach may be better.
> 
> I would also like to make a note of how we were using this code.  In our
> environment, we have an external dedicated load balancer, and three web
> servers.  The main problem that we ran into was with AOL users.  AOL
> uses a proxy that randomizes the source IP of requests.  That means that
> you can no longer count on the source IP to tell the load balancer which
> server to send future requests to.  We used this code to allow sessions
> that arive on the wrong web server to be redirected to the tomcat on the
> correct server.  This neatly side-steps the whole issue of changing IPs,
> because apache is able to make the decision based on the session ID.
> 
> The reliability issue was a nice side effect for us in that it caught a
> failed server more quickly than the load balancer did, and prevented the
> user from having a connection time out or seeing an error message.
> 
> I hope this provides some insight into why I changed the code that I
> did, and why that behavior worked well for us.
> 
> Paul
> 
> [EMAIL PROTECTED] wrote:
> 
> >Hi Mathias,
> >
> >I think it would be better to discuss this on tomcat-dev.
> >
> >The 'error' worker will not be choosen unless the
> >timeout expires. When the timeout expires, we

DO NOT REPLY [Bug 8808] - APR error at startup

2002-05-04 Thread bugzilla 

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8808

APR error at startup

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
  Component|Unknown |Connector:Coyote JK 2
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2002-05-04 20:39 ---
I changed the message to INFO.

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-05-04 Thread remm 

remm02/05/04 13:14:43

  Modified:jk/java/org/apache/jk/server JkMain.java
  Log:
  - Only log an info if JNI init is not successful.
  
  Revision  ChangesPath
  1.24  +1 -1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
  
  Index: JkMain.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JkMain.java   25 Apr 2002 23:13:24 -  1.23
  +++ JkMain.java   4 May 2002 20:14:42 -   1.24
  @@ -284,7 +284,7 @@
   wEnv.getHandler(i).init();
   } catch( IOException ex) {
   if( "apr".equals(wEnv.getHandler(i).getName() )) {
  -log.error( "APR error, disabling jni components: " + 
ex.toString());
  +log.info( "APR error, disabling jni components: " + 
ex.toString());
   } else {
   log.error( "error initializing " + 
wEnv.getHandler(i).getName(), ex );
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin Lists.java

2002-05-04 Thread remm 

remm02/05/04 13:05:14

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
  Log:
  - "Fix" the code which returns the service name on which the admin webapp is running.
Unfortunately, the result is not exact, because there is no way I can think of
to get the host on which the request was mapped using the servlet API
(getServerName() will return the host name specified by the client).
  
  Revision  ChangesPath
  1.9   +23 -22
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Lists.java26 Apr 2002 19:05:12 -  1.8
  +++ Lists.java4 May 2002 20:05:14 -   1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
 1.8 2002/04/26 19:05:12 manveen Exp $
  - * $Revision: 1.8 $
  - * $Date: 2002/04/26 19:05:12 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
 1.9 2002/05/04 20:05:14 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/05/04 20:05:14 $
*
* 
*
  @@ -78,7 +78,7 @@
* is returned.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2002/04/26 19:05:12 $
  + * @version $Revision: 1.9 $ $Date: 2002/05/04 20:05:14 $
*/
   
   public class Lists {
  @@ -599,6 +599,7 @@
   
   }
   
  +
   /**
* Return the  Service object name string
* that the admin app belongs to.
  @@ -608,25 +609,25 @@
*
* @exception Exception if thrown while retrieving the list
*/
  -public static String getAdminAppService(MBeanServer mbserver, 
  -   String domain, HttpServletRequest request)
  +public static String getAdminAppService
  +(MBeanServer mbserver, String domain, HttpServletRequest request)
   throws Exception {
   
  -// Get the admin app's service name
  -StringBuffer sb = new StringBuffer(domain);
  -sb.append(":type=Context");
  -sb.append(",path=");
  -sb.append(request.getContextPath());
  -sb.append(",host=");
  -sb.append(request.getServerName());
  -sb.append(",*");
  -ObjectName search = new ObjectName(sb.toString());
  -Iterator names = mbserver.queryNames(search, null).iterator();
  -String service = null;
  -while (names.hasNext()) {
  -service = ((ObjectName)names.next()).getKeyProperty("service");
  -}
  -return service;
  +// Get the admin app's service name
  +StringBuffer sb = new StringBuffer(domain);
  +sb.append(":type=Context");
  +sb.append(",path=");
  +sb.append(request.getContextPath());
  +sb.append(",*");
  +ObjectName search = new ObjectName(sb.toString());
  +Iterator names = mbserver.queryNames(search, null).iterator();
  +String service = null;
  +while (names.hasNext()) {
  +service = ((ObjectName)names.next()).getKeyProperty("service");
  +}
  +return service;
  +
   }
  -
  +
  +
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java

2002-05-04 Thread manveen 

manveen 02/05/04 12:56:29

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java
  Log:
  Removed entry types used just for testing.
  
  Revision  ChangesPath
  1.3   +4 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EnvEntryForm.java 4 May 2002 19:46:57 -   1.2
  +++ EnvEntryForm.java 4 May 2002 19:56:29 -   1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
 1.2 2002/05/04 19:46:57 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/05/04 19:46:57 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
 1.3 2002/05/04 19:56:29 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/05/04 19:56:29 $
*
* 
*
  @@ -77,7 +77,7 @@
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/05/04 19:46:57 $
  + * @version $Revision: 1.3 $ $Date: 2002/05/04 19:56:29 $
* @since 4.1
*/
   
  @@ -158,8 +158,6 @@
   typeVals.add(new LabelValueBean("java.lang.Long", "java.lang.Long"));
   typeVals.add(new LabelValueBean("java.lang.Short", "java.lang.Short")); 
   
   typeVals.add(new LabelValueBean("java.lang.String", "java.lang.String"));   

  -typeVals.add(new LabelValueBean("java.lang.hehe", "java.lang.hehe"));
  -typeVals.add(new LabelValueBean("java.util.Vector", "java.util.Vector"));
   
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java

2002-05-04 Thread manveen 

manveen 02/05/04 12:46:57

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java
  Log:
  Added validation check that the value entered must match entry type chosen.
  
  Revision  ChangesPath
  1.2   +68 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnvEntryForm.java 4 May 2002 14:40:09 -   1.1
  +++ EnvEntryForm.java 4 May 2002 19:46:57 -   1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
 1.1 2002/05/04 14:40:09 manveen Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/05/04 14:40:09 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
 1.2 2002/05/04 19:46:57 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/05/04 19:46:57 $
*
* 
*
  @@ -71,12 +71,13 @@
   import org.apache.struts.action.ActionMapping;
   import org.apache.webapp.admin.LabelValueBean;
   
  +import java.lang.reflect.Constructor;
   
   /**
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/05/04 14:40:09 $
  + * @version $Revision: 1.2 $ $Date: 2002/05/04 19:46:57 $
* @since 4.1
*/
   
  @@ -156,7 +157,10 @@
   typeVals.add(new LabelValueBean("java.lang.Integer", "java.lang.Integer")); 
   
   typeVals.add(new LabelValueBean("java.lang.Long", "java.lang.Long"));
   typeVals.add(new LabelValueBean("java.lang.Short", "java.lang.Short")); 
   
  -typeVals.add(new LabelValueBean("java.lang.String", "java.lang.String"));
  +typeVals.add(new LabelValueBean("java.lang.String", "java.lang.String"));   

  +typeVals.add(new LabelValueBean("java.lang.hehe", "java.lang.hehe"));
  +typeVals.add(new LabelValueBean("java.util.Vector", "java.util.Vector"));
  +
   }
   
   /**
  @@ -195,7 +199,6 @@
   
   }
   
  -
   /**
* Validate the properties that have been set from this HTTP request,
* and return an ActionErrors object that encapsulates any
  @@ -206,10 +209,13 @@
* @param mapping The mapping used to select this instance
* @param request The servlet request we are processing
*/
  +
  +private ActionErrors errors = null;
  +
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
   
  -ActionErrors errors = new ActionErrors();
  +errors = new ActionErrors();
   
   String submit = request.getParameter("submit");
   if (submit != null) {
  @@ -243,12 +249,63 @@
   errors.add("description",
  new ActionError("users.error.quotes"));
   }
  -
  +
  +if (validateType(entryType, value)) {
  +   errors.add("value",
  +   new ActionError("resources.error.value.mismatch"));
  +}
   }
  -
   return (errors);
  -
   }
   
  -
  +/**
  + * Entry type must match type of value.
  + */
  +private boolean validateType(String entryType, String value) {
  +Class cls = null;
  +boolean mismatch = false;
  +try {
  +cls = Class.forName(entryType);
  +
  +if (Character.class.isAssignableFrom(cls)) {
  +// Special handling is needed because the UI returns
  +// a string even if it is a character (single length string).
  +if (value.length() != 1) {
  +mismatch = true;
  +}
  +} else if (Boolean.class.isAssignableFrom(cls)) {
  +// Special handling is needed because Boolean
  +// string constructor accepts anything other than
  +// true to be false
  +if (!("true".equalsIgnoreCase(value) ||
  +"false".equalsIgnoreCase(value))) {
  +mismatch = true;
  +}
  +} else if (Number.class.isAssignableFrom(cls)) {
  +// all numbers throw NumberFormatException if they are
  +// constructed with an incorrect number string
  +// We use the general string constructor to do this job
  +try {
  +Class[] parameterTypes = {String.class};

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties

2002-05-04 Thread manveen 

manveen 02/05/04 12:45:07

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
  Log:
  Properties for env entry validation added.
  
  Revision  ChangesPath
  1.53  +7 -1  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- ApplicationResources_en.properties4 May 2002 06:12:19 -   1.52
  +++ ApplicationResources_en.properties4 May 2002 19:45:07 -   1.53
  @@ -263,7 +263,8 @@
   resources.env.entry=Entry Name
   resources.env.props=Environment Entry Properties
   resources.env.override=Override Application Level Entries
  -resources.actions.env.create=Create New Environment Entry
  +resources.actions.env.create=Create New Env Entry
  +resources.actions.env.edit=Edit Environment Entry
   resources.actions.env.delete=Delete Environment Entries
   resources.actions.env.list=List Existing Entries
   resources.datasrc.jdbc=JDBC Driver
  @@ -279,6 +280,11 @@
   resources.datasrc.wait=Max. Wait for Connection
   resources.datasrc.validation=Validation Query
   resources.datasrc.jndi=JNDI Name
  +resources.error.name.required=Name is required.
  +resources.error.value.required=Value is required.
  +resources.error.value.mismatch=Type and value do not seem to match.
  +resources.error.entryType.invalid=Entry Type not recognized.
  +resources.error.entryType.notimpl=Validation for this type not implemented 
yet.
   
   # -- User Database Module --
   users.actions.group.create=Create New Group
  
  
  
  1.47  +6 -0  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ApplicationResources_es.properties4 May 2002 06:12:19 -   1.46
  +++ ApplicationResources_es.properties4 May 2002 19:45:07 -   1.47
  @@ -264,6 +264,7 @@
   resources.env.props=Caracteristicas De la Entrada Del Ambiente
   resources.env.override=Entradas Del Nivel Del Uso De la Invalidacion
   resources.actions.env.create=Cree La Nueva Entrada Del Ambiente
  +resources.actions.env.edit=Corrija La Entrada Existente Del Ambiente
   resources.actions.env.delete=Entradas Del Ambiente De la Cancelacion
   resources.actions.env.list=Entradas Existentes De la Lista
   resources.datasrc.jdbc=JDBC Driver
  @@ -279,6 +280,11 @@
   resources.datasrc.wait=Max. Espera para la conexion
   resources.datasrc.validation=Validation Query
   resources.datasrc.jndi=JNDI Name
  +resources.error.name.required=Nombre requiredo.
  +resources.error.value.required=Value requiredo.
  +resources.error.value.mismatch=El tipo y el valor no se parecen emparejar.
  +resources.error.entryType.invalid=El tipo de la entrada no recognized.
  +resources.error.entryType.notimpl=Validation for this type not implemented 
yet.
   
   # -- User Database Module --
   users.actions.group.create=Cree Al Nuevo Grupo
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-05-04 Thread nacho 

nacho   02/05/04 12:07:53

  Modified:jk/native2/common jk_worker_lb.c
  Log:
  * Bug: the worker was lost if only there was 1 worker configured
  
  Revision  ChangesPath
  1.9   +4 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
  
  Index: jk_worker_lb.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_worker_lb.c3 May 2002 22:12:17 -   1.8
  +++ jk_worker_lb.c4 May 2002 19:07:53 -   1.9
  @@ -450,7 +450,10 @@
*/
   jk_worker_t *first=lb->lb_workers[0];
   lb->lb_workers[0]=w;
  -lb->lb_workers[currentWorker]=first;
  +/* Only do the exchange if the worker is not the first */
  +if( currentWorker > 0 ) {
  +lb->lb_workers[currentWorker]=first;
  +}
   }
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-05-04 Thread nacho 

nacho   02/05/04 12:06:31

  Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * Fixed it seems that the pool now resides at the mbean
  
  Revision  ChangesPath
  1.13  +2 -2  
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_isapi_plugin.c 1 May 2002 22:23:36 -   1.12
  +++ jk_isapi_plugin.c 4 May 2002 19:06:31 -   1.13
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.12 $   *
  + * Version: $Revision: 1.13 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -463,7 +463,7 @@
  be shared with other server adapters */
   rPool= worker->rPoolCache->get( env, worker->rPoolCache );
   if( rPool == NULL ) {
  -rPool=worker->pool->create( env, worker->pool, HUGE_POOL_SIZE );
  +rPool=worker->mbean->pool->create( env, worker->mbean->pool, 
HUGE_POOL_SIZE );
   env->l->jkLog(env, env->l, JK_LOG_INFO,
 "HttpExtensionProc: new rpool\n");
   }
  
  
  
  1.14  +11 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_service_iis.c  1 May 2002 22:23:36 -   1.13
  +++ jk_service_iis.c  4 May 2002 19:06:31 -   1.14
  @@ -285,26 +285,26 @@
   
   s->jvm_route = NULL;
   
  -GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_URI_HEADER_NAME, s->req_uri); 
  -GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_QUERY_HEADER_NAME, s->query_string); 
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_URI_HEADER_NAME, s->req_uri); 
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_QUERY_HEADER_NAME, 
s->query_string); 
   
   if (s->req_uri == NULL) {
   s->query_string = lpEcb->lpszQueryString;
   /* *worker_name= DEFAULT_WORKER_NAME; */
  -GET_SERVER_VARIABLE_VALUE(w->pool,"URL", s->req_uri);   
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"URL", s->req_uri);   
   if (jk_requtil_unescapeUrl(s->req_uri) < 0)
   return JK_ERR;
   jk_requtil_getParents(s->req_uri);
   }
   
  -GET_SERVER_VARIABLE_VALUE(w->pool,"AUTH_TYPE", s->auth_type);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_USER", s->remote_user);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"SERVER_PROTOCOL", s->protocol);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_HOST", s->remote_host);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_ADDR", s->remote_addr);
  -GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_NAME, s->server_name);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"AUTH_TYPE", s->auth_type);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_USER", s->remote_user);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"SERVER_PROTOCOL", s->protocol);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_HOST", s->remote_host);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_ADDR", s->remote_addr);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_NAME, s->server_name);
   GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT", s->server_port, 80);
  -GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_SOFTWARE, s->server_software);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_SOFTWARE, s->server_software);
   GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
   
   s->method   = lpEcb->lpszMethod;
  @@ -352,7 +352,7 @@
   unsigned num_of_vars = 0;
   
   for(i = 0 ; i < 9 ; i++) {
  -GET_SERVER_VARIABLE_VALUE(w->pool,ssl_env_names[i], ssl_env_values[i]);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,ssl_env_names[i], 
ssl_env_values[i]);
   if (ssl_env_values[i]) {
   num_of_vars++;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-05-04 Thread craigmcc 

craigmcc02/05/04 11:37:50

  Modified:catalina/src/share/org/apache/catalina/servlets
ManagerServlet.java
  Log:
  Make the "/deploy" command recognize a "META-INF/context.xml" file embedded
  inside the WAR, and process it as a context configuration file.  This allows
  deployment tool clients to customize the configuration of a webapp with
  exactly the same degree of freedom as those that use the "/install" command,
  with the added benefit of being able to deploy onto a Tomcat instance
  running on a different server.
  
  Revision  ChangesPath
  1.20  +193 -34   
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ManagerServlet.java   8 Apr 2002 17:46:08 -   1.19
  +++ ManagerServlet.java   4 May 2002 18:37:49 -   1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
 1.19 2002/04/08 17:46:08 craigmcc Exp $
  - * $Revision: 1.19 $
  - * $Date: 2002/04/08 17:46:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
 1.20 2002/05/04 18:37:49 craigmcc Exp $
  + * $Revision: 1.20 $
  + * $Date: 2002/05/04 18:37:49 $
*
* 
*
  @@ -74,6 +74,8 @@
   import java.net.URL;
   import java.util.Enumeration;
   import java.util.Iterator;
  +import java.util.jar.JarEntry;
  +import java.util.jar.JarFile;
   import javax.naming.InitialContext;
   import javax.naming.NameClassPair;
   import javax.naming.NamingEnumeration;
  @@ -196,7 +198,7 @@
* 
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.19 $ $Date: 2002/04/08 17:46:08 $
  + * @version $Revision: 1.20 $ $Date: 2002/05/04 18:37:49 $
*/
   
   public class ManagerServlet
  @@ -219,6 +221,14 @@
   
   
   /**
  + * File object representing the directory into which the deploy() command
  + * will store the WAR and context configuration files that have been
  + * uploaded.
  + */
  +protected File deployed = null;
  +
  +
  +/**
* The Deployer container that contains our own web application's Context,
* along with the associated Contexts for web applications that we
* are managing.
  @@ -435,6 +445,10 @@
   global = ((StandardServer) server).getGlobalNamingContext();
   }
   
  +// Calculate the directory into which we will be deploying applications
  +deployed = (File) getServletContext().getAttribute
  +("javax.servlet.context.tempdir");
  +
   // Log debugging messages as necessary
   if (debug >= 1) {
   log("init: Associated with Deployer '" +
  @@ -488,46 +502,52 @@
   }
   
   // Upload the web application archive to a local WAR file
  -File tempDir = (File) getServletContext().getAttribute
  -("javax.servlet.context.tempdir");
  -File localWar = new File(tempDir, basename + ".war");
  -localWar.delete();
  +File localWar = new File(deployed, basename + ".war");
  +if (debug >= 2) {
  +log("Uploading WAR file to " + localWar);
  +}
   try {
  -if (debug >= 2) {
  -log("Uploading WAR file to " + localWar);
  -}
  -ServletInputStream istream = request.getInputStream();
  -BufferedOutputStream ostream =
  -new BufferedOutputStream(new FileOutputStream(localWar), 1024);
  -byte buffer[] = new byte[1024];
  -while (true) {
  -int n = istream.read(buffer);
  -if (n < 0) {
  -break;
  -}
  -ostream.write(buffer, 0, n);
  -}
  -ostream.flush();
  -ostream.close();
  -istream.close();
  +uploadWar(request, localWar);
   } catch (IOException e) {
   log("managerServlet.upload[" + displayPath + "]", e);
   writer.println(sm.getString("managerServlet.exception",
   e.toString()));
  -localWar.delete();
   return;
   }
   
  -// Deploy the local WAR file
  +// Extract the nested context deployment file (if any)
  +File localXml = new File(deployed, basename + ".xml");
  +if (debug >= 2) {
  +log("Extracting XML file to " + localXml);
  +}
   try {
  -deployer.install(path,
  -

DO NOT REPLY [Bug 8808] - APR error at startup

2002-05-04 Thread bugzilla 

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8808

APR error at startup





--- Additional Comments From [EMAIL PROTECTED]  2002-05-04 18:34 ---
No, it's optional and not needed to run AJP 1.3 (and obviously HTTP/1.1). The
severity of the log should be toned down (to info or warn).

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

DO NOT REPLY [Bug 8808] New: - APR error at startup

2002-05-04 Thread bugzilla 

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8808

APR error at startup

   Summary: APR error at startup
   Product: Tomcat 4
   Version: 4.1.0
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The following errors appears in the log at startup of tomcat (binary
distribution). Is APR spose to be included?

SEVERE: APR error, disabling jni components: java.io.IOException: no apr in
java.library.path

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/resources deleteEnvEntries.jsp envEntry.jsp listEnvEntries.jspf

2002-05-04 Thread manveen 

manveen 02/05/04 10:16:51

  Modified:webapps/admin/resources envEntry.jsp listEnvEntries.jspf
  Added:   webapps/admin/resources deleteEnvEntries.jsp
  Log:
  added jsp for delete Env Entries
  enabled delete operation from action properties menu.
  
  Revision  ChangesPath
  1.3   +1 -3  jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp
  
  Index: envEntry.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- envEntry.jsp  4 May 2002 15:37:09 -   1.2
  +++ envEntry.jsp  4 May 2002 17:16:51 -   1.3
  @@ -41,12 +41,10 @@
   
   
   
  -<%--
   
  ++ URLEncoder.encode("EnvEntries Delete List") %>'>
   
   
  ---%>

   
 
  
  
  
  1.2   +3 -3  jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf
  
  Index: listEnvEntries.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listEnvEntries.jspf   4 May 2002 05:14:28 -   1.1
  +++ listEnvEntries.jspf   4 May 2002 17:16:51 -   1.2
  @@ -8,12 +8,12 @@
   -
 
   
  -  <%-- FIX ME-- add these operations once they are implemented --%>
  -  
  +  
   
 
   
  -  
  +  
   
 
   
  
  
  
  1.1  jakarta-tomcat-4.0/webapps/admin/resources/deleteEnvEntries.jsp
  
  Index: deleteEnvEntries.jsp
  ===
  
  <%@ page language="java" import="java.net.URLEncoder" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  
  
  
  <%@ include file="../users/header.jsp" %>
  
  
  
  
  
  
  
  
  
  

  
 
  

  

 
  
<%@ include file="listEnvEntries.jspf" %>
  

  

  
  
  
  
  
  
<%@ include file="../buttons.jsp" %>

<%@ include file="envEntries.jspf" %>
<%@ include file="../buttons.jsp" %>
  
  
  
  <%@ include file="../users/footer.jsp" %>
  
  
  
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources DeleteEnvEntriesAction.java

2002-05-04 Thread manveen 

manveen 02/05/04 10:14:15

  Added:   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DeleteEnvEntriesAction.java
  Log:
  Implementation class for delete env entry operation.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
  
  Index: DeleteEnvEntriesAction.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java,v
 1.1 2002/05/04 17:14:15 manveen Exp $
   * $Revision: 1.1 $
   * $Date: 2002/05/04 17:14:15 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-envEntry documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Struts", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   */
  
  
  package org.apache.webapp.admin.resources;
  
  
  import java.io.IOException;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.Locale;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpSession;
  import org.apache.struts.action.Action;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  import javax.management.Attribute;
  import javax.management.MBeanServer;
  import javax.management.MBeanServerFactory;
  import javax.management.QueryExp;
  import javax.management.Query;
  import javax.management.ObjectInstance;
  import javax.management.ObjectName;
  import javax.management.JMException;
  import javax.management.MBeanAttributeInfo;
  import javax.management.MBeanOperationInfo;
  import javax.management.MBeanInfo;
  import org.apache.struts.util.MessageResources;
  import org.apache.webapp.admin.ApplicationServlet;
  
  
  /**
   * Implementation of Action that deletes the
   * specified set of env entries.
   *
   * @author Manveen Kaur
   * @version $Revision: 1.1 $ $Date: 2002/05/04 17:14:15 $
   * @since 4.1
   */
  
  public final class DeleteEnvEntriesAction extends Action {
  
  
  // - Instance Variables

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java

2002-05-04 Thread manveen 

manveen 02/05/04 09:36:22

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
  Log:
  Save all attributes while creating a new entry.
  
  Revision  ChangesPath
  1.3   +43 -45
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
  
  Index: SaveEnvEntryAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SaveEnvEntryAction.java   4 May 2002 15:49:47 -   1.2
  +++ SaveEnvEntryAction.java   4 May 2002 16:36:22 -   1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
 1.2 2002/05/04 15:49:47 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/05/04 15:49:47 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
 1.3 2002/05/04 16:36:22 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/05/04 16:36:22 $
*
* 
*
  @@ -96,7 +96,7 @@
* updated Env Entry.
*
* @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/05/04 15:49:47 $
  + * @version $Revision: 1.3 $ $Date: 2002/05/04 16:36:22 $
* @since 4.1
*/
   
  @@ -171,15 +171,13 @@
   // Perform an "Add Entry" transaction
   if (objectName == null) {
   
  -String signature[] = new String[3];
  +String signature[] = new String[2];
   signature[0] = "java.lang.String";
   signature[1] = "java.lang.String";
  -signature[2] = "java.lang.String";
   
  -Object params[] = new Object[3];
  +Object params[] = new Object[2];
   params[0] = envEntryForm.getName();
  -params[1] = envEntryForm.getEntryType();
  -params[2] = envEntryForm.getValue();
  +params[1] = envEntryForm.getEntryType(); 
   
   ObjectName oname = null;
   
  @@ -191,7 +189,13 @@
   // Create the new object and associated MBean
   objectName = (String) mserver.invoke(oname, "addEnvironment",
params, signature);
  -
  + 
  +// FIX ME 
  +// "addEnvironment" should return the name of the new 
  +// mBean just created
  +objectName = ResourceUtils.ENVIRONMENT_TYPE + 
  + ",name=" + params[0]; 
  +
   } catch (Exception e) {
   
   getServlet().log
  @@ -207,42 +211,36 @@
   }
   
   // Perform an "Update Environment Entry" transaction
  -else {
  -
  -ObjectName oname = null;
  -String attribute = null;
  -
  -try {
  -
  -// Construct an object name for this object
  -oname = new ObjectName(objectName);
  -
  -// Update the specified env entry
  -attribute = "description";
  -mserver.setAttribute
  -(oname,
  - new Attribute(attribute, envEntryForm.getDescription()));
  -attribute = "type";
  -mserver.setAttribute
  -(oname,
  - new Attribute(attribute, envEntryForm.getEntryType()));
  -attribute = "value";
  -mserver.setAttribute
  -(oname,
  - new Attribute(attribute, envEntryForm.getValue()));
  -
  -} catch (Exception e) {
  -
  -getServlet().log
  -(resources.getMessage(locale, "users.error.set.attribute",
  -  attribute), e);
  -response.sendError
  -(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
  - resources.getMessage(locale, "users.error.set.attribute",
  -  attribute));
  -return (null);
  +String attribute = null;
  +try {
  +
  +// Construct an object name for this object
  +ObjectName oname = new ObjectName(objectName);
   
  -}
  +// Update the specified env entry
  +attribute = "description";
  +mserver.setAttribute
  +(oname,
  + new Attribute(attribute, envEntryForm.getDescription()));
  +

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

2002-05-04 Thread manveen 

manveen 02/05/04 09:10:34

  Modified:catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java
  Log:
  Env name and type are sufficient to form the key for the env entry.
  
  Revision  ChangesPath
  1.3   +5 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
  
  Index: NamingResourcesMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamingResourcesMBean.java 4 May 2002 15:48:54 -   1.2
  +++ NamingResourcesMBean.java 4 May 2002 16:10:34 -   1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
 1.2 2002/05/04 15:48:54 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/05/04 15:48:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
 1.3 2002/05/04 16:10:34 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/05/04 16:10:34 $
*
* 
*
  @@ -83,7 +83,7 @@
* org.apache.catalina.deploy.NamingResources component.
*
* @author Amy Roh
  - * @version $Revision: 1.2 $ $Date: 2002/05/04 15:48:54 $
  + * @version $Revision: 1.3 $ $Date: 2002/05/04 16:10:34 $
*/
   
   public class NamingResourcesMBean extends BaseModelMBean {
  @@ -181,7 +181,7 @@
*
* @param envName New environment entry name
*/
  -public void addEnvironment(String envName, String type, String value) {
  +public void addEnvironment(String envName, String type) {
   
   NamingResources nresources = (NamingResources) this.resource;
   if (nresources == null) {
  @@ -195,7 +195,6 @@
   env = new ContextEnvironment();
   env.setName(envName);
   env.setType(type);
  -env.setValue(value);
   nresources.addEnvironment(env);
   // FIXME add to the javax.naming.directory.DirContext
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java

2002-05-04 Thread manveen 

manveen 02/05/04 08:49:47

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
  Log:
  Implemented "add new env entry". Its working now.
  
  Revision  ChangesPath
  1.2   +4 -4  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
  
  Index: SaveEnvEntryAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SaveEnvEntryAction.java   4 May 2002 15:38:32 -   1.1
  +++ SaveEnvEntryAction.java   4 May 2002 15:49:47 -   1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
 1.1 2002/05/04 15:38:32 manveen Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/05/04 15:38:32 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
 1.2 2002/05/04 15:49:47 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/05/04 15:49:47 $
*
* 
*
  @@ -96,7 +96,7 @@
* updated Env Entry.
*
* @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/05/04 15:38:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/05/04 15:49:47 $
* @since 4.1
*/
   
  @@ -178,9 +178,9 @@
   
   Object params[] = new Object[3];
   params[0] = envEntryForm.getName();
  -params[1] = envEntryForm.getValue();
  -params[2] = envEntryForm.getDescription();
  -
  +params[1] = envEntryForm.getEntryType();
  +params[2] = envEntryForm.getValue();
  +
   ObjectName oname = null;
   
   try {
  @@ -196,7 +196,7 @@
   
   getServlet().log
   (resources.getMessage(locale, "users.error.invoke",
  -  "createUser"), e);
  +  "addEnvironment"), e);
   response.sendError
   (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, "users.error.invoke",
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-05-04 Thread manveen 

manveen 02/05/04 08:48:54

  Modified:catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java
  Log:
  Minor type on "addEnvironment" operation on the NamingResource mBean.
  Also, this operation should take value as a parameter while creating a new env entry.
  
  Revision  ChangesPath
  1.2   +7 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
  
  Index: NamingResourcesMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamingResourcesMBean.java 3 May 2002 23:42:48 -   1.1
  +++ NamingResourcesMBean.java 4 May 2002 15:48:54 -   1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
 1.1 2002/05/03 23:42:48 amyroh Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/05/03 23:42:48 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
 1.2 2002/05/04 15:48:54 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/05/04 15:48:54 $
*
* 
*
  @@ -83,7 +83,7 @@
* org.apache.catalina.deploy.NamingResources component.
*
* @author Amy Roh
  - * @version $Revision: 1.1 $ $Date: 2002/05/03 23:42:48 $
  + * @version $Revision: 1.2 $ $Date: 2002/05/04 15:48:54 $
*/
   
   public class NamingResourcesMBean extends BaseModelMBean {
  @@ -181,7 +181,7 @@
*
* @param envName New environment entry name
*/
  -public void addEnvironment(String envName, String type) {
  +public void addEnvironment(String envName, String type, String value) {
   
   NamingResources nresources = (NamingResources) this.resource;
   if (nresources == null) {
  @@ -194,7 +194,8 @@
   }
   env = new ContextEnvironment();
   env.setName(envName);
  -env.setName(type);
  +env.setType(type);
  +env.setValue(value);
   nresources.addEnvironment(env);
   // FIXME add to the javax.naming.directory.DirContext
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java

2002-05-04 Thread manveen 

manveen 02/05/04 08:38:32

  Added:   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
  Log:
  Implementation for "save" existing envirnment entry changes in place.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
  
  Index: SaveEnvEntryAction.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
 1.1 2002/05/04 15:38:32 manveen Exp $
   * $Revision: 1.1 $
   * $Date: 2002/05/04 15:38:32 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Struts", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   */
  
  
  package org.apache.webapp.admin.resources;
  
  import java.io.IOException;
  import java.net.URLDecoder;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.Locale;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpSession;
  import org.apache.struts.action.Action;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  import javax.management.Attribute;
  import javax.management.MBeanServer;
  import javax.management.MBeanServerFactory;
  import javax.management.QueryExp;
  import javax.management.Query;
  import javax.management.ObjectInstance;
  import javax.management.ObjectName;
  import javax.management.JMException;
  import javax.management.MBeanAttributeInfo;
  import javax.management.MBeanOperationInfo;
  import javax.management.MBeanInfo;
  import org.apache.struts.util.MessageResources;
  import org.apache.webapp.admin.ApplicationServlet;
  
  
  /**
   * Implementation of Action that saves a new or
   * updated Env Entry.
   *
   * @author Manveen Kaur
   * @version $Revision: 1.1 $ $Date: 2002/05/04 15:38:32 $
   * @since 4.1
   */
  
  public final class SaveEnvEntryAction extends Action {
  
  
  // - Instance Varia

cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntry.jsp

2002-05-04 Thread manveen 

manveen 02/05/04 08:37:09

  Modified:webapps/admin/resources envEntry.jsp
  Log:
  "Save" entries operational.
  "Create" new environment entry enabled.
  
  Revision  ChangesPath
  1.2   +4 -4  jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp
  
  Index: envEntry.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- envEntry.jsp  4 May 2002 14:41:22 -   1.1
  +++ envEntry.jsp  4 May 2002 15:37:09 -   1.2
  @@ -37,12 +37,12 @@
   
 -
   
  -<%--
  -
  +
  +
   
   
  -
  -'>
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntry.jsp envEntries.jspf

2002-05-04 Thread manveen 

manveen 02/05/04 07:41:22

  Modified:webapps/admin/resources envEntries.jspf
  Added:   webapps/admin/resources envEntry.jsp
  Log:
  Display/edit environment entry jsp.
  
  Revision  ChangesPath
  1.3   +3 -1  jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf
  
  Index: envEntries.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- envEntries.jspf   4 May 2002 13:52:44 -   1.2
  +++ envEntries.jspf   4 May 2002 14:41:22 -   1.3
  @@ -35,10 +35,12 @@
  URLEncoder.encode(envEntry) %>'>
   
 
  -
   
    
 
  +
  + 
  +  
   
 
   
  
  
  
  1.1  jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp
  
  Index: envEntry.jsp
  ===
  
  
  <%@ page language="java" import="java.net.URLEncoder" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  
  
  
  <%@ include file="../users/header.jsp" %>
  
  
  
  
  
  
  
  
  
  

  

  

  

  

 
  

  

  
  
-
  
  <%--
  
  
  
  
  
  
  
  --%>
   
  

  

  
<%@ include file="../buttons.jsp" %>
  
  



  

  

   
 
  
  

  
  

  

  
:
  
  

  
  


  

  

  

  
:
  
  

   
   
  
  

  

  
:
  
  

  

  

  

  
  

  

  
  
  

  
  
  

  
<%@ include file="../buttons.jsp" %>
  
  
  
  
  
  <%@ include file="../users/footer.jsp" %>
  
  
  
  
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java SetUpEnvEntryAction.java

2002-05-04 Thread manveen 

manveen 02/05/04 07:40:09

  Added:   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java SetUpEnvEntryAction.java
  Log:
  Added classes that display /edit an environment entry.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
 1.1 2002/05/04 14:40:09 manveen Exp $
   * $Revision: 1.1 $
   * $Date: 2002/05/04 14:40:09 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Struts", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   */
  
  package org.apache.webapp.admin.resources;
  
  import java.util.List;
  import java.util.ArrayList;
  
  import javax.servlet.http.HttpServletRequest;
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionMapping;
  import org.apache.webapp.admin.LabelValueBean;
  
  
  /**
   * Form bean for the individual environment entry page.
   *
   * @author Manveen Kaur
   * @version $Revision: 1.1 $ $Date: 2002/05/04 14:40:09 $
   * @since 4.1
   */
  
  public final class EnvEntryForm extends BaseForm {
  
  
  // - Instance Variables
  
  
  // - Properties
  
  
  /**
   * The name of the associated entry.
   */
  private String name = null;
  
  public String getName() {
  return (this.name);
  }
  
  public void setName(String name) {
  this.name = name;
  }
  
  /**
   * The type of the associated entry.
   */
  private String entryType = null;
  
  public String getEntryType() {
  return (this.entryType);
  }
  
  public void setEntryType(String entryType) {
  this.entryType = entryType;
  }
  
  
  /**
   * The value of the associated entry.
   */
  private String value = null;
  
  public String getValue() {
  retur

cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntries.jspf

2002-05-04 Thread manveen 

manveen 02/05/04 06:52:44

  Modified:webapps/admin/resources envEntries.jspf
  Log:
  Add link from env entries list to display propertries of the env entry.
  
  Revision  ChangesPath
  1.2   +0 -5  jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf
  
  Index: envEntries.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- envEntries.jspf   4 May 2002 05:14:28 -   1.1
  +++ envEntries.jspf   4 May 2002 13:52:44 -   1.2
  @@ -31,19 +31,14 @@
 
   
   
  -  <%-- FIX ME-- add link once the operation is implemented 
 
   
 
  -  --%>
   
   
    
 
  -
  - 
  -  
   
 
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvscommit:jakarta-tomcat-connectors/webapp/supportbuildconf.sh

2002-05-04 Thread Punky Tse 

>
>
>My priorities are kinda right... Get laid off by Sun in november, go on a
>long vacation in December (basically trying to get all my stuff toghether),
>find a new job in January, and start working on February...
>
>Sorry...
>
It's ok.  ;-)

>No, I didn't, but I'm sure that my inbox will start to be polluted by
>questions like "how do I do that? WA_VERSION is not defined..."
>
>Just to keep spam low, and if someone wants to port it, well, I'm not here
>to prevent them...
>  
>
You provide a good way and an option to other guy who want to support 
it.  That is a way cool.

>Pier
>
Punky



--
To unsubscribe, e-mail:   
For additional commands, e-mail: