DO NOT REPLY [Bug 41479] New: - tomcate keep running for about 5 days, out of memory happened.

[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=41479

   Summary: tomcate keep running for about 5 days, out of memory
happened.
   Product: Tomcat 5
   Version: 5.5.17
  Platform: Other
OS/Version: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


We have met one bug for the tomcat 5. Following is the Tomcat's catalina.out

Jan 27, 2007 3:33:10 PM org.apache.catalina.core.StandardWrapper unload
INFO: Waiting for 1 instance(s) to be deallocated
Jan 27, 2007 3:33:11 PM org.apache.catalina.core.StandardWrapper unload
INFO: Waiting for 1 instance(s) to be deallocated
Jan 27, 2007 3:33:12 PM org.apache.catalina.core.StandardWrapper unload
INFO: Waiting for 1 instance(s) to be deallocated
Jan 27, 2007 3:33:22 PM org.apache.catalina.startup.HostConfig checkResources
INFO: Reloading context [/webchat]
java.lang.reflect.InvocationTargetException
Exception in thread "main" java.lang.OutOfMemoryError: PermGen space
Jan 27, 2007 4:06:34 PM org.apache.catalina.core.AprLifecycleListener 
lifecycleEvent
INFO: The Apache Tomcat Native library which allows optimal performance in 
production environments was not found on the 
java.library.path: /usr/java/jdk1.5.0_10/jre/lib/i386/server:/usr/java/jdk1.5.0_
10/jre/lib/i386:/usr/java/jdk1.5.0_10/jre/../lib/i386
Jan 27, 2007 4:06:34 PM org.apache.coyote.http11.Http11BaseProtocol init
INFO: Initializing Coyote HTTP/1.1 on http-8080

The configure is following:

 catalina.properties 
# String cache configuration.
tomcat.util.buf.StringCache.byte.enabled=true
#tomcat.util.buf.StringCache.char.enabled=true
#tomcat.util.buf.StringCache.trainThreshold=50
#tomcat.util.buf.StringCache.cacheSize=5000

 catalina.sh -
CATALINA_OPTS="$CATALINA_OPTS -Xms512m -Xmx512m"

This issue happened serval times. It cause our service can't run.

Please assign somebody. Thank you!

Michael

-- 
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: r500534 - in /tomcat/connectors/trunk/jk: native/common/jk_lb_worker.c native/common/jk_shm.h native/common/jk_status.c xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Sat Jan 27 06:14:00 2007
New Revision: 500534

URL: http://svn.apache.org/viewvc?view=rev&rev=500534
Log:
Improve data synchronization between different processes
(use sequence number more carefully).

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

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=500534&r1=500533&r2=500534
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Jan 27 06:14:00 
2007
@@ -395,6 +395,8 @@
 worker_record_t *w = NULL;
 JK_TRACE_ENTER(l);
 
+if (p->sequence != p->s->sequence)
+jk_lb_pull(p, l);
 for (i = 0; i < p->num_of_workers; i++) {
 w = &p->lb_workers[i];
 if (w->s->state == JK_LB_STATE_ERROR) {

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?view=diff&rev=500534&r1=500533&r2=500534
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sat Jan 27 06:14:00 2007
@@ -62,7 +62,7 @@
 /* Sequence counter starting at 0 and increasing
  * every time we change the config
  */
-unsigned int sequence;
+volatile unsigned int sequence;
 /* Number of currently busy channels */
 volatile int busy;
 /* Maximum number of busy channels */

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=500534&r1=500533&r2=500534
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Jan 27 06:14:00 
2007
@@ -1644,6 +1644,11 @@
 return;
 }
 
+jk_shm_lock();
+if (lb->sequence != lb->s->sequence)
+jk_lb_pull(lb, l);
+jk_shm_unlock();
+
 jk_putv(s, "Edit load balancer settings for ",
 name, "\n", NULL);
 

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=500534&r1=500533&r2=500534
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Jan 27 
06:14:00 2007
@@ -27,6 +27,9 @@
   
 
   
+  JkStatus: Improve data synchronization between different processes. 
(rjung)
+  
+  
 41381: Fix segfault in feature fail_on_status
 (wrong order of log arguments). Patch by Juri Haberland. (rjung)
   



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

svn commit: r500537 - in /tomcat/connectors/trunk/jk: native/common/jk_lb_worker.c native/common/jk_lb_worker.h native/common/jk_status.c xdocs/miscellaneous/changelog.xml xdocs/reference/status.xml x

[rjung]

Author: rjung
Date: Sat Jan 27 06:41:05 2007
New Revision: 500537

URL: http://svn.apache.org/viewvc?view=rev&rev=500537
Log:
Do not try to recover load balancer sub workers
multiple times in parallel (except when doing forced recovery).
Use additional runtime states "PROBE" and "FORCED".
Typical state cycles are: OK->ERROR->RECOVER->PROBE->OK/ERROR.
and OK->ERROR->FORCED->OK/ERROR.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml
tomcat/connectors/trunk/jk/xdocs/reference/workers.xml

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=500537&r1=500536&r2=500537
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Jan 27 06:41:05 
2007
@@ -40,8 +40,8 @@
  * The load balancing code in this
  */
 
-#define JK_WORKER_USABLE(w)   ((w)->state != JK_LB_STATE_ERROR && (w)->state 
!= JK_LB_STATE_BUSY && (w)->activation != JK_LB_ACTIVATION_STOPPED && 
(w)->activation != JK_LB_ACTIVATION_DISABLED)
-#define JK_WORKER_USABLE_STICKY(w)   ((w)->state != JK_LB_STATE_ERROR && 
(w)->activation != JK_LB_ACTIVATION_STOPPED)
+#define JK_WORKER_USABLE(w)   ((w)->state != JK_LB_STATE_ERROR && (w)->state 
!= JK_LB_STATE_PROBE && (w)->state != JK_LB_STATE_BUSY && (w)->activation != 
JK_LB_ACTIVATION_STOPPED && (w)->activation != JK_LB_ACTIVATION_DISABLED)
+#define JK_WORKER_USABLE_STICKY(w)   ((w)->state != JK_LB_STATE_ERROR && 
(w)->state != JK_LB_STATE_PROBE && (w)->activation != JK_LB_ACTIVATION_STOPPED)
 
 static const char *lb_locking_type[] = {
 JK_LB_LOCK_TEXT_OPTIMISTIC,
@@ -65,6 +65,8 @@
 JK_LB_STATE_TEXT_RECOVER,
 JK_LB_STATE_TEXT_BUSY,
 JK_LB_STATE_TEXT_ERROR,
+JK_LB_STATE_TEXT_FORCE,
+JK_LB_STATE_TEXT_PROBE,
 "unknown",
 NULL
 };
