DO NOT REPLY [Bug 39966] - Class Cast Exception inTagHandlerPool

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=39966





--- Additional Comments From [EMAIL PROTECTED]  2006-09-16 13:19 ---
I filed this bug a while ago and have since changed jobs so I cannot reproduce
it. However from what I recall I was using 2.0. 
It is unclear from your comment but are you trying to say that TagHandlerPool is
only used for older versions of JSP? 

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 40218] - JNDI realm - recursive group/role matching

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=40218


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 40525] New: - Native library causes 100% cpu use when idle

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=40525

   Summary: Native library causes 100% cpu use when idle
   Product: Tomcat 5
   Version: 5.5.17
  Platform: PC
OS/Version: Windows 2000
Status: NEW
  Keywords: PatchAvailable
  Severity: normal
  Priority: P3
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


The jni native method poll() in poll.c does not check if the socket has no
timeout (i.e. it does not check if max_ttl is negative) before adjusting the
timeout passed to apr_pollset_poll().  

The timeout passed to apr_pollset_poll() is in the variable 'ptime'.  The
current code sets ptime to zero when there is a valid timeout (usually 2000ms)
and no socket timeout (usually -1000).

These values are common because AprEndpoint.java defaults to pollTime=2000 ms
and soTimeout=-1 sec (which gets adjusted to -1000 ms).

When a zero timeout is passed to apr_pollset_poll(), it is passed along to the 
native select() as a zero timeval which causes select() to return immediately
instead of blocking. A negative value should be passed to apr_pollset_poll() for
an infinite timeout, but I don't think that's what we want here.

The observed result is 100% cpu use when Tomcat is idle because calls to poll()
are made continuously. These calls return immediately.

The solution is to recognize when max_ttl is negative, and if so; do not use it 
to adjust the 'ptime' variable passed as an argument to poll().  Here is a 
patch 
for http://svn.apache.org/repos/asf/tomcat/connectors/trunk/.

Index: jni/native/src/poll.c
===
--- jni/native/src/poll.c   (revision 446772)
+++ jni/native/src/poll.c   (working copy)
@@ -263,7 +263,7 @@
 /* Find the minimum timeout */
 for (i = 0; i < p->nelts; i++) {
 apr_interval_time_t t = now - p->socket_ttl[i];
-if (t >= p->max_ttl) {
+if (p->max_ttl > 0 && t >= p->max_ttl) {
 ptime = 0;
 break;
 }

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 40526] New: - tomcat 5.5.17 catalina.bat - dropped support for JPDA_OPTS environment variable

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=40526

   Summary: tomcat 5.5.17 catalina.bat - dropped support for
JPDA_OPTS environment variable
   Product: Tomcat 5
   Version: 5.5.17
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


We have upgraded from tomcat 4.1.18 to 5.5.17, and have found that our 
system start up process on Windows can no longer set jpda debugger 
options on the tomcat java command line.

This occurs because the 5.5.17 catalina.bat file no longer supports 
the environment variable $JPDA_OPTS, which our start up process used 
to use to place jpda information. What is interesting is that 
catalina.sh STILL supports JPDA_OPTS. So we have this problem on windows only.

Is this an intentional change?

The above comment was sent to tomcate users list. Mark Thomas responded:

Not that I can tell. If you care to create a patch and submit it to bugzilla 
I'll take a look.

I have made the fix, and I am sending it for approval. I have a zip file with 
the correction, and the output of a diff -u on the original and corrected 
version of the catalina.bat and the catalina.sh scripts. I do not see on this 
bug entry page any place to attach this zip file. Please let me know how I can 
send the changes to the community.

Below is a summary of changes made:

Changes include revised catalina.sh and catalina.bat files supporting 
JPDA_OPTS (supported in tomcat 4.1.18), and support for a new JPDA_SUSPEND.

catalina.sh changes:

1. Documented JPDA_OPTS in the script (this was missing) 

2. Added support for JPDA_SUSPEND environment variable. If not specified, it 
defaults to "n" (backward compatible).

catalina.bat changes: 

1. Added back support for JPDA_OPTS. I basically re-implemented as it was in 
tomcat 4.1.18. Note that its only implemented in the non-security execution 
branch (this is how it was in tomcat 4.1.18).

2. Documented JPDA_OPTS in the script.

3. Added support for JPDA_SUSPEND environment variable. If not specified, it 
defaults to "n" (backward compatible).

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 40526] - tomcat 5.5.17 catalina.bat - dropped support for JPDA_OPTS environment variable

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=40526


[EMAIL PROTECTED] changed:

   What|Removed |Added

 AssignedTo|tomcat- |[EMAIL PROTECTED]
   |[EMAIL PROTECTED]  |
 Status|NEW |ASSIGNED




--- Additional Comments From [EMAIL PROTECTED]  2006-09-16 14:40 ---
Created an attachment (id=18874)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18874&action=view)
Zip file that contains correction to catalina.bat and catalina.sh scripts.

Attached is a zip file containing revised catalina.sh and catalina.bat files
supporting JPDA_OPTS (supported in tomcat 4.1.18), and support for a new
JPDA_SUSPEND.

catalina.sh changes:

1. Documented JPDA_OPTS in the script (this was missing) 2. Added support for
JPDA_SUSPEND environment variable. If not specified, it defaults to "n"
(backward compatible).

catalina.bat changes: 

1. Added back support for JPDA_OPTS. I basically re-implemented as it was in
tomcat 4.1.18. Note that its only implemented in the non-security execution
branch (this is how it was in tomcat 4.1.18).

2. Documented JPDA_OPTS in the script.

3. Added support for JPDA_SUSPEND environment variable. If not specified, it
defaults to "n" (backward compatible).


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r446913 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 11:32:04 2006
New Revision: 446913

