svn commit: r1026222 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc iis/Makefile.x86 iis/jk_isapi_plugin.c
Author: mturk Date: Fri Oct 22 06:35:25 2010 New Revision: 1026222 URL: http://svn.apache.org/viewvc?rev=1026222view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026222r1=1026221r2=1026222view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 06:35:25 2010 @@ -19,14 +19,17 @@ APU_LIB=libaprutil.lib OUTDIR=.\Release20 INTDIR=.\Release20 APACHE2_HOME=$(APACHE20_HOME) +HTTPD_VERSION=2.0.52 !ELSE !IFDEF APACHE23_HOME APACHE2_HOME=$(APACHE23_HOME) OUTDIR=.\Release23 INTDIR=.\Release23 +HTTPD_VERSION=2.3.1 !ELSE OUTDIR=.\Release22 INTDIR=.\Release22 +HTTPD_VERSION=2.2.3 !ENDIF APR_LIB=libapr-1.lib APU_LIB=libaprutil-1.lib @@ -36,11 +39,13 @@ APU_LIB=libaprutil-1.lib !ERROR Missing APACHE2_HOME environment variable. !ENDIF +JK_VERSION=1.2.31 +TARGET=mod_jk-$(JK_VERSION)-httpd-$(HTTPD_VERSION) CPP=cl.exe MTL=midl.exe RSC=rc.exe -ALL : $(OUTDIR)\mod_jk.so +ALL : $(OUTDIR)\$(TARGET).so CLEAN : @@ -71,18 +76,18 @@ CLEAN : -...@erase $(INTDIR)\mod_jk_src.pdb -...@erase $(OUTDIR)\mod_jk.exp -...@erase $(OUTDIR)\mod_jk.lib - -...@erase $(OUTDIR)\mod_jk.pdb - -...@erase $(OUTDIR)\mod_jk.so + -...@erase $(OUTDIR)\$(TARGET).pdb + -...@erase $(OUTDIR)\$(TARGET).so $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o$(OUTDIR)\mod_jk.bsc +BSC32_FLAGS=/nologo /o$(OUTDIR)\$(TARGET).bsc BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /pdb:$(OUTDIR)\mod_jk.pdb /debug /machine:I386 /out:$(OUTDIR)\mod_jk.so /implib:$(OUTDIR)\mod_jk.lib /libpath:$(APACHE2_HOME)\lib /opt:ref +LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:0x6A6B /subsystem:windows /dll /incremental:no /pdb:$(OUTDIR)\$(TARGET).pdb /debug /machine:I386 /out:$(OUTDIR)\$(TARGET).so /implib:$(OUTDIR)\mod_jk.lib /libpath:$(APACHE2_HOME)\lib /opt:ref LINK32_OBJS= \ $(INTDIR)\jk_ajp12_worker.obj \ $(INTDIR)\jk_ajp13.obj \ @@ -108,12 +113,12 @@ LINK32_OBJS= \ $(INTDIR)\jk.res \ $(INTDIR)\mod_jk.obj -$(OUTDIR)\mod_jk.so : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) +$(OUTDIR)\$(TARGET).so : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @ $(LINK32_FLAGS) $(LINK32_OBJS) - @IF EXIST $(OUTDIR)\mod_jk.manifest \ - mt -nologo -manifest $(OUTDIR)\mod_jk.manifest -outputresource:$(OUTDIR)\mod_jk.so;2 + @IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).so;2 CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I ..\common /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /D NDEBUG /D WIN32 /D _WINDOWS /Fo$(INTDIR)\\ /Fd$(INTDIR)\mod_jk_src /FD /c Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026222r1=1026221r2=1026222view=diff == --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 06:35:25 2010 @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -24,11 +27,11 @@ OutDir=.\Release_x86 !IF $(RECURSE) == 0 -ALL : $(OUTDIR)\isapi_redirect.dll +ALL : $(OUTDIR)\$(TARGET).dll !ELSE -ALL : pcre_x86 $(OUTDIR)\isapi_redirect.dll +ALL : pcre_x86 $(OUTDIR)\$(TARGET).dll !ENDIF @@ -63,10 +66,10 @@ CLEAN : -...@erase $(INTDIR)\jk_url.obj -...@erase $(INTDIR)\jk_util.obj -...@erase $(INTDIR)\jk_worker.obj - -...@erase $(OUTDIR)\isapi_redirect.dll + -...@erase $(OUTDIR)\$(TARGET).dll -...@erase $(OUTDIR)\isapi_redirect.exp -...@erase $(OUTDIR)\isapi_redirect.lib - -...@erase $(OUTDIR)\isapi_redirect.pdb + -...@erase $(OUTDIR)\$(TARGET).pdb $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) @@ -76,7 +79,7 @@ BSC32_FLAGS=/nologo /o$(OUTDIR)\isapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib
svn commit: r1026223 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64
Author: mturk Date: Fri Oct 22 06:37:27 2010 New Revision: 1026223 URL: http://svn.apache.org/viewvc?rev=1026223view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026223r1=1026222r2=1026223view=diff == --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 06:37:27 2010 @@ -18,6 +18,10 @@ # SetEnv.cmd /X64 /RETAIL # nmake -f Makefile.amd64 # + +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -29,11 +33,11 @@ OutDir=.\Release_amd64 !IF $(RECURSE) == 0 -ALL : $(OUTDIR)\isapi_redirect.dll +ALL : $(OUTDIR)\$(TARGET).dll !ELSE -ALL : pcre_amd64 $(OUTDIR)\isapi_redirect.dll +ALL : pcre_amd64 $(OUTDIR)\$(TARGET).dll !ENDIF @@ -68,10 +72,10 @@ CLEAN : -...@erase $(INTDIR)\jk_url.obj -...@erase $(INTDIR)\jk_util.obj -...@erase $(INTDIR)\jk_worker.obj - -...@erase $(OUTDIR)\isapi_redirect.dll + -...@erase $(OUTDIR)\$(TARGET).dll -...@erase $(OUTDIR)\isapi_redirect.exp -...@erase $(OUTDIR)\isapi_redirect.lib - -...@erase $(OUTDIR)\isapi_redirect.pdb + -...@erase $(OUTDIR)\$(TARGET).pdb $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) @@ -81,7 +85,7 @@ BSC32_FLAGS=/nologo /o$(OUTDIR)\isapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /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 $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:$(OUTDIR)\$(TARGET).pdb /debug /machine:AMD64 /def:.\isapi.def /out:$(OUTDIR)\$(TARGET).dll /implib:$(OUTDIR)\isapi_redirect.lib DEF_FILE= \ .\isapi.def LINK32_OBJS= \ @@ -111,12 +115,12 @@ LINK32_OBJS= \ $(INTDIR)\jk.res \ .\pcre\Release_amd64\pcre.lib -$(OUTDIR)\isapi_redirect.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) +$(OUTDIR)\$(TARGET).dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @ $(LINK32_FLAGS) $(LINK32_OBJS) - IF EXIST $(OUTDIR)\isapi_redirect.manifest \ - mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2 + IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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 JK_ISAPI /D ISAPI_EXPORTS /D HAS_PCRE /D PCRE_STATIC $(CFLAGS) /Fo$(INTDIR)\\ /Fd$(INTDIR)\isapi_redirector_src /FD /c Modified: tomcat/jk/trunk/native/iis/Makefile.ia64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026223r1=1026222r2=1026223view=diff == --- tomcat/jk/trunk/native/iis/Makefile.ia64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 06:37:27 2010 @@ -18,6 +18,10 @@ # SetEnv.cmd /SRV64 /RETAIL # nmake -f Makefile.ia64 # + +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -29,11 +33,11 @@ OutDir=.\Release_ia64 !IF $(RECURSE) == 0 -ALL : $(OUTDIR)\isapi_redirect.dll +ALL : $(OUTDIR)\$(TARGET).dll !ELSE -ALL : pcre_ia64 $(OUTDIR)\isapi_redirect.dll +ALL : pcre_ia64 $(OUTDIR)\$(TARGET).dll !ENDIF @@ -68,10 +72,10 @@ CLEAN : -...@erase $(INTDIR)\jk_url.obj -...@erase $(INTDIR)\jk_util.obj -...@erase $(INTDIR)\jk_worker.obj - -...@erase $(OUTDIR)\isapi_redirect.dll + -...@erase $(OUTDIR)\$(TARGET).dll -...@erase $(OUTDIR)\isapi_redirect.exp -...@erase $(OUTDIR)\isapi_redirect.lib - -...@erase $(OUTDIR)\isapi_redirect.pdb + -...@erase $(OUTDIR)\$(TARGET).pdb $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) @@ -81,7 +85,7 @@ BSC32_FLAGS=/nologo /o$(OUTDIR)\isapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:$(OUTDIR)\isapi_redirect.pdb /debug /machine:IA64 /def:.\isapi.def /out:$(OUTDIR)\isapi_redirect.dll /implib:$(OUTDIR)\isapi_redirect.lib
svn commit: r1026224 - in /tomcat/jk/trunk/native/netscape: Makefile.vc jk_nsapi_plugin.c
Author: mturk Date: Fri Oct 22 06:44:06 2010 New Revision: 1026224 URL: http://svn.apache.org/viewvc?rev=1026224view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/netscape/Makefile.vc tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Modified: tomcat/jk/trunk/native/netscape/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026224r1=1026223r2=1026224view=diff == --- tomcat/jk/trunk/native/netscape/Makefile.vc (original) +++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 06:44:06 2010 @@ -24,13 +24,16 @@ NULL= NULL=nul !ENDIF +JK_VERSION=1.2.31 +TARGET=nsapi_redirect-$(JK_VERSION) + OUTDIR=.\nsapi_release INTDIR=.\nsapi_release # Begin Custom Macros OutDir=.\nsapi_release # End Custom Macros -ALL : $(OUTDIR)\nsapi_redirect.dll +ALL : $(OUTDIR)\$(TARGET).dll CLEAN : @@ -56,12 +59,12 @@ CLEAN : -...@erase $(INTDIR)\jk_url.obj -...@erase $(INTDIR)\jk_util.obj -...@erase $(INTDIR)\jk_worker.obj - -...@erase $(OUTDIR)\nsapi_redirect.dll + -...@erase $(OUTDIR)\$(TARGET).dll -...@erase $(OUTDIR)\nsapi_redirect.exp -...@erase $(OUTDIR)\nsapi_redirect.lib - -...@erase $(OUTDIR)\nsapi_redirect.pdb - -...@erase .\Release\nsapi_redirect_src.idb - -...@erase .\Release\nsapi_redirect_src.pdb + -...@erase $(OUTDIR)\$(TARGET).pdb + -...@erase $(OUTDIR)\nsapi_redirect_src.idb + -...@erase $(OUTDIR)\\nsapi_redirect_src.pdb $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) @@ -108,7 +111,7 @@ BSC32_FLAGS=/nologo /o$(OUTDIR)\nsapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS) /nologo /base:0x6A6B /dll /incremental:no /pdb:$(OUTDIR)\nsapi_redirect.pdb /debug /machine:I386 /out:$(OUTDIR)\nsapi_redirect.dll /implib:$(OUTDIR)\nsapi_redirect.lib /libpath:$(IPLANET_HOME)\lib +LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS) /nologo /base:0x6A6B /dll /incremental:no /pdb:$(OUTDIR)\$(TARGET).pdb /debug /machine:I386 /out:$(OUTDIR)\$(TARGET).dll /implib:$(OUTDIR)\nsapi_redirect.lib /libpath:$(IPLANET_HOME)\lib LINK32_OBJS= \ $(INTDIR)\jk_ajp12_worker.obj \ $(INTDIR)\jk_ajp13.obj \ @@ -134,12 +137,12 @@ LINK32_OBJS= \ $(INTDIR)\jk.res \ $(INTDIR)\jk_worker.obj -$(OUTDIR)\nsapi_redirect.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) +$(OUTDIR)\$(TARGET).dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @ $(LINK32_FLAGS) $(LINK32_OBJS) - IF EXIST $(OUTDIR)\nsapi_redirect.manifest \ - mt -nologo -manifest $(OUTDIR)\nsapi_redirect.manifest -outputresource:$(OUTDIR)\nsapi_redirect.dll;2 + IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 !IF $(CFG) == nsapi - Win32 Release Modified: tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c?rev=1026224r1=1026223r2=1026224view=diff == --- tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c (original) +++ tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Fri Oct 22 06:44:06 2010 @@ -21,6 +21,10 @@ * Version: $Revision$ * ***/ +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif +#include winsock2.h #include nsapi.h #include jk_global.h - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50140] Silent installation into wrong target directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 --- Comment #2 from Michael Hopf m...@3ds.com 2010-10-22 03:20:39 EDT --- Version 6.0.29 has the same problem. We are using a 64bit Windows 2008 Enterprise system. If you are sure that the problem is NSIS related, we can close this bug report. I will open a new bug report on NSIS side. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026222 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc iis/Makefile.x86 iis/jk_isapi_plugin.c
On 22.10.2010 08:35, mt...@apache.org wrote: Author: mturk Date: Fri Oct 22 06:35:25 2010 New Revision: 1026222 URL: http://svn.apache.org/viewvc?rev=1026222view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026222r1=1026221r2=1026222view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 06:35:25 2010 @@ -19,14 +19,17 @@ APU_LIB=libaprutil.lib OUTDIR=.\Release20 INTDIR=.\Release20 APACHE2_HOME=$(APACHE20_HOME) +HTTPD_VERSION=2.0.52 !ELSE !IFDEF APACHE23_HOME APACHE2_HOME=$(APACHE23_HOME) OUTDIR=.\Release23 INTDIR=.\Release23 +HTTPD_VERSION=2.3.1 !ELSE OUTDIR=.\Release22 INTDIR=.\Release22 +HTTPD_VERSION=2.2.3 !ENDIF APR_LIB=libapr-1.lib APU_LIB=libaprutil-1.lib So since now there's a big cleanup under way: should we really want to fiddle with the detailed versions? Then we always have to remember to update the Makefile. I usually put the detail info int the README, and only added something like -2.0.x or -2.2.x to the file. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026244 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/README netscape/Makefile.vc
Author: mturk
Date: Fri Oct 22 08:38:53 2010
New Revision: 1026244
URL: http://svn.apache.org/viewvc?rev=1026244view=rev
Log:
Do not have fixed version strings in makefiles. Use command line option for
JK_VERSION and HTTPD_VERSION
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/README
tomcat/jk/trunk/native/netscape/Makefile.vc
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026244r1=1026243r2=1026244view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 08:38:53 2010
@@ -19,17 +19,14 @@ APU_LIB=libaprutil.lib
OUTDIR=.\Release20
INTDIR=.\Release20
APACHE2_HOME=$(APACHE20_HOME)
-HTTPD_VERSION=2.0.52
!ELSE
!IFDEF APACHE23_HOME
APACHE2_HOME=$(APACHE23_HOME)
OUTDIR=.\Release23
INTDIR=.\Release23
-HTTPD_VERSION=2.3.1
!ELSE
OUTDIR=.\Release22
INTDIR=.\Release22
-HTTPD_VERSION=2.2.3
!ENDIF
APR_LIB=libapr-1.lib
APU_LIB=libaprutil-1.lib
@@ -39,8 +36,7 @@ APU_LIB=libaprutil-1.lib
!ERROR Missing APACHE2_HOME environment variable.
!ENDIF
-JK_VERSION=1.2.31
-TARGET=mod_jk-$(JK_VERSION)-httpd-$(HTTPD_VERSION)
+TARGET=mod_jk-$(JK_VERSION)$(HTTPD_VERSION)
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026244r1=1026243r2=1026244view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 08:38:53 2010
@@ -19,8 +19,7 @@
# nmake -f Makefile.amd64
#
-JK_VERSION=1.2.31
-TARGET=isapi_redirect-$(JK_VERSION)
+TARGET=isapi_redirect$(JK_VERSION)
CPP=cl.exe
MTL=midl.exe
@@ -122,7 +121,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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
JK_ISAPI /D ISAPI_EXPORTS /D HAS_PCRE /D PCRE_STATIC $(CFLAGS)
/Fo$(INTDIR)\\ /Fd$(INTDIR)\isapi_redirector_src /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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 /D JK_ISAPI /D
ISAPI_EXPORTS /D HAS_PCRE /D PCRE_STATIC $(CFLAGS) /Fo$(INTDIR)\\
/Fd$(INTDIR)\isapi_redirector_src /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026244r1=1026243r2=1026244view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 08:38:53 2010
@@ -19,8 +19,7 @@
# nmake -f Makefile.ia64
#
-JK_VERSION=1.2.31
-TARGET=isapi_redirect-$(JK_VERSION)
+TARGET=isapi_redirect$(JK_VERSION)
CPP=cl.exe
MTL=midl.exe
@@ -122,7 +121,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /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
JK_ISAPI /D ISAPI_EXPORTS /D HAS_PCRE /D PCRE_STATIC $(CFLAGS)
/Fo$(INTDIR)\\ /Fd$(INTDIR)\isapi_redirector_src /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /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 /D JK_ISAPI /D
ISAPI_EXPORTS /D HAS_PCRE /D PCRE_STATIC $(CFLAGS) /Fo$(INTDIR)\\
/Fd$(INTDIR)\isapi_redirector_src /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026244r1=1026243r2=1026244view=diff
==
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 08:38:53 2010
@@ -13,8 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JK_VERSION=1.2.31
-TARGET=isapi_redirect-$(JK_VERSION)
+TARGET=isapi_redirect$(JK_VERSION)
CPP=cl.exe
svn commit: r1026246 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Fri Oct 22 08:45:17 2010 New Revision: 1026246 URL: http://svn.apache.org/viewvc?rev=1026246view=rev Log: Remove extra dash if just building mod_jk.so Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026246r1=1026245r2=1026246view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 08:45:17 2010 @@ -36,7 +36,7 @@ APU_LIB=libaprutil-1.lib !ERROR Missing APACHE2_HOME environment variable. !ENDIF -TARGET=mod_jk-$(JK_VERSION)$(HTTPD_VERSION) +TARGET=mod_jk$(JK_VERSION)$(HTTPD_VERSION) CPP=cl.exe MTL=midl.exe RSC=rc.exe - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026247 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 22 08:46:27 2010 New Revision: 1026247 URL: http://svn.apache.org/viewvc?rev=1026247view=rev Log: votes 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=1026247r1=1026246r2=1026247view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 22 08:46:27 2010 @@ -270,15 +270,17 @@ PATCHES PROPOSED TO BACKPORT: Use Enum.name() rather than Enum.toString() when evaluating composite expressions http://svn.apache.org/viewvc?rev=1024224view=rev - +1: markt, kfujino + +1: markt, kfujino, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 Handle the case where the PID file is read/write accessible but the directory is not so the PID file can not be deleted http://svn.apache.org/viewvc?rev=1024251view=rev - +1: markt + +1: markt, kkolinko -1: + kkolinko: There are known problems with -x and -r on os400, (see + comments in the *.sh files) so maybe -w does not work there as well. * Add support for maxActiveSessions attributes to BackupManager. http://svn.apache.org/viewvc?rev=1025899view=rev @@ -295,5 +297,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50138 Correct threading issues in SecurityUtil http://svn.apache.org/viewvc?rev=1026042view=rev - +1: markt, kfujino + +1: markt, kfujino, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026249 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/README netscape/Makefile.vc netscape/README
Author: mturk Date: Fri Oct 22 08:50:28 2010 New Revision: 1026249 URL: http://svn.apache.org/viewvc?rev=1026249view=rev Log: JK_VERSION is part of jk_version.h file. Use SO_VERSION instead Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/README tomcat/jk/trunk/native/netscape/Makefile.vc tomcat/jk/trunk/native/netscape/README Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 08:50:28 2010 @@ -36,7 +36,7 @@ APU_LIB=libaprutil-1.lib !ERROR Missing APACHE2_HOME environment variable. !ENDIF -TARGET=mod_jk$(JK_VERSION)$(HTTPD_VERSION) +TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VERSION) CPP=cl.exe MTL=midl.exe RSC=rc.exe Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 08:50:28 2010 @@ -19,7 +19,7 @@ # nmake -f Makefile.amd64 # -TARGET=isapi_redirect$(JK_VERSION) +TARGET=isapi_redirect$(SO_VERSION) CPP=cl.exe MTL=midl.exe Modified: tomcat/jk/trunk/native/iis/Makefile.ia64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/iis/Makefile.ia64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 08:50:28 2010 @@ -19,7 +19,7 @@ # nmake -f Makefile.ia64 # -TARGET=isapi_redirect$(JK_VERSION) +TARGET=isapi_redirect$(SO_VERSION) CPP=cl.exe MTL=midl.exe Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 08:50:28 2010 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -TARGET=isapi_redirect$(JK_VERSION) +TARGET=isapi_redirect$(SO_VERSION) CPP=cl.exe MTL=midl.exe Modified: tomcat/jk/trunk/native/iis/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/iis/README (original) +++ tomcat/jk/trunk/native/iis/README Fri Oct 22 08:50:28 2010 @@ -37,9 +37,7 @@ The steps that you need to take are: 1. Change directory to the isapi redirector plugins source directory. 2. Execute the following command: - nmake -f Makefile.x86 [JK_VERSION=-1.2.31] - -This will build both release and debug versions of the redirector plugin. + nmake -f Makefile.x86 [SO_VERSION=-1.2.31] An alternative will be to open the isapi workspace file (isapi.dsw) in msdev and build it using the build menu. Modified: tomcat/jk/trunk/native/netscape/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/netscape/Makefile.vc (original) +++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 08:50:28 2010 @@ -24,7 +24,7 @@ NULL= NULL=nul !ENDIF -TARGET=nsapi_redirect$(JK_VERSION) +TARGET=nsapi_redirect$(SO_VERSION) OUTDIR=.\nsapi_release INTDIR=.\nsapi_release Modified: tomcat/jk/trunk/native/netscape/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/README?rev=1026249r1=1026248r2=1026249view=diff == --- tomcat/jk/trunk/native/netscape/README (original) +++ tomcat/jk/trunk/native/netscape/README Fri Oct 22 08:50:28 2010 @@ -25,10 +25,7 @@ The steps that you need to take are: directory or edit the nsapi.dsp and replace all $(IPLANET_HOME) occurrences with the real path 3. Execute the following command: - MSDEV nsapi.dsp /MAKE ALL - If msdev is not in your path, enter the full path to msdev.exe - -This will build both release and debug versions of the redirector plugin. + nmake -f Makefile.vc [SO_VERSION=-1.2.31] An alternative will be to open the isapi
svn commit: r1026257 - /tomcat/jk/tags/JK_1_2_31_RC1/
Author: mturk Date: Fri Oct 22 09:05:28 2010 New Revision: 1026257 URL: http://svn.apache.org/viewvc?rev=1026257view=rev Log: Dry run went well so tag 1.2.31 RC1. If voted this tag will be renamed to JK_1_2_31 Added: tomcat/jk/tags/JK_1_2_31_RC1/ - copied from r1026256, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026294 - /tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
Author: mturk
Date: Fri Oct 22 11:05:46 2010
New Revision: 1026294
URL: http://svn.apache.org/viewvc?rev=1026294view=rev
Log:
fix typo
Modified:
tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
Modified: tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c?rev=1026294r1=1026293r2=1026294view=diff
==
--- tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Fri Oct 22 11:05:46 2010
@@ -21,10 +21,12 @@
* Version: $Revision$ *
***/
+#if defined(WIN32)
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500
#endif
#include winsock2.h
+#endif
#include nsapi.h
#include jk_global.h
@@ -276,7 +278,7 @@ NSAPI_PUBLIC int jk_init(pblock * pb, Se
jk_parse_log_level(log_level_str))) {
logger = NULL;
}
-
+
if (jk_map_alloc(init_map)) {
if (jk_map_read_properties(init_map, NULL, worker_prp_file, NULL,
JK_MAP_HANDLE_DUPLICATES, logger)) {
@@ -289,7 +291,7 @@ NSAPI_PUBLIC int jk_init(pblock * pb, Se
}
if (reject_unsafe) {
-jk_map_add(init_map, worker. REJECT_UNSAFE_TAG,
reject_unsafe);
+jk_map_add(init_map, worker. REJECT_UNSAFE_TAG,
reject_unsafe);
}
jk_shm_size = jk_shm_calculate_size(init_map, logger);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026296 - /tomcat/jk/tags/JK_1_2_31_RC2/
Author: mturk Date: Fri Oct 22 11:09:30 2010 New Revision: 1026296 URL: http://svn.apache.org/viewvc?rev=1026296view=rev Log: Tag 1.2.31 RC2 because of nsapi typo. If voted this tag will be renamed to JK_1_2_31 Added: tomcat/jk/tags/JK_1_2_31_RC2/ - copied from r1026295, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026297 - /tomcat/jk/tags/JK_1_2_31_RC1/
Author: mturk Date: Fri Oct 22 11:10:10 2010 New Revision: 1026297 URL: http://svn.apache.org/viewvc?rev=1026297view=rev Log: Remove faulty tag Removed: tomcat/jk/tags/JK_1_2_31_RC1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
Cool. Some notes ... (1) Since we already have - effectiveMajorVersion - effectiveMinorVersion Is Context.version a good name to use? Since the name version is also used by the servlet spec? Would revision be a less confusing name? (Or webappRevision). (2) [I thought of this as a side effect of reading the patch ...] Would it be a good idea if Tomcat by default always has a default ROOT webapp? Then we can guarantee a webapp is always mapped and we can let that webapp handle the 404 error. This might simplify some of the mapper and adapter code. So if there is no default webapp - tomcat inserts the default. -Tim On 10/21/2010 2:52 PM, Mark Thomas wrote: [A lot of stuff ... here is a link to it ...] http://markmail.org/message/h7fjzs52acykjkbj - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 22/10/2010 06:27, Tim Funk wrote: (1) Since we already have - effectiveMajorVersion - effectiveMinorVersion Is Context.version a good name to use? Since the name version is also used by the servlet spec? Would revision be a less confusing name? (Or webappRevision). Good point. Maybe webappVersion? (2) [I thought of this as a side effect of reading the patch ...] Would it be a good idea if Tomcat by default always has a default ROOT webapp? Then we can guarantee a webapp is always mapped and we can let that webapp handle the 404 error. This might simplify some of the mapper and adapter code. So if there is no default webapp - tomcat inserts the default. Another good point. Maybe just use the default servlet? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026305 - in /tomcat/site/trunk: docs/download-70.html docs/index.html docs/oldnews.html docs/whichversion.html xdocs/download-70.xml xdocs/index.xml xdocs/oldnews.xml xdocs/whichversion.
Author: markt Date: Fri Oct 22 11:44:03 2010 New Revision: 1026305 URL: http://svn.apache.org/viewvc?rev=1026305view=rev Log: Update for 7.0.4 release Modified: tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1026305r1=1026304r2=1026305view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Fri Oct 22 11:44:03 2010 @@ -227,8 +227,8 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a | -a href=#7.0.27.0.2/a | -a href=[preferred]/tomcat/tomcat-7/v7.0.2-betaBrowse/a | +a href=#7.0.47.0.4/a | +a href=[preferred]/tomcat/tomcat-7/v7.0.4-betaBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a /blockquote /p @@ -328,11 +328,11 @@ tr td bgcolor=#525D76 font color=#ff face=arial,helvetica,sanserif -a name=7.0.2 BETA +a name=7.0.4 BETA !--()-- /a -a name=7.0.2_BETA -strong7.0.2 BETA/strong +a name=7.0.4_BETA +strong7.0.4 BETA/strong /a /font /td @@ -342,8 +342,8 @@ p blockquote p - a name=7.0.2Please/a see the - a href=[preferred]/tomcat/tomcat-7/v7.0.2-beta/README.htmlREADME/a + a name=7.0.4Please/a see the + a href=[preferred]/tomcat/tomcat-7/v7.0.4-beta/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -367,81 +367,81 @@ liCore: ul li -a href=[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zipzip/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.md5;md5/a) +a href=[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zipzip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.md5;md5/a) /li li -a href=[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gztar.gz/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.md5;md5/a) +a href=[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gztar.gz/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.md5;md5/a) /li li -a href=[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip32-bit Windows zip/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.md5;md5/a) +a href=[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip32-bit Windows zip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.md5;md5/a) /li li -a href=[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip64-bit Windows zip/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.md5;md5/a) +a href=[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip64-bit Windows zip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.md5;md5/a) /li li -a
Re: [PROPOSAL] Parallel deployment
On 22.10.2010 13:39, Mark Thomas wrote: On 22/10/2010 06:27, Tim Funk wrote: (1) Since we already have - effectiveMajorVersion - effectiveMinorVersion Is Context.version a good name to use? Since the name version is also used by the servlet spec? Would revision be a less confusing name? (Or webappRevision). Good point. Maybe webappVersion? Will it be a webapp provided version string, or some internal automatically provided version? If the latter, would it be more like a sequence? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 22/10/2010 06:55, Rainer Jung wrote: On 22.10.2010 13:39, Mark Thomas wrote: On 22/10/2010 06:27, Tim Funk wrote: (1) Since we already have - effectiveMajorVersion - effectiveMinorVersion Is Context.version a good name to use? Since the name version is also used by the servlet spec? Would revision be a less confusing name? (Or webappRevision). Good point. Maybe webappVersion? Will it be a webapp provided version string, or some internal automatically provided version? If the latter, would it be more like a sequence? I'm thinking normally user provided but there are some scenarios where Tomcat may determine the next version as a convenience. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
Hello, I was playing around with zero downtime releases since 2003 and I think there are some pitfalls in your approach I dont see yet solved. I'm taking as premise that you are targeting 'larger' sites, meaning loadbalancers, 4++ servers etc. Small sites don't really need this feature imho (the downtime costs are absolutely low). So, how do you want to handle following: 1. ressources - for the time you have both versions in parallel you'll have double resources need, double amount of db connections, double amount of memory etc. This means that the hosting has to sized accordingly, but hosting on 2times oversized machines just to save some seconds is very expensive. 2. time - the startup of the second instance will usually consume cpu resources. This can make the tomcat unresponsive. If the loadbalancer detects the unresponsiveness it will mark it as unavailable and switch all sessions anyway - nothing won. Usually you will have 30 seconds to perform the startup of the context. 3. end - a release needs an end. Having one user with open browser and continuos refresh shouldn't bind the resources forever. On the other hand, the same behavior is easily achieveable with a bit loadbalancer tuning and Vmware. Are you sure it is worth the effort? regards Leon On Thu, Oct 21, 2010 at 8:52 PM, Mark Thomas ma...@apache.org wrote: All, As most of you are probably aware I work for SpringSource and SpringSource has an application server product - tc Server - that is heavily based on Apache Tomcat. When talking to prospective clients about tc Server, one of the things we often hear is WebSphere/WebLogic has XYZ feature - does tc Server? and one of those features is parallel deployment. Parallel deployment is essentially having two (or more) versions of the same application deployed side-by-side. Users with a session in an older version, will continue to use that older version until the session expires. Users without a session, or whose session expires, will use the latest version. Once there are no sessions using the older version it is undeployed. All versions of the application have the same context path so the transition is seamless to the users. Having looked at some implementation options, it quickly became apparent that Tomcat was the right place to implement this rather than as an 'add-on' in tc Server. I have managed to convince senior management that contributing an implementation of parallel deployment to the ASF is the way to go. I currently have a hacked together implementation [1] that works but is very ugly in places under the covers and there is still some significant work to go before it is robust enough to be put into trunk (it changes the mapper and that is an area I think we need to be very careful). A lot of the patch is dealing with the issues around the fact that we currently treat Context.getPath() and Context.getName() as the same thing but with parallel deployment these need to be treated differently. My proposal is therefore: - start committing some of the getPath() / getName() clean-up to trunk along with some of the other hooks - like adding a version attribute to Context that should be minimal risk - continue testing the current patch (e.g. with clustering) and modify as required - discuss the implementation details (like the file naming convention used) on the dev list - decide once we can see the patch without the clean-up if it is safe for 7.0.x or needs to be held back for 7.1.x Depending on how big this patch ends up looking then creating a branch for this work may make sense. I'd like to hold off creating a branch for a few days until the clean-up changes have been made to trunk so the branch can focus on the diffs required for the new feature. As always, any and all feedback welcome. Mark [1] http://people.apache.org/~markt/patches/2010-10-21-parallel-deployment.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
A bit of opinion from my side: On 22.10.2010 14:28, Leon Rosenberg wrote: 1. ressources - for the time you have both versions in parallel you'll have double resources need, double amount of db connections, double amount of memory etc. This means that the hosting has to sized accordingly, but hosting on 2times oversized machines just to save some seconds is very expensive. It would, but they wouldn't need to oversize w.r.t. CPU and it's also not really true for memory. Often lots of memory goes to sessions and there the premium for the second context would be more like 10%. DataSources can be shared even now between contexts, so should not be a problem between context versions. 2. time - the startup of the second instance will usually consume cpu resources. This can make the tomcat unresponsive. If the loadbalancer detects the unresponsiveness it will mark it as unavailable and switch all sessions anyway - nothing won. Usually you will have30 seconds to perform the startup of the context. I don't see a problem here. Startup is mostly single-threaded, hardware gets more and more concurrency. 3. end - a release needs an end. Having one user with open browser and continuos refresh shouldn't bind the resources forever. I think we don't say that this solves the update problem for all applications and environments. Using state over a long time obviously is a problem for switching webapps. So devs have to reconsider how they construct their apps. E.g. often the session is only used as a kind of cache, but the data could be reconstructed from the user identity. Short term I guess the multi version feature alone does already improve the situation for many users. And we should allow to forceably unload an old version, e.g. when administrators or scripts decide that it's no longer worth waiting for the few remaining sessions to eventually expire. Mid term, it would be nice if we could migrate a session. By this I don't mean copy all session attributes over classloader boundaries, but maybe something like copying simple things, like strings. Apps could probably detect this and reconstruct the more complex objects from the basic info. Just an idea. On the other hand, the same behavior is easily achieveable with a bit loadbalancer tuning and Vmware. Are you sure it is worth the effort? I do experience very different user companies out there. Some of them are very good in building scripted automatisms and now very well how to do more complex operations with their load balancers. Some of them do not and would prefer a more out of the box approach. I expect the target to sit between the very small deployments and the very big ones. It's the people that started small and need to grow because of their success, but still do not have a big IT department, who I think will like the approach. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 22/10/2010 13:28, Leon Rosenberg wrote: Hello, I was playing around with zero downtime releases since 2003 and I This isn't zero downtime. Tomcat already does that and has done for quite a while. This handles the case where sessions from version n can't migrate to version n+1 - e.g. to an incompatible change in the classes used for persisting data in the session. I'm taking as premise that you are targeting 'larger' sites, meaning loadbalancers, 4++ servers etc. Small sites don't really need this feature imho (the downtime costs are absolutely low). This is aimed at all sites - large and small. So, how do you want to handle following: 1. ressources - for the time you have both versions in parallel you'll have double resources need, double amount of db connections, double amount of memory etc. This means that the hosting has to sized accordingly, but hosting on 2times oversized machines just to save some seconds is very expensive. You'll only need double the resources if you have double the load. That won't be the case. The load will remain the same, just distributed across two web applications rather than a single one. There will be the increased permgen demands of an additional application deployed but that is usually a relatively small percentage of the overall memory requirements. 2. time - the startup of the second instance will usually consume cpu resources. This can make the tomcat unresponsive. I have never seen an app do that. Context initialization happens on a single thread so at the absolute worst, one thread will be consumed but that is only going to happen with an app that has a cpu intensive start-up. If the loadbalancer detects the unresponsiveness it will mark it as unavailable and switch all sessions anyway - nothing won. Usually you will have 30 seconds to perform the startup of the context. Context start-up can take as long as it likes. Requests won't get routed to the n+1 version of the context until it has started. 3. end - a release needs an end. Having one user with open browser and continuos refresh shouldn't bind the resources forever. So undeploy the old version of the app. That will force the switch. We could easily make that happen automatically after a configurable delay. On the other hand, the same behavior is easily achieveable with a bit loadbalancer tuning and Vmware. Not sure why VMware is a requirement. Yes, you can achieve the same aim with multiple instances and a load-balancer. However that requires much more plumbing than just deploying a WAR and won't work with the existing tool-sets for deployment (Ant, Maven, manager app, home grown etc.) without a fair amount of additional custom code to co-ordinate the multiple instances and the load-balancer config. Are you sure it is worth the effort? Yes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Tomcat Connectors 1.2.31
Hi, 1.2.31 release proposal based on the JK_1_2_31_RC2 tag is available for testing at: http://people.apache.org/~mturk/tomcat-connectors/jk/ Beside sources there is assorted set of binaries for your convenience. Just browse down the binaries directory and you might get lucky :) Documentation (with missing 1.2.31 announcement of course) is at the same place http://people.apache.org/~mturk/tomcat-connectors/jk/docs/jk-1.2.31/ JK_1_2_31_RC2 tag if this release get voted will be renamed to JK_1_2_31 and content of upper directory put on dist. So, Tomcat Connectors 1.2.31 is: [ ] +1 release it [ ] -1 nope, it's broken Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On Fri, Oct 22, 2010 at 3:04 PM, Mark Thomas ma...@apache.org wrote: On 22/10/2010 13:28, Leon Rosenberg wrote: Hello, I was playing around with zero downtime releases since 2003 and I This isn't zero downtime. Tomcat already does that and has done for quite a while. This handles the case where sessions from version n can't migrate to version n+1 - e.g. to an incompatible change in the classes used for persisting data in the session. I'm taking as premise that you are targeting 'larger' sites, meaning loadbalancers, 4++ servers etc. Small sites don't really need this feature imho (the downtime costs are absolutely low). This is aimed at all sites - large and small. So, how do you want to handle following: 1. ressources - for the time you have both versions in parallel you'll have double resources need, double amount of db connections, double amount of memory etc. This means that the hosting has to sized accordingly, but hosting on 2times oversized machines just to save some seconds is very expensive. You'll only need double the resources if you have double the load. That won't be the case. The load will remain the same, just distributed across two web applications rather than a single one. There will be the increased permgen demands of an additional application deployed but that is usually a relatively small percentage of the overall memory requirements. Well the primary resource I see as a problem is heap. I have one customer who runs his tomcats with 12gb heap and another with 8. Both do that on 16 gb machines. They couldn't increase without resizing the machines. The heap is really used and not for session related content but for global caching etc. 2. time - the startup of the second instance will usually consume cpu resources. This can make the tomcat unresponsive. I have never seen an app do that. Context initialization happens on a single thread so at the absolute worst, one thread will be consumed but that is only going to happen with an app that has a cpu intensive start-up. If the loadbalancer detects the unresponsiveness it will mark it as unavailable and switch all sessions anyway - nothing won. Usually you will have 30 seconds to perform the startup of the context. Context start-up can take as long as it likes. Requests won't get routed to the n+1 version of the context until it has started. Ok, I have experience with some very heavy start applications - basically they produce 100% cpu load for 1-2 minutes, this can decrease the performance of other requests, but this is surely not a common rule for all applications. 3. end - a release needs an end. Having one user with open browser and continuos refresh shouldn't bind the resources forever. So undeploy the old version of the app. That will force the switch. We could easily make that happen automatically after a configurable delay. Sounds very well. On the other hand, the same behavior is easily achieveable with a bit loadbalancer tuning and Vmware. Not sure why VMware is a requirement. Yes, you can achieve the same aim with multiple instances and a load-balancer. However that requires much more plumbing than just deploying a WAR and won't work with the existing tool-sets for deployment (Ant, Maven, manager app, home grown etc.) without a fair amount of additional custom code to co-ordinate the multiple instances and the load-balancer config. I found many operations-manager to be extremely resistant against fancy-java-features and having a we-can-do-it-better-with-vi-attitude :-) This could be an experience related to my geographic location ;-) Are you sure it is worth the effort? Yes. :-) regards Leon - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 10/21/2010 08:52 PM, Mark Thomas wrote: - decide once we can see the patch without the clean-up if it is safe for 7.0.x or needs to be held back for 7.1.x If it doesn't break things or existing users configs, I have no problem of having it in 7.0. Adding 7.1 to the list would just confuse folks given that we even didn't have a stable 7.0 release yet. +1 on the initiative. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 10/22/2010 7:39 AM, Mark Thomas wrote: On 22/10/2010 06:27, Tim Funk wrote: (1) Since we already have - effectiveMajorVersion - effectiveMinorVersion Is Context.version a good name to use? Since the name version is also used by the servlet spec? Would revision be a less confusing name? (Or webappRevision). Good point. Maybe webappVersion? Sounds good. (2) [I thought of this as a side effect of reading the patch ...] Would it be a good idea if Tomcat by default always has a default ROOT webapp? Then we can guarantee a webapp is always mapped and we can let that webapp handle the 404 error. This might simplify some of the mapper and adapter code. So if there is no default webapp - tomcat inserts the default. Another good point. Maybe just use the default servlet? Maybe ... I was of thinking something like a webapp with this (logical) definition. Context path= docBase=/dev/null / And then (assuming) the default servlet is in $CATALINA_HOME/conf/web.xml we then will not need an extra web.xml (but it might be convenient to do so in case the defaults in the system web.xml have undesirable behaviors) -Tim - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 22/10/2010 14:15, Leon Rosenberg wrote: Well the primary resource I see as a problem is heap. I have one customer who runs his tomcats with 12gb heap and another with 8. Both do that on 16 gb machines. They couldn't increase without resizing the machines. The heap is really used and not for session related content but for global caching etc. Yep, that would be an issue if most of an app's heap usage was for cache. In that case multiple machines is probably a better option and one that gets better as you have more machines since you could roll the new version out across the machines one at a time. You'd need to be careful to time the upgrades so they roughly tracked the pace of users migrating between versions. You'd also need to be careful with clustering / load-balancing config but it is all do-able. Ok, I have experience with some very heavy start applications - basically they produce 100% cpu load for 1-2 minutes, this can decrease the performance of other requests, but this is surely not a common rule for all applications. Agreed, not a common case but one that can be handled with either approach. I found many operations-manager to be extremely resistant against fancy-java-features and having a we-can-do-it-better-with-vi-attitude :-) I certainly see a preference for being able to script as much as possible, rather than use GUI tools. This feature would be optional - no-one is going to be forced to use it. I was speaking at a conference this week and mentioned this at the end of my Tomcat 7 intro presentation when I was talking about future plans. General consensus in the room was that they liked the feature and would use it. That was a mix of developers and ops folks so I think there is a demand In the same way users aren't forced to do hot re-deployment but can do it if they want, parallel deployment will add another choice. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50025] getConnection method in class DataSourceProxy is ignoring credentials
https://issues.apache.org/bugzilla/show_bug.cgi?id=50025 --- Comment #1 from bsny...@apache.org 2010-10-22 09:57:37 EDT --- Here's the description that I copy/pasted from the Spring forums: In Websphere I was able to wire an interceptor around all of my controllers and set thread-bound DB credentials based on the path of the current request. In my tcServer Developer edition (2.3.3 M1) this no longer works. My datasource is wired as a org.springframework.jdbc.datasource.UserCredential sDataSourceAdapter I've verified that I'm calling the getConnection(String username, String password) method with the correct credentials. However, the connection that is returned is of type proxyconnection[pooledconnection[oracle.jdbc.driver.t4cconnect...@6ab4a7]] with the same default credentials as those defined in server.xml. Is there another way to set the database credentials at runtime? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.4 beta released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.4 beta. Apache Tomcat 7.0 includes new features over Apache Tomcat 6.0, including support for the new Servlet 3.0, JSP 2.2 and EL 2.2 specifications, web application memory leak detection and prevention, improved security for the Manager and Host Manager applications, Generic CSRF protection, support for including external content directly in a web application (aliases), re-factoring (connectors, life-cycle) and lots of internal code clean-up. The 7.0.4 release contains numerous bug fixes compared to 7.0.2. Please refer to the change log for the list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Note that this version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for Windows operating systems running on different CPU architectures. Downloads: http://tomcat.apache.org/download-70.cgi Migration guide from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50025] getConnection method in class DataSourceProxy is ignoring credentials
https://issues.apache.org/bugzilla/show_bug.cgi?id=50025 --- Comment #2 from bsny...@apache.org 2010-10-22 10:25:43 EDT --- Do you have a code example to show how you receive this error? Or perhaps even a JUnit test? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50025] getConnection method in class DataSourceProxy is ignoring credentials
https://issues.apache.org/bugzilla/show_bug.cgi?id=50025
--- Comment #3 from Tim t...@cornell.edu 2010-10-22 10:29:26 EDT ---
(In reply to comment #2)
Do you have a code example to show how you receive this error? Or perhaps even
a JUnit test?
Take a look at the source code for getConnection. It was included in a reply
to my original post in the forums (reproduced below).
---
This is an issue with the new jdbc-pool implementation, it internally always
uses the default configured username/password. I suggest raising a bug on the
tomcat(jdbc-pool) issue tracker.
The actual code.
Code:
public class DataSourceProxy implements PoolConfiguration {
...
/**
* {...@link javax.sql.DataSource#getConnection()}
*/
public Connection getConnection(String username, String password) throws
SQLException {
return getConnection();
}
}
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Tomcat Connectors 1.2.31
On 22.10.2010 15:10, Mladen Turk wrote: Hi, 1.2.31 release proposal based on the JK_1_2_31_RC2 tag is available for testing at: http://people.apache.org/~mturk/tomcat-connectors/jk/ Beside sources there is assorted set of binaries for your convenience. Just browse down the binaries directory and you might get lucky :) Documentation (with missing 1.2.31 announcement of course) is at the same place http://people.apache.org/~mturk/tomcat-connectors/jk/docs/jk-1.2.31/ JK_1_2_31_RC2 tag if this release get voted will be renamed to JK_1_2_31 and content of upper directory put on dist. So, Tomcat Connectors 1.2.31 is: [ ] +1 release it [ ] -1 nope, it's broken Minor nit: when building the nsapi plugin on Solaris Sparc with either Sun Studio or gcc compiler, I get a build error, because config.h is not included. If I add -DHAVE_CONFIG_H to my CFLAGS, it builds fine. I guess the hand written nsapi Makefiles need an update. Since nsapi is so rare and I assume only Solaris is hit by the problem, I wouldn't say it's a showstopper. We can open a bugzilla to document and fix next time. What do you think? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Tomcat Connectors 1.2.31
On 10/22/2010 05:09 PM, Rainer Jung wrote: On 22.10.2010 15:10, Mladen Turk wrote: Since nsapi is so rare and I assume only Solaris is hit by the problem, I wouldn't say it's a showstopper. We can open a bugzilla to document and fix next time. What do you think? +1 That's how I build them anyhow :) We should just create a .am files for Solaris and axe all those hand written files. We can add the note inside dist README.html about which flags were used during build. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50143] New: jstl 1.2 el in tag files is not interpreted correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=50143
Summary: jstl 1.2 el in tag files is not interpreted correctly
Product: Tomcat 6
Version: 6.0.29
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: critical
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kristof.b...@gmail.com
Created an attachment (id=26204)
-- (https://issues.apache.org/bugzilla/attachment.cgi?id=26204)
zip file containing both source files and war file
Inside my index.jsp file, I use a custom tag (defined in a tag file
WEB-INF/tags/myTags/sayHello.tag) like this:
myTags:sayHello name=Chuck /
The custom tag uses an attribute 'name' and writes it as output using el
${name}.
The el is not interpreted. The same code works fine on tomcat 6.0.18 in the
same environment.
The attached zip file contains the war file + all source files.
You can reproduce the bug easily:
-deploy the included war file on tomcat 6.0.29
-surf to 'anything.do'
-you will see the text 'Hello ${name}' instead of the expected 'Hello Chuck'
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of SupportAndTraining by Savoir- faire Linux
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The SupportAndTraining page has been changed by Savoir-faire Linux.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=23rev2=24
--
Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]]
bietet von Basis Level Support bis hin zu Support für unternehmenskritische
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn,
Deutschland, ansässig.
+ [[http://www.savoir-faire
linux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
+ Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide support on an hourly basis,
through bank of pre-paid hours or monthly contract. Savoir-faire Linux is based
in Canada with offices in Montreal, Quebec City and Ottawa. To get a quote,
email cont...@savoirfairelinux.com. In an emergency ? Contact
supp...@savoirfairelinux.com or call us at 1-877-735-4689.
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
@@ -55, +58 @@
!DevelopIntelligence offers highly-customized, project-centric learning
solutions delivered on-site or on-line. Check out our
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Apache
Tomcat Training]] course, or our wide variety of
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Open
Source Training]] programs.
+ [[http://www.savoir-faire
linux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
+ Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private and custom courses, contact train...@savoirfairelinux.com or call
1-877-735-4689.
+
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
!SpringSource provides comprehensive
[[http://www.springsource.com/training?aw|education]] on enterprise Java with
specific [[http://springsource.com/training/apa001/syllabus?aw|training]] for
Apache Tomcat. The four-day, intensive instructor-led training provides
practical, hands-on knowledge about installation, configuration, deployment,
load balancing and troubleshooting for production systems using Apache Tomcat.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of SupportAndTraining by Savoir- faire Linux
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The SupportAndTraining page has been changed by Savoir-faire Linux.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=24rev2=25
--
[[http://www.savoir-faire
linux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
- Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private and custom courses, contact train...@savoirfairelinux.com or call
1-877-735-4689.
+ Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private, on-site and custom courses, contact train...@savoirfairelinux.com or
call 1-877-735-4689.
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of SupportAndTraining by Savoir- faire Linux
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The SupportAndTraining page has been changed by Savoir-faire Linux.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=25rev2=26
--
Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]]
bietet von Basis Level Support bis hin zu Support für unternehmenskritische
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn,
Deutschland, ansässig.
- [[http://www.savoir-faire
linux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide support on an hourly basis,
through bank of pre-paid hours or monthly contract. Savoir-faire Linux is based
in Canada with offices in Montreal, Quebec City and Ottawa. To get a quote,
email cont...@savoirfairelinux.com. In an emergency ? Contact
supp...@savoirfairelinux.com or call us at 1-877-735-4689.
@@ -58, +58 @@
!DevelopIntelligence offers highly-customized, project-centric learning
solutions delivered on-site or on-line. Check out our
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Apache
Tomcat Training]] course, or our wide variety of
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Open
Source Training]] programs.
- [[http://www.savoir-faire
linux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private, on-site and custom courses, contact train...@savoirfairelinux.com or
call 1-877-735-4689.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026496 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Oct 22 21:15:03 2010 New Revision: 1026496 URL: http://svn.apache.org/viewvc?rev=1026496view=rev Log: correct typos Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1026496r1=1026495r2=1026496view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 22 21:15:03 2010 @@ -80,7 +80,7 @@ subsection name=Cluster changelog fix -Add support for maxActiveSessions attributes to BackupManager. (kfujino) +Add support for maxActiveSessions attribute to BackupManager. (kfujino) /fix fix Improve sending an access message in DeltaManager. @@ -163,7 +163,7 @@ bug49978/bug: Correctly handle the case when a directory expected to be created during web application start is already present. Rather than throwing an exception and failing to start, allow the web -application to start normally. (mark) +application to start normally. (markt) /fix fix bug49987/bug: Fix thread safety issue with population of servlet - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026498 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 22 21:19:52 2010 New Revision: 1026498 URL: http://svn.apache.org/viewvc?rev=1026498view=rev Log: 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=1026498r1=1026497r2=1026498view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 22 21:19:52 2010 @@ -284,7 +284,7 @@ PATCHES PROPOSED TO BACKPORT: * Add support for maxActiveSessions attributes to BackupManager. http://svn.apache.org/viewvc?rev=1025899view=rev - +1: kfujino + +1: kfujino, kkolinko -1: * Improve sending an access message in DeltaManager. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026506 - /tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
Author: kkolinko
Date: Fri Oct 22 21:59:51 2010
New Revision: 1026506
URL: http://svn.apache.org/viewvc?rev=1026506view=rev
Log:
Revert part of r1026157
Removing throwa NamingException from parseName() methods as was done in
r1026157 changed their API,
so that derived classes won't be able to throw that exception anymore.
I do not know the full story behind these two parseName() methods, but if they
were supposed be overwritten it seems likely that they may throw a
NamingException.
Modified:
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1026506r1=1026505r2=1026506view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Fri Oct
22 21:59:51 2010
@@ -1469,7 +1469,7 @@ public class ProxyDirContext implements
*
* @return the parsed name
*/
-protected String parseName(String name) {
+protected String parseName(String name) throws NamingException {
return name;
}
@@ -1479,7 +1479,7 @@ public class ProxyDirContext implements
*
* @return the parsed name
*/
-protected Name parseName(Name name) {
+protected Name parseName(Name name) throws NamingException {
return name;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of SupportAndTraining by Konstan tinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The SupportAndTraining page has been changed by KonstantinKolinko.
The comment on this change is: As is written on the page, new entries must be
added to the end of the list. (a followup to r24-26)..
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=26rev2=27
--
Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]]
bietet von Basis Level Support bis hin zu Support für unternehmenskritische
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn,
Deutschland, ansässig.
-
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
-
- Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide support on an hourly basis,
through bank of pre-paid hours or monthly contract. Savoir-faire Linux is based
in Canada with offices in Montreal, Quebec City and Ottawa. To get a quote,
email cont...@savoirfairelinux.com. In an emergency ? Contact
supp...@savoirfairelinux.com or call us at 1-877-735-4689.
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
@@ -44, +41 @@
!OpenLogic provides commercial-grade
[[http://www.openlogic.com/products/open-source-support.php|support for
Tomcat]] and hundreds of other open source packages. Our open source support
comes with guaranteed Service Level Agreements and either business hours or
around-the-clock coverage.
+
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
+ Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide support on an hourly basis,
through bank of pre-paid hours or monthly contract. Savoir-faire Linux is based
in Canada with offices in Montreal, Quebec City and Ottawa. To get a quote,
email cont...@savoirfairelinux.com. In an emergency ? Contact
supp...@savoirfairelinux.com or call us at 1-877-735-4689.
+
+
=== Example company name ===
Use this example as a basis for your entry. New entries should be added just
above this example.
@@ -58, +60 @@
!DevelopIntelligence offers highly-customized, project-centric learning
solutions delivered on-site or on-line. Check out our
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Apache
Tomcat Training]] course, or our wide variety of
[[http://www.developintelligence.com/catalog/open-source-server-training.php|Open
Source Training]] programs.
-
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
-
- Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private, on-site and custom courses, contact train...@savoirfairelinux.com or
call 1-877-735-4689.
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
@@ -81, +80 @@
!OpenLogic offers
[[http://www.openlogic.com/products/open-source-training.php|training for
Tomcat]] and a wide range of other open source packages. Training options
include open-enrolment training for individuals and customized, multi-day
enterprise training courses.
+
+
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315t=1287776986392|http://www.savoirfairelinux.com}}]]
+
+ Savoir-faire Linux provides 24/7 support, consulting, development and
training services on Apache Tomcat. We provide
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For
private, on-site and custom courses, contact train...@savoirfairelinux.com or
call 1-877-735-4689.
+
+
=== Example company name ===
Use this example as a basis for your entry. New entries should be added just
above this example.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
bugzilla question : bugs fixed in trunk but not yet in tc6
How can you create a filter for bugs that are fixed in trunk, proposed to be fixed in tomcat 6, and waiting to be backported ? Do you use some special bug attribute ? Sylvain PS : Why not use JIRA ? It has many advantages over this aging bugzilla... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: bugzilla question : bugs fixed in trunk but not yet in tc6
2010/10/23 Sylvain Laurent sylvain.laur...@m4x.org: How can you create a filter for bugs that are fixed in trunk, proposed to be fixed in tomcat 6, and waiting to be backported ? Do you use some special bug attribute ? What do you mean? If it is already fixed in TC7, we change the product that the bug is assigned to: we move it to the one where it is still present: to TC6, then to TC5. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022606 - in /tomcat/trunk/java: javax/el/BeanELResolver.java org/apache/el/lang/ExpressionBuilder.java org/apache/el/util/ConcurrentCache.java
2010/10/16 Konstantin Kolinko knst.koli...@gmail.com:
2010/10/16 Tim Whittington t...@apache.org:
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1022606r1=1022605r2=1022606view=diff
(...)
public V get(K key) {
V value = this.eden.get(key);
if (value == null) {
- value = this.longterm.get(key);
+ synchronized (longterm) {
+ value = this.longterm.get(key);
+ }
if (value != null) {
this.eden.put(key, value);
}
@@ -344,7 +346,9 @@ public class BeanELResolver extends ELRe
public void put(K key, V value) {
if (this.eden.size() = this.size) {
- this.longterm.putAll(this.eden);
+ synchronized (longterm) {
+ this.longterm.putAll(this.eden);
+ }
this.eden.clear();
}
this.eden.put(key, value);
I think that a ReadWriteLock will be more suitable here, because
there will be a thousand of reads for a single write.
For a note: I was wrong here. A ReadWriteLock cannot be used, because
a get() operation on a Map is generally not guaranteed to do not
change the state of the map.
The WeakHashMap modifies itself in a get(): it deletes stale values.
The other JRE implementations may be even different.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026535 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 22 23:57:07 2010 New Revision: 1026535 URL: http://svn.apache.org/viewvc?rev=1026535view=rev Log: 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=1026535r1=1026534r2=1026535view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 22 23:57:07 2010 @@ -263,7 +263,7 @@ PATCHES PROPOSED TO BACKPORT: Threading patch provided by Takayoshi Kimura http://svn.apache.org/viewvc?rev=1022606view=rev (threading) http://svn.apache.org/viewvc?rev=1022623view=rev (cache sizes) - +1: markt, kfujino + +1: markt, kfujino, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50105 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: bugzilla question : bugs fixed in trunk but not yet in tc6
Not to step on anyones toes, but JIRA costs serious $$ after the initial 10 users. It gets expensive fast. Trac is good too though. I set up an awesome Trac system at work. - Josh On Fri, Oct 22, 2010 at 6:11 PM, Sylvain Laurent sylvain.laur...@m4x.orgwrote: How can you create a filter for bugs that are fixed in trunk, proposed to be fixed in tomcat 6, and waiting to be backported ? Do you use some special bug attribute ? Sylvain PS : Why not use JIRA ? It has many advantages over this aging bugzilla... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: bugzilla question : bugs fixed in trunk but not yet in tc6
They could be comfortable with Bugzilla too. I see JIRA has an open source license. (back pedal back pedal!!!) On Fri, Oct 22, 2010 at 8:10 PM, Josh Gooding josh.good...@gmail.comwrote: Not to step on anyones toes, but JIRA costs serious $$ after the initial 10 users. It gets expensive fast. Trac is good too though. I set up an awesome Trac system at work. - Josh On Fri, Oct 22, 2010 at 6:11 PM, Sylvain Laurent sylvain.laur...@m4x.orgwrote: How can you create a filter for bugs that are fixed in trunk, proposed to be fixed in tomcat 6, and waiting to be backported ? Do you use some special bug attribute ? Sylvain PS : Why not use JIRA ? It has many advantages over this aging bugzilla... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Distributed version of commons-daemon.jar
Hi guys, I had a bug starting tomcat6 with (commons-daemon). The problem was that common-daemons was not able to register native methods (with commons-daemon.jar). Digging into the problem made me find that the file commons-daemon.jar distributed in http://apache.infocom.ua/tomcat/tomcat-6/v6.0.29/src/apache-tomcat-6.0.29-src.tar.gz was not compatible with the (only) version of common-daemons wich is distributed right now (http://www.eu.apache.org/dist/commons/daemon/source/). Everything worked fine when I got a copy of 1.0.2 from the svn tags. So since the common-daemons-1.0.2 is no more distributed and the jar distributed in tomcat-6.0.29 seems to be in version 2, do you think it would be a good idea to to update tomcat6.0.29-src.tar.gz with the common-daemons-1.0.3.jar? Actually almost nobody will ever compile common-daemons-1.0,2 again since the archive is no more available. I got this problem while trying to update the AUR from archlinux: http://aur.archlinux.org/packages.php?ID=35060O=L=C=K=SB=SO=PP=do_Orphans=SeB= Thank you --- Alexandre Vézina