@@ -172,6 +174,10 @@
 return JK_LB_STATE_BUSY;
 else if  (*v == 'e' || *v == 'E' || *v == '4')
 return JK_LB_STATE_ERROR;
+else if  (*v == 'f' || *v == 'F' || *v == '5')
+return JK_LB_STATE_FORCE;
+else if  (*v == 'p' || *v == 'P' || *v == '6')
+return JK_LB_STATE_PROBE;
 else
 return JK_LB_STATE_DEF;
 }
@@ -446,7 +452,7 @@
 jk_log(l, JK_LOG_INFO,
"worker %s is marked for recovery",
w->s->name);
-w->s->state = JK_LB_STATE_RECOVER;
+w->s->state = JK_LB_STATE_FORCE;
 forced++;
 }
 }
@@ -857,6 +863,9 @@
 int retry_wait = JK_LB_MIN_RETRY_WAIT;
 s->route = rec->r;
 prec = rec;
+
+if (rec->s->state == JK_LB_STATE_RECOVER)
+rec->s->state = JK_LB_STATE_PROBE;
 
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?view=diff&rev=500537&r1=500536&r2=500537
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sat Jan 27 06:41:05 
2007
@@ -62,13 +62,17 @@
 #define JK_LB_STATE_RECOVER(2)
 #define JK_LB_STATE_BUSY   (3)
 #define JK_LB_STATE_ERROR  (4)
+#define JK_LB_STATE_FORCE  (5)
+#define JK_LB_STATE_PROBE  (6)
 #define JK_LB_STATE_DEF(JK_LB_STATE_NA)
 #define JK_LB_STATE_TEXT_NA("N/A")
 #define JK_LB_STATE_TEXT_OK("OK")
 #define JK_LB_STATE_TEXT_RECOVER   ("REC")
 #define JK_LB_STATE_TEXT_BUSY  ("BSY")
 #define JK_LB_STATE_TEXT_ERROR ("ERR")
-#define JK_LB_STATE_TEXT_MAX   (JK_LB_STATE_ERROR)
+#define JK_LB_STATE_TEXT_FORCE ("FRC")
+#define JK_LB_STATE_TEXT_PROBE ("PRB")
+#define JK_LB_STATE_TEXT_MAX   (JK_LB_STATE_PROBE)
 #define JK_LB_STATE_TEXT_DEF   (JK_LB_STATE_TEXT_NA)
 #define JK_LB_ACTIVATION_ACTIVE(0)
 #define JK_LB_ACTIVATION_DISABLED  (1)

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=500537&r1=500536&r2=500537
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Jan 27 06:41:05 
2007
@@ -595,6 +595,12 @@
 case JK_LB_STA

svn commit: r500540 - in /tomcat/connectors/trunk/jk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml xdocs/reference/status.xml

[rjung]

Author: rjung
Date: Sat Jan 27 06:58:59 2007
New Revision: 500540

URL: http://svn.apache.org/viewvc?view=rev&rev=500540
Log:
Add status worker feature, that allows to mark an errored
lb sub worker administratively for recovery.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=500540&r1=500539&r2=500540
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Jan 27 06:58:59 
2007
@@ -105,8 +105,9 @@
 #define JK_STATUS_CMD_UPDATE   (4)
 #define JK_STATUS_CMD_RESET(5)
 #define JK_STATUS_CMD_VERSION  (6)
+#define JK_STATUS_CMD_RECOVER  (7)
 #define JK_STATUS_CMD_DEF  (JK_STATUS_CMD_LIST)
-#define JK_STATUS_CMD_MAX  (JK_STATUS_CMD_VERSION)
+#define JK_STATUS_CMD_MAX  (JK_STATUS_CMD_RECOVER)
 #define JK_STATUS_CMD_TEXT_UNKNOWN ("unknown")
 #define JK_STATUS_CMD_TEXT_LIST("list")
 #define JK_STATUS_CMD_TEXT_SHOW("show")
@@ -114,6 +115,7 @@
 #define JK_STATUS_CMD_TEXT_UPDATE  ("update")
 #define JK_STATUS_CMD_TEXT_RESET   ("reset")
 #define JK_STATUS_CMD_TEXT_VERSION ("version")
+#define JK_STATUS_CMD_TEXT_RECOVER ("recover")
 #define JK_STATUS_CMD_TEXT_DEF (JK_STATUS_CMD_TEXT_LIST)
 
 #define JK_STATUS_MIME_UNKNOWN (0)
@@ -289,6 +291,7 @@
 JK_STATUS_CMD_TEXT_UPDATE,
 JK_STATUS_CMD_TEXT_RESET,
 JK_STATUS_CMD_TEXT_VERSION,
+JK_STATUS_CMD_TEXT_RECOVER,
 NULL
 };
 
@@ -768,6 +771,8 @@
 return JK_STATUS_CMD_RESET;
 else if (!strcmp(cmd, JK_STATUS_CMD_TEXT_VERSION))
 return JK_STATUS_CMD_VERSION;
+else if (!strcmp(cmd, JK_STATUS_CMD_TEXT_RECOVER))
+return JK_STATUS_CMD_RECOVER;
 return JK_STATUS_CMD_UNKNOWN;
 }
 
@@ -848,7 +853,8 @@
 prev = status_cmd_int(arg);
 if (cmd == JK_STATUS_CMD_UNKNOWN) {
 if (prev == JK_STATUS_CMD_UPDATE ||
-prev == JK_STATUS_CMD_RESET) {
+prev == JK_STATUS_CMD_RESET ||
+prev == JK_STATUS_CMD_RECOVER) {
 cmd = from;
 }
 }
@@ -856,7 +862,8 @@
 jk_printf(s, "%s%s=%s", started ? "&" : "?",
   JK_STATUS_ARG_CMD, status_cmd_text(cmd));
 if (cmd == JK_STATUS_CMD_EDIT ||
-cmd == JK_STATUS_CMD_RESET) {
+cmd == JK_STATUS_CMD_RESET ||
+cmd == JK_STATUS_CMD_RECOVER) {
 jk_printf(s, "%s%s=%s", "&",
   JK_STATUS_ARG_FROM, status_cmd_text(prev));
 }
@@ -1323,6 +1330,11 @@
 jk_puts(s, "|");
 status_write_uri(s, p, "R", JK_STATUS_CMD_RESET, 
JK_STATUS_MIME_UNKNOWN,
  name, wr->s->name, 0, 0, "", l);
+if (wr->s->state == JK_LB_STATE_ERROR) {
+jk_puts(s, "|");
+status_write_uri(s, p, "T", JK_STATUS_CMD_RECOVER, 
JK_STATUS_MIME_UNKNOWN,
+ name, wr->s->name, 0, 0, "", l);
+}
 jk_puts(s, "] ");
 jk_printf(s, JK_STATUS_SHOW_MEMBER_ROW,
   wr->s->name,
@@ -2827,6 +2839,79 @@
 return JK_FALSE;
 }
 
