cvs commit: jakarta-tomcat-connectors/procrun/bin tomcat5.exe
mturk 2004/08/10 23:37:17 Modified:procrun/bin tomcat5.exe Log: Fix bug 30572 not setting Startup auto on //IS Revision ChangesPath 1.5 +2 -2 jakarta-tomcat-connectors/procrun/bin/tomcat5.exe Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Patch] ExtendedAccessLogValve - broken x-H(requestedSessionIdValid)
Hello,
This is the first time I submit a patch, so I hope I do everything right.
ExtendedAccessLogValve is broken, code x-H(requestedSessionIdValid) returns the same
result as
x-H(requestedSessionId) due to a typo.
Greetings, Lilianne E. Blaze
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.9
diff -u -r1.9 ExtendedAccessLogValve.java
--- ExtendedAccessLogValve.java 23 Jun 2004 08:24:57 - 1.9
+++ ExtendedAccessLogValve.java 11 Aug 2004 03:13:42 -
@@ -1324,7 +1324,7 @@
} else if (requestedSessionIdFromCookie.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDFROMCOOKIE;
} else if (requestedSessionIdValid.equals(fieldInfo.value)){
-fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONID;
+fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDVALID;
} else if (contentLength.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_CONTENTLENGTH;
} else if (characterEncoding.equals(fieldInfo.value)){
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
New Mod_Proxy - some testing/looking
Greetings All, 1. The testing. Trying a build of the current CVS of the new (ajp) proxy modules and get the following error: #File: proxy_ftp.c # #1896: proxy_hook_scheme_handler(ap_proxy_ftp_handler, NULL, NULL, APR_HOOK_MIDDLE); # Error: ^ # illegal implicit conversion from 'int (struct request_rec *, struct *, char *, const char *, unsigned short)' to # 'int (*)(struct request_rec *, struct proxy_worker *, struct *, char *, const char *, unsigned short)' There is a similar issue in proxy_connect.c at line 374. The one module that does build without issue is proxy_http.c. A check of the coding in proxy_http.c shows a handler structure of: int ap_proxy_http_handler(request_rec *r, proxy_worker *worker, proxy_server_conf *conf, char *url, const char *proxyname, apr_port_t proxyport); whereas those in proxy_ftp and proxy_connect.c have: int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, char *url, const char *proxyhost, apr_port_t proxyport); If I add the proxy_worker *worker to both proxy_ftp and proxy_connect structures they build without issue. Any comments please? 2. The looking. In proxy_ftp.c, can the const char *proxyhost be changed to const char *proxyname for consistency please? Regards, Norm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
old issue of log4j trying to use the previous classloader
Hello, At 2004-01-23 11:54, just 4 minutes after bug number 26372 [1] was filed, Remy Maucherat threw it out, saying: This is the old issue of log4j trying to use the previous classloader (reloading will create a new classloader to load class definitions; see bug 3888 [2]). Maybe it would be good to leave this bug open so that people can complain using it, rather than file duplicates. However, I'd like everyone to know that the bug will never be fixed. You can probably fix the problem by putting log4 JARs (and the necessary commons-logging wrapper classes) inside the webapp repository. What old issue of log4j trying to use the previous classloader is Remy referring to? I am not aware of any log4j code that holds on to classloader references. If Remy was misinformed, he should retract his previous statements about log4j holding classloader references. On the other hand, if his claims are substantiated, I would be happy to study the evidence and work to correct any mistakes. Latest evidence [3] indicates that the java.lang.ThreadDeath problem has it's root causes in classloader references held by commons-logging. As the commons-logging dynamic discovery mechanism is based entirely on tracking various classloaders, there is no doubt that commons-logging holds on classloader references. For the sake of our users, I would appreciate if tomcat-developers could shed more light onto the matter. [1] http://issues.apache.org/bugzilla/show_bug.cgi?id=26372 [2] http://issues.apache.org/bugzilla/show_bug.cgi?id=3888 [3] http://issues.apache.org/bugzilla/show_bug.cgi?id=27371 -- Ceki Gülcü - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: jakarta-tomcat-catalina/jakarta-tomcat-catalina failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact folk at [EMAIL PROTECTED] Project jakarta-tomcat-catalina has an issue affecting its community integration. This issue affects 3 projects, and has been outstanding for 4 runs. Project State : 'Failed', Reason 'Build Failed' The following are affected: - jakarta-tomcat-5 : Servlet 2.4 and JSP 2.0 Reference Implementation - jakarta-tomcat-catalina : Servlet 2.4 Reference Implementation - jakarta-tomcat-jk : Connectors to various web servers Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/index.html That said, some snippets follow: The following annotations were provided: -DEBUG- Jar [naming-resources.jar] identifier set to jar basename: [naming-resources] -DEBUG- Jar [servlets-default.jar] identifier set to jar basename: [servlets-default] -DEBUG- Jar [naming-common.jar] identifier set to jar basename: [naming-common] -DEBUG- Jar [catalina.jar] identifier set to jar basename: [catalina] -DEBUG- Jar [bootstrap.jar] identifier set to jar basename: [bootstrap] -DEBUG- Jar [servlets-common.jar] identifier set to jar basename: [servlets-common] -DEBUG- Jar [servlets-invoker.jar] identifier set to jar basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-5-servlet exists, no need to add for property servlet-api.jar. -DEBUG- Dependency on jakarta-servletapi-5-jsp exists, no need to add for property jsp-api.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xml-apis.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xercesImpl.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -DEBUG- Dependency on jakarta-tomcat-coyote exists, no need to add for property tomcat-coyote.home. -INFO- Failed with reason build failed -INFO- Enable debug output, due to build failure. The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/gump_work/build_jakarta-tomcat-catalina_jakarta-tomcat-catalina.html Work Name: build_jakarta-tomcat-catalina_jakarta-tomcat-catalina (Type: Build) State: Failed Elapsed: 2 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-xerces2/java/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/usr/local/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtomcat33.home=--UnSet-- -Djsp-api.jar=/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Djtc.home=/usr/local/gump/public/workspace/jakarta-tomcat-connectors -Dmail.home=/usr/local/gump/packages/javamail-1.3 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dsite2.home=/usr/local/gump/public/workspace/jakarta-site2 -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-20040811.jar -Dcatalina.deploy=/usr/local/gump/public/workspace/jakarta-tomcat-catalina/build -Dxml-apis.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xml-apis.jar -DxercesImpl.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Dcatalina.build=/usr/local/gump/public/workspace/jakarta-tomcat-catalina/build
DO NOT REPLY [Bug 30583] New: - Cannot switch of tld scan for Embedded tomcat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30583. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30583 Cannot switch of tld scan for Embedded tomcat Summary: Cannot switch of tld scan for Embedded tomcat Product: Tomcat 5 Version: 5.0.27 Platform: PC OS/Version: Linux Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, I'm using the Embedded tomcat 5.0.27 for servlets only. So a minimalistic setup is ok. When starting up, the StandardContext does a TLD scan, which fails als it finds a TLD, which is not meant to be used in this setup: java.lang.NullPointerException at org.apache.catalina.startup.DigesterFactory.register(DigesterFactory.java:174) at org.apache.catalina.startup.DigesterFactory.registerLocalSchema(DigesterFactory.java:130) at org.apache.catalina.startup.DigesterFactory.newDigester(DigesterFactory.java:92) at org.apache.catalina.startup.TldConfig.createTldDigester(TldConfig.java:408) at org.apache.catalina.startup.TldConfig.tldScanStream(TldConfig.java:508) at org.apache.catalina.startup.TldConfig.tldScanJar(TldConfig.java:472) at org.apache.catalina.startup.TldConfig.execute(TldConfig.java:307) at org.apache.catalina.core.StandardContext.start(StandardContext.java:4282) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1083) at org.apache.catalina.core.StandardHost.start(StandardHost.java:789) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1083) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:478) at org.apache.catalina.startup.Embedded.start(Embedded.java:846) at com.coremedia.servlet.tomcat.EmbeddedTomcat.start(EmbeddedTomcat.java:118) Please consider making the TLD scan optional, as thought about in StandardContext: org.apache.catalina.core.StandardContext, line 4260ff // Read tldListeners. XXX Option to disable TldConfig tldConfig = new TldConfig(); tldConfig.setContext(this); The workaround to overwrite this large start() method is not very elegant and error prone. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
JK2 ISAPI Reconfiguration not working?
Hi, I'm using JK2-ISAPI 2.0.4 in a IIS6, communicating via AJP13 wih the Tomcat's. There is a section saying that one can reconfigure the JK2 at runtime, say to drain or disable a Tomcat node. I've tried to reconfigure JK2 via configfile and JMX. 1. Via configfile, it displays that the file has changed in the scoreboard, but doesn't update the settings. 2. Via JMX, the JK2 takes the changes, but it doesn't write the configfile (workers2.properties) as mentioned in http://jakarta.apache.org/tomcat/connectors-doc/jk2/jk2/configweb.html#Advan ced:%20reconfiguration%20using%20JMX so other threads have no chance to get the changes - which I'd doubt the'd do anyway, because of point 1. Has anyone similar experiences, or, better, has anyone got runtime-reconfiguration working on W2k3, IIS6 (IIS6-Mode) and JK2.0.4 ? -- Bjoern Andersen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30383] - JK2 runtime reconfiguration doesn't work on win2k3 IIS6
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30383 JK2 runtime reconfiguration doesn't work on win2k3 IIS6 [EMAIL PROTECTED] changed: What|Removed |Added URL||http://jakarta.apache.org/to ||mcat/connectors- ||doc/jk2/jk2/configweb.html#A ||dvanced: reconfiguration ||using JMX --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 10:53 --- First, sorry for pasting my config - I should have attached it, i konw. But now I can't change it. I’ve tried to reconfigure JK2 via configfile and JMX. 1. Via configfile, it displays that the file has changed in the scoreboard, but doesn't update the settings. 2. Via JMX, the JK2 takes the changes, but it doesn't write the configfile (workers2.properties) as mentioned in so other threads have no chance to get the changes - which I'd doubt the'd do anyway, because of point 1. Has anyone ever got runtime-reconfiguration working on W2k3, IIS6 (IIS6-Mode) and JK2.0.4? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_util.c
mturk 2004/08/11 03:49:49
Modified:ajp/proxy proxy_util.c
Log:
Added dynamic worker limit. It ensures that the addng dynamic
workers to the balancers never excedes that limit.
Revision ChangesPath
1.26 +14 -2 jakarta-tomcat-connectors/ajp/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_util.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- proxy_util.c 10 Aug 2004 18:06:49 - 1.25
+++ proxy_util.c 11 Aug 2004 10:49:49 - 1.26
@@ -26,6 +26,7 @@
/* Global balancer counter */
static int lb_workers = 0;
+static int lb_workers_limit = 0;
static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r);
static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r);
@@ -1157,8 +1158,17 @@
ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, mpm_daemons);
/* Check if we are prefork or single child */
-if (worker-hmax mpm_daemons 1)
+if (worker-hmax mpm_daemons 1) {
+/* Check only if workers_limit is set */
+if (lb_workers_limit (lb_workers + 1) lb_workers_limit) {
+ap_log_perror(APLOG_MARK, APLOG_ERR, 0, pool,
+ proxy: Can not add worker (%s) to balancer (%s).
+ Dynamic limit reached.,
+ worker-name, balancer-name);
+return;
+}
score = ap_get_scoreboard_lb(getpid(), lb_workers);
+}
else
#endif
{
@@ -1859,5 +1869,7 @@
PROXY_DECLARE(int) ap_proxy_lb_workers(void)
{
-return (lb_workers + PROXY_DYNAMIC_BALANCER_LIMIT);
+/* Set the dynamic #workers limit */
+lb_workers_limit = lb_workers + PROXY_DYNAMIC_BALANCER_LIMIT;
+return lb_workers_limit;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_ftp.c
mturk 2004/08/11 04:45:49
Modified:ajp/proxy proxy_ftp.c
Log:
Start porting connection pool to ftp.
Revision ChangesPath
1.2 +129 -171 jakarta-tomcat-connectors/ajp/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ftp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proxy_ftp.c 3 Aug 2004 10:01:18 - 1.1
+++ proxy_ftp.c 11 Aug 2004 11:45:48 - 1.2
@@ -19,6 +19,12 @@
#if APR_HAVE_TIME_H
#include time.h
#endif
+#include apr_version.h
+
+#if (APR_MAJOR_VERSION 1)
+#undef apr_socket_create
+#define apr_socket_create apr_socket_create_ex
+#endif
#define AUTODETECT_PWD
/* Automatic timestamping (Last-Modified header) based on MDTM is used if:
@@ -31,7 +37,7 @@
module AP_MODULE_DECLARE_DATA proxy_ftp_module;
int ap_proxy_ftp_canon(request_rec *r, char *url);
-int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
+int ap_proxy_ftp_handler(request_rec *r, proxy_worker *worker, proxy_server_conf
*conf,
char *url, const char *proxyhost,
apr_port_t proxyport);
apr_status_t ap_proxy_send_dir_filter(ap_filter_t * f,
@@ -728,7 +734,22 @@
return HTTP_UNAUTHORIZED;
}
+static
+apr_status_t proxy_ftp_cleanup(request_rec *r, proxy_conn_rec *backend)
+{
+
+backend-close_on_recycle = 1;
+ap_set_module_config(r-connection-conn_config, proxy_ftp_module, NULL);
+ap_proxy_release_connection(FTP, backend, r-server);
+
+return OK;
+}
+static ftp_proxyerror(request_rec *r, proxy_conn_rec *conn, int statuscode, const
char *message)
+{
+proxy_ftp_cleanup(r, conn);
+return ap_proxyerror(r, statuscode, message);
+}
/*
* Handles direct access of ftp:// URLs
* Original (Non-PASV) version from
@@ -736,7 +757,7 @@
* PASV added by Chuck
* Filters by [Graham Leggett [EMAIL PROTECTED]]
*/
-int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
+int ap_proxy_ftp_handler(request_rec *r, proxy_worker *worker, proxy_server_conf
*conf,
char *url, const char *proxyhost,
apr_port_t proxyport)
{
@@ -747,7 +768,7 @@
apr_sockaddr_t *connect_addr;
apr_status_t rv;
conn_rec *origin, *data = NULL;
-int err;
+apr_status_t err = APR_SUCCESS;
apr_bucket_brigade *bb = apr_brigade_create(p, c-bucket_alloc);
char *buf, *connectname;
apr_port_t connectport;
@@ -771,6 +792,7 @@
/* stuff for PASV mode */
int connect = 0, use_port = 0;
char dates[APR_RFC822_DATE_LEN];
+int status;
/* is this for us? */
if (proxyhost) {
@@ -786,18 +808,6 @@
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r-server,
proxy: FTP: serving URL %s, url);
-/* create space for state information */
-backend = (proxy_conn_rec *) ap_get_module_config(c-conn_config,
proxy_ftp_module);
-if (!backend) {
-backend = apr_pcalloc(c-pool, sizeof(proxy_conn_rec));
-backend-connection = NULL;
-backend-hostname = NULL;
-backend-port = 0;
-ap_set_module_config(c-conn_config, proxy_ftp_module, backend);
-}
-if (backend-connection)
-origin_sock = ap_get_module_config(backend-connection-conn_config,
core_module);
-
/*
* I: Who Do I Connect To? ---
@@ -891,21 +901,11 @@
proxy: FTP: connecting %s to %s:%d, url, connectname, connectport);
/* do a DNS lookup for the destination host */
-err = apr_sockaddr_info_get(connect_addr, connectname, APR_UNSPEC,
connectport, 0, p);
-
-/* check if ProxyBlock directive on this host */
-if (OK != ap_proxy_checkproxyblock(r, conf, connect_addr)) {
-return ap_proxyerror(r, HTTP_FORBIDDEN,
- Connect to remote machine blocked);
-}
-
-
-/*
- * II: Make the Connection ---
- *
- * We have determined who to connect to. Now make the connection.
- */
-
+if (!worker-cp-addr)
+err = apr_sockaddr_info_get((worker-cp-addr),
+connectname, APR_UNSPEC,
+connectport, 0,
+worker-cp-pool);
/*
* get all the possible IP addresses for the destname and loop through
* them until we get a successful connection
@@ -916,105 +916,55 @@
connectname, NULL));
}
-/*
- * At this point we have a list of one or more IP addresses of the
- *
DO NOT REPLY [Bug 30383] - JK2 runtime reconfiguration doesn't work on win2k3 IIS6
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30383 JK2 runtime reconfiguration doesn't work on win2k3 IIS6 --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 12:00 --- Created an attachment (id=12389) JK2 log when reconfigure JK2 via config-file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30587] New: - ExtendedAccessLogValve typo for x-H(requestedSessionIdValid)
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30587. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30587 ExtendedAccessLogValve typo for x-H(requestedSessionIdValid) Summary: ExtendedAccessLogValve typo for x- H(requestedSessionIdValid) Product: Tomcat 5 Version: Nightly Build Platform: All URL: http://marc.theaimsgroup.com/?l=tomcat- devm=109220681724335w=2 OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Per the link there's a typo in ExtendedAccessLogValve. The link has a PATCH too. Just copying from the tomcat-dev list - so its not lost. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] ExtendedAccessLogValve - broken x-H(requestedSessionIdValid)
Its now bugzilla 30587.
-Tim
Lilianne E. Blaze wrote:
Hello,
This is the first time I submit a patch, so I hope I do everything right.
ExtendedAccessLogValve is broken, code x-H(requestedSessionIdValid) returns the same result as
x-H(requestedSessionId) due to a typo.
Greetings, Lilianne E. Blaze
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.9
diff -u -r1.9 ExtendedAccessLogValve.java
--- ExtendedAccessLogValve.java 23 Jun 2004 08:24:57 - 1.9
+++ ExtendedAccessLogValve.java 11 Aug 2004 03:13:42 -
@@ -1324,7 +1324,7 @@
} else if (requestedSessionIdFromCookie.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDFROMCOOKIE;
} else if (requestedSessionIdValid.equals(fieldInfo.value)){
-fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONID;
+fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDVALID;
} else if (contentLength.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_CONTENTLENGTH;
} else if (characterEncoding.equals(fieldInfo.value)){
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30383] - JK2 runtime reconfiguration doesn't work on win2k3 IIS6
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30383 JK2 runtime reconfiguration doesn't work on win2k3 IIS6 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 13:06 --- I made it work. Problem was that the Website was outdated. The info on http://jakarta.apache.org/tomcat/connectors- doc/jk2/jk2/configwebcom.html#Common%20properties is invalid! It sais that version is a common property, instead, it is ver. Also on http://jakarta.apache.org/tomcat/connectors- doc/jk2/jk2/installhowto.html#Installation it sais that the registry entry HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi Redirector\2.0 - serverRoot has to point to the tomcat Installation. This does not apply on windows-systems, when the tomcat is on a different server. Instead, this entriy HAS TO point to the dir where workers2.properties resides. With that corrected, it works. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Request: Webpage update jakarta.apache.org/tomcat/connectors-doc /jk2/jk2/ for IIS-Setup
Hi Webmasters of that site, Some errors re: Setup on Windows/IIS/JK2 (2.0.4) took me a week to find out. Please correct! See resolved Bug [Bug 30383] Problem was that the Website was outdated. The info on http://jakarta.apache.org/tomcat/connectors-doc/jk2/jk2/ configwebcom.html#Common%20properties is invalid! It says that version is a common property, instead, it is ver. Also on http://jakarta.apache.org/tomcat/connectors-doc/jk2/jk2/installhowto.html#In stallation it says that the registry entry HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi Redirector\2.0 - serverRoot has to point to the tomcat Installation. This does not apply to environments where the tomcat is on a different server. Instead, this entry HAS TO point to the dir where workers2.properties resides. Please update the Website or tell me where I can do it. Also, would be nice to update the IIS-Part of that site, a lot referes only to JK1, and IIS6 in IIS6-mode works too now. Last thing: The anchors on the side would work better when you would not use spaces in them. (e.g. ..m.html#Common%20properties - ...html#Common_properties or similar) -- Bjoern Andersen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30286] - JK2 ISAPI registry settings serverRoot required
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30286. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30286 JK2 ISAPI registry settings serverRoot required [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 13:21 --- *** This bug has been marked as a duplicate of 30383 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30383] - JK2 runtime reconfiguration doesn't work on win2k3 IIS6
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30383 JK2 runtime reconfiguration doesn't work on win2k3 IIS6 --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 13:21 --- *** Bug 30286 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30594] New: - JK2 modjk-configuration - updateInterval simple-to-fix error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30594. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30594 JK2 modjk-configuration - updateInterval simple-to-fix error Summary: JK2 modjk-configuration - updateInterval simple-to- fix error Product: Tomcat 5 Version: 5.0.27 Platform: PC URL: http://jakarta.apache-korea.org/tomcat/tomcat-4.1- doc/jk2/jk2/configtccom.html#modjk OS/Version: Windows XP Status: NEW Severity: Major Priority: Other Component: Native:JK AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When configuring a modjk-connection to the webserver-end jkstatuspage in the jk2.properties, the properties are (not verry well) described here: http://jakarta.apache-korea.org/tomcat/tomcat-4.1- doc/jk2/jk2/configtccom.html#modjk All works as expected, except when setting updateInterval, e.g. modjk.updateInterval=5000 stdout.log produces something like the attached log. I didn't inspect the code, but I guess somebody missed to typecast this value from string to long somewhere. All other (Strings) work fine. Should be easy to fix, so please do it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30594] - JK2 modjk-configuration - updateInterval simple-to-fix error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30594. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30594 JK2 modjk-configuration - updateInterval simple-to-fix error --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 14:38 --- Created an attachment (id=12391) Logfile part from Tomcat trying to start the coyote/jk2 against the fronten-webserver - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.h
mturk 2004/08/11 08:31:19
Modified:ajp/proxy mod_proxy.h
Log:
Added proxy status for conf, and elected member to runtime worker
Revision ChangesPath
1.31 +7 -0 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_proxy.h 10 Aug 2004 14:58:24 - 1.30
+++ mod_proxy.h 11 Aug 2004 15:31:18 - 1.31
@@ -170,6 +170,12 @@
apr_array_header_t* cookie_domains;
const apr_strmatch_pattern* cookie_path_str;
const apr_strmatch_pattern* cookie_domain_str;
+enum {
+status_off,
+status_on,
+status_full
+} proxy_status; /* Status display options */
+char proxy_status_set;
} proxy_server_conf;
@@ -261,6 +267,7 @@
double lbfactor; /* dynamic lbfactor */
apr_size_t transfered; /* Number of bytes transfered to remote */
apr_size_t readed; /* Number of bytes readed from remote */
+apr_size_t elected;/* Number of times the worker was elected */
} proxy_runtime_stat;
/* Runtime worker. */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
mturk 2004/08/11 08:32:55
Modified:ajp/proxy mod_proxy.c
Log:
Added mod_status extension for displaying runtime
status informations for load balancer.
Revision ChangesPath
1.35 +129 -2jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_proxy.c 10 Aug 2004 18:00:16 - 1.34
+++ mod_proxy.c 11 Aug 2004 15:32:55 - 1.35
@@ -18,8 +18,8 @@
#include mod_proxy.h
#include mod_core.h
-
#include apr_optional.h
+#include mod_status.h
#if (MODULE_MAGIC_NUMBER_MAJOR 20020903)
#include mod_ssl.h
@@ -1233,6 +1233,27 @@
return NULL;
}
+static const char*
+set_status_opt(cmd_parms *parms, void *dummy, const char *arg)
+{
+proxy_server_conf *psf =
+ap_get_module_config(parms-server-module_config, proxy_module);
+
+if (strcasecmp(arg, Off) == 0)
+psf-proxy_status = status_off;
+else if (strcasecmp(arg, On) == 0)
+psf-proxy_status = status_on;
+else if (strcasecmp(arg, Full) == 0)
+psf-proxy_status = status_full;
+else {
+return ProxyStatus must be one of:
+off | on | block;
+}
+
+psf-proxy_status_set = 1;
+return NULL;
+}
+
static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)
{
server_rec *s = cmd-server;
@@ -1294,7 +1315,7 @@
return apr_pstrcat(cmd-temp_pool, BalancerMember , err, NULL);
}
/* Try to find the balancer */
-balancer = ap_proxy_get_balancer(cmd-temp_pool, conf, name);
+balancer = ap_proxy_get_balancer(cmd-temp_pool, conf, path);
if (!balancer) {
const char *err = ap_proxy_add_balancer(balancer,
cmd-pool,
@@ -1485,6 +1506,8 @@
A balancer name and scheme with list of params),
AP_INIT_TAKE12(BalancerStickySession, set_sticky_session, NULL,
RSRC_CONF|ACCESS_CONF,
A balancer and sticky session name),
+AP_INIT_TAKE1(ProxyStatus, set_status_opt, NULL, RSRC_CONF,
+ Configure Status: proxy status to one of: on | off | full),
{NULL}
};
@@ -1522,6 +1545,108 @@
return OK;
}
+
+#define KBYTE 1024
+#define MBYTE 1048576L
+#define GBYTE 1073741824L
+
+/* Format the number of bytes nicely */
+static void format_byte_out(request_rec *r, apr_off_t bytes)
+{
+
+if (bytes (5 * KBYTE))
+ap_rprintf(r, %d B, (int) bytes);
+else if (bytes (MBYTE / 2))
+ap_rprintf(r, %.1f kB, (float) bytes / KBYTE);
+else if (bytes (GBYTE / 2))
+ap_rprintf(r, %.1f MB, (float) bytes / MBYTE);
+else
+ap_rprintf(r, %.1f GB, (float) bytes / GBYTE);
+}
+
+/*
+ * proxy Extension to mod_status
+ */
+static int proxy_status_hook(request_rec *r, int flags)
+{
+int i, n;
+void *sconf = r-server-module_config;
+proxy_server_conf *conf = (proxy_server_conf *)
+ap_get_module_config(sconf, proxy_module);
+proxy_balancer *balancer = NULL;
+proxy_runtime_worker *worker = NULL;
+
+if (flags AP_STATUS_SHORT || conf-balancers-nelts == 0 ||
+conf-proxy_status == status_off)
+return OK;
+
+balancer = (proxy_balancer *)conf-balancers-elts;
+for (i = 0; i conf-balancers-nelts; i++) {
+ap_rputs(hr /\nh1Proxy LoadBalancer Status for , r);
+ap_rvputs(r, balancer-name, /h1\n\n, NULL);
+ap_rputs(\n\ntable border=\0\tr
+ thSSes/ththTimeout/th
+ /tr\ntr, r);
+ap_rvputs(r, td, balancer-sticky, NULL);
+ap_rprintf(r, /tdtd%d %d sec/td\n, i,
+ apr_time_sec(balancer-timeout));
+ap_rputs(/table\n, r);
+ap_rputs(\n\ntable border=\0\tr
+ thSch/ththHost/th
+ thRoute/ththRedir/th
+ thF/ththAcc/ththWr/ththRd/th
+ /tr\n, r);
+
+worker = (proxy_runtime_worker *)balancer-workers-elts;
+for (n = 0; n balancer-workers-nelts; n++) {
+
+ap_rvputs(r, tr\ntd, worker-w-scheme, /td, NULL);
+ap_rvputs(r, td, worker-w-hostname, /td, NULL);
+ap_rvputs(r, td, worker-w-route, NULL);
+ap_rvputs(r, /tdtd, worker-w-redirect, NULL);
+ap_rprintf(r, /tdtd%.2f/td, worker-s-lbfactor);
+ap_rprintf(r, td%d/tdtd, (int)(worker-s-elected));
+format_byte_out(r, worker-s-transfered);
+ap_rputs(/tdtd, r);
+format_byte_out(r, worker-s-transfered);
+ap_rputs(/td\n,
cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_util.c
mturk 2004/08/11 08:34:27 Modified:ajp/proxy proxy_util.c Log: Fix setting of hostname for backend. The now reflects the real name withouth scheme:// prefix. Revision ChangesPath 1.27 +3 -1 jakarta-tomcat-connectors/ajp/proxy/proxy_util.c Index: proxy_util.c === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_util.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- proxy_util.c 11 Aug 2004 10:49:49 - 1.26 +++ proxy_util.c 11 Aug 2004 15:34:26 - 1.27 @@ -1129,9 +1129,11 @@ ap_str_tolower(uri); *worker = apr_array_push(conf-workers); memset(*worker, 0, sizeof(proxy_worker)); -(*worker)-name = (*worker)-hostname = apr_pstrdup(p, uri); +(*worker)-name = apr_pstrdup(p, uri); *c = '\0'; (*worker)-scheme = uri; +(*worker)-hostname = c + 3; + if (port == -1) port = apr_uri_port_of_scheme((*worker)-scheme); (*worker)-port = port; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy config.m4
mturk 2004/08/11 08:35:50 Modified:ajp/proxy config.m4 Log: Add ../generators to include path, so that mod_status.h can be reached. Revision ChangesPath 1.4 +1 -0 jakarta-tomcat-connectors/ajp/proxy/config.m4 Index: config.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/config.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.m4 9 Aug 2004 08:05:31 - 1.3 +++ config.m4 11 Aug 2004 15:35:50 - 1.4 @@ -30,6 +30,7 @@ ;; esac +APR_ADDTO(INCLUDES, [-I../generators]) APACHE_MODULE(proxy_connect, Apache proxy CONNECT module, $proxy_connect_objs, , $proxy_mods_enable) APACHE_MODULE(proxy_ftp, Apache proxy FTP module, $proxy_ftp_objs, , $proxy_mods_enable) APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , $proxy_mods_enable) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.dsp
mturk 2004/08/11 08:37:18 Modified:ajp/proxy mod_proxy.dsp Log: Add ../generators to include path, so that mod_status.h can be reached. Revision ChangesPath 1.2 +2 -2 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.dsp Index: mod_proxy.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_proxy.dsp 3 Aug 2004 10:01:18 - 1.1 +++ mod_proxy.dsp 11 Aug 2004 15:37:18 - 1.2 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ../ssl /I ../../include /I ../../srclib/apr/include /I ../../srclib/apr-util/include /D NDEBUG /D WIN32 /D _WINDOWS /D PROXY_DECLARE_EXPORT /FdRelease\mod_proxy_src /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ../ssl /I ../../include /I ../../srclib/apr/include /I ../../srclib/apr-util/include /I ../generators /D NDEBUG /D WIN32 /D _WINDOWS /D PROXY_DECLARE_EXPORT /FdRelease\mod_proxy_src /FD /c # ADD BASE MTL /nologo /D NDEBUG /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d NDEBUG @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D WIN32 /D _DEBUG /D _WINDOWS /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ../ssl /I ../../include /I ../../srclib/apr/include /I ../../srclib/apr-util/include /D _DEBUG /D WIN32 /D _WINDOWS /D PROXY_DECLARE_EXPORT /FdDebug\mod_proxy_src /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ../ssl /I ../../include /I ../../srclib/apr/include /I ../../srclib/apr-util/include /I ../generators /D _DEBUG /D WIN32 /D _WINDOWS /D PROXY_DECLARE_EXPORT /FdDebug\mod_proxy_src /FD /c # ADD BASE MTL /nologo /D _DEBUG /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d _DEBUG - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
mturk 2004/08/11 08:46:54 Modified:ajp/proxy mod_proxy.c Log: Small status displaying fix. Revision ChangesPath 1.36 +1 -1 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c Index: mod_proxy.c === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mod_proxy.c 11 Aug 2004 15:32:55 - 1.35 +++ mod_proxy.c 11 Aug 2004 15:46:54 - 1.36 @@ -1588,7 +1588,7 @@ thSSes/ththTimeout/th /tr\ntr, r); ap_rvputs(r, td, balancer-sticky, NULL); -ap_rprintf(r, /tdtd%d %d sec/td\n, i, +ap_rprintf(r, /tdtd%d/td\n, apr_time_sec(balancer-timeout)); ap_rputs(/table\n, r); ap_rputs(\n\ntable border=\0\tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[proxy] New implementation ready for testing
Hi all, We've finished the initial development of extended mod_proxy. Since the development took place at jakata-tomcat-connectors, the source code can be found under ajp/proxy. Here is the list of major features added: 1. AJP13 protocol support 2. Connection pool for threaded servers 3. Added new module proxy_balancer 4. Added mod_status extended information hook. Connection pool: The connection pool enables reusing backend connections and was build around apr_reslist. At the moment only the proxy_ajp extensively uses this connection pool, with performance slightly better then mod_jk. Http module also uses connection pool, but only to the level of skipping DNS lookup, and shows around 20% performance boost over the current implementation. Ftp module although uses the connection pool will need more testing. proxy_balancer: The new proxy balancer is capable to balance the load trough the cluster of backend server. For the moment the implemented algorithm is based on the preset dispatch factor, counting the number of connections processed on each node. It can mix the protocols so one can make a cluster containing the http, ajp and ftp backends, although the usability of such configuration is questionable. TODO: 1. Testing 2. Bugfixing 3. finish AJP13 (ssl + resend) P.S. I'll be on vacation for the next two weeks, and unreachable by the standard electronic devices. Regards, MT. smime.p7s Description: S/MIME Cryptographic Signature
DO NOT REPLY [Bug 29671] - Context don't start with multiple HTTP 1.1 connectors
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29671. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29671 Context don't start with multiple HTTP 1.1 connectors [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:22 --- Resolution INVALID?!? How is this not a bug? I am having the same problem with 3 Connectors defined. Sometimes I get the error and when I do, one of my connectors is unavailable. Sometimes I don't get the error and when I don't, all connectors are available. So again I am left wondering as to how this is not a bug. Perhaps Tomcat should use a Hashtable or a synchronized HashMap to avoid the ConcurrentModificationException. Marion Bass [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30587] - ExtendedAccessLogValve typo for x-H(requestedSessionIdValid)
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30587. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30587 ExtendedAccessLogValve typo for x-H(requestedSessionIdValid) [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:35 --- OK, fixed. Thanks for submitting the patch. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/08/11 09:33:56
Modified:catalina/src/share/org/apache/catalina/valves
ExtendedAccessLogValve.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 30587.
Revision ChangesPath
1.10 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtendedAccessLogValve.java 23 Jun 2004 08:24:57 - 1.9
+++ ExtendedAccessLogValve.java 11 Aug 2004 16:33:56 - 1.10
@@ -1324,7 +1324,7 @@
} else if (requestedSessionIdFromCookie.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDFROMCOOKIE;
} else if (requestedSessionIdValid.equals(fieldInfo.value)){
-fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONID;
+fieldInfo.location = FieldInfo.X_LOC_REQUESTEDSESSIONIDVALID;
} else if (contentLength.equals(fieldInfo.value)){
fieldInfo.location = FieldInfo.X_LOC_CONTENTLENGTH;
} else if (characterEncoding.equals(fieldInfo.value)){
1.89 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- changelog.xml 6 Aug 2004 13:14:25 - 1.88
+++ changelog.xml 11 Aug 2004 16:33:56 - 1.89
@@ -67,6 +67,9 @@
update
Fixed broken link to JK documenration from AJP Connector reference page.
(yoavs)
/update
+ fix
+bug30587/bug: Typo in ExtendedAccessLogValve. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30535] - Servlet mapping fails when url includes semicolon
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30535. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30535 Servlet mapping fails when url includes semicolon --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:36 --- I think the Servlet Specification v2.4 doesn't mandate us to map URLs with colons, as that's a URL terminator. Can you show otherwise? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30510] - Tomcat shutdown does not work properly when started as daemon
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30510. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30510 Tomcat shutdown does not work properly when started as daemon [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:38 --- This is an internal VM crash, not Tomcat's fault. Make sure you JDK installation is legit and you have installed the required SunSolve patches for your OS, if using a Snu JDK and such patches are mentioned. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28256] - WebappClassLoader.findClassInternal() permission problems
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28256. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28256 WebappClassLoader.findClassInternal() permission problems --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:40 --- With the current refactoring of classloaders for Tomcat 5.next (or 5.1, or 5.5, or whatever), I'm probably going to close this item as it will no longer be relevant. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29867] - jdbc database Connecting pool leak
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29867. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29867 jdbc database Connecting pool leak --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 16:45 --- This is what we get for adding convenience features like DefaultContext. I recommend you stick to the Servlet Spec and declare the connection pool in your context element only, not in the DefaultContext. The latter also has the undesirable side effect of creating one pool per context, so the total number of connections can be higher than you wanted. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30602] New: - Subject is not available during the first call to the servlet which use the basic authentication
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=30602.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=30602
Subject is not available during the first call to the servlet which use the basic
authentication
Summary: Subject is not available during the first call to the
servlet which use the basic authentication
Product: Tomcat 5
Version: 5.0.27
Platform: All
OS/Version: Other
Status: NEW
Severity: Critical
Priority: Other
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Hi,
I’m using jakarta-tomcat-5.0.27-src and Windows XP.
I made a servlet that print current subject principals (authenticated user).
The servlet code is:
code
private void doQuery(
HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
response.setContentType(text/html);
PrintWriter out = response.getWriter();
out.println(HTML);
out.println(HEAD);
out.println(TITLETestServletProtected/TITLE);
out.println(META HTTP-EQUIV=\Pragma\ CONTENT=\no-cache\);
out.println(META HTTP-EQUIV=\Expires\ CONTENT=\-1\);
out.println(/HEAD);
out.println(BODY);
out.println(br);
out.println(request.getAuthType());
out.println(/br);
out.println(br);
out.println(request.getRemoteUser());
out.println(/br);
out.println(br);
out.println(request.getUserPrincipal());
out.println(/br);
out.println(br);
out.println(request.isUserInRole(tomcat));
out.println(/br);
out.println(br);
out.println(request.isUserInRole(admin));
out.println(/br);
Subject subject = Subject.getSubject(AccessController.getContext());
out.println(br);
out.println(subject);
out.println(/br);
subject =
(Subject) request.getSession(true).getAttribute(
javax.security.auth.subject);
out.println(br);
out.println(subject);
out.println(/br);
out.println(/BODY);
out.println(/BODY);
out.println(/HTML);
out.close();
}
/code
The first time I call this servlet I get:
BASIC
tomcat
GenericPrincipal[tomcat(admin,manager,tomcat,)]
true
true
null
null
The next time I get:
BASIC
tomcat
GenericPrincipal[tomcat(admin,manager,tomcat,)]
true
true
Subject: Principal: GenericPrincipal[tomcat(admin,manager,tomcat,)]
Subject: Principal: GenericPrincipal[tomcat(admin,manager,tomcat,)]
I found that SecurityUtil.execute trying to find the subject in the current
session,
but because the session is not been created yet, the subject passed to the
function
Subject.doAsPrivileged is null.
When I changed the code in the function SecurityUtil.execute to:
// The first argument is always the request object
if (targetArguments != null
targetArguments[0] instanceof HttpServletRequest){
HttpServletRequest request =
(HttpServletRequest)targetArguments[0];
HttpSession session = request.getSession(false);
if (session != null){
subject =(Subject)session.getAttribute(Globals.SUBJECT_ATTR);
}
if ((subject == null) (principal != null)){
subject = new Subject();
subject.getPrincipals().add(principal);
if(session != null) {
session.setAttribute(Globals.SUBJECT_ATTR, subject);
}
}
}
Everything looks OK except that the subject is not in the session
(request.getSession(true).getAttribute(
javax.security.auth.subject); return null).
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15557] - Remove use of URL.setURLStreamHandlerFactory()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15557. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=15557 Remove use of URL.setURLStreamHandlerFactory() [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 17:33 --- http://marc.theaimsgroup.com/?t=10921872912r=1w=2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29631] - customize URL.setURLStreamHandlerFactory
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29631. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29631 customize URL.setURLStreamHandlerFactory [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 17:33 --- http://marc.theaimsgroup.com/?t=10921872912r=1w=2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30128] - StandardDefaultContext don't handle LifecycleListener correct
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30128. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30128 StandardDefaultContext don't handle LifecycleListener correct --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 17:34 --- Why bother with LifecycleListener instead of ServletContextListener? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
At 11:14 AM 8/11/2004, Mladen Turk wrote: We've finished the initial development of extended mod_proxy. Since the development took place at jakata-tomcat-connectors, the source code can be found under ajp/proxy. That's something of a shame, because we lose the development history importing the finished effort, and it was further disappointing that you didn't bring across the earlier cvs history so this branch could be brought back into httpd/modules/proxy with a complete history. I'm actually very excited that we can offer in the 2.2 release - this really rocks. What you accomplished is very cool! I'm entirely +1 today for bringing it back into modules/proxy/ (it's a c-t-r branch.) How you did it makes this a non-trivial exercise. Boo :( (Sorry my earlier responses only seem to have hit httpd-dev, due to trashcan'ned moderation and my list-receipt email differing from my -accept from account differing.) Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30482] - ERROR:JSP:_jspx_meth_bean_message_0:struts compile error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30482. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30482 ERROR:JSP:_jspx_meth_bean_message_0:struts compile error --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 17:47 --- I was not able to read you attachment. It's not a jar or zip file. Can you just give me a war file? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [AJP] proxy status
At 02:15 PM 8/7/2004, Costin wrote: Now let's see how to get this in Apache2.0... Gonna try to make that happen, if I can somehow merge history (ick) It would be great if we would have at least one or 2 people who are committers in both projects. Since we can't propose Mladen in apache, maybe we can convince Graham to join tomcat :-) Can't propose mturk? Why, because he is already active in httpd space? I actually am thinking that generation 2 of mod_aspdotnet will support the ajp connector for out-of-process ASP.NET content ;-) I would like to see ajp discussion back on httpd, or failing that, should we resurrect [EMAIL PROTECTED] for lower bandwidth discussion by both groups? Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
At 11:14 AM 8/11/2004, Mladen Turk wrote: The connection pool enables reusing backend connections and was build around apr_reslist. At the moment only the proxy_ajp extensively uses this connection pool, with performance slightly better then mod_jk. I noticed one huge win - unless I'm misreading... we don't require any includes from j2sdk/include/ ??? That in and of itself is great :) Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
William A. Rowe, Jr. wrote: We've finished the initial development of extended mod_proxy. Since the development took place at jakata-tomcat-connectors, the source code can be found under ajp/proxy. I'm entirely +1 today for bringing it back into modules/proxy/ (it's a c-t-r branch.) How you did it makes this a non-trivial exercise. Boo :( Mea culpa :( Never cross my mind that we'll need all those try-error-fix commits back on the httpd cvs tree. Regards, MT. smime.p7s Description: S/MIME Cryptographic Signature
Re: [proxy] New implementation ready for testing
Mladen Turk wrote: Hi all, We've finished the initial development of extended mod_proxy. Since the development took place at jakata-tomcat-connectors, the source code can be found under ajp/proxy. Here is the list of major features added: 1. AJP13 protocol support 2. Connection pool for threaded servers 3. Added new module proxy_balancer 4. Added mod_status extended information hook. Connection pool: The connection pool enables reusing backend connections and was build around apr_reslist. At the moment only the proxy_ajp extensively uses this connection pool, with performance slightly better then mod_jk. Http module also uses connection pool, but only to the level of skipping DNS lookup, and shows around 20% performance boost over the current implementation. Ftp module although uses the connection pool will need more testing. So compared to AJP, this gives what ? Q: is there session stickiness in HTTP ? Congratulations for improving on mod_jk performance :) proxy_balancer: The new proxy balancer is capable to balance the load trough the cluster of backend server. For the moment the implemented algorithm is based on the preset dispatch factor, counting the number of connections processed on each node. It can mix the protocols so one can make a cluster containing the http, ajp and ftp backends, although the usability of such configuration is questionable. Does it do session stickiness right now ? TODO: 1. Testing 2. Bugfixing 3. finish AJP13 (ssl + resend) P.S. I'll be on vacation for the next two weeks, and unreachable by the standard electronic devices. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.next] Progress, more ideas and native connector benchmarks
Some updates ... Remy Maucherat wrote: * Default global and per-host configurations: - conf/engine/host/context.xml.default - conf/engine/host/web.xml.default - conf/context.xml - conf/web.xml This will lead to the removal of the DefaultContext interface, since this will fully replace the functionality (while being very simple to implement and actually complete functionality wise; I have no idea why I never thought of doing it this way, since the default web.xml is implemented like that). For the admin webapp support for DefaultContext, we would simply need to register a Context instance in JMX with the usual DefaultContext MBean name, and tweak a little. So I'll now proceed with removing DefaultContext and creating the new MBeans. * HTML host manager servlet (allows easily creating host and preconfiguring them - ex: with the manager webapp installed, and a default context file). I think this would be useful (?). My next big item :) * The other features I mentioned earlier: startup time optimization, removal of stuff which isn't used (such as container listeners). In other features, I added package renaming for DBCP. It is less useful with Ant IMO. I'll experiment a little, although untangling the javac task seems rather hard ;) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
William A. Rowe, Jr. wrote: That's something of a shame, because we lose the development history importing the finished effort, and it was further disappointing that you didn't bring across the earlier cvs history so this branch could be brought back into httpd/modules/proxy with a complete history. Ideally though I personally would like to see proxy_ajp in httpd v2.0 (assuming it's practical, which could only be assessed once proxy_ajp existed). Getting it into a working form first, then getting it into v2.1, and then backporting it in clean logical sections to http v2.0 means it may be possible to get it into httpd v2.0, without small bugfix commits getting in the way. I'm actually very excited that we can offer in the 2.2 release - this really rocks. What you accomplished is very cool! I'm entirely +1 today for bringing it back into modules/proxy/ (it's a c-t-r branch.) How you did it makes this a non-trivial exercise. Boo :( My plan is to start bringing it into httpd v2.1 from next week, assessing how hard the backports to httpd v2.0 would potentially be. Is the history kept in the tomcat connector tree enough, or is it critical to get the full history into httpd HEAD? Regards, Graham -- smime.p7s Description: S/MIME Cryptographic Signature
Re: [proxy] New implementation ready for testing
Remy Maucherat wrote: Q: is there session stickiness in HTTP ? As I understood from the commits, stickiness is part of balancer, and balancer is protocol independant, which would make the answer yes. Am I understanding correctly? Regards, Graham -- smime.p7s Description: S/MIME Cryptographic Signature
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml installhowto.xml
yoavs 2004/08/11 11:06:27 Modified:jk/xdocs/jk2 configwebcom.xml installhowto.xml Log: Corrected docs per email comments to tomcat-dev in thread titled Request: Webpage update jakarta.apache.org/tomcat/connectors-doc/jk2/jk2/ for IIS-Setup Revision ChangesPath 1.19 +62 -42jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml Index: configwebcom.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- configwebcom.xml 26 May 2004 07:06:00 - 1.18 +++ configwebcom.xml 11 Aug 2004 18:06:27 - 1.19 @@ -15,51 +15,71 @@ See the License for the specific language governing permissions and limitations under the License. /copyright + properties -titleComponents/title -author email=[EMAIL PROTECTED]Costin Manolache/author -author email=[EMAIL PROTECTED]Jean-Frederic Clere/author -date$Date$/date + titleComponents/title + + author email=[EMAIL PROTECTED]Costin Manolache/author + author email=[EMAIL PROTECTED]Jean-Frederic Clere/author + author email=[EMAIL PROTECTED]Yoav Shapira/author + + date$Date$/date /properties -section name=IntropEach component instance has a name, that is used for configuration and at runtime. Each component has a number of configurable properties. The following rules are used: -ulliThe name is composed from the type and a local part, separated with a ':' ( example: channel.unixsocket:/tmp/jk.socket ) /li -liThe 'type' consist of '.' and ascii characters. It is mapped to a JMX 'domain'. /li -liThe local part consists of ascii characters and .:/; -pNote that '=,' are not currently allowed - a future version may support the jmx syntax by using quotes to separate the local part from the property and value ( in .properties mode we must use '=' to separate the value from type, local name and property name ). /p/li -liThe property is a simple name, with no dots. /li -liA simple form of substitution is used in values, where $(property) will be replaced with a previously defined setting. If the property has ':' in it, it'll take the value from the object, if not it'll take the value from a global map./li/ul/p + +section name=Intro + p +Each component instance has a name, that is used for configuration and at runtime. +Each component has a number of configurable properties. The following rules are used: +ul + liThe name is composed from the type and a local part, separated with a ':' ( example: channel.unixsocket:/tmp/jk.socket ) /li + liThe 'type' consist of '.' and ascii characters. It is mapped to a JMX 'domain'. /li + liThe local part consists of ascii characters and .:/; + +p + Note that '=,' are not currently allowed - a future version may support the jmx syntax by using quotes to separate the local part from the property and value ( in .properties mode we must use '=' to separate the value from type, local name and property name ). +/p + /li + liThe property is a simple name, with no dots. /li + liA simple form of substitution is used in values, where $(property) will be replaced with a previously defined setting. If the property has ':' in it, it'll take the value from the object, if not it'll take the value from a global map. + /li +/ul + /p /section -section name=Common properties -pCommon properties for all components/p -p -table -tr -thProperty name/th -thDefault/th -thDescription/th -/tr -tr -tddisabled/td -td0 (false)/td -tddisabled state for the component, 1=true 0=false/td -/tr -tr -tddebug/td -td0 (false)/td -tdDebug level for the component, 0=disabled, 1..10 enabled. Higher levels -generate more debug./td -/tr -tr -tdversion/td -td0/td -td'Generation' of the component config. Important for runtime reconfiguration. -If you edit the config file or set the shmem properties, you need to also -upgrade the version of the modified component. The config layer will detect -the change and call the setter method./td - /tr -/table -/p -/section
Re: [proxy] New implementation ready for testing
Remy Maucherat wrote: So compared to AJP, this gives what ? Nothing regarding performance :) Or you can use the https to connect to the tomcat on the internet. Q: is there session stickiness in HTTP ? Yes. Congratulations for improving on mod_jk performance :) proxy_balancer: Does it do session stickiness right now ? Yes, and redirect_route too. In addition it has options missing from jk. The sticky session param/cookie is configurable. You have a force-sticky option (if there is no backend session replication). MT. smime.p7s Description: S/MIME Cryptographic Signature
RE: Why aren't tomcat connectors their own Product under bugzilla?
Hi, When a user goes to report a bug he has to first search existing bugs. Right now you would have to search under multiple Project entries, and you would have no way of limiting your search by release number since the release numbers are tomcat release numbers, not jk release numbers. You can search Bugzilla for both Tomcat 4 and Tomcat 5 (and Tomcat 3, or for that matter any combination of items in the Program listbox, in one search. You're right that you can't specify JK release numbers, but I think that's not a practical limitation in the Tomcat and connectors world. I bet most people leave the release number field unselected (i.e. search for bugs filed against any release), as the opposite relies on people correctly filing the release number when the file a bug (and people don't do this correctly). Also since the connectors seem to be developed seperately from Tomcat wouldn't it make sense for those developers to have their own product entry to better manage the bugs? The connectors are not developed completely separately from Tomcat. There have been and there will likely be for a while bugs that span both code in the connectors and code in Tomcat. In the past the development used to be tighter, that's true. In the future there may be a separate Tomcat-Connectors or similar Program entry in Bugzilla if we deem it necessary. But right now I think the existing system works fine. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs jndi-datasource-examples-howto.xml
yoavs 2004/08/11 11:23:36 Modified:webapps/docs jndi-datasource-examples-howto.xml Log: Clarified DBCP maxIdle parameter doc per Dirk Verbeeck's mailing list comments. Revision ChangesPath 1.9 +2 -1 jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml Index: jndi-datasource-examples-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jndi-datasource-examples-howto.xml27 May 2004 18:33:11 - 1.8 +++ jndi-datasource-examples-howto.xml11 Aug 2004 18:23:36 - 1.9 @@ -230,7 +230,8 @@ lt;/parametergt; lt;!-- Maximum number of idle dB connections to retain in pool. - Set to 0 for no limit. + Set to -1 for no limit. See also the DBCP documentation on this + and the minEvictableIdleTimeMillis configuration parameter. --gt; lt;parametergt; lt;namegt;maxIdlelt;/namegt; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: JDBC pool configuration bug/ugliness
Hi, OK, docs corrected and clarified. Thanks for pointing that out. Yoav Shapira Millennium Research Informatics -Original Message- From: Dirk Verbeeck [mailto:[EMAIL PROTECTED] Sent: Tuesday, August 10, 2004 12:55 PM To: Tomcat Developers List Subject: Re: JDBC pool configuration bug/ugliness This is a documentation bug, it should be: !-- Maximum number of idle dB connections to retain in pool. Set to -1 for no limit. -- A connection is considered idle when it is returned to the pool by calling conn.close() So by setting maxIdle=0 you never get any connection in the pool effectively disabling the pooling. This is probably not what you want. In your case you want to use the minEvictableIdleTimeMillis parameter. http://jakarta.apache.org/commons/dbcp/configuration.html If a connection is unused (idle) for xxx msec then the pool will close it. -- Dirk Wojciech Sobczuk wrote: hey, i hope that i'm getting to the right people with this email. anyway, the tomcat JDBC connection pool docs state: !-- Maximum number of idle dB connections to retain in pool. Set to 0 for no limit. -- parameter namemaxIdle/name value30/value /parameter well due to this i have to have at least one db connection per website using the database. i'm running a host with 30 such websites and each has 1 DB connections at all times. this isn't exactly critical but i'd like to have those connections dropped and opened up when they're needed, and not at all times like now. the configuration doesn't allow you to set maximum number of idle connections to 0 (anyway, when is a connection considered idle? that isn't covered by the configuration either at least the docs don't mention it). so i'm proposing to allow the user to set the max idle connection number to 0 so that all unused connections for a site can be reclaimed and there isn't always one hanging around. plus to allow the user to set what an idle connection means (how many seconds have to pass without a query before a connection is condered to be idle). thanks, Wojtek - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29671] - Context don't start with multiple HTTP 1.1 connectors
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29671. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29671 Context don't start with multiple HTTP 1.1 connectors [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 18:40 --- It's not a *Tomcat* bug. If you want to file a bug with mx4j, be my guest :). In the meantime, use the JMX RI like Remy suggested. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30510] - Tomcat shutdown does not work properly when started as daemon
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30510. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30510 Tomcat shutdown does not work properly when started as daemon --- Additional Comments From [EMAIL PROTECTED] 2004-08-11 18:43 --- You could also try using the jsvc from the commons-daemon CVS HEAD. The version that ships with TC is known to not shutdown cleanly. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.next] Progress, more ideas and native connector benchmarks
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, August 11, 2004 11:04 AM Subject: Re: [5.next] Progress, more ideas and native connector benchmarks Some updates ... Remy Maucherat wrote: * Default global and per-host configurations: - conf/engine/host/context.xml.default - conf/engine/host/web.xml.default - conf/context.xml - conf/web.xml This will lead to the removal of the DefaultContext interface, since this will fully replace the functionality (while being very simple to implement and actually complete functionality wise; I have no idea why I never thought of doing it this way, since the default web.xml is implemented like that). For the admin webapp support for DefaultContext, we would simply need to register a Context instance in JMX with the usual DefaultContext MBean name, and tweak a little. So I'll now proceed with removing DefaultContext and creating the new MBeans. Actually, admin doesn't really handle DC now, so anything would be an improvement there :). * HTML host manager servlet (allows easily creating host and preconfiguring them - ex: with the manager webapp installed, and a default context file). I think this would be useful (?). My next big item :) * The other features I mentioned earlier: startup time optimization, removal of stuff which isn't used (such as container listeners). In other features, I added package renaming for DBCP. It is less useful with Ant IMO. I'll experiment a little, although untangling the javac task seems rather hard ;) It certainly made Gump unhappy :). Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
At 01:03 PM 8/11/2004, Graham Leggett wrote: William A. Rowe, Jr. wrote: That's something of a shame, because we lose the development history importing the finished effort, and it was further disappointing that you didn't bring across the earlier cvs history so this branch could be brought back into httpd/modules/proxy with a complete history. Ideally though I personally would like to see proxy_ajp in httpd v2.0 (assuming it's practical, which could only be assessed once proxy_ajp existed). Getting it into a working form first, then getting it into v2.1, and then backporting it in clean logical sections to http v2.0 means it may be possible to get it into httpd v2.0, without small bugfix commits getting in the way. Since it will take some time to assess that the changes and new features are stable, v.s. dev quality, I believe it's sorta pointless to put extra energy into the 2.0 backport. We won't compromise mod_proxy again in 2.0 after its very slow crawl to some measure of stability. So count me a pretty strong -1 for backporting any major refactoring of proxy for 2.0. You know what pain it took for proxy to be accepted as useful (v.s. 1.3). This is a pretty significant leap, so it really doesn't make that much sense to compromise things. I'm actually very excited that we can offer in the 2.2 release - this really rocks. What you accomplished is very cool! I'm entirely +1 today for bringing it back into modules/proxy/ (it's a c-t-r branch.) How you did it makes this a non-trivial exercise. Boo :( My plan is to start bringing it into httpd v2.1 from next week, assessing how hard the backports to httpd v2.0 would potentially be. Is the history kept in the tomcat connector tree enough, or is it critical to get the full history into httpd HEAD? If it weren't critical, the Apache Group would still be kicking around patch files and tarballs :) I'm looking at the mechanics of moving this already. 2.1-dev stays C-T-R just to avoid this sort of mess and encourage new contributions. If folks would focus on adding the new wiz-bang stuff to 2.1-dev, and not obsess over backports, 2.2 would already be out the door, IMHO :) Obviously, if there were no other way, it would be a no-brainer that some 2.0 feature (or separate downloadable patch) would be appropriate. It wouldn't be a stretch to have a little conditional #if APR_MAJOR 1 logic to offer backwards compatibility, then an end user could build their httpd with the 2.1-dev proxy tree instead of the 2.0 flavor. But with both _jk and _jk2, there are options - this is simply a monumental improvement over the old way. That's why versions exist in the first place :) Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
How to send a patch
Hello dudes, could anyone here tell how can i send a patch? I don´t know if i should send all files in one email or one email per file. Regards, Edson
RE: How to send a patch
Hi, See the Patches section at http://jakarta.apache.org/site/source.html. Yoav Shapira Millennium Research Informatics -Original Message- From: Edson Alves Pereira [mailto:[EMAIL PROTECTED] Sent: Wednesday, August 11, 2004 3:02 PM To: Tomcat-DeveloperList (E-mail) Subject: How to send a patch Hello dudes, could anyone here tell how can i send a patch? I don´t know if i should send all files in one email or one email per file. Regards, Edson - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [5.next] Progress, more ideas and native connector benchmarks
Bill Barker wrote: It certainly made Gump unhappy :). Ooops, yes, it's going to be a problem. It's quite hard to build my custom JAR :( Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Fwd: Re: [proxy] New implementation ready for testing
Mr./mrs. Moderator I am a Turkish. I don't want those e - mails. Do you Yahoo!? Yahoo! Mail is new and improved - Check it out!---BeginMessage--- William A. Rowe, Jr. wrote: That's something of a shame, because we lose the development history importing the finished effort, and it was further disappointing that you didn't bring across the earlier cvs history so this branch could be brought back into httpd/modules/proxy with a complete history. Ideally though I personally would like to see proxy_ajp in httpd v2.0 (assuming it's practical, which could only be assessed once proxy_ajp existed). Getting it into a working form first, then getting it into v2.1, and then backporting it in clean logical sections to http v2.0 means it may be possible to get it into httpd v2.0, without small bugfix commits getting in the way. I'm actually very excited that we can offer in the 2.2 release - this really rocks. What you accomplished is very cool! I'm entirely +1 today for bringing it back into modules/proxy/ (it's a c-t-r branch.) How you did it makes this a non-trivial exercise. Boo :( My plan is to start bringing it into httpd v2.1 from next week, assessing how hard the backports to httpd v2.0 would potentially be. Is the history kept in the tomcat connector tree enough, or is it critical to get the full history into httpd HEAD? Regards, Graham -- smime.p7s Description: S/MIME Cryptographic Signature ---End Message--- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
William A. Rowe, Jr. wrote: Since it will take some time to assess that the changes and new features are stable, v.s. dev quality, I believe it's sorta pointless to put extra energy into the 2.0 backport. We won't compromise mod_proxy again in 2.0 after its very slow crawl to some measure of stability. So count me a pretty strong -1 for backporting any major refactoring of proxy for 2.0. You know what pain it took for proxy to be accepted as useful (v.s. 1.3). This is a pretty significant leap, so it really doesn't make that much sense to compromise things. I see your point... In that case I'm now keen to see httpd v2.2 go out the door. :) One of the side effects of this work is that the connection pool and load balancing code is available to proxy_http as well as proxy_ajp, which means a performance boost to the HTTP proxy. The main reason I was keen to see an RPM spec file in the official release was to make it easy for people to use our most recent versions out in the real world, instead of vendor supplied more conservative releases (especially releases minus the experimental modules). It would be cool to see packaging for Debian, or Solaris, etc added as well. This would make it easy for people to deploy our latest releases without being forced to wait for the more conservative vendors to catch up, and in turn get httpd 2.2 onto more servers. Regards, Graham -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [proxy] New implementation ready for testing
At 01:37 PM 8/11/2004, William A. Rowe, Jr. wrote: At 01:03 PM 8/11/2004, Graham Leggett wrote: My plan is to start bringing it into httpd v2.1 from next week, assessing how hard the backports to httpd v2.0 would potentially be. Is the history kept in the tomcat connector tree enough, or is it critical to get the full history into httpd HEAD? If it weren't critical, the Apache Group would still be kicking around patch files and tarballs :) sarcasm=off/ This has been committed with full history retained (dropping a few backed-out patches.) I'm looking at the mechanics of moving this already. This is done. Don't make me hurt you for causing more development on the jakarta-tomcat-connectors/ajp/proxy/ fork!!! Please blast that branch into the attic before someone sends my blood pressure through the roof (again :) Graham, please commit those patches from ajp developers as needed (for the time being.) Remember 2.0-HEAD is C-T-R. I've protected the -I ./ajp within the --enable-proxy-ajp feature, and fixed for broken vpath builds. What about adding a -with-ajp=/path/to/ajp feature, which would enable the proxy-ajp based on the --enable-proxy setting? As it stands with my commits, ajp is disabled unless explicitly enabled (due to the ajplib dependency.) I have no problems if we also add ajp* sources to either modules/proxy itself, or bury it in apr-util (should be brought up with the [EMAIL PROTECTED] list.) Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Response.java
luehe 2004/08/11 16:54:27
Modified:catalina/src/share/org/apache/catalina/connector
Response.java
Log:
Allow Response subclasses to add additional info to rewritten URL
Revision ChangesPath
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java
Index: Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Response.java 28 Jul 2004 20:42:55 - 1.6
+++ Response.java 11 Aug 2004 23:54:27 - 1.7
@@ -1515,7 +1515,7 @@
* @param url URL to be encoded with the session id
* @param sessionId Session id to be included in the encoded URL
*/
-private String toEncoded(String url, String sessionId) {
+protected String toEncoded(String url, String sessionId) {
if ((url == null) || (sessionId == null))
return (url);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [AJP] proxy status
William A. Rowe, Jr. wrote: At 02:15 PM 8/7/2004, Costin wrote: Now let's see how to get this in Apache2.0... Gonna try to make that happen, if I can somehow merge history (ick) It would be great if we would have at least one or 2 people who are committers in both projects. Since we can't propose Mladen in apache, maybe we can convince Graham to join tomcat :-) Can't propose mturk? Why, because he is already active in httpd space? My point was that it is hard to do development across 2 projects, while none of the developers has CVS access in both. If it is not possible to find a solution to the cvs permissions in either apache or tomcat - then maybe it would be good to have it in a separate repository. It may make it easier to also port it to apache2.0, as a separate standalone module. Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina build.xml
billbarker2004/08/11 21:53:10
Modified:catalina build.xml
Log:
Make the name of the new dbcp jar configurable (this is for Gump).
Also key the dbcp and pool flags off of the new jar.
Revision ChangesPath
1.65 +11 -12jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- build.xml 10 Aug 2004 22:42:37 - 1.64
+++ build.xml 12 Aug 2004 04:53:10 - 1.65
@@ -41,20 +41,20 @@
value=${tomcat-jk.home}/build/conf/jk2.properties/
property name=tomcat-http11.jar
value=${tomcat-http11.home}/build/lib/tomcat-http11.jar/
-
+ property name=tomcat-dbcp.jar
+
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
!-- Construct Catalina classpath --
path id=catalina.classpath
pathelement location=${activation.jar}/
pathelement location=${ant.jar}/
pathelement location=${commons-beanutils.jar}/
pathelement location=${commons-collections.jar}/
-pathelement location=${commons-dbcp.jar}/
+pathelement location=${tomcat-dbcp.jar}/
pathelement location=${commons-digester.jar}/
pathelement location=${commons-fileupload.jar}/
pathelement location=${commons-launcher.jar}/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
-pathelement location=${commons-pool.jar}/
pathelement location=${tomcat-util.jar}/
pathelement location=${tomcat-coyote.jar}/
pathelement location=${jaas.jar}/
@@ -83,13 +83,12 @@
pathelement location=${ant.jar}/
pathelement location=${commons-beanutils.jar}/
pathelement location=${commons-collections.jar}/
-pathelement location=${commons-dbcp.jar}/
+pathelement location=${tomcat-dbcp.jar}/
pathelement location=${commons-digester.jar}/
pathelement location=${commons-fileupload.jar}/
pathelement location=${commons-launcher.jar}/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
-pathelement location=${commons-pool.jar}/
pathelement location=${jaas.jar}/
pathelement location=${jcert.jar}/
pathelement location=${jdbc20ext.jar}/
@@ -142,8 +141,8 @@
classname=org.apache.commons.collections.FastHashMap
classpath=${commons-collections.jar}/
available property=dbcp.present
- classname=org.apache.commons.dbcp.ConnectionFactory
- classpath=${commons-dbcp.jar}/
+ classname=org.apache.tomcat.dbcp.dbcp.ConnectionFactory
+ classpath=${tomcat-dbcp.jar}/
available property=digester.present
classname=org.apache.commons.digester.Digester
classpath=${commons-digester.jar}/
@@ -211,8 +210,8 @@
classname=com.sun.jndi.ldap.LdapClient
classpath=${ldap.jar} /
available property=pool.present
- classname=org.apache.commons.pool.ObjectPool
- classpath=${commons-pool.jar}/
+ classname=org.apache.tomcat.dbcp.pool.ObjectPool
+ classpath=${tomcat-dbcp.jar}/
available property=regexp.present
classname=org.apache.regexp.RE
classpath=${regexp.jar} /
@@ -221,7 +220,7 @@
classpath=${xercesImpl.jar} /
!-- JAR files availability flags --
-available property=dbcp.jar.present file=${commons-dbcp.jar} /
+available property=dbcp.jar.present file=${tomcat-dbcp.jar} /
available property=fileupload.jar.present file=${commons-fileupload.jar} /
available property=jaas.jar.present file=${jaas.jar} /
condition property=javamail.jar.present
@@ -247,7 +246,7 @@
available property=ldap.jar.present file=${ldap.jar} /
available property=logging.jar.present file=${commons-logging.jar} /
available property=modeler.jar.present file=${commons-modeler.jar} /
-available property=pool.jar.present file=${commons-pool.jar} /
+available property=pool.jar.present file=${tomcat-dbcp.jar} /
available property=regexp.jar.present file=${regexp.jar} /
available property=servlet-api.jar.present file=${servlet-api.jar} /
available property=tomcat-util.jar.present file=${tomcat-util.jar} /
@@ -545,7 +544,7 @@
copy todir=${catalina.build}/common/lib file=${servlet-api.jar}/
--
copy todir=${catalina.build}/common/lib
-
file=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ file=${tomcat-dbcp.jar} /
!-- Configuration Files --
copy todir=${catalina.build}/conf
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands,
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/08/11 21:56:08
Modified:.build.xml
Log:
Move the dbcp jar building code into its own target (so that Gump can invoke it).
Also make the directory and jar file configurable (mostly for Gump). Cleaned up the
download target so that it isn't so touchy about building the dbcp jar.
Revision ChangesPath
1.195 +26 -16jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- build.xml 10 Aug 2004 22:42:37 - 1.194
+++ build.xml 12 Aug 2004 04:56:08 - 1.195
@@ -55,6 +55,9 @@
property name=tomcat.release value=${basedir}/release/
property name=webapps.buildvalue=${catalina.home}/webapps/build/
property name=webapps.dist value=${catalina.home}/webapps/dist/
+ property name=tomcat-dbcp.home value=${base.path}/tomcat-deps /
+ property name=tomcat-dbcp.jar
+ value=${tomcat-dbcp.home}/naming-factory-dbcp-${commons-dbcp.version}.jar/
!-- Some compilers will disable debugging if true. And it doesn't do anything
in most cases --
@@ -500,18 +503,25 @@
antcall target=downloadgz
param name=sourcefile value=${commons-collections-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
antcall target=downloadgz
param name=sourcefile value=${commons-pool-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
antcall target=downloadgz
param name=sourcefile value=${commons-dbcp-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
- mkdir dir=${base.path}/tomcat-deps/
-copy todir=${base.path}/tomcat-deps
+
+ mkdir dir=${tomcat-dbcp.home}/
+ antcall target=build-tomcat-dbcp
+ param name=basedir value=${tomcat-dbcp.home} /
+ /antcall
+ /target
+
+ target name=build-tomcat-dbcp
+copy todir=${tomcat-dbcp.home}
fileset dir=${commons-collections.home}
include name=**/collections/CursorableLinkedList.java /
include name=**/collections/KeyValue.java /
@@ -529,34 +539,34 @@
exclude name=**/test/** /
/fileset
/copy
- replace dir=${base.path}/tomcat-deps/src/java/org/apache/commons
+ replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
replacefilter token=return UnmodifiableList.decorate(l);
value=return l; /
replacefilter token=import
org.apache.commons.collections.list.UnmodifiableList;
value= /
/replace
- replace dir=${base.path}/tomcat-deps/src/java/org/apache/commons
+ replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
replacefilter token=org.apache.commons
value=org.apache.tomcat.dbcp /
/replace
- mkdir dir=${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp /
- move todir=${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp
- fileset dir=${base.path}/tomcat-deps/src/java/org/apache/commons /
+ mkdir dir=${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp /
+ move todir=${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp
+ fileset dir=${tomcat-dbcp.home}/src/java/org/apache/commons /
/move
- mkdir dir=${base.path}/tomcat-deps/classes/
-javac destdir=${base.path}/tomcat-deps/classes
+ mkdir dir=${tomcat-dbcp.home}/classes/
+javac destdir=classes
optimize=off debug=on
- srcdir=${base.path}/tomcat-deps/src/java
+ sourcepath=${tomcat-dbcp.home}/src/java
+ srcdir=src/java
include name=** /
/javac
-jar
jarfile=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar
+jar jarfile=${tomcat-dbcp.jar}
index=true
- fileset dir=${base.path}/tomcat-deps/classes
+ fileset dir=${tomcat-dbcp.home}/classes
include name=**/*.class /
include name=**/*.properties /
/fileset
/jar
-
/target
target name=build-webapps depends=init
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
