svn commit: r604786 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-12-17 Thread mturk
Author: mturk
Date: Mon Dec 17 00:07:28 2007
New Revision: 604786

URL: http://svn.apache.org/viewvc?rev=604786view=rev
Log:
Use correct XHTML instead HTML. We were using XHTML syntax anyhow

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

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?rev=604786r1=604785r2=604786view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Mon Dec 17 00:07:28 
2007
@@ -150,9 +150,10 @@
 #define JK_STATUS_REFRESH_DEF  10
 #define JK_STATUS_ESC_CHARS(?)
 
-#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \
-   DTD HTML 3.2 Final//EN\\n  \
-   htmlheadtitleJK Status 
Manager/title
+#define JK_STATUS_HEAD ?xml version=\1.0\ 
encoding=\ISO-8859-1\?\n \
+   !DOCTYPE html PUBLIC 
\-//W3C//DTD XHTML 1.0 Transitional//EN\ \
+
\http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\;\n \
+   html 
xmlns=\http://www.w3.org/1999/xhtml\; xml:lang=\en\ lang=\en\
 
 #define JK_STATUS_COPYRIGHTCopyright #169; 1999-2007, The 
Apache Software Foundationbr / \
Licensed under the a 
href=\http://www.apache.org/licenses/LICENSE-2.0\; \
@@ -1928,7 +1929,7 @@
 jk_putv(s, hr/h3Edit load balancer settings for ,
 name, /h3\n, NULL);
 
-status_start_form(s, p, GET, JK_STATUS_CMD_UPDATE, l);
+status_start_form(s, p, get, JK_STATUS_CMD_UPDATE, l);
 
 jk_putv(s, table\ntrtd, JK_STATUS_ARG_LB_TEXT_RETRIES,
 :/tdtdinput name=\,
@@ -2016,7 +2017,7 @@
 
 jk_putv(s, hr/h3Edit worker settings for ,
 wr-s-name, /h3\n, NULL);
-status_start_form(s, p, GET, JK_STATUS_CMD_UPDATE, l);
+status_start_form(s, p, get, JK_STATUS_CMD_UPDATE, l);
 
 jk_puts(s, table\n);
 jk_putv(s, trtd, JK_STATUS_ARG_LBM_TEXT_ACTIVATION,
@@ -2128,7 +2129,7 @@
 ' for all members of load balancer ,
 name, /h3\n, NULL);
 
-status_start_form(s, p, GET, JK_STATUS_CMD_UPDATE, l);
+status_start_form(s, p, get, JK_STATUS_CMD_UPDATE, l);
 
 jk_putv(s, tabletr
 thBalanced Worker/thth, aname, /th
@@ -3397,7 +3398,7 @@
 jk_puts(s, \Stop auto refresh/a]nbsp;nbsp;);
 }
 else {
-status_start_form(s, p, GET, JK_STATUS_CMD_UNKNOWN, 
l);
+status_start_form(s, p, get, JK_STATUS_CMD_UNKNOWN, 
l);
 jk_puts(s, input type=\submit\ value=\Start auto 
refresh\/\n);
 jk_putv(s, (every ,
 input name=\, JK_STATUS_ARG_REFRESH,



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



svn commit: r604787 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-12-17 Thread mturk
Author: mturk
Date: Mon Dec 17 00:12:54 2007
New Revision: 604787

URL: http://svn.apache.org/viewvc?rev=604787view=rev
Log:
Add missing head tag

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

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?rev=604787r1=604786r2=604787view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Mon Dec 17 00:12:54 
2007
@@ -153,7 +153,8 @@
 #define JK_STATUS_HEAD ?xml version=\1.0\ 
encoding=\ISO-8859-1\?\n \
!DOCTYPE html PUBLIC 
\-//W3C//DTD XHTML 1.0 Transitional//EN\ \
 
\http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\;\n \
-   html 
xmlns=\http://www.w3.org/1999/xhtml\; xml:lang=\en\ lang=\en\
+   html 
xmlns=\http://www.w3.org/1999/xhtml\; xml:lang=\en\ lang=\en\ \
+   headtitleJK Status 
Manager/title
 
 #define JK_STATUS_COPYRIGHTCopyright #169; 1999-2007, The 
Apache Software Foundationbr / \
Licensed under the a 
href=\http://www.apache.org/licenses/LICENSE-2.0\; \



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



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

2007-12-17 Thread mturk
Author: mturk
Date: Mon Dec 17 01:44:07 2007
New Revision: 604807

URL: http://svn.apache.org/viewvc?rev=604807view=rev
Log:
Fix opening logger. We try to log without logger in jk_set_time_fmt

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?rev=604807r1=604806r2=604807view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Dec 17 01:44:07 2007
@@ -553,7 +553,6 @@
 if (rc  p) {
 rc-log = log_to_file;
 rc-level = level;
-jk_set_time_fmt(rc, NULL);
 rc-logger_private = p;
 #if defined(AS400)  !defined(AS400_UTF8)
 p-logfile = fopen(file, a+, o_ccsid=0);
@@ -562,7 +561,7 @@
 #endif
 if (p-logfile) {
 *l = rc;
-jk_log(rc, JK_LOG_DEBUG, log time stamp format is '%s', 
rc-log_fmt);
+jk_set_time_fmt(rc, NULL);
 return JK_TRUE;
 }
 }



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



svn commit: r604809 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

2007-12-17 Thread mturk
Author: mturk
Date: Mon Dec 17 01:57:38 2007
New Revision: 604809

URL: http://svn.apache.org/viewvc?rev=604809view=rev
Log:
Fix core dump in terminate. Seems that modified wc_close uses shared memory, so 
close shared memory afterwards

Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=604809r1=604808r2=604809view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Mon Dec 17 01:57:38 
2007
@@ -1594,8 +1594,8 @@
 }
 jk_map_free(rregexp_map);
 }
-jk_shm_close();
 wc_close(logger);
+jk_shm_close();
 if (logger) {
 jk_close_file_logger(logger);
 }



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



svn commit: r604859 - /tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

2007-12-17 Thread rjung
Author: rjung
Date: Mon Dec 17 04:58:10 2007
New Revision: 604859

URL: http://svn.apache.org/viewvc?rev=604859view=rev
Log:
Port r604809 from IIS to Netscape.
We must close workers before the shm, because
lb workers pass shm adresses to their members
when creating them. For successful destroy of
their members these addresses must still be
valid (e.g. the worker name).

Modified:
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=604859r1=604858r2=604859view=diff
==
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Mon Dec 17 
04:58:10 2007
@@ -330,8 +330,8 @@
 jk_map_free(init_map);
 }
 