+static int recover_worker(jk_ws_service_t *s,
+  status_endpoint_t *p,
+  jk_logger_t *l)
+{
+unsigned int i;
+const char *worker;
+const char *sub_worker;
+lb_worker_t *lb;
+jk_worker_t *jw = NULL;
+worker_record_t *wr = NULL;
+
+JK_TRACE_ENTER(l);
+status_get_string(p, JK_STATUS_ARG_WORKER, "", &worker, l);
+status_get_string(p, JK_STATUS_ARG_SUB_WORKER, "", &sub_worker, l);
+jk_log(l, JK_LOG_INFO,
+   "recovering worker '%s' sub worker '%s'",
+   worker ? worker : "(null)", sub_worker ? sub_worker : "(null)");
+if (!worker || !worker[0]) {
+jk_log(l, JK_LOG_WARNING,
+   "NULL or EMPTY worker param");
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+jw = wc_get_worker_for_name(worker, l);
+if (!jw) {
+jk_log(l, JK_LOG_WARNING,
+   "could not find worker '%s'",
+   worker);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+if (jw->type != JK_LB_WORKER_TYPE) {
+jk_log(l, JK_LOG_WARNING,
+   "worker type not implemented");
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+lb = (lb_worker_t *)jw->worker_private;
+if (!lb) {
+jk_log(l, JK_LOG_WARNING,
+   "lb structure is (nu

svn commit: r500543 - in /tomcat/connectors/trunk/jk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml xdocs/reference/status.xml xdocs/reference/workers.xml

[rjung]

Author: rjung
Date: Sat Jan 27 07:15:48 2007
New Revision: 500543

URL: http://svn.apache.org/viewvc?view=rev&rev=500543
Log:
- Allow a user of a read/write status worker to switch it to and
  from read_only mode temporarily.
- Do not show read/write commands in a read_only status worker.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml
tomcat/connectors/trunk/jk/xdocs/reference/workers.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=500543&r1=500542&r2=500543
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Jan 27 07:15:48 
2007
@@ -69,6 +69,7 @@
 #define JK_STATUS_ARG_OPTION_NO_LEGEND 0x0004
 #define JK_STATUS_ARG_OPTION_NO_LB 0x0008
 #define JK_STATUS_ARG_OPTION_NO_AJP0x0010
+#define JK_STATUS_ARG_OPTION_READ_ONLY 0x0020
 
 #define JK_STATUS_ARG_LB_RETRIES   ("lr")
 #define JK_STATUS_ARG_LB_RECOVER_TIME  ("lt")
@@ -1150,6 +1151,7 @@
 char buf_wr[32];
 int cmd;
 int mime;
+int read_only = 0;
 int single = 0;
 unsigned int hide_members;
 const char *arg;
@@ -1169,6 +1171,13 @@
 mime = status_mime_int(arg);
 hide_members = status_get_int(p, JK_STATUS_ARG_OPTIONS, 0, l) &
 JK_STATUS_ARG_OPTION_NO_MEMBERS;
+if (w->read_only) {
+read_only = 1;
+}
+else {
+read_only = status_get_int(p, JK_STATUS_ARG_OPTIONS, 0, l) &
+JK_STATUS_ARG_OPTION_READ_ONLY;
+}
 if (cmd == JK_STATUS_CMD_SHOW) {
 single = 1;
 }
@@ -1202,12 +1211,14 @@
 status_write_uri(s, p, "S", JK_STATUS_CMD_SHOW, 
JK_STATUS_MIME_UNKNOWN,
  name, "", 0, 0, "", l);
 }
-jk_puts(s, "|");
-status_write_uri(s, p, "E", JK_STATUS_CMD_EDIT, JK_STATUS_MIME_UNKNOWN,
- name, "", 0, 0, "", l);
-jk_puts(s, "|");
-status_write_uri(s, p, "R", JK_STATUS_CMD_RESET, 
JK_STATUS_MIME_UNKNOWN,
- name, "", 0, 0, "", l);
+if (!read_only) {
+jk_puts(s, "|");
+status_write_uri(s, p, "E", JK_STATUS_CMD_EDIT, 
JK_STATUS_MIME_UNKNOWN,
+ name, "", 0, 0, "", l);
+jk_puts(s, "|");
+status_write_uri(s, p, "R", JK_STATUS_CMD_RESET, 
JK_STATUS_MIME_UNKNOWN,
+ name, "", 0, 0, "", l);
+}
 jk_puts(s, "]  ");
 jk_putv(s, "Worker Status for ", name, "\n", NULL);
 jk_puts(s, "" JK_STATUS_SHOW_LB_HEAD);
@@ -1324,18 +1335,22 @@
 
 if (mime == JK_STATUS_MIME_HTML) {
 
-jk_puts(s, "\n[");
-status_write_uri(s, p, "E", JK_STATUS_CMD_EDIT, 
JK_STATUS_MIME_UNKNOWN,
- name, wr->s->name, 0, 0, "", l);
-jk_puts(s, "|");
-status_write_uri(s, p, "R", JK_STATUS_CMD_RESET, 
JK_STATUS_MIME_UNKNOWN,
- name, wr->s->name, 0, 0, "", l);
-if (wr->s->state == JK_LB_STATE_ERROR) {
+jk_puts(s, "\n");
+if (!read_only) {
+jk_puts(s, "[");
+status_write_uri(s, p, "E", JK_STATUS_CMD_EDIT, 
JK_STATUS_MIME_UNKNOWN,
+ name, wr->s->name, 0, 0, "", l);
 jk_puts(s, "|");
-status_write_uri(s, p, "T", JK_STATUS_CMD_RECOVER, 
JK_STATUS_MIME_UNKNOWN,
+status_write_uri(s, p, "R", JK_STATUS_CMD_RESET, 
JK_STATUS_MIME_UNKNOWN,
  name, wr->s->name, 0, 0, "", l);
+if (wr->s->state == JK_LB_STATE_ERROR) {
+jk_puts(s, "|");
+status_write_uri(s, p, "T", JK_STATUS_CMD_RECOVER, 
JK_STATUS_MIME_UNKNOWN,
+ name, wr->s->name, 0, 0, "", l);
+}
+jk_puts(s, "]");
 }
-jk_puts(s, "] ");
+jk_puts(s, " ");
 jk_printf(s, JK_STATUS_SHOW_MEMBER_ROW,
   wr->s->name,
   status_worker_type(wr->w->type),
@@ -1448,25 +1463,27 @@
 if (mime == JK_STATUS_MIME_HTML) {
 
 jk_puts(s, "\n");
-jk_puts(s, "Edit one attribute for all members: [");
-status_write_uri(s, p, JK_STATUS_ARG_LBM_TEXT_ACTIVATION, 
JK_STATUS_CMD_EDIT, JK_STATUS_MIME_UNKNOWN,
- name, "", 0, 0, JK_STATUS_ARG_LBM_ACTIVATION, l);
-jk_puts(s, "\n|");
-

svn commit: r500550 - in /tomcat/connectors/trunk/jk: jkstatus/src/share/org/apache/jk/status/ native/common/ xdocs/miscellaneous/ xdocs/reference/

[rjung]

Author: rjung
Date: Sat Jan 27 07:41:36 2007
New Revision: 500550

URL: http://svn.apache.org/viewvc?view=rev&rev=500550
Log:
Show estimated time until next global maintenance in status worker.
Change displayed time until next recovery to a min/max pair.

Modified:

tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java

tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml

Modified: 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java?view=diff&rev=500550&r1=500549&r2=500550
==
--- 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
 (original)
+++ 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
 Sat Jan 27 07:41:36 2007
@@ -88,6 +88,12 @@
 /* possible with > 1.2.20 */
 int time_to_recover = -1 ;
 
+/* possible with > 1.2.21 */
+int time_to_recover_max = -1 ;
+
+/* possible with > 1.2.21 */
+int time_to_recover_min = -1 ;
+
 /**
  * @return Returns the jvm_route.
  * @since mod_jk 1.2.16
@@ -107,22 +113,22 @@
 }
 
 /**
-* @return the route
+ * @return the route
 * @since mod_jk 1.2.20
-*/
-   public String getRoute() {
-   return route;
-   }
+ */
+public String getRoute() {
+return route;
+}
 
-   /**
-* @param route the route to set
+/**
+ * @param route the route to set
 * @since mod_jk 1.2.20
-*/
-   public void setRoute(String route) {
-   this.route = route;
-   }
+ */
+public void setRoute(String route) {
+this.route = route;
+}
 
-   /**
+/**
  * @return Returns the address.
  */
 public String getAddress() {
@@ -459,21 +465,52 @@
 this.distance = distance;
 }
 
-   /**
-* @return the time_to_recover
+/**
+ * @return the time_to_recover
  * @since mod_jk 1.2.20
-*/
-   public int getTime_to_recover() {
-   return time_to_recover;
-   }
+ */
+public int getTime_to_recover() {
+return time_to_recover;
+}
 
-   /**
-* @param time_to_recover the time_to_recover to set
+/**
+ * @param time_to_recover the time_to_recover to set
  * @since mod_jk 1.2.20
-*/
-   public void setTime_to_recover(int time_to_recover) {
-   this.time_to_recover = time_to_recover;
-   }
+ */
+public void setTime_to_recover(int time_to_recover) {
+this.time_to_recover = time_to_recover;
+}
 
+/**
+ * @return the time_to_recover_min
+ * @since mod_jk 1.2.21
+ */
+public int getTime_to_recover_min() {
+return time_to_recover_min;
+}
+
+/**
+ * @param time_to_recover_min the time_to_recover_min to set
+ * @since mod_jk 1.2.21
+ */
+public void setTime_to_recover_min(int time_to_recover_min) {
+this.time_to_recover_min = time_to_recover_min;
+}
+
+/**
+ * @return the time_to_recover_max
+ * @since mod_jk 1.2.21
+ */
+public int getTime_to_recover_max() {
+return time_to_recover_max;
+}
+
+/**
+ * @param time_to_recover_max the time_to_recover_max to set
+ * @since mod_jk 1.2.21
+ */
+public void setTime_to_recover_max(int time_to_recover_max) {
+this.time_to_recover_max = time_to_recover_max;
+}
 
 }

Modified: 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?view=diff&rev=500550&r1=500549&r2=500550
==
--- 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
 (original)
+++ 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
 Sat Jan 27 07:41:36 2007
@@ -622,6 +622,17 @@
 currentProject.setNewProperty(prefix + ".time_to_recover",
 Integer.toString(member.getTime_to_recover()));
 }
+if(member.getTime_to_recover_min() >= 0) {
+currentProject.setNewProperty(prefix + ".time_to_recover_min",
+Integer.toString(member.getTime_to_recover_min()));
+}
+if(member.getTime_to_recover_max() >= 0) {
+currentProject.setNewProperty(prefix + ".time_to_recover_max",
+Integer.toString(m

svn commit: r500555 - in /tomcat/connectors/trunk/jk: jkstatus/src/share/org/apache/jk/status/ native/common/ xdocs/miscellaneous/

[rjung]

Author: rjung
Date: Sat Jan 27 07:59:41 2007
New Revision: 500555

URL: http://svn.apache.org/viewvc?view=rev&rev=500555
Log:
Add estimated time until next global maintenance to xml/txt/property
mime types in status worker and adopt jkstatus ant task.

Modified:

tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java

tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml

Modified: 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java?view=diff&rev=500555&r1=500554&r2=500555
==
--- 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
 (original)
+++ 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
 Sat Jan 27 07:59:41 2007
@@ -43,6 +43,8 @@
 int max_busy = -1 ;
 int member_count = -1 ;
 int map_count = -1 ;
+int time_to_maintenance_min = -1 ;
+int time_to_maintenance_max = -1 ;

 List members = new ArrayList() ;
 List mappings = new ArrayList() ;
@@ -167,135 +169,167 @@
 public void setType(String type) {
 this.type = type;
 }
-   /**
-* @return the bad
+/**
+ * @return the bad
+ * @since mod_jk 1.2.20
+ */
+public int getBad() {
+return bad;
+}
+/**
+ * @param bad the bad to set
+ * @since mod_jk 1.2.20
+ */
+public void setBad(int bad) {
+this.bad = bad;
+}
+/**
+ * @return the busy
+ * @since mod_jk 1.2.20
+ */
+public int getBusy() {
+return busy;
+}
+/**
+ * @param busy the busy to set
+ * @since mod_jk 1.2.20
+ */
+public void setBusy(int busy) {
+this.busy = busy;
+}
+/**
+ * @return the degraded
+ * @since mod_jk 1.2.20
+ */
+public int getDegraded() {
+return degraded;
+}
+/**
+ * @param degraded the degraded to set
+ * @since mod_jk 1.2.20
+ */
+public void setDegraded(int degraded) {
+this.degraded = degraded;
+}
+/**
+ * @return the good
+ * @since mod_jk 1.2.20
+ */
+public int getGood() {
+return good;
+}
+/**
+ * @param good the good to set
+ * @since mod_jk 1.2.20
+ */
+public void setGood(int good) {
+this.good = good;
+}
+/**
+ * @return the lock
+ * @since mod_jk 1.2.20
+ */
+public String getLock() {
+return lock;
+}
+/**
+ * @param lock the lock to set
+ * @since mod_jk 1.2.20
+ */
+public void setLock(String lock) {
+this.lock = lock;
+}
+/**
+ * @return the max_busy
+ * @since mod_jk 1.2.20
+ */
+public int getMax_busy() {
+return max_busy;
+}
+/**
+ * @param max_busy the max_busy to set
+ * @since mod_jk 1.2.20
+ */
+public void setMax_busy(int max_busy) {
+this.max_busy = max_busy;
+}
+/**
+ * @return the method
+ * @since mod_jk 1.2.20
+ */
+public String getMethod() {
+return method;
+}
+/**
+ * @param method the method to set
+ * @since mod_jk 1.2.20
+ */
+public void setMethod(String method) {
+this.method = method;
+}
+
+/**
+ * @return the member_count
+ * @since mod_jk 1.2.20
+ */
+public int getMember_count() {
+return member_count;
+}
+
+/**
+ * @param member_count the member_count to set
+ * @since mod_jk 1.2.20
+ */
+public void setMember_count(int member_count) {
+this.member_count = member_count;
+}
+
+/**
+ * @return the map_count
  * @since mod_jk 1.2.20
-*/
-   public int getBad() {
-   return bad;
-   }
-   /**
-* @param bad the bad to set
- * @since mod_jk 1.2.20
-*/
-   public void setBad(int bad) {
-   this.bad = bad;
-   }
-   /**
-* @return the busy
- * @since mod_jk 1.2.20
-*/
-   public int getBusy() {
-   return busy;
-   }
-   /**
-* @param busy the busy to set
- * @since mod_jk 1.2.20
-*/
-   public void setBusy(int busy) {
-   this.busy = busy;
-   }
-   /**
-* @return the degraded
- * @since mod_jk 1.2.20
-*/
-   public int getDegraded() {
-   return degraded;
-   }
-   /**
-* @param degraded the degraded to set
- * @since mod_jk 1.2.20
-*/
-   public void setDegraded(int degraded) {
-   

DO NOT REPLY [Bug 41479] - tomcate keep running for about 5 days, out of memory happened.

[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=41479


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-01-27 12:02 ---
Bugzilla is not a support forum. Please use the Tomcat users mailing list for
questions like this.

-- 
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: r500616 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 13:00:07 2007
New Revision: 500616

URL: http://svn.apache.org/viewvc?view=rev&rev=500616
Log:
Correct error messages. Should be context.xml not web.xml

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=500616&r1=500615&r2=500616
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Sat Jan 27 13:00:07 2007
@@ -780,8 +780,8 @@
 context.addWatchedResource(file.getAbsolutePath());
 }
 } catch (Exception e) {
-log.error(sm.getString("contextConfig.defaultMissing") 
-  + " " + resourceName + " " + file , e);
+log.error(sm.getString("contextConfig.contextMissing",  
+  resourceName + " " + file) , e);
 }
 
 if (source == null)
@@ -805,13 +805,15 @@
 log.debug("Successfully processed context [" + 
context.getName() 
 + "] configuration file " + baseDir + " " + 
resourceName);
 } catch (SAXParseException e) {
-log.error(sm.getString("contextConfig.defaultParse"), e);
+log.error(sm.getString("contextConfig.contextParse",
+context.getName()), e);
 log.error(sm.getString("contextConfig.defaultPosition",
  "" + e.getLineNumber(),
  "" + e.getColumnNumber()));
 ok = false;
 } catch (Exception e) {
-log.error(sm.getString("contextConfig.defaultParse"), e);
+log.error(sm.getString("contextConfig.contextParse",
+context.getName()), e);
 ok = false;
 } finally {
 contextDigester.reset();
@@ -821,7 +823,7 @@
 stream.close();
 }
 } catch (IOException e) {
-log.error(sm.getString("contextConfig.defaultClose"), e);
+log.error(sm.getString("contextConfig.contextClose"), e);
 }
 }
 }

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?view=diff&rev=500616&r1=500615&r2=500616
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
Sat Jan 27 13:00:07 2007
@@ -11,6 +11,9 @@
 contextConfig.cce=Lifecycle event data object {0} is not a Context
 contextConfig.certificatesConfig.added=Added certificates -> request attribute 
Valve
 contextConfig.certificatesConfig.error=Exception adding CertificatesValve:
+contextConfig.contextClose=Error closing context.xml
+contextConfig.contextMissing=Missing context.xml: {0}
+contextConfig.contextParse=Parse error in context.xml for {0}
 contextConfig.defaultClose=Error closing default web.xml
 contextConfig.defaultConfig=Configuration error in default web.xml
 contextConfig.defaultMissing=Missing default web.xml, using application 
web.xml only

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500616&r1=500615&r2=500616
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 13:00:07 2007
@@ -26,6 +26,10 @@
   
 Optimized access log valve, submitted by Takayuki Kaneko. (remm)
   
+  
+Fix error messages when parsing context.xml that incorrectly referred 
to
+web.xml. (markt)
+  
 
   
   



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

svn commit: r500622 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/servlet/JspServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 13:14:06 2007
New Revision: 500622

URL: http://svn.apache.org/viewvc?view=rev&rev=500622
Log:
Port fix for bug 41327. Show full URI for a 404.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?view=diff&rev=500622&r1=500621&r2=500622
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Sat Jan 
27 13:14:06 2007
@@ -306,7 +306,7 @@
 // creating unnecessary directories and files.
 if (null == context.getResource(jspUri)) {
 response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   jspUri);
+   request.getRequestURI());
 return;
 }
 boolean isErrorPage = exception != null;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500622&r1=500621&r2=500622
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 13:14:06 2007
@@ -51,6 +51,10 @@
   
 Fix regression for implicit taglib and page data version numbers. 
(remm)
   
+  
+41327: Show full URI for a 404. Patch provided by Vijay.
+(markt)
+  
 
   
   



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

svn commit: r500626 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 13:25:41 2007
New Revision: 500626

URL: http://svn.apache.org/viewvc?view=rev&rev=500626
Log:
Port fox for bug 41217. Set secure attribute on SSO cookie when cookie is 
created during a secure request. Patch provided by Chris Halstead.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?view=diff&rev=500626&r1=500625&r2=500626
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 Sat Jan 27 13:25:41 2007
@@ -743,6 +743,9 @@
 cookie.setMaxAge(-1);
 cookie.setPath("/");
 
+// Bugzilla 41217
+cookie.setSecure(request.isSecure());
+
 // Bugzilla 34724
 String ssoDomain = sso.getCookieDomain();
 if(ssoDomain != null) {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500626&r1=500625&r2=500626
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 13:25:41 2007
@@ -30,6 +30,11 @@
 Fix error messages when parsing context.xml that incorrectly referred 
to
 web.xml. (markt)
   
+  
+41217: Set secure attribute on SSO cookie when cookie is
+created during a secure request. Patch provided by Chris Halstead.
+(markt)
+  
 
   
   



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

svn commit: r500629 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/authenticator/ webapps/docs/

[markt]

Author: markt
Date: Sat Jan 27 13:32:52 2007
New Revision: 500629

URL: http://svn.apache.org/viewvc?view=rev&rev=500629
Log:
Port fix bug 40524. request.getAuthType() now returns CLIENT_CERT rather than 
CLIENT-CERT as per the spec. Now only web.xml, o.a.c.deploy.LoginConfig and 
Authenticators.properties use CLIENT-CERT.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java?view=diff&rev=500629&r1=500628&r2=500629
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java 
Sat Jan 27 13:32:52 2007
@@ -25,7 +25,7 @@
 
 // Authentication methods for login configuration
 public static final String BASIC_METHOD = "BASIC";
-public static final String CERT_METHOD = "CLIENT-CERT";
+public static final String CERT_METHOD = "CLIENT_CERT";
 public static final String DIGEST_METHOD = "DIGEST";
 public static final String FORM_METHOD = "FORM";
 
@@ -55,7 +55,7 @@
  * or not any user has been authenticated:
  * 
  * request.getAuthType()
- * will return BASIC, CLIENT-CERT, DIGEST, FORM, or null
+ * will return BASIC, CLIENT_CERT, DIGEST, FORM, or null
  * if there is no authenticated user.
  * request.getUserPrincipal()
  * will return the authenticated Principal returned by the

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?view=diff&rev=500629&r1=500628&r2=500629
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
 Sat Jan 27 13:32:52 2007
@@ -102,7 +102,7 @@
 
 // NOTE: We don't try to reauthenticate using any existing SSO session,
 // because that will only work if the original authentication was
-// BASIC or FORM, which are less secure than the CLIENT-CERT auth-type
+// BASIC or FORM, which are less secure than the CLIENT_CERT auth-type
 // specified for this webapp
 //
 // Uncomment below to allow previous FORM or BASIC authentications

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?view=diff&rev=500629&r1=500628&r2=500629
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
Sat Jan 27 13:32:52 2007
@@ -616,7 +616,7 @@
  * 
  * The purpose of this method is to allow an SSO entry that was
  * established without a username/password combination (i.e. established
- * following DIGEST or CLIENT-CERT authentication) to be updated with
+ * following DIGEST or CLIENT_CERT authentication) to be updated with
  * a username and password if one becomes available through a subsequent
  * BASIC or FORM authentication.  The SSO entry will then be usable for
  * reauthentication.
@@ -630,7 +630,7 @@
  * @param ssoId identifier of Single sign to be updated
  * @param principal the Principal returned by the latest
  *  call to Realm.authenticate.
- * @param authType  the type of authenticator used (BASIC, CLIENT-CERT,
+ * @param authType  the type of authenticator used (BASIC, CLIENT_CERT,
  *  DIGEST or FORM)
  * @param username  the username (if any) used for the authentication
  * @param password  the password (if any) used for the authentication

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java?view=diff&rev=500629&r1=500628&r2=500629
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java

svn commit: r500644 - in /tomcat/tc6.0.x/trunk/webapps: ROOT/WEB-INF/web.xml docs/WEB-INF/web.xml docs/changelog.xml examples/WEB-INF/web.xml host-manager/WEB-INF/web.xml manager/WEB-INF/web.xml

[markt]

Author: markt
Date: Sat Jan 27 14:35:35 2007
New Revision: 500644

URL: http://svn.apache.org/viewvc?view=rev&rev=500644
Log:
Update all webapps to use the servlet 2.5 xsd

Modified:
tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml Sat Jan 27 14:35:35 2007
@@ -18,8 +18,8 @@
 
 http://java.sun.com/xml/ns/j2ee";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
-version="2.4">
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+version="2.5">
 
   Welcome to Tomcat
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml Sat Jan 27 14:35:35 2007
@@ -1,8 +1,8 @@
 
 http://java.sun.com/xml/ns/j2ee";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
-version="2.4">
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+version="2.5">
 
   Tomcat Documentation
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 14:35:35 2007
@@ -73,6 +73,9 @@
   
 Add a virtual hosting how-to contributed by Hassan Schroeder. (markt)
   
+  
+Update all webapps to use the servlet 2.5 xsd. (markt)
+  
 
   
 

Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml Sat Jan 27 14:35:35 
2007
@@ -18,8 +18,8 @@
 
 http://java.sun.com/xml/ns/j2ee";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
-version="2.4">
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+version="2.5">
 
 
   Servlet and JSP Examples.

Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Sat Jan 27 
14:35:35 2007
@@ -1,10 +1,9 @@
 
 
-http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-
+http://java.sun.com/xml/ns/j2ee";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+version="2.5">
 
   Tomcat Manager Application
   

Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?view=diff&rev=500644&r1=500643&r2=500644
==
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Sat Jan 27 14:35:35 
2007
@@ -18,8 +18,8 @@
 
 http://java.sun.com/xml/ns/j2ee";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";

svn commit: r500651 - in /tomcat/tc6.0.x/trunk: bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 14:45:06 2007
New Revision: 500651

URL: http://svn.apache.org/viewvc?view=rev&rev=500651
Log:
Port fix bug 40526. Return support for JPDA_OPTS to catalina.bat and add a new 
option JPDA_SUSPEND. Patch provided by Kurt Roy.

Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=500651&r1=500650&r2=500651
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Sat Jan 27 14:45:06 2007
@@ -37,6 +37,18 @@
 rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda 
start"
 rem   command is executed. The default is "jdbconn".
 rem
+rem   JPDA_SUSPEND(Optional) Java runtime options used when the "jpda 
start"
+rem   command is executed. Specifies whether JVM should suspend
+rem   execution immediately after startup. Default is "n".
+rem
+rem   JPDA_OPTS   (Optional) Java runtime options used when the "jpda 
start"
+rem   command is executed. If used, JPDA_TRANSPORT, 
JPDA_ADDRESS,
+rem   and JPDA_SUSPEND are ignored. Thus, all required jpda
+rem   options MUST be specified. The default is:
+rem
+rem   -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,
+rem   
address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+rem
 rem $Id$
 rem ---
 
@@ -113,7 +125,12 @@
 if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
 set JPDA_ADDRESS=jdbconn
 :gotJpdaAddress
-shift
+if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
+set JPDA_SUSPEND=n
+:gotJpdaSuspend
+if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
+set JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+:gotJpdaOptsshift
 :noJpda
 
 if ""%1"" == ""debug"" goto doDebug
@@ -197,10 +214,10 @@
 goto end
 :doJpda
 if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath 
"%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" 
%MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 :doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath 
"%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 
 :end

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?view=diff&rev=500651&r1=500650&r2=500651
==
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Sat Jan 27 14:45:06 2007
@@ -32,6 +32,18 @@
 #   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
 #   command is executed. The default is 8000.
 #
+#   JPDA_SUSPEND(Optional) Java runtime options used when the "jpda start"
+#   command is executed. Specifies whether JVM should suspend
+#   execution immediately after startup. Default is "n".
+#
+#   JPDA_OPTS   (Optional) Java runtime options used when the "jpda start"
+#   command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS,
+#   and JPDA_SUSPEND are ignored. Thus, all required jpda
+#   options MUST be specified. The default is:
+#
+#   -Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,
+#   address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND
+#
 #   JSSE_HOME   (Optional) May

svn commit: r500656 - /tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp

[markt]

Author: markt
Date: Sat Jan 27 14:49:37 2007
New Revision: 500656

URL: http://svn.apache.org/viewvc?view=rev&rev=500656
Log:
Javadocs are no longer included by default and the pages are not pre-compiled.

Modified:
tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp

Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?view=diff&rev=500656&r1=500655&r2=500656
==
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Sat Jan 27 14:49:37 2007
@@ -182,17 +182,12 @@
  
   where "$CATALINA_HOME" is the root of the Tomcat installation 
directory. If you're seeing this page, and you don't think you should be, then 
either you're either a user who has arrived at new installation of Tomcat, or 
you're an administrator who hasn't got his/her setup quite right. Providing the 
latter is the case, please refer to the Tomcat 
Documentation for more detailed setup and administration information than 
is found in the INSTALL file.
 
-NOTE: This page is precompiled. If you change it, this 
page will not change since
-  it was compiled into a servlet at build time.
-  (See $CATALINA_HOME/webapps/ROOT/WEB-INF/web.xml as 
to how it was mapped.)
-
-
 NOTE: For security reasons, using the administration webapp
 is restricted to users with role "admin". The manager webapp
 is restricted to users with role "manager".
 Users are defined in 
$CATALINA_HOME/conf/tomcat-users.xml.
 
-Included with this release are a host of sample Servlets and 
JSPs (with associated source code), extensive documentation (including the 
Servlet 2.4 and JSP 2.0 API JavaDoc), and an introductory guide to developing 
web applications.
+Included with this release are a host of sample Servlets and 
JSPs (with associated source code), extensive documentation, and an 
introductory guide to developing web applications.
 
 Tomcat mailing lists are available at the Tomcat project web 
site:
 



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

svn commit: r500660 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/EmbeddedServletOptions.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 14:56:47 2007
New Revision: 500660

URL: http://svn.apache.org/viewvc?view=rev&rev=500660
Log:
Port fix bug 41265 by removing the code that resets checkInterval values of 
zero to 300. If checkInterval is not specified it defaults to zero anyway and 
removing the code was easier than trying to explain in the documentation why 
the stated default could not be explicitly set.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?view=diff&rev=500660&r1=500659&r2=500660
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Sat 
Jan 27 14:56:47 2007
@@ -496,12 +496,6 @@
 if (checkInterval != null) {
 try {
 this.checkInterval = Integer.parseInt(checkInterval);
-if (this.checkInterval == 0) {
-this.checkInterval = 300;
-if (log.isWarnEnabled()) {
-
log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
-}
-}
 } catch(NumberFormatException ex) {
 if (log.isWarnEnabled()) {
 
log.warn(Localizer.getMessage("jsp.warning.checkInterval"));

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500660&r1=500659&r2=500660
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 14:56:47 2007
@@ -68,6 +68,11 @@
 Fix regression for implicit taglib and page data version numbers. 
(remm)
   
   
+41265: Allow JspServlet checkInterval init parameter to be
+explicitly set to the stated default value of zero by removing the
+code that resets it to 300 if explicitly specified as zero. (markt)
+  
+  
 41327: Show full URI for a 404. Patch provided by Vijay.
 (markt)
   



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

svn commit: r500668 - in /tomcat/tc6.0.x/trunk/webapps: docs/ examples/WEB-INF/classes/compressionFilters/

[markt]

Author: markt
Date: Sat Jan 27 15:07:51 2007
New Revision: 500668

URL: http://svn.apache.org/viewvc?view=rev&rev=500668
Log:
Port fix bug 39572. Improvements to CompressionFilter provided by Eric 
Hedström. Also cleaned up unused imports and methods.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=500668&r1=500667&r2=500668
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 27 15:07:51 2007
@@ -86,6 +86,10 @@
   
 Update all webapps to use the servlet 2.5 xsd. (markt)
   
+  
+39572: Improvements to CompressionFilter example provided by
+Eric Hedström. (markt)
+  
 
   
 

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java?view=diff&rev=500668&r1=500667&r2=500668
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 Sat Jan 27 15:07:51 2007
@@ -18,7 +18,6 @@
 package compressionFilters;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Enumeration;
 import javax.servlet.*;
 import javax.servlet.http.*;

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?view=diff&rev=500668&r1=500667&r2=500668
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 Sat Jan 27 15:07:51 2007
@@ -81,7 +81,7 @@
 /**
  * The underlying gzip output stream to which we should write data.
  */
-protected GZIPOutputStream gzipstream = null;
+protected OutputStream gzipstream = null;
 
 /**
  * Has this stream been closed?
@@ -295,8 +295,14 @@
 if (debug > 1) {
 System.out.println("new GZIPOutputStream");
 }
-response.addHeader("Content-Encoding", "gzip");
-gzipstream = new GZIPOutputStream(output);
+if (response.isCommitted()) {
+if (debug > 1)
+System.out.print("Response already committed. Using 
original output stream");
+gzipstream = output;
+} else {
+response.addHeader("Content-Encoding", "gzip");
+gzipstream = new GZIPOutputStream(output);
+}
 }
 gzipstream.write(b, off, len);
 

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?view=diff&rev=500668&r1=500667&r2=500668
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 Sat Jan 27 15:07:51 2007
@@ -17,16 +17,9 @@
 package compressionFilters;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Locale;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
@@ -247,31 +240,6 @@
 
 
 public void setContentLength(int length) {
-}
-
-
-/**
- * Returns

svn commit: r500669 - /tomcat/tc6.0.x/trunk/.classpath

[markt]

Author: markt
Date: Sat Jan 27 15:08:13 2007
New Revision: 500669

URL: http://svn.apache.org/viewvc?view=rev&rev=500669
Log:
Add source for examples to Eclipse project

Modified:
tomcat/tc6.0.x/trunk/.classpath

Modified: tomcat/tc6.0.x/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.classpath?view=diff&rev=500669&r1=500668&r2=500669
==
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Sat Jan 27 15:08:13 2007
@@ -1,6 +1,7 @@
 
 

+   






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

svn commit: r500674 - in /tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes: ./ cal/ dates/ error/ examples/ filters/ jsp2/examples/el/ jsp2/examples/simpletag/ listeners/ sessions/

[markt]

Author: markt
Date: Sat Jan 27 15:15:00 2007
New Revision: 500674

URL: http://svn.apache.org/viewvc?view=rev&rev=500674
Log:
Code clean up in the examples. Removed unused imports and unused code.

Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/cal/Entries.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/cal/TableBean.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/error/Smart.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/ContextListener.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?view=diff&rev=500674&r1=500673&r2=500674
==
--- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java 
(original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java 
Sat Jan 27 15:15:00 2007
@@ -19,7 +19,6 @@
  */
 
 import java.io.*;
-import java.text.*;
 import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?view=diff&rev=500674&r1=500673&r2=500674
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java 
Sat Jan 27 15:15:00 2007
@@ -19,7 +19,6 @@
  */
 
 import java.io.*;
-import java.text.*;
 import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?view=diff&rev=500674&r1=500673&r2=500674
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 
Sat Jan 27 15:15:00 2007
@@ -19,7 +19,6 @@
  */
 
 import java.io.*;
-import java.text.*;
 import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?view=diff&rev=500674&r1=500673&r2=500674
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/webapps/exampl

svn commit: r500684 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/ catalina/ant/jmx/ catalina/core/ catalina/ha/authenticator/ catalina/ha/context/ catalina/ha/session/ catalina/ha/tcp/ catalin

[markt]

Author: markt
Date: Sat Jan 27 15:27:18 2007
New Revision: 500684

URL: http://svn.apache.org/viewvc?view=rev&rev=500684
Log:
Clean up unused imports for the tc6 source tree

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool14Impl.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/StaticMember.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java?view=diff&rev=500684&r1=500683&r2=500684
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java Sat Jan 27 
15:27:18 2007
@@ -17,8 +17,6 @@
 
 package org.apache.catalina;
 
-import java.io.IOException;
-import java.net.URL;
 /**
  * A Cluster works as a Cluster client/server for the local host
  * Different Cluster implementations can be used to support different

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java?view=diff&rev=500684&r1=500683&r2=500684
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
 Sat Jan 27 15:27:18 2007
@@ -16,9 +16,6 @@
  */
 package org.apache.catalina.ant.jmx;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?view=diff&rev=500684&r1=500683&r2=500684
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat 
Jan 27 1

svn commit: r500710 - /tomcat/tc6.0.x/trunk/bin/catalina.bat

[markt]

Author: markt
Date: Sat Jan 27 16:24:33 2007
New Revision: 500710

URL: http://svn.apache.org/viewvc?view=rev&rev=500710
Log:
Fix paste error

Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=500710&r1=500709&r2=500710
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Sat Jan 27 16:24:33 2007
@@ -130,7 +130,8 @@
 :gotJpdaSuspend
 if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
 set JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
-:gotJpdaOptsshift
+:gotJpdaOpts
+shift
 :noJpda
 
 if ""%1"" == ""debug"" goto doDebug



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

svn commit: r500713 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java

[markt]

Author: markt
Date: Sat Jan 27 16:51:28 2007
New Revision: 500713

URL: http://svn.apache.org/viewvc?view=rev&rev=500713
Log:
Fix getting the nested exception of the standard Exception class

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java?view=diff&rev=500713&r1=500712&r2=500713
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
 Sat Jan 27 16:51:28 2007
@@ -269,8 +269,10 @@
 
 if (rootCause == nestedRootCause)
 rootCause = null;
-else
+else {
 rootCause = nestedRootCause;
+nestedRootCause = null;
+}
 } catch (ClassCastException e) {
 rootCause = null;
 }



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

svn commit: r500716 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/core/StandardWrapper.java java/org/apache/catalina/valves/ErrorReportValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jan 27 16:55:24 2007
New Revision: 500716

URL: http://svn.apache.org/viewvc?view=rev&rev=500716
Log:
Port fix bug 39088 that prevents infinite loops when an exception is thrown the 
returns itself for getRootCause(). Also port changes that enable the root cause 
to be found when the nesting is particularly extreme.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?view=diff&rev=500716&r1=500715&r2=500716
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat 
Jan 27 16:55:24 2007
@@ -31,6 +31,8 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.sql.SQLException;
+
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -60,6 +62,7 @@
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.InstanceSupport;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.log.SystemLogHandler;
 import org.apache.tomcat.util.modeler.Registry;
 
@@ -291,7 +294,19 @@
  */
 protected static Properties restrictedServlets = null;
 
+
+private static Class jspExceptionClazz;
 
+static {
+try {
+jspExceptionClazz = 
Class.forName("javax.servlet.jsp.JspException");
+} catch (ClassNotFoundException e) {
+// Expected if jsp-api not on classpath, eg when embedding
+jspExceptionClazz = null;
+}
+}
+
+
 // - Properties
 
 
@@ -675,18 +690,41 @@
  * @param e The servlet exception
  */
 public static Throwable getRootCause(ServletException e) {
-Throwable rootCause = e;
-Throwable rootCauseCheck = null;
-// Extra aggressive rootCause finding
-int loops = 0;
-do {
-loops++;
-rootCauseCheck = rootCause.getCause();
-if (rootCauseCheck != null)
-rootCause = rootCauseCheck;
-} while (rootCauseCheck != null && (loops < 20));
-return rootCause;
+Throwable rootCause = e.getRootCause();
+return findRootCause(e, rootCause);
 }
+
+
+/*
+ * Work through the root causes using specific methods for well known types
+ * and getCause() for the rest. Stop when the next rootCause is null or
+ * an exception is found that has itself as its own rootCause. 
+ */
+private static final Throwable findRootCause(Throwable theException,
+Throwable theRootCause) {
+
+Throwable deeperRootCause = null;
+
+if (theRootCause == null || theRootCause == theException) {
+return theException;
+}
+
+if (theRootCause instanceof ServletException) {
+deeperRootCause = ((ServletException) theRootCause).getRootCause();
+} else if (jspExceptionClazz!=null &&
+jspExceptionClazz.isAssignableFrom(theRootCause.getClass())) {
+deeperRootCause = (Throwable)IntrospectionUtils.getProperty(
+theRootCause, "rootCause"); 
+} else if (theRootCause instanceof SQLException) {
+deeperRootCause = ((SQLException) theRootCause).getNextException();
+}
+if (deeperRootCause == null) {
+deeperRootCause = theRootCause.getCause();
+}
+
+return findRootCause(theRootCause, deeperRootCause);
+}
+
 
 
 /**

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?view=diff&rev=500716&r1=500715&r2=500716
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
Sat Jan 27 16:55:24 2007
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.Writer;
+import java.sql.SQLException;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -33,6 +34,7 @@
 import org.apache.catalina.util.RequestUtil;
 import org.apache.catalina.util.ServerInfo;
 import org.apache.catalina.util.StringManager;
+import org.apache.to