DO NOT REPLY [Bug 41912] New: - JSF datatable does not work on tomcat 6.0.9

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

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

   Summary: JSF datatable does not work on tomcat 6.0.9
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


In a page we want to use the jsf element 'dataTable' as follows:





   

   





The testlist is a simple list of strings. 

We are using Tomcat 6 and Sun RI jsf 1.2 implementation. 

On Glassfish it works fine, but with Tomcat 6 I get the following error:



An error occurred at line: 33 in the jsp file: /Page2.jsp The method

setVar(String) in the type DataTableTag is not applicable for the arguments
(JspValueExpression) ...



Stacktrace:

at

org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHa

ndler.java:85)

at

org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.ja

va:330)

at

org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:41

5)

at

org.apache.jasper.compiler.Compiler.compile(Compiler.java:308)

at

org.apache.jasper.compiler.Compiler.compile(Compiler.java:286)

at

org.apache.jasper.compiler.Compiler.compile(Compiler.java:273)

at

org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.ja

va:566)

at

org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.ja

va:308)

at

org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:320)

at

org.apache.jasper.servlet.JspServlet.service(JspServlet.java:266)

at javax.servlet.http.HttpServlet.service(HttpServlet.java:803)

at

org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Applica

tionFilterChain.java:290)

at

org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilt

erChain.java:206)

at

org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatc

her.java:687)

at

org.apache.catalina.core.ApplicationDispatcher.processRequest(Applicatio

nDispatcher.java:469)

at

org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDisp

atcher.java:403)

at

org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispat

cher.java:301)

at

com.sun.faces.context.ExternalContextImpl.dispatch(ExternalContextImpl.j

ava:414)

at

com.sun.faces.application.ViewHandlerImpl.executePageToBuildView(ViewHan

dlerImpl.java:455)

at

com.sun.faces.application.ViewHandlerImpl.renderView(ViewHandlerImpl.jav

a:139)

at

com.sun.faces.lifecycle.RenderResponsePhase.execute(RenderResponsePhase.

java:108)

at

com.sun.faces.lifecycle.LifecycleImpl.phase(LifecycleImpl.java:266)

at

com.sun.faces.lifecycle.LifecycleImpl.render(LifecycleImpl.java:159)

at

javax.faces.webapp.FacesServlet.service(FacesServlet.java:245)

at

org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Applica

tionFilterChain.java:290)

at

org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilt

erChain.java:206)

at

org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValv

e.java:228)

at

org.apache.catalina.core.StandardContextValve.invoke(StandardContextValv

e.java:175)

at

org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java

:128)

at

org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java

:104)

at

org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:517

)

at

org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.

java:109)

at

org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:2

12)

at

org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:84

4)

at

org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(

Http11Protocol.java:634)

at

org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:445)

at java.lang.Thread.run(Thread.java:595)



Greetings,



Anneke Jansen

-- 
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: r520854 - in /tomcat/connectors/trunk/jk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.vc Makefile.x86 pcre/dftables.x86 pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 05:15:24 2007
New Revision: 520854

URL: http://svn.apache.org/viewvc?view=rev&rev=520854
Log:
Update command line make files with pcre library

Added:
tomcat/connectors/trunk/jk/native/iis/Makefile.x86
tomcat/connectors/trunk/jk/native/iis/pcre/dftables.x86
tomcat/connectors/trunk/jk/native/iis/pcre/pcre.amd64
tomcat/connectors/trunk/jk/native/iis/pcre/pcre.ia64
tomcat/connectors/trunk/jk/native/iis/pcre/pcre.x86
Removed:
tomcat/connectors/trunk/jk/native/iis/Makefile.vc
Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.amd64?view=diff&rev=520854&r1=520853&r2=520854
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Wed Mar 21 05:15:24 
2007
@@ -3,25 +3,31 @@
 # SetEnv.cmd /X64 /RETAIL
 # nmake -f Makefile.amd64
 #
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release_amd64
-INTDIR=.\Release_amd64
+OUTDIR=.\Release_x86
+INTDIR=.\Release_x86
 # Begin Custom Macros
-OutDir=.\Release_amd64
+OutDir=.\Release_x86
 # End Custom Macros
 
+!IF "$(RECURSE)" == "0" 
+
 ALL : "$(OUTDIR)\isapi_redirect.dll"
 
+!ELSE 
+
+ALL : "pcre_amd64" "$(OUTDIR)\isapi_redirect.dll"
+
+!ENDIF 
 
+!IF "$(RECURSE)" == "1" 
+CLEAN :"pcre_amd64CLEAN" 
+!ELSE 
 CLEAN :