-jk_shm_close();
 wc_close(logger);
+jk_shm_close();
 if (logger) {
 jk_close_file_logger(logger);
 }



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



svn commit: r604888 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-17 Thread rjung
Author: rjung
Date: Mon Dec 17 07:01:32 2007
New Revision: 604888

URL: http://svn.apache.org/viewvc?rev=604888view=rev
Log:
Remove worker name from log message during
endpoint destruction. There's a chance, that
the worker name is already invalid.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604888r1=604887r2=604888view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Dec 17 
07:01:32 2007
@@ -709,8 +709,8 @@
 
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-(%s) closing endpoint with sd = %u %s,
- ae-worker-name, ae-sd, ae-reuse?  : (socket shutdown));
+closing endpoint with sd = %u %s,
+ ae-sd, ae-reuse?  : (socket shutdown));
 if (IS_VALID_SOCKET(ae-sd)) {
 jk_shutdown_socket(ae-sd, l);
 ae-sd = JK_INVALID_SOCKET;



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



DO NOT REPLY [Bug 44085] New: - Encryption of password in server.xml JNDI datasource

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44085.
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=44085

   Summary: Encryption of password in server.xml JNDI datasource
   Product: Tomcat 4
   Version: 4.1.27
  Platform: All
OS/Version: All
Status: NEW
  Severity: minor
  Priority: P2
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hello,

I have set up a JNDI datasource in accordance with the instructions given in 
the JNDI Datasource HOWTO, and it works. However, the passwords in all the 
sample ResourceParams blocks are in plaintext (i.e. unencrypted) which could 
create a security issue. I can't seem to find anything in the Tomcat 4 docs 
that explains how to encrypt the password field.

Are there any plans to add encryption to the server.xml file to protect 
password information? Or is there an undocumented way of doing this?

Thank you,
Vikram Ravindran
Infor, Inc.

-- 
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 44085] - Encryption of password in server.xml JNDI datasource

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44085.
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=44085


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|minor   |enhancement
 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-12-17 11:28 ---
This is regularly discussed on the users list.

-- 
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: r604974 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

2007-12-17 Thread markt
Author: markt
Date: Mon Dec 17 11:36:44 2007
New Revision: 604974

URL: http://svn.apache.org/viewvc?rev=604974view=rev
Log:
Fix bug 44041. Duplicate class definition under load.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=604974r1=604973r2=604974view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 17 11:36:44 2007
@@ -31,11 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
-  http://svn.apache.org/viewvc?rev=603340view=rev
-  +1: markt, jim, fhanik
-  -1:
-
 * Fix chunked encoding parsing
   The following patch fixes how the Comet processors blocks, it doesn't change 