URL: http://svn.apache.org/viewvc?view=rev&rev=446913
Log:
Exclude disabled worker from the single worker shurtcut in lb.
Even for the single worker case, disabled should behave as documented, i.e.
not accept requests without correct jvm_route.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=446913&r1=446912&r2=446913
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Sep 16 11:32:04 
2006
@@ -601,9 +601,11 @@
  * if there is a single one
  */
 if (JK_WORKER_USABLE_STICKY(p->lb_workers[0].s)) {
-p->lb_workers[0].r = &(p->lb_workers[0].s->jvm_route[0]);
-JK_TRACE_EXIT(l);
-return &p->lb_workers[0];
+if (p->lb_workers[0].s->activation != JK_LB_ACTIVATION_DISABLED) {
+p->lb_workers[0].r = &(p->lb_workers[0].s->jvm_route[0]);
+JK_TRACE_EXIT(l);
+return &p->lb_workers[0];
+}
 }
 else {
 JK_TRACE_EXIT(l);



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

svn commit: r446920 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 12:22:09 2006
New Revision: 446920

URL: http://svn.apache.org/viewvc?view=rev&rev=446920
Log:
Remove unused variable.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=446920&r1=446919&r2=446920
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Sep 16 12:22:09 
2006
@@ -386,7 +386,6 @@
 
 JK_TRACE_ENTER(l);
 if (p && p->worker_private) {
-unsigned int n = 0;
 lb_worker_t *lb = (lb_worker_t *)p->worker_private;
 
 for (i = 0; i < lb->num_of_workers; i++) {



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

svn commit: r446925 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 12:28:51 2006
New Revision: 446925

URL: http://svn.apache.org/viewvc?view=rev&rev=446925
Log:
Add a special environment variable to be able to set
target worker names via env variable.
Useful to combine the more powerful regexps of LocationMatch
and mod_rewrite/mod_env/mod_setenvif with mod_jk.
One can now also control mod_jk via
- SetHandler jakarta-servlet (old feature)
- SetEnv JK_HTTP_WORKER name_of_target_worker
The variable name JK_HTTP_WORKER can be changed via
JkWorkerIndicator NEW_VARIABLE_NAME.
This new features makes it easier to define flexible mappings
depending on ":jsessionid" path info and JSESSIONID
(and other) cookies.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=446925&r1=446924&r2=446925
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sat Sep 16 12:28:51 
2006
@@ -60,6 +60,7 @@
 #include "jk_ajp13.h"
 #include "jk_shm.h"
 
+#define JK_ENV_WORKER_NAME  ("JK_WORKER_NAME")
 #define JK_NOTE_WORKER_NAME ("JK_WORKER_NAME")
 #define JK_NOTE_WORKER_TYPE ("JK_WORKER_TYPE")
 #define JK_NOTE_REQUEST_DURATION("JK_REQUEST_DURATION")
@@ -133,6 +134,11 @@
 array_header *format;
 
 /*
+ * Setting target worker via environment
+ */
+   char *worker_indicator;
+
+/*
  * SSL Support
  */
 int ssl_enable;
@@ -1393,6 +1399,25 @@
 }
 
 /*
+ * JkWorkerIndicator Directive Handling
+ *
+ * JkWorkerIndicator JkWorker
+ */
+
+static const char *jk_set_worker_indicator(cmd_parms * cmd,
+   void *dummy, char *indicator)
+{
+server_rec *s = cmd->server;
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(s->module_config,
+  &jk_module);
+
+conf->worker_indicator = ap_pstrdup(cmd->pool, indicator);
+
+return NULL;
+}
+
+/*
  * JkExtractSSL Directive Handling
  *
  * JkExtractSSL On/Off
@@ -1699,6 +1724,17 @@
  "The mod_jk module automatic context apache alias directory"},
 
 /*
+ * Enable worker name to be set in an environment variable.
+ * this way one can use LocationMatch together with mod_end,
+ * mod_setenvif and mod_rewrite to set the target worker.
+ * Use this in combination with SetHandler jakarta-servlet to
+ * make mod_jk the handler for the request.
+ *
+ */
+{"JkWorkerIndicator", jk_set_worker_indicator, NULL, RSRC_CONF, TAKE1,
+ "Name of the Apache environment that contains the worker name"},
+
+/*
  * Apache has multiple SSL modules (for example apache_ssl, stronghold
  * IHS ...). Each of these can have a different SSL environment names
  * The following properties let the administrator specify the envoiroment
@@ -1759,27 +1795,73 @@
 {
 /* Retrieve the worker name stored by jk_translate() */
 const char *worker_name = ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(r->server->
+  module_config,
+  &jk_module);
+jk_logger_t *l = conf->log ? conf->log : main_log;
 int rc;
 
+JK_TRACE_ENTER(l);
+
 if (r->proxyreq) {
+jk_log(l, JK_LOG_ERROR,
+   "Request has proxyreq flag set in mod_jk handler - aborting.");
+JK_TRACE_EXIT(l);
 return HTTP_INTERNAL_SERVER_ERROR;
 }
 
 /* Set up r->read_chunked flags for chunked encoding, if present */
 if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK))) {
+jk_log(l, JK_LOG_ERROR,
+   "Could not setup client_block for chunked encoding - aborting");
+JK_TRACE_EXIT(l);
 return rc;
 }
 