+!ENDIF 
+   [EMAIL PROTECTED] "$(INTDIR)\isapi_redirect.res"
[EMAIL PROTECTED] "$(INTDIR)\isapi_redirector_src.idb"
[EMAIL PROTECTED] "$(INTDIR)\isapi_redirector_src.pdb"
[EMAIL PROTECTED] "$(INTDIR)\jk_ajp12_worker.obj"
@@ -59,7 +65,7 @@
 BSC32_SBRS= \

 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
bufferoverflowu.lib strsafe.lib /nologo /dll /incremental:no 
/pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def" 
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib bufferoverflowu.lib /nologo /dll /incremental:no 
/pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def" 
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" 
 DEF_FILE= \
".\isapi.def"
 LINK32_OBJS= \
@@ -84,14 +90,16 @@
"$(INTDIR)\jk_status.obj" \
"$(INTDIR)\jk_uri_worker_map.obj" \
"$(INTDIR)\jk_util.obj" \
-   "$(INTDIR)\jk_worker.obj"
+   "$(INTDIR)\jk_worker.obj" \
+   "$(INTDIR)\isapi_redirect.res" \
+   ".\pcre\Release_x86\pcre.lib"
 
 "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
 $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I 
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D 
"_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "ISAPI_EXPORTS" 
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" 
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D 
"ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -124,6 +132,13 @@
 <<
 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\isapi_redirect.res" /d "NDEBUG" 
+
+SOURCE=.\isapi_redirect.rc
+
+"$(INTDIR)\isapi_redirect.res" : $(SOURCE) "$(INTDIR)"
+   $(RSC) $(RSC_PROJ) $(SOURCE)
+
 
 SOURCE=..\common\jk_ajp12_worker.c
 
@@ -255,3 +270,13 @@
 "$(INTDIR)\jk_worker.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
 
+
+"pcre_amd64" : 
+   cd ".\pcre"
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64"
+   cd ".."
+
+"pcre_amd64CLEAN" : 
+   cd ".\pcre"
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64" RECURSE=1 CLEAN 
+   cd ".."

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.ia64?view=diff&rev=520854&r1=520853&r2=520854
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Wed Mar 21 05:15:24 2007
@@ -1,27 +1,33 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on isapi.dsp
 # Use Platform SDK:
 # SetEnv.cmd /SRV64 /RETAIL
-# nmake -f Makefile.amd64
+# nmake -f Makefile.ia64
 #
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release_i

svn commit: r520856 - in /tomcat/connectors/trunk/jk/native/iis: Makefile.amd64 Makefile.ia64

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 05:27:51 2007
New Revision: 520856

URL: http://svn.apache.org/viewvc?view=rev&rev=520856
Log:
Embed manifests into dll if generated

Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.amd64?view=diff&rev=520856&r1=520855&r2=520856
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Wed Mar 21 05:27:51 
2007
@@ -6,10 +6,10 @@
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release_x86
-INTDIR=.\Release_x86
+OUTDIR=.\Release_amd64
+INTDIR=.\Release_amd64
 # Begin Custom Macros
-OutDir=.\Release_x86
+OutDir=.\Release_amd64
 # End Custom Macros
 
 !IF "$(RECURSE)" == "0" 
@@ -98,6 +98,8 @@
 $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
+   IF EXIST $(OUTDIR)\isapi_redirect.manifest \
+   mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest 
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
 
 CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" 
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D 
"ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
 

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.ia64?view=diff&rev=520856&r1=520855&r2=520856
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Wed Mar 21 05:27:51 2007
@@ -98,6 +98,8 @@
 $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
+   IF EXIST $(OUTDIR)\isapi_redirect.manifest \
+   mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest 
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
 
 CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I 
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" 
/D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D 
"ISAPI_EXPORTS" /D "HAS_PCRE" /Fo"$(INTDIR)\\" 
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c 
 



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

svn commit: r520859 - in /tomcat/connectors/trunk/jk/native/iis: README installer/conf/uriworkermap.properties

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 05:33:20 2007
New Revision: 520859

URL: http://svn.apache.org/viewvc?view=rev&rev=520859
Log:
Add Tomcat6 examples to the sample mappings file

Modified:
tomcat/connectors/trunk/jk/native/iis/README
tomcat/connectors/trunk/jk/native/iis/installer/conf/uriworkermap.properties

Modified: tomcat/connectors/trunk/jk/native/iis/README
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/README?view=diff&rev=520859&r1=520858&r2=520859
==
--- tomcat/connectors/trunk/jk/native/iis/README (original)
+++ tomcat/connectors/trunk/jk/native/iis/README Wed Mar 21 05:33:20 2007
@@ -37,8 +37,7 @@
1. Change directory to the isapi redirector plugins source directory.