the 
   way chunked parsing is done, but changing when it blocks and doesn't block.

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=604974r1=604973r2=604974view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
Mon Dec 17 11:36:44 2007
@@ -883,7 +883,9 @@
 }
 if ((clazz == null)  hasExternalRepositories) {
 try {
-clazz = super.findClass(name);
+synchronized (this) {
+clazz = super.findClass(name);
+}
 } catch(AccessControlException ace) {
 throw new ClassNotFoundException(name, ace);
 } catch (RuntimeException e) {

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?rev=604974r1=604973r2=604974view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 17 11:36:44 2007
@@ -95,6 +95,9 @@
   fix
 bug43993/bug: mime mapping for WS-Policy. Patch by Fabian Ritzmann 
 (funkman)
   /fix
+  fix
+bug44041/bug: Fix duplicate class definition under load. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Coyote



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



svn commit: r604975 - /tomcat/tc6.0.x/trunk/STATUS.txt

2007-12-17 Thread markt
Author: markt
Date: Mon Dec 17 11:39:26 2007
New Revision: 604975

URL: http://svn.apache.org/viewvc?rev=604975view=rev
Log:
Add my vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=604975r1=604974r2=604975view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 17 11:39:26 2007
@@ -50,5 +50,5 @@

return result;
   
-  +1: fhanik
+  +1: fhanik, markt
   -1: 



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



DO NOT REPLY [Bug 44086] New: - Bad errror reporting for abstract class as servlet

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44086.
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=44086

   Summary: Bad errror reporting for abstract class as servlet
   Product: Tomcat 6
   Version: 6.0.14
  Platform: Other
OS/Version: other
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


When a servlet is an abstract class, an error will occur while trying to access
the servlet (not at initialization time, parse of web.xml) and no clear message
about the problem can be found, except this stack trace:

java.lang.InstantiationException
at
sun.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:30)
at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
at java.lang.Class.newInstance0(Class.java:355)
at java.lang.Class.newInstance(Class.java:308)
at
org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1104)
at 
org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:981)
at
org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:4045)
at 
org.apache.catalina.core.StandardContext.start(StandardContext.java:4351)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791)
at 
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:525)
at
org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:626)
at
org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:553)
at 
org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:488)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1138)
at
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:311)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:117)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:719)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
at 
org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443)
at 
org.apache.catalina.core.StandardService.start(StandardService.java:516)
at 
org.apache.catalina.core.StandardServer.start(StandardServer.java:710)
at org.apache.catalina.startup.Catalina.start(Catalina.java:566)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413)


IMHO, I'd be desirable to have servlet classes validated for not being abstract

-- 
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: r605000 [2/2] - in /tomcat/trunk/java/org/apache: ./ catalina/core/ catalina/deploy/ catalina/security/ catalina/startup/ catalina/util/ jasper/ jasper/compiler/ jasper/runtime/ jasper/ser

2007-12-17 Thread fhanik
Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=605000r1=604999r2=605000view=diff
==
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Mon Dec 17 12:55:56 2007
@@ -193,6 +193,9 @@
 public static final boolean IS_SECURITY_ENABLED = 
 (System.getSecurityManager() != null);
 
+public static final boolean USE_INSTANCE_MANAGER_FOR_TAGS =
+
Boolean.valueOf(System.getProperty(org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS,
 false)).booleanValue();
