RE: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
I saw many post from this gentleman but they are never commited. Any reasons ? - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Adrian Almenar [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 09, 2002 8:31 PM To: Tomcat List Subject: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web app/admin /ApplicationResources_es.properties Here are some more enhancements for jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web app/admin/App licationResources_es.properties Please Commit these, Cheers, Adrian Almenar -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: Apache mod_jk Ajp13 Tomcat 4 shutdown delay, bug?
We all have encountered this kind of problem with socket implementation (derived from the good old known BSD). The only solution is to close the socket to have the read aborted and so the thread awaiked ;( And I don't speak about writing on half-closed socket where you get no error for a while since TCP stack the messages to be send (argh damn't BSD socket implementation) ;) ideally :) i think the problem might be that once you're blocked reading on a socket, other than shutting down the socket (i.e. Socket.shutdown()), there's no way to interrupt. i'm not 100% sure on that, though. i need to think about it some more... Those extra seconds required for shutdown count when you have to do a stop/start of tomcat on a production system. -- 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: Todo list for 4.0.2 b2
First Happy New Year to all of you. Just back from hollidays and start to dig into my ton of email, and so delayed some contributions like 4.0.2b1 RPM (will do the b2) and active participation on J-T-C (but there is today many great people working on it). Question : - Did jk from j-t-c for TC 4.0.2B2 will support load balancing ? I didn't see the use of getJvmRoute/setJvmRoute in latest TC 4.0 CVS. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: nbio connector
I believe someone on this list once said something like open source development: have fun or get paid for it. I'm working on NIO solely because it's a fun new technology in Java with a huge potential, and if it happens to turn out useful it's a clear win. :-) NBIO is really an interesting stuff and any works conducted on it is good to make us learn (or relearn) An interesting point is that we ALL (Unix Developpers) used select(), poll() or whatever on our early age (especially up to the time threads API came up. Then we all switch to threads with blocked IO since it's really simpler for developpment. And it's funny to note that on the Windows Developpers with winsocks async mode have often keep the NON-BLOCKED mode. So my advice is continue to play with NBIO, and if bench are good for any parts of Tomcat (or even jakarta), contribute it ASAP. Keep on this works, since the benchs I saw on Matt site were more than interesting on heavily servers. Regards -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: mod_jk_Apache_1_3_20_EAPI-jakarta_tomcat_3_2_3-NT.zip
It's an excellent news :) What about doing the same against jakarta-tomcat 3.3 mod_jk (I will upload it to site for others win users). Also it will be good to have you done the same for jakarta-tomcat-connectors which cover the up to date mod_jk. BTW: What about switching to Apache 1.3.22-mod_ssl 2.8.5 ? - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Giovanni Roccia [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 09, 2002 3:39 PM To: [EMAIL PROTECTED] Subject: mod_jk_Apache_1_3_20_EAPI-jakarta_tomcat_3_2_3-NT.zip hi i have spend a few days to get a mod_jk for Apache with EAPI. first i couldn't find an apropriate binary and then i couldn't use the mod_jk.dsp (find in the jakarta-tomcat-3.2.3-src) to build my own dll. now, after building a new makefile (thanks to kevin seguin), i'm owner of a mod_jk.dll that works. i hope the attached mod_jk.dll and mod_jk.mak could find a place in the apache-downloads and so help other developers to safe time. p.s. this is my first mail, hope i have select the right way. giovanni roccia mailto:[EMAIL PROTECTED] clan informatik ag langstrasse 21 8004 zürich tel +41 1 247 70 40 fax +41 1 240 02 65 http://www.claninfo.ch -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: nbio connector
Yes, after Mauricio brought to my attention the existence of a non-JDK NBIO package few days ago. At this point in time my framework was almost complete. On the first glance, the Sandstorm services platform part of the SEDA quite resembles my effort but I'll have to also take a closer look. Attila. - Original Message - From: Daniel Rall [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: 2002. január 10. 0:26 Subject: Re: nbio connector Have you looked at Matt Welsh's SEDA http://www.cs.berkeley.edu/~mdw/proj/sandstorm/? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] smime.p7s Description: application/pkcs7-signature
RE: Dealing with the Tomcat 3.3 aux.jsp DOS problem and a Tomca t 3. 3.1 release
I still plan to release the jakarta-tomcat HEAD as 3.3.1. 3.3a will be the original 3.3 source with just enough changes to avoid the DOS problem. This is for those who require a validated version of Tomcat 3.3 and can't just switch to a new version. Hopefully the minimal changes will make it feasible for them to update. I also plan to mention on the site that for those who can switch, the nightly 3.3.x would be as stable and more bug free than the current, or patched, Tomcat 3.3. It has been a requirement that Tomcat 3.x be able to run under JDK1.1.8. If we keep this requirement, the HEAD of jakarta-tomcat isn't releasable at the moment. I haven't tried to track this down yet, but I assume it won't be a problem to file. It's little issues like this that I don't routinely test that make me reluctant to try to release the HEAD right away. Cheers, Larry -Original Message- From: Bojan Smojver [mailto:[EMAIL PROTECTED]] Sent: Wed 1/9/2002 10:45 PM To: Tomcat Developers List Cc: Subject: Re: Dealing with the Tomcat 3.3 aux.jsp DOS problem and a Tomca t 3. 3.1 release Larry Isaacs wrote: Since it won't be possible to fetch the patched 3.3 from CVS using a tag or branch, I'm reluctant to give it a normal version number. 3.3a seems like a reasonable alternative. I'll provide full tar.gzs and zips in addition to jars to update an existing Tomcat 3.3 installation. So, the 3.3a will be 'current Tomcat 3.3 HEAD from CVS, but released as 3.3a'. Right? Bojan -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] mailto:[EMAIL PROTECTED] msg20066/bin0.bin Description: application/ms-tnef -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: RE: Dealing with the Tomcat 3.3 aux.jsp DOS problem and a Tomca t 3. 3.1 release
Sounds very good to me. Thanks. Bojan Larry Isaacs wrote: I still plan to release the jakarta-tomcat HEAD as 3.3.1. 3.3a will be the original 3.3 source with just enough changes to avoid the DOS problem. This is for those who require a validated version of Tomcat 3.3 and can't just switch to a new version. Hopefully the minimal changes will make it feasible for them to update. I also plan to mention on the site that for those who can switch, the nightly 3.3.x would be as stable and more bug free than the current, or patched, Tomcat 3.3. It has been a requirement that Tomcat 3.x be able to run under JDK1.1.8. If we keep this requirement, the HEAD of jakarta-tomcat isn't releasable at the moment. I haven't tried to track this down yet, but I assume it won't be a problem to file. It's little issues like this that I don't routinely test that make me reluctant to try to release the HEAD right away. Cheers, Larry -Original Message- From: Bojan Smojver [mailto:[EMAIL PROTECTED]] Sent: Wed 1/9/2002 10:45 PM To: Tomcat Developers List Cc: Subject: Re: Dealing with the Tomcat 3.3 aux.jsp DOS problem and a Tomca t 3. 3.1 release Larry Isaacs wrote: Since it won't be possible to fetch the patched 3.3 from CVS using a tag or branch, I'm reluctant to give it a normal version number. 3.3a seems like a reasonable alternative. I'll provide full tar.gzs and zips in addition to jars to update an existing Tomcat 3.3 installation. So, the 3.3a will be 'current Tomcat 3.3 HEAD from CVS, but released as 3.3a'. Right? Bojan -- 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/http11/src/java/org/apache/coyote/http11/filters IdentityInputFilter.java
remm02/01/10 04:53:50
Modified:http11/src/java/org/apache/coyote/http11
Http11Connector.java InternalInputBuffer.java
InternalOutputBuffer.java
http11/src/java/org/apache/coyote/http11/filters
IdentityInputFilter.java
Log:
- Fix some obvious content delimitation problems.
- Implement content delimitation for identity transfer encoding.
Revision ChangesPath
1.9 +10 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java
Index: Http11Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Http11Connector.java 9 Jan 2002 23:29:29 - 1.8
+++ Http11Connector.java 10 Jan 2002 12:53:50 - 1.9
@@ -295,6 +295,16 @@
// Finish the handling of the request
try {
+inputBuffer.endRequest();
+} catch (IOException e) {
+e.printStackTrace();
+error = true;
+} catch (Throwable t) {
+// Problem ...
+t.printStackTrace();
+error = true;
+}
+try {
outputBuffer.endRequest();
} catch (IOException e) {
e.printStackTrace();
1.8 +12 -7
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
Index: InternalInputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InternalInputBuffer.java 9 Jan 2002 12:57:49 - 1.7
+++ InternalInputBuffer.java 10 Jan 2002 12:53:50 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
1.7 2002/01/09 12:57:49 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2002/01/09 12:57:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
1.8 2002/01/10 12:53:50 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/01/10 12:53:50 $
*
*
*
@@ -303,6 +303,8 @@
activeFilters[++lastActiveFilter] = filter;
+filter.setRequest(request);
+
}
@@ -376,8 +378,9 @@
public void endRequest()
throws IOException {
-for (int i = 0; i = lastActiveFilter; i++) {
-pos -= activeFilters[i].end();
+if (lastActiveFilter != -1) {
+int extraBytes = (int) activeFilters[lastActiveFilter].end();
+pos = pos - extraBytes;
}
}
@@ -761,9 +764,11 @@
return -1;
}
-chunk.setBytes(buf, pos, lastValid - pos);
+int length = lastValid - pos;
+chunk.setBytes(buf, pos, length);
+pos = lastValid;
-return (lastValid - pos);
+return (length);
}
1.8 +2 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
Index: InternalOutputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InternalOutputBuffer.java 9 Jan 2002 12:57:49 - 1.7
+++ InternalOutputBuffer.java 10 Jan 2002 12:53:50 - 1.8
@@ -278,6 +278,8 @@
activeFilters[++lastActiveFilter] = filter;
+filter.setResponse(response);
+
}
1.6 +17 -6
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Index: IdentityInputFilter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IdentityInputFilter.java 9 Dec 2001 22:10:47 - 1.5
+++ IdentityInputFilter.java 10 Jan 2002 12:53:50 - 1.6
@@ -102,7 +102,7 @@
/**
* Remaining bytes.
*/
-protected long remaining = -1;
+protected long remaining = 0;
RE: Todo list for 4.0.2 b2
- Did jk from j-t-c for TC 4.0.2B2 will support load balancing ? I didn't see the use of getJvmRoute/setJvmRoute in latest TC 4.0 CVS. nope :( it's never been clear to me exactly what has to be done to support load balancing, so i've never attempted to add the functionality. and it's not something i use, so it obviously doesn't bubble up on my priority list :) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5615] - Tomcat 4 webapp module won't compile on FreeBSD 4.4
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=5615. 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=5615 Tomcat 4 webapp module won't compile on FreeBSD 4.4 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5066] - Build errors for mod_webapp with Apache 2.0
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=5066. 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=5066 Build errors for mod_webapp with Apache 2.0 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: Dealing with the Tomcat 3.3 aux.jsp DOS problem and a Tomcat 3. 3.1 release
But I'm +1 on whatever you choose. Let me know if/how I can help - I don't have time but I could sleep less :-) I concur with Costin here. Your pick is +1. me2 Same for me, I'm ok for a release (security fixes are mandatory) and will produce the RPM and binaries. BTW, it will be fine to have for Tomcat 3.3 a faster release rate than it was for 3.2, since everybody agree that 3.3.1 is just 3.3 + bug fixes and that added features (SSLSessionID/STM) could (should) be desactivated in default configuration. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5150] - webapp module doesn't compile
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=5150. 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=5150 webapp module doesn't compile [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 06:36 --- *** This bug has been marked as a duplicate of 4925 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4925] - WebApp module doesn't build on GNU/Linux
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=4925. 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=4925 WebApp module doesn't build on GNU/Linux [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 06:36 --- *** Bug 5150 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5773] - WebXmlReader keeps warnings to itself
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=5773. 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=5773 WebXmlReader keeps warnings to itself --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 06:39 --- I can confirm that this was committed by Bill Barker in Revision 1.16 of WebXmlReader. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4944] - webapp built failed with Solaris 2.7
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=4944. 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=4944 webapp built failed with Solaris 2.7 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 06:51 --- This error is due to a broken Apache install (broken apxs). The configure detects the problem. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: nbio connector
El Jueves 10 Enero 2002 06:16, GOMEZ Henri escribió: I believe someone on this list once said something like open source development: have fun or get paid for it. I'm working on NIO solely because it's a fun new technology in Java with a huge potential, and if it happens to turn out useful it's a clear win. :-) NBIO is really an interesting stuff and any works conducted on it is good to make us learn (or relearn) Really, I need to learn all about this, because I am a autodidact programmer. ( I am a commercial enginner working as webmaster) So my advice is continue to play with NBIO, and if bench are good for any parts of Tomcat (or even jakarta), contribute it ASAP. Keep on this works, since the benchs I saw on Matt site were more than interesting on heavily servers. I will try to get NBIO work as a Ajp13 connector, because my site it's very high loaded ( IMHO ), and i NEED to get a better performance. Will be posible publish a bechmarking page? I want to compare my hardware,load, software, OS, JVM , and configuration with others. By example: My site Load: 65000 page views daily. I'm using a Linux Firewall compiled with LinuxVirtualServer to balanced between 2 webservers. Each webServers have a Apache 1.3.20 and a Tomcat 3.3.1 Both are Linux 2.2 I'm using Blackdown JDK 1.3 with green threads and the JIT ShudoJit. The Tomcat Home and the Apache DocumentRoot is hosted on a third server, and accesssed by NFS for the webservers. This third server have a Oracle database to server to both Tomcats. TOMCAT_OPTS=-Xms32m -Xmx256m -Djava.compiler=shudojit I'm using AJP13 balanced between both webservers. in httpd.conf: MaxClients 256 in server.xml: MaxThreads 300 AutoReloading off. Aditional libraries: FreeMarker JDBC Oracle Thin COS Regards -- 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/webapp/apache-1.3 mod_webapp.c
jfclere 02/01/10 07:13:21
Modified:webapp/apache-1.3 mod_webapp.c
Log:
Fix getScheme() for ApacheSSL.
PR: 5372
Submitted by: David Graff, [EMAIL PROTECTED]
Revision ChangesPath
1.30 +5 -2 jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
Index: mod_webapp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_webapp.c 1 Nov 2001 22:20:51 - 1.29
+++ mod_webapp.c 10 Jan 2002 15:13:21 - 1.30
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.29 2001/11/01 22:20:51 pier Exp $
+ * @version $Id: mod_webapp.c,v 1.30 2002/01/10 15:13:21 jfclere Exp $
*/
#include httpd.h
@@ -441,6 +441,7 @@
/* Set up the WebApp Library request structure client and server host
data (from the connection */
+ap_add_common_vars(r);
stmp=(char *)r-hostname;
ctmp=(char *)ap_get_remote_host(con,r-per_dir_config, REMOTE_HOST);
if (stmp==NULL) req-serv-host=;
@@ -457,7 +458,6 @@
req-ruri=apr_pstrdup(req-pool,r-uri);
req-args=apr_pstrdup(req-pool,r-args);
req-prot=apr_pstrdup(req-pool,r-protocol);
-req-schm=apr_pstrdup(req-pool,ap_http_method(r));
req-user=apr_pstrdup(req-pool,con-user);
req-auth=apr_pstrdup(req-pool,con-ap_auth_type);
req-clen=0;
@@ -467,6 +467,8 @@
/* SSL logic */
ssl_temp = (char *)ap_table_get(r-subprocess_env,HTTPS);
if ( ssl_temp !strcasecmp(ssl_temp, on)) {
+req-schm=apr_pstrdup(req-pool,https);
+
req-ssld=(wa_ssldata *) apr_palloc(req-pool,sizeof(wa_ssldata));
req-ssld-ciph = (char *)ap_table_get(
@@ -484,6 +486,7 @@
req-ssld-cert = (char *)ap_table_get(
r-subprocess_env,SSL_CLIENT_CERT);
} else {
+req-schm=apr_pstrdup(req-pool,http);
req-ssld=NULL;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Todo list for 4.0.2 b2
FYI: Based on previous discussions on this list, I've added setJvmRoute/JvmRoute to Engine (and StandardEngine) as part of the work I've been doing for distributed sessions. Not being a committer, nothing has been checked in. Tom Drake - Original Message - From: Kevin Seguin [EMAIL PROTECTED] To: 'Tomcat Developers List' [EMAIL PROTECTED] Sent: Thursday, January 10, 2002 4:59 AM Subject: RE: Todo list for 4.0.2 b2 | - Did jk from j-t-c for TC 4.0.2B2 will support load balancing ? |I didn't see the use of getJvmRoute/setJvmRoute in latest | TC 4.0 CVS. | | | nope :( | | it's never been clear to me exactly what has to be done to support load | balancing, so i've never attempted to add the functionality. and it's not | something i use, so it obviously doesn't bubble up on my priority list :) | | -- | 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/http11/src/java/org/apache/coyote/http11 Http11Connector.java
remm02/01/10 07:23:24
Modified:http11/src/java/org/apache/coyote/http11
Http11Connector.java
Log:
- Fix cut paste bug.
Revision ChangesPath
1.10 +1 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java
Index: Http11Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Http11Connector.java 10 Jan 2002 12:53:50 - 1.9
+++ Http11Connector.java 10 Jan 2002 15:23:23 - 1.10
@@ -556,7 +556,7 @@
OutputFilter[] outputFilters = outputBuffer.getFilters();
-int contentLength = request.getContentLength();
+int contentLength = response.getContentLength();
if (contentLength != -1) {
outputBuffer.addActiveFilter
(outputFilters[Constants.IDENTITY_FILTER]);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 InternalInputBuffer.java
remm02/01/10 07:30:38
Modified:http11/src/java/org/apache/coyote/http11
InternalInputBuffer.java
Log:
- Fix an off by one byte bug after reading the request header.
Revision ChangesPath
1.9 +4 -3
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
Index: InternalInputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InternalInputBuffer.java 10 Jan 2002 12:53:50 - 1.8
+++ InternalInputBuffer.java 10 Jan 2002 15:30:38 - 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
1.8 2002/01/10 12:53:50 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2002/01/10 12:53:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java,v
1.9 2002/01/10 15:30:38 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/01/10 15:30:38 $
*
*
*
@@ -551,6 +551,7 @@
if ((chr == Constants.CR) || (chr == Constants.LF)) {
if (chr == Constants.LF) {
+pos++;
return false;
}
} else {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
GOMEZ Henri wrote: I saw many post from this gentleman but they are never commited. Any reasons ? My Spanish is good enough to tell that the translation sounds better after the patch than before ;-) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Adrian Almenar [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 09, 2002 8:31 PM To: Tomcat List Subject: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web app/admin /ApplicationResources_es.properties Here are some more enhancements for jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web app/admin/App licationResources_es.properties Please Commit these, Cheers, Adrian Almenar -- 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/http11/src/java/org/apache/coyote/http11/filters ChunkedOutputFilter.java
remm02/01/10 07:37:47 Modified:http11/src/java/org/apache/coyote/http11/filters ChunkedOutputFilter.java Log: - The chunk data must be terminated by a CRLF. Revision ChangesPath 1.3 +3 -0 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Index: ChunkedOutputFilter.java === RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChunkedOutputFilter.java 9 Jan 2002 23:29:29 - 1.2 +++ ChunkedOutputFilter.java 10 Jan 2002 15:37:47 - 1.3 @@ -167,6 +167,9 @@ buffer.doWrite(chunk); +chunkHeader.setBytes(chunkLength, 8, 2); +buffer.doWrite(chunkHeader); + return result; } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters IdentityInputFilter.java
remm02/01/10 07:45:32
Modified:http11/src/java/org/apache/coyote/http11/filters
IdentityInputFilter.java
Log:
- The filter was incorrectly reading and discarding extra bytes.
Revision ChangesPath
1.7 +8 -9
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
Index: IdentityInputFilter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/IdentityInputFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IdentityInputFilter.java 10 Jan 2002 12:53:50 - 1.6
+++ IdentityInputFilter.java 10 Jan 2002 15:45:32 - 1.7
@@ -151,31 +151,30 @@
public int doRead(ByteChunk chunk)
throws IOException {
-buffer.doRead(chunk);
-
-int result = chunk.getLength();
-
-if (result = 0) {
-return -1;
-}
+int result = 0;
if (contentLength 0) {
if (remaining 0) {
-if (chunk.getLength() remaining) {
+int nRead = buffer.doRead(chunk);
+if (nRead remaining) {
// The chunk is longer than the number of bytes remaining
// in the body; changing the chunk length to the number
// of bytes remaining
chunk.setBytes(chunk.getBytes(), chunk.getStart(),
(int) remaining);
result = (int) remaining;
+} else {
+result = nRead;
}
-remaining = remaining - chunk.getLength();
+remaining = remaining - nRead;
} else {
// No more bytes left to be read : return -1 and clear the
// buffer
chunk.recycle();
result = -1;
}
+} else {
+result = buffer.doRead(chunk);
}
return result;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/tomcat UnixSocket.c
[EMAIL PROTECTED] wrote: I've also wrote the unix socket code, in the jni directory. APR is going to support unix sockets. So I will wait a little before going on ;-)) I'll check in my version too, and try a merge later ( I've also got the jkservlet working with both 3.3 and 4.0, things look pretty good ) Costin On 5 Jan 2002 [EMAIL PROTECTED] wrote: jfclere 02/01/05 02:03:43 Modified:jk/java/org/apache/jk/server JkMain.java jk/native2 build.xml Added: jk/java/org/apache/jk/common ChannelUnixSocket.java jk/native2/tomcat UnixSocket.c Log: Add code for AF_UNIX sockets. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUnixSocket.java Index: ChannelUnixSocket.java === /* * * * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. The end-user documentation included with the redistribution, if *any, must include the following acknowlegement: * This product includes software developed by the *Apache Software Foundation (http://www.apache.org/). *Alternately, this acknowlegement may appear in the software itself, *if and wherever such third-party acknowlegements normally appear. * * 4. The names The Jakarta Project, Tomcat, and Apache Software *Foundation must not be used to endorse or promote products derived *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS 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 * http://www.apache.org/. * * [Additional notices, if required by prior licensing conditions] * */ package org.apache.jk.common; import java.io.*; import java.net.*; import java.util.*; import org.apache.tomcat.util.buf.*; import org.apache.tomcat.util.http.*; import org.apache.tomcat.util.threads.*; import org.apache.jk.core.*; /* XXX Make the 'message type' pluggable */ /* A lot of the 'original' behavior is hardcoded - this uses Ajp13 wire protocol, TCP, Ajp14 API etc. As we add other protocols/transports/APIs this will change, the current goal is to get the same level of functionality as in the original jk connector. */ /** * Jk2 can use multiple protocols/transports. * Various container adapters should load this object ( as a bean ), * set configurations and use it. Note that the connector will handle * all incoming protocols - it's not specific to ajp1x. The protocol * is abstracted by Endpoint/Message/Channel. */ /** Accept ( and send ) messages via Unix Socket (AF_UNIX). * The AF_UNIX is not supported by JAVA so we need a piece of native code. * * @author Costin Manolache
DO NOT REPLY [Bug 5784] New: - org.apache.catalina.WELCOME_FILES attribute replaced
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=5784. 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=5784 org.apache.catalina.WELCOME_FILES attribute replaced Summary: org.apache.catalina.WELCOME_FILES attribute replaced Product: Tomcat 4 Version: 4.0.1 Final Platform: Other OS/Version: Other Status: NEW Severity: Minor Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] During Tomcat startup, the order of events for context from a listener pov is as follow : 1. context is initialized 2. attribute org.apache.catalina.WELCOME_FILES is replaced This looks strange to me because - the container doesn't call attributeAdded first - this doesn't happen for other attributes (jsp_classpath, resources javax..tempdir) I would rather notify the application that these attributes are added AFTER context is initialized, so the client app has a consistent view of attr mgmt. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5785] New: - XML request time attribute not generated correctly
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=5785.
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=5785
XML request time attribute not generated correctly
Summary: XML request time attribute not generated correctly
Product: Tomcat 4
Version: 4.0.1 Final
Platform: PC
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Example JSP: converted and modified from foo.jsp in the examples/jsp/simpletag
directory.
jsp:root
xmlns:jsp=http://java.sun.com/JSP/Page;
xmlns:eg=http://jakarta.apache.org/tomcat/examples-taglib;
version=1.2
html
body
Radio stations that rock:
ul
eg:foo att1=98.5 att2=92.3 att3=107.7
form action=%= member %/
lijsp:expressionmember/jsp:expression/li
/eg:foo
/ul
/body
/html
/jsp:root
The jsp:expression is generated okay. But the request-time expression in the
action attribute is not.
It seems if a tag is considered 'uninterpreted', then the attributes are simply
output to the servlet writer.
Possible fix:
diff -C 5
tomcat/src/jasper/src/share/org/apache/jasper/compiler/UninterpretedTagBeginGenerator.java
jakarta-tomcat-4.0.1-src/jasper/src/share/org/apache/jasper/compiler/UninterpretedTagBeginGenerator.java
***
tomcat/src/jasper/src/share/org/apache/jasper/compiler/UninterpretedTagBeginGenerator.java
Mon Jan 7 16:35:34 2002
---
jakarta-tomcat-4.0.1-src/jasper/src/share/org/apache/jasper/compiler/UninterpretedTagBeginGenerator.java
Sun Oct 14 12:14:32 2001
***
*** 102,121
String quote = doubleQuote;
String name = attrs.getQName(i);
String value = attrs.getValue(i);
if (value.indexOf('') != -1) quote = singleQuote;
sb.append( ).append(name).append(=).append(quote);
! if (JspUtil.isExpression(value, true))
! {
! sb.append(\););
! sb.append(out.print( + new
String(JspUtil.escapeXml(JspUtil.getExpr(value, true))) + ););
! sb.append(out.write(\).append(quote);
! }
! else
! {
! sb.append(value).append(quote);
! }
}
sb.append();
}
writer.print(sb.toString());
writer.print(\););
--- 102,112
String quote = doubleQuote;
String name = attrs.getQName(i);
String value = attrs.getValue(i);
if (value.indexOf('') != -1) quote = singleQuote;
sb.append( ).append(name).append(=).append(quote);
! sb.append(value).append(quote);
}
sb.append();
}
writer.print(sb.toString());
writer.print(\););
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Todo list for 4.0.2 b2
On Thu, 10 Jan 2002, Tom Drake wrote: FYI: Based on previous discussions on this list, I've added setJvmRoute/JvmRoute to Engine (and StandardEngine) as part of the work I've been doing for distributed sessions. Can you send the patch for this one ? There are just 2 changes that are needed - the methods in Engine and about 2 lines of code in the session manager ( to check if vmRoute is set and if so add it to the session id ). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.0.2-B2.txt
jfclere 02/01/10 08:43:18 Modified:.Tag: tomcat_40_branch RELEASE-NOTES-4.0.2-B2.txt Log: This error in mod_webapp has been corrected. Revision ChangesPath No revision No revision 1.1.2.4 +1 -5 jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.2-B2.txt Index: RELEASE-NOTES-4.0.2-B2.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.2-B2.txt,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- RELEASE-NOTES-4.0.2-B2.txt5 Jan 2002 22:25:29 - 1.1.2.3 +++ RELEASE-NOTES-4.0.2-B2.txt10 Jan 2002 16:43:18 - 1.1.2.4 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-4.0.2-B2.txt,v 1.1.2.3 2002/01/05 22:25:29 larryi Exp $ +$Id: RELEASE-NOTES-4.0.2-B2.txt,v 1.1.2.4 2002/01/10 16:43:18 jfclere Exp $ @@ -151,10 +151,6 @@ * With this release, FORM-based authentication will work correctly, but there is a bug that prevents BASIC authentication from operating. This will be addressed before final release. - -* If you restart Tomcat, you must also restart Apache to avoid receiving - Error 400 - Bad Request errors. This will be handled transparently - in the final release. * The combination of Apache+Tomcat currently passes all spec validation tests in the jakarta-watchdog-4.0 suite. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: nbio connector
On Thu, 10 Jan 2002, Mauricio Nuñez wrote: Keep on this works, since the benchs I saw on Matt site were more than interesting on heavily servers. I will try to get NBIO work as a Ajp13 connector, because my site it's very high loaded ( IMHO ), and i NEED to get a better performance. In few days we'll have the jk2 working, so you can play with unix domain sockets - that should improve a bit the performance. There are few other optimizations there ( more agressive recycling, etc ) - and we really need help testing it and feedback. ( I have it working on my machine, but I'm still trying to figure how to deal with 4.0 class loaders - if I can't I'll just use the old mechanism ). Regarding NBIO and Jk2 - I think the Channel abstraction could be enhanced to use poll() ( using APR ). One thing on my todo list is another attempt at doors, which should be even ligher than nbio. ( I don't expect this to happen soon, unless more people start to help ) Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
How to find the Changelog files for different versions of Tomcat?
Hi, I am doing research on software engineering. I wish to use the Tomcat as an example to analysis the process of the java open source software. It is important for me to get changelog files for different versions of the Tomcat. I have tried my best, but can't find it. Are there anybody who would like to tell me how to find the Changelog file? Your help is highly appreciated! Kai __ Kai Chen E-mail: [EMAIL PROTECTED] Office tel: 615-343-4404 Home tel: 615-460-7085 __ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/test/tests test1.txt
remm02/01/10 08:57:03
Modified:http11/src/test/java/org/apache/coyote/http11
TestAdapter.java
http11/src/test/tests test1.txt
Log:
- Improve the first test.
- Improve the default adapter, which will read the request body,
and write it back on the output.
Revision ChangesPath
1.2 +30 -2
jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/TestAdapter.java
Index: TestAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/TestAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAdapter.java 2 Jan 2002 15:06:35 - 1.1
+++ TestAdapter.java 10 Jan 2002 16:57:03 - 1.2
@@ -59,8 +59,10 @@
package org.apache.coyote.http11;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.coyote.ActionCode;
import org.apache.coyote.Adapter;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
@@ -84,6 +86,8 @@
throws Exception {
StringBuffer buf = new StringBuffer();
+buf.append(Request dump:);
+buf.append(CRLF);
buf.append(req.method());
buf.append( );
buf.append(req.unparsedURI());
@@ -91,8 +95,32 @@
buf.append(req.protocol());
buf.append(CRLF);
-
-
+MimeHeaders headers = req.getMimeHeaders();
+int size = headers.size();
+for (int i = 0; i size; i++) {
+buf.append(headers.getName(i) + : );
+buf.append(headers.getValue(i).toString());
+buf.append(CRLF);
+}
+
+buf.append(Request body:);
+buf.append(CRLF);
+
+res.action(ActionCode.ACTION_ACK, null);
+
+ByteChunk bc = new ByteChunk();
+byte[] b = buf.toString().getBytes();
+bc.setBytes(b, 0, b.length);
+res.doWrite(bc);
+
+int nRead = 0;
+
+while (nRead = 0) {
+nRead = req.doRead(bc);
+if (nRead 0)
+res.doWrite(bc);
+}
+
}
1.2 +35 -1 jakarta-tomcat-connectors/http11/src/test/tests/test1.txt
Index: test1.txt
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/test/tests/test1.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test1.txt 2 Jan 2002 15:06:36 - 1.1
+++ test1.txt 10 Jan 2002 16:57:03 - 1.2
@@ -1,7 +1,41 @@
GET /foo HTTP/1.1
-Host: localhost
+Header1: simple header
+Host: random_host
+Header2: this is a sample multiline header formatted
+ using lots of extra spaces
+Header3:another
+ multiline
+ header
+ which
+spans
+six lines
+Content-Length: 204
+01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
GET /bar HTTP/1.1
+Host:foobar
+
+
+GET /foo2 HTTP/1.1
+Host: localhost
+Header4: this is a sample multiline header formatted
+ using lots of extra spaces
+Header5:another
+ multiline
+ header
+ which
+spans
+six lines
+Content-Length: 12
+
+0123456789
+GET /bar2 HTTP/1.1
+Header6:another
+ multiline
+ header
+ which
+spans
+six lines
Host:foobar
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Constants.java Http11Connector.java InternalOutputBuffer.java
remm02/01/10 08:58:17
Modified:http11/src/java/org/apache/coyote/http11 Constants.java
Http11Connector.java InternalOutputBuffer.java
Log:
- Add support for sending acknoledgments.
- Implement reset.
Revision ChangesPath
1.6 +8 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Constants.java9 Jan 2002 23:29:29 - 1.5
+++ Constants.java10 Jan 2002 16:58:17 - 1.6
@@ -141,7 +141,7 @@
/**
* Default HTTP header buffer size.
*/
-public static final int DEFAULT_HTTP_HEADER_BUFFER_SIZE = 128 * 1024;
+public static final int DEFAULT_HTTP_HEADER_BUFFER_SIZE = 128 * 1000;
/**
@@ -178,6 +178,13 @@
* HTTP/1.1.
*/
public static final String HTTP_11 = HTTP/1.1;
+
+
+/**
+ * Ack string when pipelining HTTP requests.
+ */
+public static final byte[] ACK =
+(new String(HTTP/1.1 100 Continue\r\n\r\n)).getBytes();
}
1.11 +17 -3
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java
Index: Http11Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Http11Connector.java 10 Jan 2002 15:23:23 - 1.10
+++ Http11Connector.java 10 Jan 2002 16:58:17 - 1.11
@@ -163,6 +163,12 @@
/**
+ * HTTP/1.1 flag.
+ */
+protected boolean http11 = true;
+
+
+/**
* Content delimitator for the request (if false, the connection will
* be closed at the end of the request).
*/
@@ -360,7 +366,13 @@
// Send a 100 status back if it makes sense (response not committed
// yet, and client specified an expectation for 100-continue)
-// FIXME
+try {
+outputBuffer.sendAck();
+} catch (IOException e) {
+// Log the error, and set error flag
+e.printStackTrace();
+error = true;
+}
} else if (actionCode == ActionCode.ACTION_CLOSE) {
@@ -383,6 +395,8 @@
// Note: This must be called before the response is committed
+outputBuffer.reset();
+
} else if (actionCode == ActionCode.ACTION_CUSTOM) {
// Do nothing
@@ -423,7 +437,7 @@
*/
protected void prepareRequest() {
-boolean http11 = true;
+http11 = true;
contentDelimitation = false;
MessageBytes protocolMB = request.protocol();
@@ -434,6 +448,7 @@
keepAlive = false;
} else {
// Unsupported protocol
+http11 = false;
error = true;
// Send 505; Unsupported HTTP version
response.setStatus(505);
@@ -541,7 +556,6 @@
*/
protected void prepareResponse() {
-boolean http11 = true;
boolean http09 = false;
contentDelimitation = false;
1.9 +28 -5
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
Index: InternalOutputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InternalOutputBuffer.java 10 Jan 2002 12:53:50 - 1.8
+++ InternalOutputBuffer.java 10 Jan 2002 16:58:17 - 1.9
@@ -226,8 +226,6 @@
*/
public void addFilter(OutputFilter filter) {
-// FIXME: Check for null ?
-
OutputFilter[] newFilterLibrary =
new OutputFilter[filterLibrary.length + 1];
for (int i = 0; i filterLibrary.length; i++) {
@@ -267,9 +265,6 @@
*/
public void addActiveFilter(OutputFilter filter) {
-// FIXME: Check for null ?
-// FIXME: Check index ?
-
if (lastActiveFilter == -1) {
filter.setBuffer(outputStreamOutputBuffer);
} else {
@@ -287,6 +282,22 @@
/**
+ * Reset current response.
+ *
+ * @throws IllegalStateException if the response has already been committed
+ */
+public
shell connector
hi, I'm working on a webapp, for which I want to build (eventually) some shell access for administration purposes. I want administrators to be able to log into the application and perform maintenance through a UNIX like shell. I was thinking about writing this in Jython, but I wonder how I can do this best. Does this involve writing a new connector and if so, is it the best thing to do (and do others need it as well)? armijn -- --- [EMAIL PROTECTED] | http://people.nl.linux.org/~armijn/ | Penguin Power --- http://nl.linux.org/ | Alles over Linux --- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4944] - webapp built failed with Solaris 2.7
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=4944. 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=4944 webapp built failed with Solaris 2.7 --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 10:24 --- Tried on Solaris 8. Work ok. Still fail on Solaris 7. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: shell connector
At 06:55 PM 1/10/02 +0100, Armijn Hemel wrote: hi, I'm working on a webapp, for which I want to build (eventually) some shell access for administration purposes. I want administrators to be able to log into the application and perform maintenance through a UNIX like shell. I was thinking about writing this in Jython, but I wonder how I can do this best. Does this involve writing a new connector and if so, is it the best thing to do (and do others need it as well)? armijn -- Writing a UNIX like shell is pretty straight-forward, armijn. Use a command design pattern and have your class names and constructor parameters equal the commands, options and targets you want. Do something like what is done with JNDI by Flanagan, Farley, Crawford and Magnusson in Java Enterprise in a Nutshell (O'Reilly), Ch. 6, The Naming Shell Application, and convert it for the web. -- micael -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: How to find the Changelog files for different versions of Tomcat?
On Thu, 10 Jan 2002, chenk wrote: Date: Thu, 10 Jan 2002 10:56:09 -0600 From: chenk [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: How to find the Changelog files for different versions of Tomcat? Hi, I am doing research on software engineering. I wish to use the Tomcat as an example to analysis the process of the java open source software. It is important for me to get changelog files for different versions of the Tomcat. I have tried my best, but can't find it. Are there anybody who would like to tell me how to find the Changelog file? We haven't maintained a formal CHANGELOG file for Tomcat versions. The release notes tend to include documentation of the changes that are of most interest to Tomcat users. See the files RELEASE-NOTES-*.txt in the top level Tomcat 4 directory, for example. It would be feasible to automate a detailed changelog based on the CVS commit messages, but my feeling is that this is overkill for what most users really want. Your help is highly appreciated! Kai Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: shell connector
On Thu, 10 Jan 2002, Armijn Hemel wrote: Date: Thu, 10 Jan 2002 18:55:24 +0100 From: Armijn Hemel [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: shell connector hi, I'm working on a webapp, for which I want to build (eventually) some shell access for administration purposes. I want administrators to be able to log into the application and perform maintenance through a UNIX like shell. I was thinking about writing this in Jython, but I wonder how I can do this best. Does this involve writing a new connector and if so, is it the best thing to do (and do others need it as well)? What's wrong with just using telnet or ssh, and running command line apps that update the *data* that underlies your web application? I don't see any reason that all data updates need to be made through Tomcat. armijn Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] jakarta-tomcat-4.0/webapps/admin
Hi,
Encoded the node label names as they contain spaces and other reserved
characters.
Please commit my patch to the head branch.
thanks,
Manveen
Index: WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
===
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.5
diff -u -r1.5 TomcatTreeBuilder.java
--- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 10 Jan 2002
03:41:13 - 1.5
+++ WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 10 Jan 2002
+19:01:55 -
@@ -140,11 +140,13 @@
// because Tomcat does this automatically
String encodedServerName = URLEncoder.encode(serverObjName);
+String encodedNodeLabel = URLEncoder.encode(SERVER_LABEL);
+
TreeControlNode serverNode =
new TreeControlNode(serverObjName,
folder_16_pad.gif, SERVER_LABEL,
setUpServer.do?select= + encodedServerName
-+nodeLabel= + SERVER_LABEL,
++nodeLabel= + encodedNodeLabel,
content, true);
return serverNode;
@@ -175,13 +177,14 @@
encodedServiceName =
URLEncoder.encode(service.getObjectName().toString());
String nodeLabel = Service ( + serviceName + );
-
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
TreeControlNode serviceNode =
new TreeControlNode(service.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpService.do?select= + encodedServiceName
-+nodeLabel= + nodeLabel,
++nodeLabel= + encodedNodeLabel,
content, true);
serverNode.addChild(serviceNode);
@@ -213,17 +216,19 @@
encodedConnectorName =
URLEncoder.encode(connectorObj.getObjectName().toString());
+String nodeLabel = Connector ( + connectorName + );
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
// Do not display the connector node if it is a warp connector.
// This is because warp connector doesn't conform to the
// standard Engine/Host/Context hierarchy and we don't support it.
if (!warp.equalsIgnoreCase(connectorName)) {
-String nodeLabel = Connector ( + connectorName + );
connectorNode =
new TreeControlNode(connectorObj.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpConnector.do?select= + encodedConnectorName
-+ nodeLabel=+nodeLabel,
++ nodeLabel=+ encodedNodeLabel,
content, true);
serviceNode.addChild(connectorNode);
@@ -264,13 +269,14 @@
encodedHostName = URLEncoder.encode(hostObj.getObjectName().toString());
String nodeLabel=Host ( + hostName + );
-
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
hostNode =
new TreeControlNode(hostObj.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpHost.do?select= + encodedHostName
-+nodeLabel=+nodeLabel,
++nodeLabel=+ encodedNodeLabel,
content, true);
serviceNode.addChild(hostNode);
cvs server: Diffing images
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: How to find the Changelog files for different versions of Tomcat?
chenk [EMAIL PROTECTED] writes: I am doing research on software engineering. I wish to use the Tomcat as an example to analysis the process of the java open source software. It is important for me to get changelog files for different versions of the Tomcat. I have tried my best, but can't find it. Are there anybody who would like to tell me how to find the Changelog file? Your help is highly appreciated! http://jakarta.apache.org/site/cvsindex.html http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/ Look at the RELEASE-NOTES* entries. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5792] New: - synchronization issue when compiling JSPs with Tomcat 4.0
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=5792. 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=5792 synchronization issue when compiling JSPs with Tomcat 4.0 Summary: synchronization issue when compiling JSPs with Tomcat 4.0 Product: Tomcat 4 Version: 4.0 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Major Priority: Other Component: Webapps AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi. I'm currently working on a webapp running on Apache-Tomcat 4.0. The issue I've been having is that when two users simultaneously hit an uncompiled JSP, the JSP compiler fails. Sometimes this results in one person being forwarded to the error page showing an error message saying that the JSP could not be compiled and the other person getting through, other times a more serious error occurs that causes the whole JVM to crash. It appears to me that this is a race condition. Is there any synchronization between the two requests running in Tomcat? Has anyone else encountered this error or anything like it? The only solution I can find for now is to precompile all my JSPs before deploying the webapp, but if someone could shed any light on my situation it would be much appreciated. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5759] - CGI servlet mapping by extension *.cgi does not work
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=5759. 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=5759 CGI servlet mapping by extension *.cgi does not work [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 11:48 --- CGI servlet does recognize *.cgi extension. All CGI scripts should reside in the right cgi bin path specified in web.xml servlet servlet-namecgi/servlet-name servlet-classorg.apache.catalina.servlets.CGIServlet/servlet-class init-param param-nameclientInputTimeout/param-name param-value100/param-value /init-param init-param param-namedebug/param-name param-value6/param-value /init-param init-param param-namecgiPathPrefix/param-name param-valueWEB-INF/cgi/param-value /init-param load-on-startup5/load-on-startup /servlet Pls. make sure the cgi scripts are in the WEB-INF/cgi directory. Any CGI applications that are executed must be present within the web application. The following mapping works for me to run any cgi scripts just fine (*.pl or *.cgi). servlet-mapping servlet-namecgi/servlet-name url-pattern/cgi-bin/*/url-pattern /servlet-mapping -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4488] - Web-application (context) hangs and tomcat need to be restarted
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=4488. 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=4488 Web-application (context) hangs and tomcat need to be restarted [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 12:28 --- *** This bug has been marked as a duplicate of 5747 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5747] - another deadlock in shutdown code
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=5747. 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=5747 another deadlock in shutdown code [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 12:28 --- *** Bug 4488 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5793] New: - variable element in tld with TagExtraInfo class
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=5793. 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=5793 variable element in tld with TagExtraInfo class Summary: variable element in tld with TagExtraInfo class Product: Tomcat 4 Version: 4.0.1 Final Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] when a variable element is present in the tld file, tomcat should not accept a non-null returning getVariableInfo() method, as specified in the JSP1.2 spec, C.1 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java
patrickl02/01/10 12:34:04
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TomcatTreeBuilder.java
Log:
Encoded the node label names as they contain spaces and other reserved characters.
Submitted by: Manveen Kaur
Revision ChangesPath
1.6 +17 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
Index: TomcatTreeBuilder.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TomcatTreeBuilder.java10 Jan 2002 03:41:13 - 1.5
+++ TomcatTreeBuilder.java10 Jan 2002 20:34:04 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.5 2002/01/10 03:41:13 patrickl Exp $
- * $Revision: 1.5 $
- * $Date: 2002/01/10 03:41:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.6 2002/01/10 20:34:04 patrickl Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/01/10 20:34:04 $
*
*
*
@@ -91,7 +91,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/01/10 03:41:13 $
+ * @version $Revision: 1.6 $ $Date: 2002/01/10 20:34:04 $
*/
@@ -140,11 +140,13 @@
// because Tomcat does this automatically
String encodedServerName = URLEncoder.encode(serverObjName);
+String encodedNodeLabel = URLEncoder.encode(SERVER_LABEL);
+
TreeControlNode serverNode =
new TreeControlNode(serverObjName,
folder_16_pad.gif, SERVER_LABEL,
setUpServer.do?select= + encodedServerName
-+nodeLabel= + SERVER_LABEL,
++nodeLabel= + encodedNodeLabel,
content, true);
return serverNode;
@@ -175,13 +177,14 @@
encodedServiceName =
URLEncoder.encode(service.getObjectName().toString());
String nodeLabel = Service ( + serviceName + );
-
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
TreeControlNode serviceNode =
new TreeControlNode(service.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpService.do?select= + encodedServiceName
-+nodeLabel= + nodeLabel,
++nodeLabel= + encodedNodeLabel,
content, true);
serverNode.addChild(serviceNode);
@@ -213,17 +216,19 @@
encodedConnectorName =
URLEncoder.encode(connectorObj.getObjectName().toString());
+String nodeLabel = Connector ( + connectorName + );
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
// Do not display the connector node if it is a warp connector.
// This is because warp connector doesn't conform to the
// standard Engine/Host/Context hierarchy and we don't support it.
if (!warp.equalsIgnoreCase(connectorName)) {
-String nodeLabel = Connector ( + connectorName + );
connectorNode =
new TreeControlNode(connectorObj.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpConnector.do?select= + encodedConnectorName
-+ nodeLabel=+nodeLabel,
++ nodeLabel=+ encodedNodeLabel,
content, true);
serviceNode.addChild(connectorNode);
@@ -264,13 +269,14 @@
encodedHostName =
URLEncoder.encode(hostObj.getObjectName().toString());
String nodeLabel=Host ( + hostName + );
-
+String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
hostNode =
new TreeControlNode(hostObj.getObjectName().toString(),
folder_16_pad.gif,
nodeLabel,
setUpHost.do?select= + encodedHostName
-+nodeLabel=+nodeLabel,
++nodeLabel=+ encodedNodeLabel,
content, true);
serviceNode.addChild(hostNode);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5792] - synchronization issue when compiling JSPs with Tomcat 4.0
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=5792. 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=5792 synchronization issue when compiling JSPs with Tomcat 4.0 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 12:40 --- This looks like the same issue than 5203. *** This bug has been marked as a duplicate of 5203 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5203] - A frameset with 2 JSP's causes duplicate class definition - sometimes
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=5203. 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=5203 A frameset with 2 JSP's causes duplicate class definition - sometimes [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-01-10 12:40 --- *** Bug 5792 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] Fix for data corruption in the Warp connector
When using the Warp connector, the read method of the stream returned by request.getInputStream() would return negative numbers for bytes greater than 0xEF. The attached patch fixes this problem. --- WarpRequest.javaWed Jan 9 20:38:23 2002 +++ WarpRequest.java.newWed Jan 9 20:36:00 2002 @@ -139,7 +139,7 @@ throw new IOException(Invalid WARP packet type for body); if (this.packet.pointerthis.packet.size) -return((int)this.packet.buffer[this.packet.pointer++]); +return((int)this.packet.buffer[this.packet.pointer++] 0xFF); this.packet.reset(); this.packet.setType(Constants.TYPE_CBK_READ); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5795] New: - Catalina Shutdown relies on localhost causing problems in a Clustered Solaris environment
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=5795. 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=5795 Catalina Shutdown relies on localhost causing problems in a Clustered Solaris environment Summary: Catalina Shutdown relies on localhost causing problems in a Clustered Solaris environment Product: Tomcat 4 Version: 4.0.1 Final Platform: Sun OS/Version: Solaris Status: NEW Severity: Enhancement Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] I am using Tomcat in a clustered Sun E1 (E10K). I run an Apache/Tomcat instance on each logical server with one or more logical servers running on a given node on the E10K. As a result, a node will be associated with a number of IP addresses, with a subset of those IPs associated with a logical server. I need to be able to bind the Tomcat Startup / Shutdown with a given IP or set of IPs. I was able to exploit an undocumented 'inet' parameter in the earlier Tomcat 3 code and hack org.apache.tomcat.task.StopTomcat.java to achieve this, but the structure is completely different for Catalina. The modifications to Catalina for this enhancement would include: --- 1) Add an 'inet' (or equivalent) parameter to the Server tag in server.xml Server inet=myserver.com port=8005 shutdown=SHUTDOWN debug=0 2) Change org.apache.catalina.core.StandardServer.java line 276-8 serverSocket = new ServerSocket(port, 1, InetAddress.getByName(127.0.0.1)); to incorporate the inet address defined in the Server tag from server.xml and use 127.0.0.1 as the default value if it is not defined. 3) Change org.apache.catalina.startup.Catalina.java line 826 Socket socket = new Socket(127.0.0.1, server.getPort()); to incorporate the inet address define in the Server tag from server.xml and use 127.0.0.1 as the default value if it is not defined. - Ideally, I would like to be able to bind a set of IPs to Tomcat 4, but the Socket I/O implementation in java lacks the accept() method available in C to do this. Since I use an Apache front end, all communication to Catalina is over one IP anyway. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs class-loader-howto.xml
craigmcc02/01/10 14:17:13 Modified:webapps/tomcat-docs Tag: tomcat_40_branch class-loader-howto.xml Log: Fix typos in class loader HOWTO docs. Submitted by: Samarth Kumar Samarth_Kumar at Vanguard.com Revision ChangesPath No revision No revision 1.1.2.1 +2 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml Index: class-loader-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- class-loader-howto.xml4 Sep 2001 04:39:04 - 1.1 +++ class-loader-howto.xml10 Jan 2002 22:17:13 - 1.1.2.1 @@ -100,7 +100,7 @@ of the codeCLASSPATH/code environment variable itself, and instead build the System class loader from the following repositories: ul -liem$CATALINA_HOME/lib/bootstrap.jar/em - Contains the main() method +liem$CATALINA_HOME/bin/bootstrap.jar/em - Contains the main() method that is used to initialize the Tomcat 4 server, and the class loader implementation classes it depends on./li liem$JAVA_HOME/lib/tools.jar/em - Contains the javac compiler used @@ -201,7 +201,7 @@ liBootstrap classes of your JVM/li liSystem class loader classses (described above)/li liem$CATALINA_HOME/common/classes/em/li -liem$CATALINA_HOME/common/*.jar/em/li +liem$CATALINA_HOME/common/lib/*.jar/em/li liem$CATALINA_HOME/classes/em/li liem$CATALINA_HOME/lib/*.jar/em/li /ul -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] Fix for data corruption in the Warp connector
Hi Daniel. Pier checked this change into jakarta-tomcat-connectors CVS a while back. I don't believe it's been ported to the jakarta-tomcat-4.0 repository yet -- it really needs to be, there have been a lot of reports of this bug (though few fixes :). Daniel Harding [EMAIL PROTECTED] writes: When using the Warp connector, the read method of the stream returned by request.getInputStream() would return negative numbers for bytes greater than 0xEF. The attached patch fixes this problem. --- WarpRequest.java Wed Jan 9 20:38:23 2002 +++ WarpRequest.java.new Wed Jan 9 20:36:00 2002 @@ -139,7 +139,7 @@ throw new IOException(Invalid WARP packet type for body); if (this.packet.pointerthis.packet.size) -return((int)this.packet.buffer[this.packet.pointer++]); +return((int)this.packet.buffer[this.packet.pointer++] 0xFF); this.packet.reset(); this.packet.setType(Constants.TYPE_CBK_READ); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs class-loader-howto.xml
craigmcc02/01/10 14:19:49 Modified:webapps/tomcat-docs class-loader-howto.xml Log: Fix typos in class loader HOW-TO document. Submitted by: Samarth Kumar Sammarth_Kumar at Vanguard.com Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml Index: class-loader-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- class-loader-howto.xml12 Nov 2001 21:03:48 - 1.3 +++ class-loader-howto.xml10 Jan 2002 22:19:49 - 1.4 @@ -94,7 +94,7 @@ of the codeCLASSPATH/code environment variable itself, and instead build the System class loader from the following repositories: ul -liem$CATALINA_HOME/lib/bootstrap.jar/em - Contains the main() method +liem$CATALINA_HOME/bin/bootstrap.jar/em - Contains the main() method that is used to initialize the Tomcat 4 server, and the class loader implementation classes it depends on./li liem$JAVA_HOME/lib/tools.jar/em - Contains the javac compiler used @@ -197,7 +197,7 @@ liBootstrap classes of your JVM/li liSystem class loader classses (described above)/li liem$CATALINA_HOME/common/classes/em/li -liem$CATALINA_HOME/common/*.jar/em/li +liem$CATALINA_HOME/common/lib/*.jar/em/li liem$CATALINA_HOME/shared/classes/em/li liem$CATALINA_HOME/shared/lib/*.jar/em/li /ul -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5797] New: - UnCatched ? StringIndexOutOfBoundsException: String index out of range: -1
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=5797. 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=5797 UnCatched ? StringIndexOutOfBoundsException: String index out of range: -1 Summary: UnCatched ? StringIndexOutOfBoundsException: String index out of range: -1 Product: Tomcat 3 Version: 3.2.x Nightly Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Servlet AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Tomcat:3.2.4, Java:JDK1.3.1_01, OS:Win2K. Connection with a Java Apps (arcims Administrator). no loss of data?, no fails?, only that : 2002-01-10 23:25:29 - Ctx( ): Exception in: R( + + null) - java.lang.StringIn dexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1525) at org.apache.tomcat.request.DirHandler.doService(StaticInterceptor.java :561) at org.apache.tomcat.core.Handler.service(Handler.java:287) at org.apache.tomcat.core.ServletWrapper.service(ServletWrapper.java:372 ) at org.apache.tomcat.core.ContextManager.internalService(ContextManager. java:806) at org.apache.tomcat.core.ContextManager.service(ContextManager.java:752 ) at org.apache.tomcat.service.http.HttpConnectionHandler.processConnectio n(HttpConnectionHandler.java:213) at org.apache.tomcat.service.TcpWorkerThread.runIt(PoolTcpEndpoint.java: 416) at org.apache.tomcat.util.ThreadPool$ControlRunnable.run(ThreadPool.java :501) at java.lang.Thread.run(Thread.java:484) -- 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/ant - New directory
craigmcc02/01/10 16:35:48 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs manager-howto.xml
craigmcc02/01/10 16:37:31
Modified:catalina build.xml
webapps/tomcat-docs manager-howto.xml
Added: catalina/src/share/org/apache/catalina/ant
AbstractCatalinaTask.java InstallTask.java
ListTask.java ReloadTask.java RemoveTask.java
StartTask.java StopTask.java
Log:
Many people find the Manager webapp useful in installing and removing
applications from a running instance of Tomcat 4. This checkin adds a
set of custom Ant tasks that correspond to each of the commands that
Manager supports, so you can use them in build.xml scripts for your
web applications directly.
Documentation and an example build.xml script are in the updated
manager-howto.xml file.
Revision ChangesPath
1.95 +9 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- build.xml 5 Jan 2002 20:24:30 - 1.94
+++ build.xml 11 Jan 2002 00:37:30 - 1.95
@@ -865,6 +865,7 @@
!-- Catalina Main JAR File --
jar jarfile=${catalina.deploy}/server/lib/catalina.jar
fileset dir=${catalina.build}/server/classes
+exclude name=org/apache/catalina/ant/** /
exclude name=org/apache/naming/** /
exclude name=**/connector/warp/** /
exclude name=org/apache/catalina/startup/Bootstrap.class /
@@ -877,6 +878,14 @@
exclude name=org/apache/catalina/startup/SecurityClassLoad.class /
exclude name=org/apache/catalina/servlets/** /
exclude name=org/apache/catalina/util/ssi/** /
+ /fileset
+/jar
+
+!-- Catalina Ant Tasks JAR File --
+jar jarfile=${catalina.deploy}/server/lib/catalina-ant.jar
+ fileset dir=${catalina.build}/server/classes
+include name=org/apache/catalina/ant/** /
+include name=org/apache/catalina/util/Base64.class /
/fileset
/jar
1.1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java
Index: AbstractCatalinaTask.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java,v
1.1 2002/01/11 00:37:30 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2002/01/11 00:37:30 $
*
*
*
* 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, Tomcat, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS 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
DO NOT REPLY [Bug 5799] New: - PersistentManager overwrites session every 60 seconds
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=5799.
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=5799
PersistentManager overwrites session every 60 seconds
Summary: PersistentManager overwrites session every 60 seconds
Product: Tomcat 4
Version: 4.0.1 Final
Platform: PC
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
I know the PersistentManager is currently experimental, but I thought you'd like
to know about this. I found that if I enter a Manager element in server.xml for
my web app context such as the one shown below, the current session is
overwritten every 60 seconds by some old session data. If I don't put a Manager
element the default systems seems to work OK - it's only when I add the Manager
element. Also below is the debug output showing the reload every 60 seconds.
Manager className=org.apache.catalina.session.PersistentManager
debug=4
maxActiveSessions=-1
minIdleSwap=-1
maxIdleSwap=-1
maxIdleBackup=-1
Store className=org.apache.catalina.session.FileStore
degub=4/
/Manager
Debug output:
2002-01-11 11:49:36 PersistentManager[/ps]: readObject() loading session
C0D4D4C27372241483C32416E594
2002-01-11 11:49:36 PersistentManager[/ps]: loading attribute
'weborganic.Login' with value '{username=philipr, userDetails={public=,
product=ce, announce=ce, test=ce, demo=ce, admin=c}}'
2002-01-11 11:49:36 PersistentManager[/ps]: loading attribute
'weborganic.SpecifyGroup' with value '{group=demo,
redirect=/ps/servlet/com.pageseeder.EditGroupURIs}'
2002-01-11 11:49:36 PersistentManager[/ps]: loading attribute
'weborganic.Subscription' with value '{selGroupId=6}'
2002-01-11 11:50:36 PersistentManager[/ps]: readObject() loading session
C0D4D4C27372241483C32416E594
2002-01-11 11:50:36 PersistentManager[/ps]: loading attribute
'weborganic.Login' with value '{username=philipr, userDetails={public=,
product=ce, announce=ce, test=ce, demo=ce, admin=c}}'
2002-01-11 11:50:36 PersistentManager[/ps]: loading attribute
'weborganic.SpecifyGroup' with value '{group=demo,
redirect=/ps/servlet/com.pageseeder.EditGroupURIs}'
2002-01-11 11:50:36 PersistentManager[/ps]: loading attribute
'weborganic.Subscription' with value '{selGroupId=6}'
2002-01-11 11:51:36 PersistentManager[/ps]: readObject() loading session
C0D4D4C27372241483C32416E594
2002-01-11 11:51:36 PersistentManager[/ps]: loading attribute
'weborganic.Login' with value '{username=philipr, userDetails={public=,
product=ce, announce=ce, test=ce, demo=ce, admin=c}}'
2002-01-11 11:51:36 PersistentManager[/ps]: loading attribute
'weborganic.SpecifyGroup' with value '{group=demo,
redirect=/ps/servlet/com.pageseeder.EditGroupURIs}'
2002-01-11 11:51:36 PersistentManager[/ps]: loading attribute
'weborganic.Subscription' with value '{selGroupId=6}'
2002-01-11 11:52:36 PersistentManager[/ps]: readObject() loading session
C0D4D4C27372241483C32416E594
2002-01-11 11:52:36 PersistentManager[/ps]: loading attribute
'weborganic.Login' with value '{username=philipr, userDetails={public=,
product=ce, announce=ce, test=ce, demo=ce, admin=c}}'
2002-01-11 11:52:36 PersistentManager[/ps]: loading attribute
'weborganic.SpecifyGroup' with value '{group=demo,
redirect=/ps/servlet/com.pageseeder.EditGroupURIs}'
2002-01-11 11:52:36 PersistentManager[/ps]: loading attribute
'weborganic.Subscription' with value '{selGroupId=6}'
--
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/ant package.html
craigmcc02/01/10 18:04:46 Added: catalina/src/share/org/apache/catalina/ant package.html Log: Oops, forgot Javadoc package.html file. Revision ChangesPath 1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/package.html Index: package.html === body pThis package contains a set of codeTask/code implementations for emAnt (version 1.4 or later)/em that can be used to interact with the Manager application to install, reload, and remove web applications from a running instance of Tomcat. For more information, see a href=http://jakarta.apache.org/tomcat/tomcat-4.0-doc/manager-howto.html; http://jakarta.apache.org/tomcat/tomcat-4.0-doc/manager-howto.html/a./p pThe attributes of each task element correspond exactly to the request parameters that are included with an HTTP request sent directly to the Manager application. They are summarized as follows: /p table tr th align=center width=15%Attribute/th th align=center width=85%Description/th /tr tr td align=centerurl/td td The URL of the Manager web application you will use to perform the requested operations. If not specified, defaults to codehttp://localhost:8080/manager/code (which corresponds to a standard installation of Tomcat 4). /td /tr tr td align=centerusername/td td The username of a Tomcat user that has been configured with the codemanager/code role, as required to execute Manager application commands. This attribute is required. /td /tr tr td align=centerpassword/td td The password of a Tomcat user that has been configured with the codemanager/code role, as required to execute Manager application commands. This attribute is required. /td /tr tr td align=centerconfig/td td A URL pointing at the context configuration file (i.e. a file containing only the codelt;Contextgt;/code element, and its nested elements, from codeserver.xml/code for a particular web application). This attribute is supported only on the codeinstall/code target, and is required only if you wish to install an application with non-default configuration characteristics. /td /tr tr td align=centerpath/td td The context path (including the leading slash) of the web application this command is intended to manage, or a zero-length string for the ROOT web application. This attribute is valid for the codeinstall/code, codereload/code, coderemove/code, codestart/code, and codestop/code tasks only, and is required in all of those cases. /td /tr tr td align=centerwar/td td A codejar:/code URL that points at a web application archive (WAR) file, or a codefile:/code URL that points at an unpacked directory containing the web application. This attribute is supported only on the codeinstall/code target. You must specify at least one of the codeconfig/code and codewar/code attributes; if you specify both, the codewar/code attribute overrides the codedocBase/code attribute in the context configuration file. /td /tr /table pstrongNOTE/strong - Commands executed through the emManager/em application are strongNOT/strong reflected in updates to the Tomcat codeserver.xml/code configuration file, so they do not persist past the next time you restart the entire Tomcat container./p /body -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/compat Jdk12Support.java
billbarker02/01/10 22:55:30
Modified:src/share/org/apache/tomcat/util/compat Jdk12Support.java
Log:
Remove hard-coded assumptions about URLClassLoader.
To allow configuring the App-Classloader to be a SimpleClassLoader (to hopefully get
around the problem of re-loading jar files), we need more flexablity here. The only
effect in the default configuration is to execute a few more instructions on
non-critical paths.
Revision ChangesPath
1.10 +9 -2
jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk12Support.java
Index: Jdk12Support.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk12Support.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Jdk12Support.java 19 Sep 2001 01:28:34 - 1.9
+++ Jdk12Support.java 11 Jan 2002 06:55:30 - 1.10
@@ -138,9 +138,16 @@
while(cl instanceof DependClassLoader cl != null )
cl=((DependClassLoader)cl).getParentLoader();
if (cl==null) break;
-if (depth==c) return ((URLClassLoader)cl).getURLs();
+if (depth==c) {
+ if(cl instanceof URLClassLoader)
+ return ((URLClassLoader)cl).getURLs();
+ else if(cl instanceof SimpleClassLoader)
+ return ((SimpleClassLoader)cl).getURLs();
+ else
+ return null;
+ }
c++;
-cl=((URLClassLoader)cl).getParent();
+cl=getParentLoader(cl);
}while((cl!=null) ( depth = c ));
return null;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config LoaderInterceptor11.java
billbarker02/01/10 23:01:24
Modified:src/share/org/apache/tomcat/modules/config
LoaderInterceptor11.java
Log:
Allow the user to optionally configure to use the 1.1 loader even under Java2.
SimpleClassLoader should handle replaced jar files better than URLClassLoader. This
makes this an option for people that want jar reloading, and can live without
enforcement of Java2 Manifest options. Hopefully this gives the best of 3.2 and 3.3
for these people.
Revision ChangesPath
1.24 +14 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
Index: LoaderInterceptor11.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- LoaderInterceptor11.java 5 Dec 2001 11:26:57 - 1.23
+++ LoaderInterceptor11.java 11 Jan 2002 07:01:24 - 1.24
@@ -83,6 +83,7 @@
boolean useCommonL=false;
boolean useContainerL=false;
boolean useNoParent=false;
+boolean use11Loader=false;
boolean addJaxp=true;
@@ -112,6 +113,13 @@
useNoParent=b;
}
+/** Use the 1.1 loader even if running under Java2.
+ * This allows for a work-around to the currently broken URLClassLoader
+ * which can't reload classes from changed jar files.
+ */
+public void setUse11Loader( boolean b ) {
+ use11Loader = b;
+}
/** Directory where jaxp jars are installed. Defaults to
tomcat_install/lib/container, where the parser used by
@@ -324,7 +332,12 @@
parent=this.getClass().getClassLoader();
}
- ClassLoader loader=jdk11Compat.newClassLoaderInstance( classP, parent);
+ ClassLoader loader=null;
+ if( use11Loader ) {
+ loader = new SimpleClassLoader(classP, parent);
+ } else {
+ loader=jdk11Compat.newClassLoaderInstance( classP, parent);
+ }
if( debug 0 )
log(Loader + loader.getClass().getName() + + parent);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.1.txt
billbarker02/01/10 23:11:27 Modified:.RELEASE-NOTES-3.3.1.txt Log: Documenting changes to StaticInterceptor LoaderInterceptor11 Revision ChangesPath 1.21 +7 -1 jakarta-tomcat/RELEASE-NOTES-3.3.1.txt Index: RELEASE-NOTES-3.3.1.txt === RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.1.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- RELEASE-NOTES-3.3.1.txt 9 Jan 2002 06:41:01 - 1.20 +++ RELEASE-NOTES-3.3.1.txt 11 Jan 2002 07:11:26 - 1.21 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-3.3.1.txt,v 1.20 2002/01/09 06:41:01 larryi Exp $ +$Id: RELEASE-NOTES-3.3.1.txt,v 1.21 2002/01/11 07:11:26 billbarker Exp $ This document describes the changes that have been made since the @@ -89,6 +89,9 @@ the test get a chance to receive its input before the socket is closed. Otherwise, Socket reset by peer errors occur. + Make the App-classloader configurable to allow using the 1.1 + loader even when running under Java2. This should allow for better + jar reloading at the cost of not enforcing sealing etc. Server: @@ -151,6 +154,9 @@ getReader() was called, you would get the old reader rather than a new reader for the current request. +5724 Supress the check for WEB-INF in the Default Servlet (aka + StaticInterceptor). The check was redundant, and was causing + Spec problems. Configuration: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc serverxml.html
billbarker02/01/10 23:17:17 Modified:src/doc serverxml.html Log: Document new attribute to LoaderInterceptor11 Revision ChangesPath 1.15 +7 -1 jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- serverxml.html1 Jan 2002 00:33:20 - 1.14 +++ serverxml.html11 Jan 2002 07:17:17 - 1.15 @@ -4,7 +4,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN html head - !-- $Id: serverxml.html,v 1.14 2002/01/01 00:33:20 larryi Exp $ -- + !-- $Id: serverxml.html,v 1.15 2002/01/11 07:17:17 billbarker Exp $ -- !-- Copyright 1999-2001 Apache Software Foundation -- meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 link rel=stylesheet href=style.css @@ -1749,6 +1749,12 @@ sets the context classloader's parent to the a href=tomcat-ug.html#configuring_classesServer Classloader/a./td tdtrue/td + /tr + tr valign=top +tduse11Loader/td +tdIf codetrue/code, use the 1.1 Classloader even under Java2. +For compatiblity with Tomcat 3.2.x./td +tdfalse/td /tr /table -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
billbarker02/01/10 23:24:17
Modified:src/share/org/apache/tomcat/startup EmbededTomcat.java
Log:
Remove dependency on URLClassLoader that was preventing running under 1.1
Revision ChangesPath
1.63 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
Index: EmbededTomcat.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- EmbededTomcat.java9 Jan 2002 07:03:58 - 1.62
+++ EmbededTomcat.java11 Jan 2002 07:24:17 - 1.63
@@ -836,7 +836,7 @@
if( noClassLoaders ) {
commonCL=this.getClass().getClassLoader();
if( commonCL == null ) {
-commonCL=new java.net.URLClassLoader( new URL[] {}, null );
+commonCL=jdk11Compat.newClassLoaderInstance(new URL [] {}, null);
}
parentCL=commonCL;
containerCL=commonCL;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