2. Execute the following command:
-  MSDEV isapi.dsp /MAKE ALL
-  If msdev is not in your path, enter the full path to msdev.exe
+  nmake -f Makefile.x86
 
 This will build both release and debug versions of the redirector plugin.
 

Modified: 
tomcat/connectors/trunk/jk/native/iis/installer/conf/uriworkermap.properties
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/installer/conf/uriworkermap.properties?view=diff&rev=520859&r1=520858&r2=520859
==
--- 
tomcat/connectors/trunk/jk/native/iis/installer/conf/uriworkermap.properties 
(original)
+++ 
tomcat/connectors/trunk/jk/native/iis/installer/conf/uriworkermap.properties 
Wed Mar 21 05:33:20 2007
@@ -9,6 +9,7 @@
 /manager/*=wlb
 /jsp-examples/*=wlb
 /servlets-examples/*=wlb
+/examples/*=wlb
 
 # Optionally filter out all .jpeg files inside that context
 # For no mapping the url has to start with exclamation (!)



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

svn commit: r520862 - /tomcat/connectors/trunk/jk/native/iis/Makefile.ia64

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 05:38:31 2007
New Revision: 520862

URL: http://svn.apache.org/viewvc?view=rev&rev=520862
Log:
Use correct directory for IA64 builds

Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.ia64?view=diff&rev=520862&r1=520861&r2=520862
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Wed Mar 21 05:38:31 2007
@@ -6,10 +6,10 @@
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release_x86
-INTDIR=.\Release_x86
+OUTDIR=.\Release_ia64
+INTDIR=.\Release_ia64
 # Begin Custom Macros
-OutDir=.\Release_x86
+OutDir=.\Release_ia64
 # End Custom Macros
 
 !IF "$(RECURSE)" == "0" 
@@ -92,7 +92,7 @@
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
"$(INTDIR)\isapi_redirect.res" \
-   ".\pcre\Release_x86\pcre.lib"
+   ".\pcre\Release_ia64\pcre.lib"
 
 "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
 $(LINK32) @<<



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

DO NOT REPLY [Bug 40809] - Tomcat 5.5.20 fails to load ServletContextListener in tld!

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |




--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 07:24 ---
We have had lots of problem with non-registered listeners on Tomcat releases
after 5.5.17. After digging around we discovered that installing Tomcat in a
path without spaces makes the problem go away. So the normal Windows
installation in '\Program files\' etc fails, while '\tomcat\' etc work.
Some sources discuss changes in org.apache.catalina.loader.WebappClassLoader
that turn paths into URI (with '%20' instead of spaces). Could this be related?


-- 
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: r520926 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 09:05:29 2007
New Revision: 520926

URL: http://svn.apache.org/viewvc?view=rev&rev=520926
Log:
Added regexp rewrite options for IIS

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?view=diff&rev=520926&r1=520925&r2=520926
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Mar 21 09:05:29 
2007
@@ -39,6 +39,11 @@
 #include "jk_worker.h"
 #include "jk_uri_worker_map.h"
 #include "jk_shm.h"
+#include "pcre.h"
+
+#ifndef POSIX_MALLOC_THRESHOLD
+#define POSIX_MALLOC_THRESHOLD (10)
+#endif
 
 #include 
 
@@ -154,6 +159,7 @@
 static jk_uri_worker_map_t *uw_map = NULL;
 static jk_map_t *workers_map = NULL;
 static jk_map_t *rewrite_map = NULL;
+static jk_map_t *rregexp_map = NULL;
 
 static jk_logger_t *logger = NULL;
 static char *SERVER_NAME = "SERVER_NAME";
@@ -748,6 +754,283 @@
 return rv;
 }
 
+
+#define AP_REG_ICASE0x01 /** use a case-insensitive match */
+#define AP_REG_NEWLINE  0x02 /** don't match newlines against '.' etc */
+#define AP_REG_NOTBOL   0x04 /** ^ will not match against start-of-string */
+#define AP_REG_NOTEOL   0x08 /** $ will not match against end-of-string */
+
+#define AP_REG_EXTENDED (0)  /** unused */
+#define AP_REG_NOSUB(0)  /** unused */
+/** The max number of regex captures that can be expanded by ap_pregsub */
+#define AP_MAX_REG_MATCH 10
+
+/* Error values: */
+enum {
+AP_REG_ASSERT = 1,  /** internal error ? */
+AP_REG_ESPACE,  /** failed to get memory */
+AP_REG_INVARG,  /** invalid argument */
+AP_REG_NOMATCH  /** match failed */
+};
+
+/* The structure representing a compiled regular expression. */
+typedef struct {
+void *re_pcre;
+size_t re_nsub;
+size_t re_erroffset;
+} ap_regex_t;
+
+/* The structure in which a captured offset is returned. */
+typedef struct {
+int rm_so;
+int rm_eo;
+} ap_regmatch_t;
+
+
+/* Table of error strings corresponding to POSIX error codes; must be
+ * kept in synch with include/ap_regex.h's AP_REG_E* definitions. */
+
+static const char *const pstring[] = {
+  "",/* Dummy for value 0 */
+  "internal error",  /* AP_REG_ASSERT */
+  "failed to get memory",/* AP_REG_ESPACE */
+  "bad argument",/* AP_REG_INVARG */
+  "match failed" /* AP_REG_NOMATCH */
+};
+
+static size_t ap_regerror(int errcode, const ap_regex_t *preg,
+  char *errbuf, size_t errbuf_size)
+{
+const char *message, *addmessage;
+size_t length, addlength;
+
+message = (errcode >= (int)(sizeof(pstring)/sizeof(char *))) ?
+"unknown error code" : pstring[errcode];
+length = strlen(message) + 1;
+
+addmessage = " at offset ";
+addlength = (preg != NULL && (int)preg->re_erroffset != -1)?
+strlen(addmessage) + 6 : 0;
+
+if (errbuf_size > 0) {
+if (addlength > 0 && errbuf_size >= length + addlength)
+StringCbPrintf(errbuf, sizeof(errbuf), "%s%s%-6d",
+  message, addmessage,
+  (int)preg->re_erroffset);
+else {
+strncpy(errbuf, message, errbuf_size - 1);
+errbuf[errbuf_size-1] = 0;
+}
+}
+
+return length + addlength;
+}
+
+/*
+ *   Free store held by a regex  *
+ */
+
+static void ap_regfree(ap_regex_t *preg)
+{
+(pcre_free)(preg->re_pcre);
+}
+
+
+
+
+/*
+ *Compile a regular expression   *
+ */
+
+/*
+Arguments:
+  pregpoints to a structure for recording the compiled expression
+  pattern the pattern to compile
+  cflags  compilation flags
+
+Returns:  0 on success
+  various non-zero codes on failure
+*/
+
+static int ap_regcomp(ap_regex_t *preg, const char *pattern, int cflags)
+{
+const char *errorptr;
+int erroffset;
+int options = 0;
+
+if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
+if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
+
+preg->re_pcre = pcre_compile(pattern, options, &errorptr, &erroffset, 
NULL);
+preg->re_erroffset = erroffset;
+
+if (preg->re_pcre == NULL) return AP_REG_INVARG;
+
+preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
+return 0;
+}
+
+/*
+ *  Match a regular expression   *
+ *

svn commit: r520927 - /tomcat/connectors/trunk/jk/native/iis/Makefile.amd64

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 09:07:59 2007
New Revision: 520927

URL: http://svn.apache.org/viewvc?view=rev&rev=520927
Log:
Link with correct pcre library for amd64

Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64

Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.amd64?view=diff&rev=520927&r1=520926&r2=520927
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Wed Mar 21 09:07:59 
2007
@@ -92,7 +92,7 @@
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
"$(INTDIR)\isapi_redirect.res" \
-   ".\pcre\Release_x86\pcre.lib"
+   ".\pcre\Release_amd64\pcre.lib"
 
 "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
 $(LINK32) @<<



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

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

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 09:11:51 2007
New Revision: 520930

URL: http://svn.apache.org/viewvc?view=rev&rev=520930
Log:
Fix some compile time warning on 64 bit platforms

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?view=diff&rev=520930&r1=520929&r2=520930
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Mar 21 09:11:51 
2007
@@ -882,7 +882,7 @@
 in a macro that can be changed at configure time. */
 
 static int ap_regexec(const ap_regex_t *preg, const char *string,
-  size_t nmatch, ap_regmatch_t pmatch[],
+  int nmatch, ap_regmatch_t pmatch[],
   int eflags)
 {
 int rc;
@@ -1065,7 +1065,7 @@
 char *subs = ap_pregsub(src, uri,
AP_MAX_REG_MATCH, regm);
 if (subs) {
-int diffsz = strlen(subs) - (regm[0].rm_eo - 
regm[0].rm_so);
+size_t diffsz = strlen(subs) - (regm[0].rm_eo - 
regm[0].rm_so);
 char *buf = malloc(INTERNET_MAX_URL_LENGTH);
 memcpy(buf, uri, regm[0].rm_so);
 StringCbCopy(buf + regm[0].rm_so, INTERNET_MAX_URL_LENGTH, 
subs);



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

svn commit: r520968 - in /tomcat/tc6.0.x/trunk: conf/ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/net/

2007-03-21 Thread fhanik 
Author: fhanik
Date: Wed Mar 21 11:00:39 2007
New Revision: 520968

URL: http://svn.apache.org/viewvc?view=rev&rev=520968
Log:
Added in the Executor skeleton. the executor gets created in the service, so 
that the connectors can reference it.
Feel free to hack away on improvements or yell at me if this is completely not 
what was intended and I will pull it out


Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Executor.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Service.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?view=diff&rev=520968&r1=520967&r2=520968
==
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Wed Mar 21 11:00:39 2007
@@ -32,7 +32,13 @@
Documentation at /docs/config/service.html
-->
   
-
+  
+
+
+
+
 
 
+
+

DO NOT REPLY [Bug 41922] New: - JkEnvVar no longer works in apache 1.3

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

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

   Summary: JkEnvVar no longer works in apache 1.3
   Product: Tomcat 5
   Version: Unknown
  Platform: All
OS/Version: All
Status: NEW
  Severity: critical
  Priority: P1
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


In v1.2.19, in the apache-1.3 mod_jk.c code, the jk_add_env_var function used 
to do:

conf->envvars_in_use = JK_TRUE;

The apache-2.0 code still does this in 1.2.21 but the apache-1.3 code no longer
does which causes JkEnvVar to not work at all.

I can't get ahold of 1.2.19 source or I would submit a patch for 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]

DO NOT REPLY [Bug 41922] - JkEnvVar no longer works in apache 1.3

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

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





--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 12:00 ---
I forgot to mention.  We added that code snippet back into our local source and
recompiled it, tested it, and it worked.


-- 
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 41923] New: - Tomcat doesnt recognized client abort

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

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

   Summary: Tomcat doesnt recognized client abort
   Product: Tomcat 5
   Version: 5.5.16
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connector:AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Hi,

i'm using an apache WS with mod_jk 1.2.20 and a tomcat 5.5.xx on a linux 
system. I configured a loadbalancer with a worker. On this worker i 
set "recovery_options=4". I try to catch in my application the client abort ( 
the client close of http connection), but cant get it. In my application i 
cant recognize the close of http connection on client side. Tomcat is writing 
every time succesfully the response, if the client connection is alive or not. 
The status of the response is in every case without an error (error=false) and 
it's commited.
The recovery_option 4, should be used to inform servlet engine about a broken 
client connection but it doesnt work. I tried additionally the JKoption 
DiableReuse, but it doesnt change the situation.

Hope you can help or fix it or you have a workaround for this problem.

thanks a lot for your help

greeting thomsen

-- 
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: r520991 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c xdocs/miscellaneous/changelog.xml

2007-03-21 Thread mturk 
Author: mturk
Date: Wed Mar 21 13:27:19 2007
New Revision: 520991

URL: http://svn.apache.org/viewvc?view=rev&rev=520991
Log:
Fix #41922 by seting the envars_in_use when there is JkEnvVar directive

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=520991&r1=520990&r2=520991
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Mar 21 13:27:19 
2007
@@ -1775,6 +1775,7 @@
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
 
+conf->envvars_in_use = JK_TRUE;
 
 /* env_name is mandatory, default_value is optional.
  * No value means send the attribute only, if the env var is set during 
runtime.

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=520991&r1=520990&r2=520991
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Mar 21 
13:27:19 2007
@@ -26,6 +26,9 @@
   
   
 
+  
+419222: Apache 1.3. Enable JkEnvVar. (mturk)
+  
   
 Apache. Add --enable-flock configure parameter for explicit
 compilation of faster flock() system calls for OS supporting



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

DO NOT REPLY [Bug 41922] - JkEnvVar no longer works in apache 1.3

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 13:28 ---
Fixed in the SVN. Will be part of 1.2.22
Thanks for spotting that.

-- 
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: r521048 - /tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile

2007-03-21 Thread fuankg 
Author: fuankg
Date: Wed Mar 21 16:18:54 2007
New Revision: 521048

URL: http://svn.apache.org/viewvc?view=rev&rev=521048
Log:
Few minor cosmetic changes.

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile?view=diff&rev=521048&r1=521047&r2=521048
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/NWGNUmakefile Wed Mar 21 
16:18:54 2007
@@ -81,7 +81,7 @@
$(EOLIST)
 
 XLFLAGS+= \
-   $(EOLIST)
+   $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -95,7 +95,7 @@
$(EOLIST)
 
 XLFLAGS+= \
-   $(EOLIST)
+   $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -117,7 +117,7 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME   = mod_jk
+NLM_NAME   = mod_jk
 
 #
 # This is used by the link '-desc ' directive.
@@ -167,14 +167,14 @@
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS  =  AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS  = AUTOUNLOAD, PSEUDOPREEMPTION
 
 #
 # If this is specified it will be linked in with the XDCData option in the def
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA =
+XDCDATA=
 
 #
 # If there is an NLM target, put it here
@@ -223,7 +223,7 @@
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-   libcpre.o \
+   libcpre.o \
$(EOLIST)
 
 #



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

DO NOT REPLY [Bug 40809] - Tomcat 5.5.20 fails to load ServletContextListener in tld!

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

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





--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 16:39 ---
You'll need to provide a test case that demonstrates this as the Tomcat team has
been unable to reproduce this issue.

-- 
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 39530] - Tomcat 5.5.17 generates incorrect code with trimSpaces turned on.

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 17:57 ---
We've just come across this problem, and I can't believe nobody else has either
commented on this bug or discussed it at all? Surely lots of people must strike
this problem using jsp's with trimSpaces on?

-- 
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: r521062 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/ajp.xml config/executor.xml config/http.xml config/project.xml

2007-03-21 Thread fhanik 
Author: fhanik
Date: Wed Mar 21 18:00:01 2007
New Revision: 521062

URL: http://svn.apache.org/viewvc?view=rev&rev=521062
Log:
Documented the Executor element

Added:
tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml

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=521062&r1=521061&r2=521062
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar 21 18:00:01 2007
@@ -17,6 +17,10 @@
 
   
 
+  
+Added support for shared thread pools by adding in the 
+element as a nested element to the  element. (fhanik)
+  
   
 41666 Correct handling of boundary conditions for
 If-Unmodified-Since and If-Modified-Since headers. Patch provided by

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?view=diff&rev=521062&r1=521061&r2=521062
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Wed Mar 21 18:00:01 2007
@@ -173,6 +173,8 @@
   support for the Srevlet specification using the header recommended in the
   specification.  The default value is false.
 
+
+
 
   
 
@@ -216,6 +218,12 @@
   The number of milliseconds this Connector will wait,
   after accepting a connection, for the request URI line to be
   presented.  The default value is infinite (i.e. no timeout).
+
+
+
+  A reference to the name in an Executor 
element.
+ If this attribute is enabled, and the named executor exists, the 
connector will
+ use the executor, and all the other thread attributes will be 
ignored.
 
 
 

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml?view=auto&rev=521062
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml Wed Mar 21 18:00:01 
2007
@@ -0,0 +1,95 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The Executor (thread pool)
+  
+
+
+
+
+
+
+  The Executor represents a thread pool that can be shared 
+ between components in Tomcat. Historically there has been a thread pool 
per
+ connector created but this allows you to share a thread pool, between 
(primarly) connector
+ but also other components when those get configured to support 
executors
+
+
+  The executor has to implement the 
org.apache.catalina.Executor interface.
+  
+  The executor is a nested element to the Service element.
+ And in order for it to be picked up by the connectors, the Executor 
element has to appear
+ prior to the Connector element in server.xml
+
+
+
+
+
+  
+
+  All implementations of Executor
+  support the following attributes:
+
+  
+ 
+
+  The class of the implementation. The implementation has to implement 
the 
+ org.apache.catalina.Executor interface.
+ This interface ensures that the object can be referenced through its 
name attribute
+ and that implements Lifecycle, so that it can be started and stopped 
with the container.
+ The default value for the className is 
org.apache.catalina.core.StandardThreadExecutor
+
+
+
+  The name used to reference this pool in other places in server.xml.
+ The name is required and must be unique.
+
+
+  
+
+  
+
+  
+
+  
+  The default implementation supports the following attributes:
+
+  
+
+
+  (int) The thread priority for threads in the executor, the default is 
Thread.NORM_PRIORITY
+
+
+  (boolean) Whether the threads should be daemon threads or not, the 
default is true
+
+
+  (String) The name prefix for each thread created by the executor.
+ The thread name for an individual thread will be 
namePrefix+threadNumber
+
+
+  (int) The max number of active threads in this pool, default is 
200
+
+
+  (int) The minimum number of threads always kept alive, default is 
25
+
+
+  (int) The number of milliseconds before an idle thread shutsdown, 
unless the number of active threads are less
+ or equal to minSpareThreads. Default value is 6(1 
minute)
+
+  
+
+
+  
+
+
+
+
+
+

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http

svn commit: r521068 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

2007-03-21 Thread fhanik 
Author: fhanik
Date: Wed Mar 21 18:21:25 2007
New Revision: 521068

URL: http://svn.apache.org/viewvc?view=rev&rev=521068
Log:
Make sure that we don't need to use any locks or synchronized statements to get 
our executor to work properly.
If the task gets executed, means that the threadpool just reached max threads 
when we were about to add this one in.
a simple race condition that we can take care of easily

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?view=diff&rev=521068&r1=521067&r2=521068
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java 
Wed Mar 21 18:21:25 2007
@@ -11,6 +11,7 @@
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.util.LifecycleSupport;
+import java.util.concurrent.RejectedExecutionException;
 
 public class StandardThreadExecutor implements Executor {
 
@@ -59,8 +60,14 @@
 }
 
 public void execute(Runnable command) {
-if ( executor != null ) executor.execute(command);
-else throw new IllegalStateException("StandardThreadPool not 
started.");
+if ( executor != null ) {
+try {
+executor.execute(command);
+} catch (RejectedExecutionException rx) {
+//there could have been contention around the queue
+if ( !( (TaskQueue) executor.getQueue()).force(command) ) 
throw new RejectedExecutionException();
+}
+} else throw new IllegalStateException("StandardThreadPool not 
started.");
 }
 
 public int getThreadPriority() {
@@ -171,10 +178,15 @@
 public void setParent(ThreadPoolExecutor tp) {
 parent = tp;
 }
+
+public boolean force(Runnable o) {
+if ( parent.isShutdown() ) throw new RejectedExecutionException();
+return super.offer(o); //forces the item onto the queue, to be 
used if the task is rejected
+}
 
 public boolean offer(Runnable o) {
 if (parent != null && parent.getPoolSize() < 
parent.getMaximumPoolSize())
-return false; //force creation of new threads
+return false; //force creation of new threads by rejecting the 
task
 else
 return super.offer(o);
 }



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

svn commit: r521076 - /tomcat/tc6.0.x/trunk/conf/web.xml

2007-03-21 Thread markt 
Author: markt
Date: Wed Mar 21 18:39:00 2007
New Revision: 521076

URL: http://svn.apache.org/viewvc?view=rev&rev=521076
Log:
Use the 2.5 schema

Modified:
tomcat/tc6.0.x/trunk/conf/web.xml

Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?view=diff&rev=521076&r1=521075&r2=521076
==
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Wed Mar 21 18:39:00 2007
@@ -1,8 +1,8 @@
 
-http://java.sun.com/xml/ns/j2ee";
+http://java.sun.com/xml/ns/javaee";
 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/javaee 
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
+version="2.5">
 
   
   



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

svn commit: r521080 - in /tomcat/site/trunk: docs/security-4.html docs/security-5.html docs/security-6.html xdocs/security-4.xml xdocs/security-5.xml xdocs/security-6.xml

2007-03-21 Thread markt 
Author: markt
Date: Wed Mar 21 18:55:43 2007
New Revision: 521080

URL: http://svn.apache.org/viewvc?view=rev&rev=521080
Log:
Fix typo.

Modified:
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/xdocs/security-4.xml
tomcat/site/trunk/xdocs/security-5.xml
tomcat/site/trunk/xdocs/security-6.xml

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?view=diff&rev=521080&r1=521079&r2=521080
==
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Wed Mar 21 18:55:43 2007
@@ -230,7 +230,7 @@
 Requests with multiple content-length headers should be rejected as
invalid. When multiple components (firewalls, caches, proxies and 
Tomcat)
process a sequence of requests where one or more requests contain
-   multiple content-length headers and several components accept do not
+   multiple content-length headers and several components do not
reject the request and make different decisions as to which
content-length leader to use an attacker can poision a web-cache, 
perform
an XSS attack and obtain senstive information from requests other then

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?view=diff&rev=521080&r1=521079&r2=521080
==
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Wed Mar 21 18:55:43 2007
@@ -230,7 +230,7 @@
 Requests with multiple content-length headers should be rejected as
invalid. When multiple components (firewalls, caches, proxies and 
Tomcat)
process a sequence of requests where one or more requests contain
-   multiple content-length headers and several components accept do not
+   multiple content-length headers and several components do not
reject the request and make different decisions as to which
content-length leader to use an attacker can poision a web-cache, 
perform
an XSS attack and obtain senstive information from requests other then

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?view=diff&rev=521080&r1=521079&r2=521080
==
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Wed Mar 21 18:55:43 2007
@@ -230,7 +230,7 @@
 Requests with multiple content-length headers should be rejected as
invalid. When multiple components (firewalls, caches, proxies and 
Tomcat)
process a sequence of requests where one or more requests contain
-   multiple content-length headers and several components accept do not
+   multiple content-length headers and several components do not
reject the request and make different decisions as to which
content-length leader to use an attacker can poision a web-cache, 
perform
an XSS attack and obtain senstive information from requests other then

Modified: tomcat/site/trunk/xdocs/security-4.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?view=diff&rev=521080&r1=521079&r2=521080
==
--- tomcat/site/trunk/xdocs/security-4.xml (original)
+++ tomcat/site/trunk/xdocs/security-4.xml Wed Mar 21 18:55:43 2007
@@ -32,7 +32,7 @@
 Requests with multiple content-length headers should be rejected as
invalid. When multiple components (firewalls, caches, proxies and 
Tomcat)
process a sequence of requests where one or more requests contain
-   multiple content-length headers and several components accept do not
+   multiple content-length headers and several components do not
reject the request and make different decisions as to which
content-length leader to use an attacker can poision a web-cache, 
perform
an XSS attack and obtain senstive information from requests other then

Modified: tomcat/site/trunk/xdocs/security-5.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?view=diff&rev=521080&r1=521079&r2=521080
==
--- tomcat/site/trunk/xdocs/security-5.xml (original)
+++ tomcat/site/trunk/xdocs/security-5.xml Wed Mar 21 18:55:43 2007
@@ -32,7 +32,7 @@
 Requests with multiple content-length headers should be rejected as
invalid. When multiple components (firewalls, caches, proxies and 
Tomcat)
process a sequence of requests where one or more requests contain
-   mu

svn commit: r521085 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

2007-03-21 Thread fhanik 
Author: fhanik
Date: Wed Mar 21 19:20:42 2007
New Revision: 521085

URL: http://svn.apache.org/viewvc?view=rev&rev=521085
Log:
small comment added

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?view=diff&rev=521085&r1=521084&r2=521085
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java 
Wed Mar 21 19:20:42 2007
@@ -180,7 +180,7 @@
 }
 
 public boolean force(Runnable o) {
-if ( parent.isShutdown() ) throw new RejectedExecutionException();
+if ( parent.isShutdown() ) throw new 
RejectedExecutionException("Executor not running, can't force a command into 
the queue");
 return super.offer(o); //forces the item onto the queue, to be 
used if the task is rejected
 }
 



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

Executor is implemented

2007-03-21 Thread Filip Hanik - Dev Lists 

I took the liberty and added the  element to server.xml today.
It performs surprisingly well,

I tried to make the default implementation as basic as possible.
Let me know if you have any feedback.

Filip

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

DO NOT REPLY [Bug 41923] - Tomcat doesnt recognized client abort

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 19:26 ---
This question would be better asked on the users mailing 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: r521087 - /tomcat/build/tc5.5.x/build.properties.default

2007-03-21 Thread markt 
Author: markt
Date: Wed Mar 21 19:31:19 2007
New Revision: 521087

URL: http://svn.apache.org/viewvc?view=rev&rev=521087
Log:
Remove duplicate JAF entry. Bug 41851. Patch by Chris Halstead.

Modified:
tomcat/build/tc5.5.x/build.properties.default

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?view=diff&rev=521087&r1=521086&r2=521087
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Wed Mar 21 19:31:19 2007
@@ -255,11 +255,6 @@
 mail.lib=${mail.home}
 mail.jar=${mail.lib}/mail.jar
 
-# - Java Activation Framework, version 1.0.1 or later -
-activation.home=${base.path}/jaf-1.0.2
-activation.lib=${activation.home}
-activation.jar=${activation.lib}/activation.jar
-
 # - PureTLS Extension, version 0.9 or later -
 puretls.home=${base.path}/puretls-0.9b4
 puretls.lib=${puretls.home}/build



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

DO NOT REPLY [Bug 41851] - build.properties.default has duplicate definition block for JAF

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 19:31 ---
Fixed in svn. Thanks for the report.

-- 
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 41849] - Blank page after login on static html page (form authentication)

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

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





--- Additional Comments From [EMAIL PROTECTED]  2007-03-21 19:33 ---
Form authentication works as expected for me. Please provide a simple test WAR
that demonstrates this issue.

-- 
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 41923] - Tomcat doesnt recognized client abort

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

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |




--- Additional Comments From [EMAIL PROTECTED]  2007-03-22 00:20 ---
In my opinion its a bug, cause the description of recovery_option=4 said that 
servlet engine should be informed when client connection is lost. but it 
doesnt works.

-- 
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 40809] - Tomcat 5.5.20 fails to load ServletContextListener in tld!

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

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





--- Additional Comments From [EMAIL PROTECTED]  2007-03-22 00:45 ---
Try http://www.ecode.se/tmp/jsf_nb_sample.war, this war file is the result of
making a new 'Visual Web Project' in Netbeans 5.5, enabling war-compression,
then building. No other changes. It runs fine on Tomcat 5.5.23 (Java 1.5) when
tomcat is installed in 'c:\Tomcat_5_5'. It won't start (NPE at
javax.faces.webapp.FacesServlet.init(FacesServlet.java:165)) when tomcat is
installed in 'C:\Program Files\Apache Software Foundation\Tomcat 5.5'.

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