+
 /**
  * The name of the path parameter used to pass the session identifier
  * back and forth with the client.

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=605000r1=604999r2=605000view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Mon Dec 17 
12:55:56 2007
@@ -589,12 +589,7 @@
 try {
 getJspLoader();
 
-String name;
-if (isTagFile()) {
-name = tagInfo.getTagClassName();
-} else {
-name = getServletPackageName() + . + getServletClassName();
-}
+String name = getFQCN();
 servletClass = jspLoader.loadClass(name);
 } catch (ClassNotFoundException cex) {
 throw new 
JasperException(Localizer.getMessage(jsp.error.unable.load),
@@ -605,6 +600,16 @@
 }
 removed = 0;
 return servletClass;
+}
+
+public String getFQCN() {
+String name;
+if (isTagFile()) {
+name = tagInfo.getTagClassName();
+} else {
+name = getServletPackageName() + . + getServletClassName();
+}
+return name;
 }
 
 //  protected methods  

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=605000r1=604999r2=605000view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Mon Dec 17 
12:55:56 2007
@@ -48,20 +48,20 @@
 
 /**
  * Generate Java source from Nodes
- * 
+ *
  * @author Anil K. Vijendran
  * @author Danno Ferrin
  * @author Mandar Raje
  * @author Rajiv Mordani
  * @author Pierre Delisle
- * 
+ *
  * Tomcat 4.1.x and Tomcat 5:
  * @author Kin-man Chung
  * @author Jan Luehe
  * @author Shawn Bayern
  * @author Mark Roth
  * @author Denis Benoit
- * 
+ *
  * Tomcat 6.x
  * @author Jacob Hookom
  * @author Remy Maucherat
@@ -71,10 +71,10 @@
 
 private static final Class[] OBJECT_CLASS = { Object.class };
 
-private static final String VAR_EXPRESSIONFACTORY = 
+private static final String VAR_EXPRESSIONFACTORY =
 
System.getProperty(org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY,
 _el_expressionfactory);
-private static final String VAR_ANNOTATIONPROCESSOR = 
-
System.getProperty(org.apache.jasper.compiler.Generator.VAR_ANNOTATIONPROCESSOR,
 _jsp_annotationprocessor);
+private static final String VAR_INSTANCEMANAGER =
+
System.getProperty(org.apache.jasper.compiler.Generator.VAR_INSTANCEMANAGER, 
_jsp_instancemanager);
 
 private ServletWriter out;
 
@@ -186,7 +186,7 @@
 /*
  * Generates getServletInfo() method that returns the value of the
  * page directive's 'info' attribute, if present.
- * 
+ *
  * The Validator has already ensured that if the translation unit
  * contains more than one page directive with an 'info' attribute,
  * their values match.
@@ -251,7 +251,7 @@
 
 /*
  * Constructor
- * 
+ *
  * @param v Vector of tag handler pool names to populate
  */
 TagHandlerPoolVisitor(Vector v) {
@@ -280,7 +280,7 @@
 /*
  * Creates the name of the tag handler pool whose tag handlers may
  * be (re)used to service this action.
- * 
+ *
  * @return The name of the tag handler pool
  */
 private String createTagHandlerPoolName(String prefix,
@@ -376,7 +376,7 @@
  * Generates the _jspInit() method for instantiating the tag handler pools.
  * For tag file, _jspInit has to be invoked manually, 

DO NOT REPLY [Bug 44087] New: - tomcat-native-1.1.10 duplicate requests on tcp connection

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44087.
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=44087

   Summary: tomcat-native-1.1.10 duplicate requests on tcp
connection
   Product: Tomcat 5
   Version: Unknown
  Platform: Other
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Native:Integration
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Using jboss 4.2.1 (based on tomcat 5.5), with tomcat-native-1.1.10 installed, 
and SSL enabled.  Connecting to port 8443 (https port) using netcat and then 
disconnecting without sending any data will cause tomcat to handle a duplicate 
copy of one of the recent requests.  For example, a client at 10.0.0.1 is 
making HTTP GET requests for https://someserver:8443/someurl?foo=1, with foo 
being incremented on each request.  If you connect to the https port from 
10.0.0.2 and then disconnect without sending any data, the access log will show 
10.0.0.2 issuing a request for someurl?foo=some_recent_number.

-- 
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 43242] - New HttpSession created in HttpServletRequest under IPv6

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=43242.
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=43242


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2007-12-17 14:16 ---
This works for me with a simple JSP test case in Windows 2k3. I wonder if it is
a JNLP issue or something else?

There does not appear to be a Tomcat issue here. I suggest you follow this up on
the users list. My suggestion would be to using something like TcpMon (if it
supports ipv6) and monitor the traffic to see if it is a client or server issue.

The folks on the users list are usually pretty helpful.

If you do conclude it is a Tomcat issue, feel free to re-open this and include
the steps to reproduce.

-- 
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 44088] New: - Cannot expire session via html manager webapp

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44088.
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=44088

   Summary: Cannot expire session via html manager webapp
   Product: Tomcat 6
   Version: 6.0.14
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Manager application
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The html manager webapp done not work correctly when clicking the expire
sessions button. The idle param is missing from the form.

The following html shows this bug...

form method=POST action=/manager/html/expire?path=/
  small
  nbsp;input type=submit value=Expire sessionsnbsp;with idle
ge;nbsp;input type=text name=expire size=5 
value=30nbsp;minutesnbsp;
  /small
  /form

The name of the text input should be idle.

-- 
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 44088] - Cannot expire session via html manager webapp

2007-12-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44088.
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=44088





--- Additional Comments From [EMAIL PROTECTED]  2007-12-17 15:16 ---
Created an attachment (id=21280)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=21280action=view)
Patch code this fixes this bug

This patch should be applied to the trunk. 

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