+if (worker_name == NULL && r->handler && !strcmp(r->handler, JK_HANDLER)) {
+/* we may be here because of a manual directive ( that overrides
+ * translate and
+ * sets the handler directly ). We still need to know the worker.
+ */
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "Retrieving environment %s", conf->worker_indicator);
+worker_name = (char *)ap_table_get(r->subprocess_env, 
conf->worker_indicator);
+if (worker_name) {
+  /* The JkWorkerIndicator environment variable has
+   * been used to explicitely set the worker without JkMount.
+   * This is useful in combination with LocationMatch or mod_rewrite.
+   */
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l,

svn commit: r446930 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 12:51:02 2006
New Revision: 446930

URL: http://svn.apache.org/viewvc?view=rev&rev=446930
Log:
Add the missing no-jk feature to apache 1.3 and a missing
JK_IS_DEBUG_LEVEL to the no-jk impl in apache 2.0.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=446930&r1=446929&r2=446930
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sat Sep 16 12:51:02 
2006
@@ -1793,17 +1793,26 @@
  */
 static int jk_handler(request_rec * r)
 {
-/* Retrieve the worker name stored by jk_translate() */
-const char *worker_name = ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(r->server->
   module_config,
   &jk_module);
 jk_logger_t *l = conf->log ? conf->log : main_log;
+/* Retrieve the worker name stored by jk_translate() */
+const char *worker_name = ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
 int rc;
 
 JK_TRACE_ENTER(l);
 
+if (ap_table_get(r->subprocess_env, "no-jk")) {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "Into handler no-jk env var detected for uri=%s, declined",
+   r->uri);
+JK_TRACE_EXIT(l);
+return DECLINED;
+}
+
 if (r->proxyreq) {
 jk_log(l, JK_LOG_ERROR,
"Request has proxyreq flag set in mod_jk handler - aborting.");
@@ -2321,6 +2330,14 @@
 char *clean_uri = ap_pstrdup(r->pool, r->uri);
 const char *worker;
 
+if (ap_table_get(r->subprocess_env, "no-jk")) {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "Into translate no-jk env var detected for uri=%s, 
declined",
+   r->uri);
+return DECLINED;
+}
+
 ap_no2slash(clean_uri);
 worker = map_uri_to_worker(conf->uw_map, clean_uri, l);
 
@@ -2443,15 +2460,23 @@
 if (r->main) {
 jk_server_conf_t *conf = (jk_server_conf_t *)
 ap_get_module_config(r->server->module_config, &jk_module);
+jk_logger_t *l = conf->log ? conf->log : main_log;
 char *worker = (char *)ap_table_get(r->notes, JK_NOTE_WORKER_NAME);
 
+if (ap_table_get(r->subprocess_env, "no-jk")) {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "Into fixup no-jk env var detected for uri=%s, 
declined",
+   r->uri);
+return DECLINED;
+}
+
 /* Only if we have no worker and ForwardDirectories is set */
 if (!worker && (conf->options & JK_OPT_FWDDIRS)) {
 char *dummy_ptr[1], **names_ptr, *idx;
 int num_names;
 dir_config_rec *d = (dir_config_rec *)
 ap_get_module_config(r->per_dir_config, &dir_module);
-jk_logger_t *l = conf->log ? conf->log : main_log;
 
 /* Direct lift from mod_dir */
 if (d->index_names) {

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=446930&r1=446929&r2=446930
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Sep 16 12:51:02 
2006
@@ -1853,9 +1853,10 @@
   &jk_module);
 JK_TRACE_ENTER(xconf->log);
 if (apr_table_get(r->subprocess_env, "no-jk")) {
-jk_log(xconf->log, JK_LOG_DEBUG,
-   "Into handler no-jk env var detected for uri=%s, declined",
-   r->uri);
+if (JK_IS_DEBUG_LEVEL(xconf->log))
+jk_log(xconf->log, JK_LOG_DEBUG,
+   "Into handler no-jk env var detected for uri=%s, declined",
+   r->uri);
 
 JK_TRACE_EXIT(xconf->log);
 return DECLINED;



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

svn commit: r446948 - in /tomcat/connectors/trunk/jk/xdocs: config/apache.xml howto/apache.xml

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 13:36:40 2006
New Revision: 446948

URL: http://svn.apache.org/viewvc?view=rev&rev=446948
Log:
Explain how to use SetHandler and env vars to control mod_jk
behaviour. Part of the functionality is old, but has never been
documented, part of it is new.

Modified:
tomcat/connectors/trunk/jk/xdocs/config/apache.xml
tomcat/connectors/trunk/jk/xdocs/howto/apache.xml

Modified: tomcat/connectors/trunk/jk/xdocs/config/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/apache.xml?view=diff&rev=446948&r1=446947&r2=446948
==
--- tomcat/connectors/trunk/jk/xdocs/config/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/apache.xml Sat Sep 16 13:36:40 2006
@@ -38,6 +38,9 @@
 
 Should the base server mounts be copied to the virtual server.
 
+
+Name of the Apache environment variable that can be used to set worker names.
+
 
 Full or server relative path to the Tomcat Connector module log file
 
@@ -540,6 +543,53 @@
 applications. Apache will reload the file and update the mount
 points within 60 second interval.
 
+
+
+
+
+
+Alternatively to the mod_jk specific directives, you can also use
+SetHandler and environment variables to control, which requests
+are being forwarded via which worker. This gives you more flexibility,
+but the results might be more difficult to understand. If you mix both
+ways of defining the forwards, in general to mod_jk directives will win.
+
+
+SetHandler jakarta-servlet forces requests to be handled by mod_jk.
+If you neither specify any workers via JkMount and the related directives,
+not via the environment variable described below,
+the first worker in the list of all worker will be chosen. You can use 
SetHandler
+for example in Location blocks or with Apache 2.2 also in RewriteRule.
+
+
+In order to control the worker using SetEnvIf or RewriteRule
+for more complex rules, you can set the environment variable 
JK_WORKER_NAME
+to the name of your chosen target worker. This enables you to decide on
+the chosen worker in a more flexible way, including dependencies on cookie 
values.
+
+
+In order to use another variable than JK_WORKER_NAME, you can set the 
name
+of this variable via the JkWorkerIndicator directive.
+
+
+Finally you can define exclusions from mod_jk forwards by setting the 
environment
+variable no-jk.
+
+
+  # Automatically map all encoded urls
+  
+SetHandler jakarta-servlet
+SetEnv JK_WORKER_NAME my_worker
+  
+
+  # Map all subdirs to workers via naming rule
+  # and exclude static content.
+  
+SetHandler jakarta-servlet
+SetEnvIf REQUEST_URI ^/apps/([^/]*)/ JK_WORKER_NAME $1
+SetEnvIf REQUEST_URI ^/apps/([^/]*)/static no-jk
+  
+
 
 
  

Modified: tomcat/connectors/trunk/jk/xdocs/howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/howto/apache.xml?view=diff&rev=446948&r1=446947&r2=446948
==
--- tomcat/connectors/trunk/jk/xdocs/howto/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/howto/apache.xml Sat Sep 16 13:36:40 2006
@@ -608,7 +608,7 @@
 
 
 
-Starting with mod_jk 1.2.6, and under Apache 2.0, it's possible to exclude 
some URL/URI from
+Starting with mod_jk 1.2.6 for Apache 2.0 and 1.2.19 for Apache 1.3, it's 
possible to exclude some URL/URI from
 jk processing by setting the env var no-jk, for example with the 
SetEnvIf Directive.
 
 



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

svn commit: r446954 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 14:18:38 2006
New Revision: 446954

URL: http://svn.apache.org/viewvc?view=rev&rev=446954
Log:
Fix wrong parameter name for package size configuration.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=446954&r1=446953&r2=446954
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sat Sep 16 14:18:38 2006
@@ -964,7 +964,7 @@
 return DEF_BUFFER_SZ;
 }
 
-MAKE_WORKER_PARAM(DISTANCE_OF_WORKER);
+MAKE_WORKER_PARAM(WORKER_MAX_PACKET_SIZE);
 sz = jk_map_get_int(m, buf, DEF_BUFFER_SZ);
 sz = JK_ALIGN(sz, 1024);
 if (sz < DEF_BUFFER_SZ)



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

DO NOT REPLY [Bug 39966] - Class Cast Exception inTagHandlerPool

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=39966





--- Additional Comments From [EMAIL PROTECTED]  2006-09-16 23:15 ---
(In reply to comment #2)
> I filed this bug a while ago and have since changed jobs so I cannot reproduce
> it. However from what I recall I was using 2.0. 
> It is unclear from your comment but are you trying to say that TagHandlerPool 
> is
> only used for older versions of JSP? 

Nope, just saying I had the exact same problem.  As far as I can tell,
TagHandlerPool is still used, but the overall handling of tags is slightly
different in 2.0 (interface JspTag was shunted to be a superinterface of Tag). 
So I think if you specify <2.0 in the TLD, the translator will go ahead and
expect the Tag interface in your custom tags.  It'll use TagAdapter to link them
both together (so getParent() works properly when you mix and match
SimpleTag[Support] subclasses with implementors of Tag).

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r446959 - /tomcat/connectors/trunk/jk/xdocs/config/apache.xml

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 14:40:29 2006
New Revision: 446959

URL: http://svn.apache.org/viewvc?view=rev&rev=446959
Log:
Add version info to the doc of the new env var feature.

Modified:
tomcat/connectors/trunk/jk/xdocs/config/apache.xml

Modified: tomcat/connectors/trunk/jk/xdocs/config/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/apache.xml?view=diff&rev=446959&r1=446958&r2=446959
==
--- tomcat/connectors/trunk/jk/xdocs/config/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/apache.xml Sat Sep 16 14:40:29 2006
@@ -566,6 +566,7 @@
 for more complex rules, you can set the environment variable 
JK_WORKER_NAME
 to the name of your chosen target worker. This enables you to decide on
 the chosen worker in a more flexible way, including dependencies on cookie 
values.
+This feature has been added in version 1.2.19 of mod_jk.
 
 
 In order to use another variable than JK_WORKER_NAME, you can set the 
name



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

Going to tag mod_jk 1.2.19

2006-09-16 Thread Rainer Jung 
Hi,

I'm going to tag tomcat-connectors 1.2.19 in around an hour. In case
anyone has a pending important commit, please let me know soon.

Regards,

Rainer

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

svn commit: r446962 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 15:13:30 2006
New Revision: 446962

URL: http://svn.apache.org/viewvc?view=rev&rev=446962
Log:
Avoid compiler warning, keep code the same in Apache 1.3 and 2.0.

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=446962&r1=446961&r2=446962
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Sep 16 15:13:30 
2006
@@ -1880,7 +1880,8 @@
translate and
sets the handler directly ). We still need to know the worker.
  */
-if (worker_name = apr_table_get(r->subprocess_env, 
xconf->worker_indicator)) {
+worker_name = apr_table_get(r->subprocess_env, 
xconf->worker_indicator);
+if (worker_name) {
   /* The JkWorkerIndicator environment variable has
* been used to explicitely set the worker without JkMount.
* This is useful in combination with LocationMatch or mod_rewrite.



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

svn commit: r446983 - /tomcat/connectors/trunk/jk/tools/lineends.pl

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 17:12:04 2006
New Revision: 446983

URL: http://svn.apache.org/viewvc?view=rev&rev=446983
Log:
Adding lineends.pl from apr native connector.
Copying it here makes jk release  more indepependant.

Added:
tomcat/connectors/trunk/jk/tools/lineends.pl   (with props)

Added: tomcat/connectors/trunk/jk/tools/lineends.pl
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/lineends.pl?view=auto&rev=446983
==
--- tomcat/connectors/trunk/jk/tools/lineends.pl (added)
+++ tomcat/connectors/trunk/jk/tools/lineends.pl Sat Sep 16 17:12:04 2006
@@ -0,0 +1,149 @@
+#!/usr/local/bin/perl
+#
+#  Heuristically converts line endings to the current OS's preferred format
+#  
+#  All existing line endings must be identical (e.g. lf's only, or even
+#  the accedental cr.cr.lf sequence.)  If some lines end lf, and others as
+#  cr.lf, the file is presumed binary.  If the cr character appears anywhere
+#  except prefixed to an lf, the file is presumed binary.  If there is no 
+#  change in the resulting file size, or the file is binary, the conversion 
+#  is discarded.
+#  
+#  Todo: Handle NULL stdin characters gracefully.
+#
+
+use IO::File;
+use File::Find;
+
+# The ignore list is '-' seperated, with this leading hyphen and
+# trailing hyphens in ever concatinated list below.
+$ignore = "-";
+
+# Image formats
+$ignore .= "gif-jpg-jpeg-png-ico-bmp-";
+
+# Archive formats
+$ignore .= "tar-gz-z-zip-jar-war-";
+
+# Many document formats
+$ignore .= "eps-psd-pdf-ai-";
+
+# Some encodings
+$ignore .= "ucs2-ucs4-";
+
+# Some binary objects
+$ignore .= "class-so-dll-exe-obj-";
+
+# Some build env files in NW/Win32
+$ignore .= "mcp-xdc-ncb-opt-pdb-ilk-sbr-";
+
+$preservedate = 1;
+
+$forceending = 0;
+
+$givenpaths = 0;
+
+$notnative = 0;
+
+while (defined @ARGV[0]) {
+if (@ARGV[0] eq '--touch') {
+$preservedate = 0;
+}
+elsif (@ARGV[0] eq '--nocr') {
+$notnative = -1;
+}
+elsif (@ARGV[0] eq '--cr') {
+$notnative = 1;
+}
+elsif (@ARGV[0] eq '--force') {
+$forceending = 1;
+}
+elsif (@ARGV[0] eq '--FORCE') {
+$forceending = 2;
+}
+elsif (@ARGV[0] =~ m/^-/) {
+die "What is " . @ARGV[0] . " supposed to mean?\n\n" 
+ . "Syntax:\t$0 [option()s] [path(s)]\n\n" . <<'OUTCH'
+Where: paths specifies the top level directory to convert (default of '.')
+   options are;
+
+ --cr keep/add one ^M
+ --nocr   remove ^M's
+ --touch  the datestamp (default: keeps date/attribs)
+ --force  mismatched corrections (unbalanced ^M's)
+ --FORCE  all files regardless of file name!
+
+OUTCH
+}
+else {
+find(\&totxt, @ARGV[0]);
+   print "scanned " . @ARGV[0] . "\n";
+   $givenpaths = 1;
+}
+shift @ARGV;
+}
+
+if (!$givenpaths) {
+find(\&totxt, '.');
+print "did .\n";
+}
+
+sub totxt {
+$oname = $_;
+   $tname = '.#' . $_;
+if (!-f) {
+return;
+}
+   @exts = split /\./;
+   if ($forceending < 2) {
+while ($#exts && ($ext = pop(@exts))) {
+if ($ignore =~ m|-$ext-|i) {
+return;
+}
+   }
+}
+   @ostat = stat($oname);
+$srcfl = new IO::File $oname, "r" or die;
+   $dstfl = new IO::File $tname, "w" or die;
+binmode $srcfl; 
+   if ($notnative) {
+binmode $dstfl;
+   } 
+   undef $t;
+while (<$srcfl>) { 
+if (s/(\r*)\n$/\n/) {
+   $n = length $1;
+   if (!defined $t) { 
+   $t = $n; 
+   }
+   if (!$forceending && (($n != $t) || m/\r/)) {
+   print "mismatch in " .$oname. ":" .$n. " expected " .$t. 
"\n";
+   undef $t;
+   last;
+   }
+   elsif ($notnative > 0) {
+s/\n$/\r\n/; 
+}
+}
+   print $dstfl $_; 
+   }
+   if (defined $t && (tell $srcfl == tell $dstfl)) {
+   undef $t;
+   }
+   undef $srcfl;
+   undef $dstfl;
+   if (defined $t) {
+unlink $oname or die;
+rename $tname, $oname or die;
+@anames = ($oname);
+if ($preservedate) {
+utime $ostat[9], $ostat[9], @anames;
+}
+chmod $ostat[2] & 0, @anames;
+chown $ostat[5], $ostat[6], @anames;
+print "Converted file " . $oname . " to text in " . 
$File::Find::dir . "\n"; 
+   }
+   else {
+   unlink $tname or die;
+   }
+}

Propchange: tomcat/connectors/trunk/jk/tools/lineends.pl
--
svn:eol-style = native

Propchange: tomcat/connectors/trunk/jk/tools/lineends.pl
--

svn commit: r446990 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 18:15:32 2006
New Revision: 446990

URL: http://svn.apache.org/viewvc?view=rev&rev=446990
Log:
New features for release script:
- tag can be chosen by commandline flag
- another commandline flag enables packaging from trunk
- use lineends.pl to convert line ends before packaging a zip

Modified:
tomcat/connectors/trunk/jk/tools/jkrelease.sh

Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?view=diff&rev=446990&r1=446989&r2=446990
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Sat Sep 16 18:15:32 2006
@@ -10,32 +10,59 @@
 # gpg
 # And any one of: w3m, elinks, links
 
+usage() {
+echo "Usage:: $0 -t VERSION [-T]"
+echo "-t: version to package"
+echo "-T: package from trunk"
+}
+
+while getopts :t:T c
+do
+case $c in
+t) tag=$OPTARG;;
+T) trunk=trunk;;
+\:)usage
+   exit 2;;
+\?)usage
+   exit 2;;
+esac
+done
+shift `expr $OPTIND - 1`
+
 export ANT_HOME=/usr/local/ant
 export JAVA_HOME=/usr/local/jdk1.4.2
 
-# You need to change the version numbers
-JK_VERMAJOR="1"
-JK_VERMINOR="2"
-JK_VERFIX="19"
-ASFROOT="http://svn.apache.org/repos/asf";
+SVNROOT="http://svn.apache.org/repos/asf";
+SVNPROJ="tomcat/connectors"
 JK_CVST="tomcat-connectors"
 
 JK_OWNER="asf"
 JK_GROUP="asf"
 
 COPY_TOP="KEYS LICENSE NOTICE"
-COPY_JK="BUILD.txt native support tools xdocs"
+COPY_JK="BUILD.txt native jkstatus support tools xdocs"
 COPY_CONF="uriworkermap.properties workers.properties 
workers.properties.minimal"
 
-JK_VER="${JK_VERMAJOR}.${JK_VERMINOR}.${JK_VERFIX}"
-JK_BRANCH="jk${JK_VERMAJOR}.${JK_VERMINOR}.x"
-JK_TAG="JK_${JK_VERMAJOR}_${JK_VERMINOR}_${JK_VERFIX}"
-
-JK_DIST=${JK_CVST}-${JK_VER}-src
-JK_SVN_URL="${ASFROOT}/tomcat/connectors/tags/${JK_BRANCH}/${JK_TAG}"
-
  NO CHANGE BELOW THIS LINE ##
 
+if [ "X$tag" = "X" ]
+then
+usage
+exit 2
+fi
+if [ "X$trunk" = "Xtrunk" ]
+then
+JK_SVN_URL="${SVNROOT}/${SVNPROJ}/trunk"
+JK_REV=`svn info ${JK_SVN_URL} | awk '$1 == "Revision:" {print $2}'`
+JK_DIST=${JK_CVST}-${tag}-dev-${JK_REV}-src
+else
+JK_VER=$tag
+JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
+JK_BRANCH=`echo $tag | sed -e 's#^#jk#' -e 's#\.[0-9][0-9]*$##' -e 
's#$#.x#'`
+JK_SVN_URL="${SVNROOT}/${SVNPROJ}/tags/${JK_BRANCH}/${JK_TAG}"
+JK_DIST=${JK_CVST}-${JK_VER}-src
+fi
+
 umask 022
 
 rm -rf ${JK_DIST}
@@ -160,6 +187,7 @@
 # Pack and sign
 tar cvf ${JK_DIST}.tar --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST}
 gzip ${JK_DIST}.tar
+perl ${JK_DIST}/tools/lineends.pl --cr ${JK_DIST}
 zip -9 -r ${JK_DIST}.zip ${JK_DIST}
 # Create detatched signature
 gpg -ba ${JK_DIST}.tar.gz



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

svn commit: r446991 - in /tomcat/connectors/trunk/jk: native/STATUS.txt native/common/jk_version.h xdocs/index.xml xdocs/news/20060101.xml

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 18:17:29 2006
New Revision: 446991

URL: http://svn.apache.org/viewvc?view=rev&rev=446991
Log:
Prepare STATUS, index, news and jk_version for tagging new release.

Modified:
tomcat/connectors/trunk/jk/native/STATUS.txt
tomcat/connectors/trunk/jk/native/common/jk_version.h
tomcat/connectors/trunk/jk/xdocs/index.xml
tomcat/connectors/trunk/jk/xdocs/news/20060101.xml

Modified: tomcat/connectors/trunk/jk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?view=diff&rev=446991&r1=446990&r2=446991
==
--- tomcat/connectors/trunk/jk/native/STATUS.txt (original)
+++ tomcat/connectors/trunk/jk/native/STATUS.txt Sat Sep 16 18:17:29 2006
@@ -3,7 +3,7 @@
 
 Release:
 
-1.2.19  : in development
+1.2.19  : released September 17, 2006
 1.2.18  : released July, 2006
 1.2.17  : not released
 1.2.16  : not released

Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?view=diff&rev=446991&r1=446990&r2=446991
==
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Sat Sep 16 18:17:29 
2006
@@ -32,7 +32,7 @@
 #define JK_VERBETA  0
 #define JK_BETASTRING   "0"
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 #define JK_VERRC0
 #define JK_RCSTRING "0"
 

Modified: tomcat/connectors/trunk/jk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?view=diff&rev=446991&r1=446990&r2=446991
==
--- tomcat/connectors/trunk/jk/xdocs/index.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/index.xml Sat Sep 16 18:17:29 2006
@@ -8,6 +8,7 @@
 
   
 Mladen Turk
+Rainer Jung
 Documentation Index
   
 
@@ -28,6 +29,17 @@
 
 
 
+17 September 2006 - JK-1.2.19 
released
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.19 Stable.
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz";>JK
 1.2.19 release sources
+ | http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz.asc";>PGP
 signature
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries
 for selected platforms.
+
+
+
 27 July 2006 - JK-1.2.18 
released
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.18 Stable.

Modified: tomcat/connectors/trunk/jk/xdocs/news/20060101.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20060101.xml?view=diff&rev=446991&r1=446990&r2=446991
==
--- tomcat/connectors/trunk/jk/xdocs/news/20060101.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20060101.xml Sat Sep 16 18:17:29 2006
@@ -15,6 +15,23 @@
 
 
 
+ 
+17 September - JK-1.2.19 released
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.19. This is a stable release adding some features
+and a few bug fixes to version 1.2.18.
+Furthermore the non-functional code trees for isapi and domino have been 
removed.
+
+
+ Please see the ChangeLog for a full list of 
changes.
+
+If you find any bugs while using this release, please fill in the
+http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla
+Bug Report. When entering bug select Native:JK Component.
+
+
+
+
  
 13 July - JK-1.2.18 released
 The Apache Tomcat team is proud to announce the immediate availability



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

svn commit: r446992 - /tomcat/connectors/trunk/jk/conf/workers.properties

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 18:21:10 2006
New Revision: 446992

URL: http://svn.apache.org/viewvc?view=rev&rev=446992
Log:
Rename deprecated property in example config file.

Modified:
tomcat/connectors/trunk/jk/conf/workers.properties

Modified: tomcat/connectors/trunk/jk/conf/workers.properties
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/conf/workers.properties?view=diff&rev=446992&r1=446991&r2=446992
==
--- tomcat/connectors/trunk/jk/conf/workers.properties (original)
+++ tomcat/connectors/trunk/jk/conf/workers.properties Sat Sep 16 18:21:10 2006
@@ -126,7 +126,7 @@
 #once in a while. Until then all work is redirected to peer
 #workers.
 worker.loadbalancer.type=lb
-worker.loadbalancer.balanced_workers=ajp12, ajp13
+worker.loadbalancer.balance_workers=ajp12, ajp13
 
 
 #



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

svn commit: r446985 - /tomcat/connectors/trunk/jk/native/common/portable.h.sample

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 17:32:33 2006
New Revision: 446985

URL: http://svn.apache.org/viewvc?view=rev&rev=446985
Log:
Update sample protable.h to include new fileio.h check.

Modified:
tomcat/connectors/trunk/jk/native/common/portable.h.sample

Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?view=diff&rev=446985&r1=446984&r2=446985
==
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Sat Sep 16 
17:32:33 2006
@@ -29,6 +29,9 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_FILIO_H 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -59,25 +62,25 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION ""
 
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
 #define SIZEOF_CHAR 1
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #define SIZEOF_LONG 4
 
-/* The size of a `longlong', as computed by sizeof. */
+/* The size of `longlong', as computed by sizeof. */
 #define SIZEOF_LONGLONG 0
 
-/* The size of a `long double', as computed by sizeof. */
+/* The size of `long double', as computed by sizeof. */
 #define SIZEOF_LONG_DOUBLE 16
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #define SIZEOF_LONG_LONG 8
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #define SIZEOF_SHORT 2
 
 /* Define to 1 if you have the ANSI C header files. */



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

svn commit: r446993 - /tomcat/connectors/trunk/jk/xdocs/changelog.xml

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 18:36:55 2006
New Revision: 446993

URL: http://svn.apache.org/viewvc?view=rev&rev=446993
Log:
Update changelog before tagging 1.2.19 (todays changes).

Modified:
tomcat/connectors/trunk/jk/xdocs/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=446993&r1=446992&r2=446993
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sat Sep 16 18:36:55 2006
@@ -8,6 +8,7 @@
 
   
 Mladen Turk
+Rainer Jung
 Changelog
   
 
@@ -25,6 +26,44 @@
   
   
 
+  
+  Docs: Add SetHandler and new env var to Apache config docs. (rjung)
+  
+  
+  Apache 1.3: Backport "no-jk" feature. (rjung)
+  
+  
+  Apache: Add an environment variable to make SetHandler "jakarta-servlet" 
more
+  useful. The variable is JK_WORKER_NAME, but can be changed by the
+  new directive JkWorkerIndicator. (rjung)
+  
+  
+  LB: Don't use single worker shortcut, if the single worker is being 
diabled. (rjung)
+  
+  
+  Status worker: Add short explanation of activation and error states to 
legend. (rjung)
+  
+  
+  Docs: Add meaning of zero timeout values for various timeouts
+  in workers.properties. (rjung)
+  
+  
+  LB: Cleanup of Mladens forced recovery. (rjung)
+  
+  
+  LB: Do not change lb_value for recovering workers to max, if 
+  we are using BUSYNESS method. (rjung)
+  
+  
+  Apache: Since 1.2.14 mod_jk failed to detect client abort. (rjung)
+  
+  
+  Docs: Corrected description of JkEnvVar. (rjung)
+  
+  
+  Solaris: Detect filio.h in configure to make the new connection detection
+  build on solaris (r432825). (rjung)
+  
   
   Add feature to force the recovery of workers that are
   member of loadbalancer if all the members are in error



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

svn commit: r446996 - /tomcat/connectors/trunk/jk/HOWTO-RELEASE

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 18:57:51 2006
New Revision: 446996

URL: http://svn.apache.org/viewvc?view=rev&rev=446996
Log:
Update release howto:
- correct list of files which are version dependant
- drop details of what jkrelease.sh does

Modified:
tomcat/connectors/trunk/jk/HOWTO-RELEASE

Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/HOWTO-RELEASE?view=diff&rev=446996&r1=446995&r2=446996
==
--- tomcat/connectors/trunk/jk/HOWTO-RELEASE (original)
+++ tomcat/connectors/trunk/jk/HOWTO-RELEASE Sat Sep 16 18:57:51 2006
@@ -16,13 +16,11 @@
 and replace it with the new version.  These are the docs I found which
 had to be updated:
 
-xdocs/howto/apache.xml
-xdocs/howto/quick.xml
-xdocs/howto/workers.xml
+xdocs/index.xml
+xdocs/news/.xml
+native/STATUS.txt
 
-Update the version in jk/native/configure.in.
-
-Update the version in jk/native/common/jk_version.h, here is
+Update the JK_VERISRELEASE define in jk/native/common/jk_version.h, here is
 a svn diff that shows what I changed:
 
 Index: native/common/jk_version.h
@@ -70,86 +68,8 @@
 Create the new source distribution
 --
 
-(A tool named jkrelease.sh in tomcat-connectors/jk/tools does the
-following steps).
-
-Create the directory
-tomcat-connectors-jk-{MAJOR_REVISION}-{MINOR_REVISION}-{RELEASE}-src
-
-For this example mkdir tomcat-connectors-jk-1.2.16-src
-
-Copy the files KEYS and LICENSE from tomcat-conectors to
-the source distribution directory.
-
-cp tomcat-connectors/KEYS tomcat-connectors-jk-1.2.16-src
-cp tomcat-connectors/LICENSE tomcat-connectors-jk-1.2.16-src
-
-Copy the directory tomcat-connectors/scandoc to the source
-distribution directory.
-
-cp -pr tomcat-connectors/scandoc tomcat-connectors-jk-1.2.16-src
-
-Copy the directory tomcat-connectors/common to the source
-distribution directory.
-
-cp -pr tomcat-connectors/common tomcat-connectors-jk-1.2.16-src
-
-Make the jk directory in the source distribution.
-
-mkdir tomcat-connectors-jk-1.2.16-src/jk
-
-Copy the file BUILD.txt from tomcat-conectors/jk to 
-the source distribution jk directory.
-
-cp -p tomcat-connectors/jk/BUILD.txt tomcat-connectors-jk-1.2.16-src/README.txt
-
-Copy the directory tomcat-connectors/build/docs to the source
-distribution directory.
-
-cp -pr tomcat-connectors/jk/build/docs tomcat-connectors-jk-1.2.16-src/jk
-
-Copy the directory tomcat-connectors/tools to the source
-distribution directory.
-
-cp -pr tomcat-connectors/jk/tools tomcat-connectors-jk-1.2.16-src/jk
-
-Make the jk conf directory in the source distribution.
-
-mkdir tomcat-connectors-jk-1.2.16-src/jk/conf
-
-Copy the worker.properties file to the jk/conf directory.
-
-cp -p tomcat-connectors/jk/conf/worker.properties 
tomcat-connectors-jk-1.2.16-src/jk/conf
-
-Copy the directory tomcat-connectors/support to the source
-distribution directory.
-
-cp -pr tomcat-connectors/jk/support tomcat-connectors-jk-1.2.16-src/jk
-
-Copy the directory tomcat-connectors/native to the source
-distribution directory.
-
-cp -pr tomcat-connectors/jk/native tomcat-connectors-jk-1.2.16-src/jk
-
-Remove all the CVS and .svn directories from the new source distribution.
-
-find tomcat-connectors-jk-1.2.16-src -type d -name CVS | xargs rm -rf
-find tomcat-connectors-jk-1.2.16-src -type d -name .svn | xargs rm -rf
-
-cd to tomcat-connectors-jk-1.2.16-src/jk/native and run buildconf.sh
-to create the configure script.
-
-Create a tar gzip'd archive
-
-tar zcf tomcat-connectors-jk-1.2.16-src.tar.gz tomcat-connectors-jk-1.2.16-src
-
-Create a zip archive
-
-zip -r tomcat-connectors-jk-1.2.16-src.zip tomcat-connectors-jk-1.2.16-src
-
-Sign the release using PGP. Here is an example using gpg:
-
-gpg -abs -o tomcat-connectors-jk-1.2.16-src.tar.gz.asc 
tomcat-connectors-jk-1.2.16-src.tar.gz
+A tool named jkrelease.sh in tomcat-connectors/jk/tools creates
+a release tarball and a zip including signature files.
 
 Upload source distribution and documentation to www.apache.org
 ---
@@ -196,8 +116,14 @@
 Update source for next version
 --
 
-Reset JK_VERISRELEASE to 0 and update JK_VERSTRING, JK_VERMAJOR,
-JK_VERMINOR, and JK_VERFIX as needed.  Commit your changes to subversion.
+native/STATUS.txt: Add status "in development" for new version.
+native/configure.in: Update variable VERSION.
+native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, 
JK_VERFIX,
+JK_VERSTRING, and JK_VERISRELEASE.
+native/common/portable.h.sample: Update VERSION define.
+native/iis/isapi_redirect.rc: Update JK_VERSION_STR, FILEVERSION, and 
PRODUCTVERSION
+native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion.
+xdocs/changelog.xml: Start a new section for the new version.
 
 Remove old release distributions from www.apache.org

svn commit: r446998 - /tomcat/connectors/tags/jk1.2.x/JK_1_2_19/

2006-09-16 Thread rjung 
Author: rjung
Date: Sat Sep 16 19:10:41 2006
New Revision: 446998

URL: http://svn.apache.org/viewvc?view=rev&rev=446998
Log:
Tagging mod_jk 1.2.19.

Added:
tomcat/connectors/tags/jk1.2.x/JK_1_2_19/
  - copied from r446997, tomcat/connectors/trunk/


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

Offering help: Tomcat Packaging

2006-09-16 Thread Serdar Bulut 
I would like to offer some help in packaging tomcat, i.e. 
creating RPM packages that could be used with Redhat, 
Centos, Fedora, etc.


Please let me know.

Best,
-Serdar Bulut
TFG

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

mod_jk 1.2.19 release candidate: ready to test

2006-09-16 Thread Rainer Jung 
Hi,

version 1.2.19 of the Apache Tomcat mod_jk web server connector has been
tagged. This version contains numerous bug fixes and some new
improvements over our last release 1.2.18. Please test and share your
experience. Your feedback helped us a lot during the previous release,
so we hope there will be again many testers and contributors for binaries.

If no critical bugs will be found, we will have a formal release vote
on the dev list starting at Thursday, September 21st.

The source distribution can be downloaded from:

http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.19/

The updated documentation can be found at

http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.19/docs

Please see

http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.19/docs/changelog.html

for a complete list of changes.

The most important news are:

Configuration: Implement worker configuration templates (attribute
reference).

Configuration: Allow mount, balance_worker etc. in multiple lines per
worker.

Logging: Log deprecated attributes.

Logging: Add %R JkRequestLogFormat for Apache.

Logging: Add many notes set by the load balancer for logging in Apache
access log.

Logging: Fix default log level (info).

Apache: Docs and implementation completion how to use SetHandler and env
vars to control mod_jk forwards (aka the ";jsessionid=" problem).

Apache: New JkOption DisableReuse to disable persistant connections to
tomcat.

Apache: Detect aborted client connection. This was broken since version
1.2.14.

IIS: Fix simple_rewrite for the cases where the rewritten url is larger
then the original one.

IIS: Make rewrite_rule_map and log_level as non mandatory directives for
isapi_redirect.

Load balancer: Force immediate recovery attempts, if all balance workers
are in error state.

Load balancer: combine "stopped" and "disabled" to one new attribute
"activation"; combine various runtime error states in one new attribute.

Load balancer: Reorg of the main service loop; make retries work better.

Load balancer: only use disabled worker in single worker load balancer,
if the request carries a session id with the correct jvm_route.

JkStatus: Add refresh link; add display of recover time, child error
numbers; make jvm_route manageable

JkStatus: Include ant tasks in source distribution.

Network code: several fixes and improvements.

Regards,

Rainer

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

DO NOT REPLY [Bug 40528] New: - missing error message localisations

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

http://issues.apache.org/bugzilla/show_bug.cgi?id=40528

   Summary: missing error message localisations
   Product: Tomcat 5
   Version: 5.5.17
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


The following two error messages are used in JspRuntimeLibrary.java, but are 
missing from org/apache/
jasper/resources/LocalStrings.properties.

Google gave me two values that seem to be about right:

jsp.error.beans.property.conversion=Unable to convert string \"{0}\" to class 
\"{1}\" for attribute \"{2}\": 
{3}
sp.error.beans.propertyeditor.notregistered=Property Editor not registered with 
the 
PropertyEditorManager

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Re: Offering help: Tomcat Packaging

2006-09-16 Thread Henri Gomez 

www.jpackage.org allready provide such rpm (and many many others)

Regards


2006/9/17, Serdar Bulut <[EMAIL PROTECTED]>:

I would like to offer some help in packaging tomcat, i.e.
creating RPM packages that could be used with Redhat,
Centos, Fedora, etc.

Please let me know.

Best,
-Serdar Bulut
TFG

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