svn commit: r1153793 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Aug 4 08:59:29 2011 New Revision: 1153793 URL: http://svn.apache.org/viewvc?rev=1153793&view=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=1153793&r1=1153792&r2=1153793&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 4 08:59:29 2011 @@ -116,7 +116,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1138953&view=rev http://svn.apache.org/viewvc?rev=1140693&view=rev http://svn.apache.org/viewvc?rev=1142043&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: * Multiple improvements to the Windows Installer @@ -163,7 +163,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51509 Correct concurrency issue in CSRF prevention filter http://svn.apache.org/viewvc?rev=1148471&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51515 @@ -176,12 +176,12 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51588 Make it easier to extend the AccessLogValve to add support for custom elements http://svn.apache.org/viewvc?rev=1152601&view=rev - +1: markt, kkolinko + +1: markt, kkolinko,kfujino -1: * Update to Apache Commons Daemon 1.0.7 Use two alternative download locations for components downloaded from apache.org. http://people.apache.org/~kkolinko/patches/2011-08-03_tc6_daemon107.patch - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1153824 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml extras.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Aug 4 10:09:45 2011
New Revision: 1153824
URL: http://svn.apache.org/viewvc?rev=1153824&view=rev
Log:
* Update to Apache Commons Daemon 1.0.7
* Use two alternative download locations for components downloaded from
apache.org.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1153824&r1=1153823&r2=1153824&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 4 10:09:45 2011
@@ -178,10 +178,3 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=1152601&view=rev
+1: markt, kkolinko,kfujino
-1:
-
-* Update to Apache Commons Daemon 1.0.7
- Use two alternative download locations for components downloaded from
- apache.org.
- http://people.apache.org/~kkolinko/patches/2011-08-03_tc6_daemon107.patch
- +1: kkolinko, markt, kfujino
- -1:
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1153824&r1=1153823&r2=1153824&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Aug 4 10:09:45 2011
@@ -43,8 +43,13 @@ compile.source=1.5
compile.target=1.5
compile.debug=true
-base-commons.loc=http://archive.apache.org/dist/commons
-base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-apache.loc.1=http://www.apache.org/dist
+base-apache.loc.2=http://archive.apache.org/dist
+base-commons.loc.1=${base-apache.loc.1}/commons
+base-commons.loc.2=${base-apache.loc.2}/commons
+base-tomcat.loc.1=${base-apache.loc.1}/tomcat
+base-tomcat.loc.2=${base-apache.loc.2}/tomcat
+
base-sf.loc=http://downloads.sourceforge.net
base-maven.loc=http://repo2.maven.org/maven2
@@ -56,7 +61,8 @@ base-maven.loc=http://repo2.maven.org/ma
# - servletapi
commons-logging.version=1.1.1
commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
-commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
# - Avalon Framework (required by commons logging) -
@@ -114,18 +120,25 @@ jdt.loc.2=http://download.eclipse.org/ec
tomcat-native.version=1.1.20
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
+tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
+tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
# - Commons DBCP, version 1.1 or later -
commons-dbcp.version=1.3
commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# - Commons Pool, version 1.1 or later -
commons-pool.version=1.5.6
commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
# - NSIS,
svn commit: r1153828 - in /tomcat/tc6.0.x/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Aug 4 10:19:50 2011
New Revision: 1153828
URL: http://svn.apache.org/viewvc?rev=1153828&view=rev
Log:
Various improvements to the Windows installer to be able to install several
copies of Tomcat 6 side by side. Allow to configure service name, connector and
shutdown ports. Allow to choose whether to install Start menu shortcuts and
Apache Tomcat monitor application for all users or for the current one only.
Improve server.xml file handling. Fix uninstallation icon.
Modified:
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1153828&r1=1153827&r2=1153828&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Aug 4 10:19:50 2011
@@ -45,7 +45,15 @@ Var JavaExe
Var JvmDll
Var Arch
Var ResetInstDir
-Var TomcatPort
+Var TomcatPortShutdown
+Var TomcatPortHttp
+Var TomcatPortAjp
+Var TomcatMenuEntriesEnable
+Var TomcatShortcutAllUsers
+Var TomcatServiceName
+Var TomcatServiceDefaultName
+Var TomcatServiceFileName
+Var TomcatServiceManagerFileName
Var TomcatAdminEnable
Var TomcatAdminUsername
Var TomcatAdminPassword
@@ -53,7 +61,11 @@ Var TomcatAdminRoles
; Variables that store handles of dialog controls
Var CtlJavaHome
-Var CtlTomcatPort
+Var CtlTomcatPortShutdown
+Var CtlTomcatPortHttp
+Var CtlTomcatPortAjp
+Var CtlTomcatServiceName
+Var CtlTomcatShortcutAllUsers
Var CtlTomcatAdminUsername
Var CtlTomcatAdminPassword
Var CtlTomcatAdminRoles
@@ -70,8 +82,8 @@ Var ServiceInstallLog
!define MUI_HEADERIMAGE_BITMAP header.bmp
!define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat@version_ma...@w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat@VERSION_MAJOR@
+ !define MUI_FINISHPAGE_RUN
+ !define MUI_FINISHPAGE_RUN_FUNCTION "startService"
!define MUI_FINISHPAGE_NOREBOOTSUPPORT
!define MUI_ABORTWARNING
@@ -87,12 +99,17 @@ Var ServiceInstallLog
LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection."
LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path
selection"
+ LangString TEXT_INSTDIR_NOT_EMPTY ${LANG_ENGLISH} "The specified
installation directory is not empty. Do you wish to continue?"
LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 5.0 or later JRE installed on your system."
- LangString TEXT_CONF_LABEL_PORT ${LANG_ENGLISH} "HTTP/1.1 Connector Port"
+ LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
+ LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
+ LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
+ LangString TEXT_CONF_LABEL_SERVICE_NAME ${LANG_ENGLISH} "Windows Service
Name"
+ LangString TEXT_CONF_LABEL_SHORTCUT_ALL_USERS ${LANG_ENGLISH} "Create
shortcuts for all users"
LangString TEXT_CONF_LABEL_ADMIN ${LANG_ENGLISH} "Tomcat Administrator Login
(optional)"
LangString TEXT_CONF_LABEL_ADMINUSERNAME ${LANG_ENGLISH} "User Name"
LangString TEXT_CONF_LABEL_ADMINPASSWORD ${LANG_ENGLISH} "Password"
@@ -106,6 +123,7 @@ Var ServiceInstallLog
!insertmacro MUI_PAGE_COMPONENTS
Page custom pageConfiguration pageConfigurationLeave "$(TEXT_CONF_PAGETITLE)"
Page custom pageChooseJVM pageChooseJVMLeave "$(TEXT_JVM_PAGETITLE)"
+ !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageDirectoryLeave
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
Page custom CheckUserType
@@ -138,13 +156,8 @@ Var ServiceInstallLog
InstType Minimum
InstType Full
- ; Main registry key
- InstallDirRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@" ""
-
ReserveFile "${NSISDIR}\Plugins\System.dll"
ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
- ReserveFile confinstall\server_1.xml
- ReserveFile confinstall\server_2.xml
ReserveFile confinstall\tomcat-users_1.xml
ReserveFile confinstall\tomcat-users_2.xml
@@ -183,33 +196,37 @@ Section "Core" SecTomcatCore
DetailPrint "Using Jvm: $JavaHome"
+ StrCpy $R0 $TomcatServiceName
+ StrCpy $TomcatServiceFileName $R0.exe
+ StrCpy $TomcatServiceManagerFileName $R0w.exe
+
SetOutPath $INSTDIR\bin
- File bin\tomcat@version_ma...@w.exe
+ File /oname=$TomcatServiceManagerFileName bin\tomcat@version_ma...@w.exe
; Get the current platform x86 / AMD64 / IA64
${If} $Arch == "x86"
-File /oname=tomcat@VERSION_MAJOR@.exe bin\t
svn commit: r1153834 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/confinstall/server_1.xml res/confinstall/server_2.xml res/main.ico res/tickno.bmp res/tickyes.bmp res/uninst.ico webapps/docs/changelog.
Author: kkolinko Date: Thu Aug 4 10:25:38 2011 New Revision: 1153834 URL: http://svn.apache.org/viewvc?rev=1153834&view=rev Log: Various improvements to the Windows installer. Completing the patch, svn rm res/confinstall/server_1.xml svn rm res/confinstall/server_2.xml svn rm res/tickno.bmp svn rm res/tickyes.bmp svn rm res/main.ico svn rm res/uninst.ico Add issue numbers to changelog and remove item from STATUS. Removed: tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml tomcat/tc6.0.x/trunk/res/main.ico tomcat/tc6.0.x/trunk/res/tickno.bmp tomcat/tc6.0.x/trunk/res/tickyes.bmp tomcat/tc6.0.x/trunk/res/uninst.ico Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1153834&r1=1153833&r2=1153834&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 4 10:25:38 2011 @@ -119,35 +119,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko, kfujino -1: -* Multiple improvements to the Windows Installer - - https://issues.apache.org/bugzilla/show_bug.cgi?id=33262 -Install monitor to auto-start for current user only rather than all users to -be consistent with menu item creation. - - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510 -Provide an option to install shortcuts for the current user or all users. -Also ensure registry is correctly cleaned on uninstall for 64-bit platforms. - - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949 -Provide the ability to specify the AJP port and service name when installing -Tomcat using the Windows installer. This permits multiple instances of the -same Tomcat version to be installed side-by-side. - - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51135 -Fix auto-detection of JAVA_HOME for 64-bit Windows platforms that only have -a 32-bit JVM installed. - - Simplify the installer by using search and replace for server.xml - - Provide the ability to configure the shutdown port - - Provide service name and port validation - 1) Commands to remove files - removal of binaries cannot be expressed by the patch - svn rm res/confinstall/server_1.xml - svn rm res/confinstall/server_2.xml - svn rm res/tickno.bmp - svn rm res/tickyes.bmp - svn rm res/main.ico - svn rm res/uninst.ico - 2) http://people.apache.org/~kkolinko/patches/2011-08-03_tc6_windows-installer_v2.patch - +1: kkolinko, markt - -1: - - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49929 No definitive information that this is the fix but back-porting Mladen's fix from 7.0.x can't hurt and may help Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1153834&r1=1153833&r2=1153834&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 4 10:25:38 2011 @@ -349,6 +349,15 @@ Clarify error messages in *.sh files to mention that if a script is not found it might be because execute permission is needed. (kkolinko) + +33262, 40510, 50949, 51135: +Various improvements to the Windows installer to be able to install +several copies of Tomcat 6 side by side. Allow to configure service +name, connector and shutdown ports. Allow to choose whether to install +Start menu shortcuts and Apache Tomcat monitor application for all +users or for the current one only. Improve server.xml file handling. +Fix uninstallation icon. (markt/kkolinko) + 50854: Add additional entries to the default catalina.policy file to support running the manager web application from CATALINA_HOME @@ -378,14 +387,6 @@ At build time use two alternative download locations for components downloaded from apache.org. (kkolinko) - -Various improvements to the Windows installer to be able to install -several copies of Tomcat 6 side by side. Allow to configure service -name, connector and shutdown ports. Allow to choose whether to install -Start menu shortcuts and Apache Tomcat monitor application for all -users or for the current one only. Improve server.xml file handling. -Fix uninstallation icon. (markt/kkolinko) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1153838 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Aug 4 10:30:59 2011 New Revision: 1153838 URL: http://svn.apache.org/viewvc?rev=1153838&view=rev Log: Add description of BZ 51135 to the changelog. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.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?rev=1153838&r1=1153837&r2=1153838&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 4 10:30:59 2011 @@ -355,7 +355,9 @@ several copies of Tomcat 6 side by side. Allow to configure service name, connector and shutdown ports. Allow to choose whether to install Start menu shortcuts and Apache Tomcat monitor application for all -users or for the current one only. Improve server.xml file handling. +users or for the current one only. Improve auto-detection of JAVA_HOME +for 64-bit Windows platforms: autoselect 32-bit JRE if it exists and +64-bit one is not available. Improve server.xml file handling. Fix uninstallation icon. (markt/kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51614] New: PersistentManager loads session from Store and calls session.expire() twice.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51614
Bug #: 51614
Summary: PersistentManager loads session from Store and calls
session.expire() twice.
Product: Tomcat 7
Version: trunk
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kfuj...@apache.org
Classification: Unclassified
To check whether session is loaded into memory, StoreBase#processExpires calls
findSession(id).
=
...
if (manager.findSession(keys[i]) != null) {
isLoaded = true;
}
...
=
However, PersistentManager#findSession(id) loads session from Store when there
is no session in memory.
Because session loaded from Store is an invalid session
PersistentManager logs errorlog, calls session.expire(), and deletes session
from Store.
As a result, findSession(id) returns null, and isLoaded becomes false.
And, session.expire() is called again, and the session is deleted from Store.
If manager is PersistentManager, it is necessary to call
PersistentManagerBase#isLoaded(id).
However, to avoid regression of r1033024, other managers call findSession(id).
Best regards.
--
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 51614] PersistentManager loads session from Store and calls session.expire() twice.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51614 --- Comment #1 from Keiichi Fujino 2011-08-04 11:22:08 UTC --- Created attachment 27348 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27348 patch against trunk. -- 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
svn commit: r1153854 - in /tomcat/trunk: java/org/apache/catalina/session/StoreBase.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Aug 4 11:45:53 2011
New Revision: 1153854
URL: http://svn.apache.org/viewvc?rev=1153854&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51614
Avoid two times calls of store.load() and session.expire() in PersistentManager.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StoreBase.java?rev=1153854&r1=1153853&r2=1153854&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StoreBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StoreBase.java Thu Aug 4
11:45:53 2011
@@ -168,12 +168,16 @@ public abstract class StoreBase extends
manager.getContainer().getLogger().debug(getStoreName()+
": processExpires expire store session " + keys[i] );
}
boolean isLoaded = false;
-try {
-if (manager.findSession(keys[i]) != null) {
-isLoaded = true;
+if (manager instanceof PersistentManagerBase) {
+isLoaded = ((PersistentManagerBase)
manager).isLoaded(keys[i]);
+} else {
+try {
+if (manager.findSession(keys[i]) != null) {
+isLoaded = true;
+}
+} catch (IOException ioe) {
+// Ignore - session will be expired
}
-} catch (IOException ioe) {
-// Ignore - session will be expired
}
if (isLoaded) {
// recycle old backup session
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1153854&r1=1153853&r2=1153854&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 4 11:45:53 2011
@@ -129,6 +129,10 @@
Allow to have several AccessLogValve instances in the same scope (e.g.
in the same Context). (kkolinko)
+
+51614: Avoid two times calls of store.load() and
+session.expire() in PersistentManager. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51614] PersistentManager loads session from Store and calls session.expire() twice.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51614 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Keiichi Fujino 2011-08-04 11:48:47 UTC --- Fixed in 7.0.x and will be included in 7.0.20 onwards. -- 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 51515] Comet over HTTPS: END event recieved immeidately for the first few times
https://issues.apache.org/bugzilla/show_bug.cgi?id=51515 --- Comment #6 from Sudeep Pradhan 2011-08-04 18:23:28 UTC --- The patch fixes the problem mentioned in the bug. There is another problem, END event is not raised when the client closes the connection abruptly. e.g. Ctrl-C on terminal running curl http client. Is this another bug? -- 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 51615] New: Line 267 of "org.apache.tomcat.jdbc.pool.PooledConnection": double assignment typo
https://issues.apache.org/bugzilla/show_bug.cgi?id=51615 Bug #: 51615 Summary: Line 267 of "org.apache.tomcat.jdbc.pool.PooledConnection": double assignment typo Product: Tomcat 7 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: d.tonho...@m-plify.com Classification: Unclassified Nothing bad here, but my compiler lights up: connection = connection = driver.connect(driverURL, properties); Clearly, to be fixed. -- 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 Apache Tomcat Native 1.1.22
On 29/07/2011 11:06, jean-frederic clere wrote: > Hi, > > Native 1.1.22 is available for testing. > Compared with 1.1.21 it just fix typos in docs and the packaging script. > > If you want to take a look, the final source distribution can be > downloaded from: > http://tomcat.apache.org/dev/dist/tomcat-connectors/native/1.1.22/source > > Win32/Win64 binaries are available at: > http://tomcat.apache.org/dev/dist/tomcat-connectors/native/1.1.22/binaries/ > > So here's the vote. > It will be closed in about 72 hours > (or sooner if enough votes are encountered) The 72 hours have passed and sufficient votes were cast for this release. Usually the person calling the vote closes it but this is holding up the Tomcat 7.0.20 release so I intend to close the vote and do the release tomorrow morning unless someone objects or gets to it before me. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FAQ/Logging" by DavidTonhofer
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FAQ/Logging" page has been changed by DavidTonhofer:
http://wiki.apache.org/tomcat/FAQ/Logging?action=diff&rev1=18&rev2=19
Comment:
Added more text on JULI and an image. Hope it's correct, but looking at the
source says yes.
* Prior to Tomcat 5.5, Tomcat provided a Logger element that you could
configure and extend according to your needs.
* Starting with Tomcat 5.5, Logger was removed and
[[http://commons.apache.org/logging/|Apache Commons-Logging]] {{{Log}}} is used
everywhere in Tomcat. Read the Commons-Logging documentation if you'd like to
know how to better use and configure Tomcat's internal logging. See also
http://tomcat.apache.org/tomcat-5.5-doc/logging.html
- * To enable request logging similar to the Apache HTTP server, you may
include the following line in the server.xml file, in the tag:
+ * In Tomcat 7 (and also 6), the logging code is based on a set of classes
interacting with the
[[http://download.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html|java.util.logging
API]] (JUL), which comes with Java since version 1.4. The Tomcat startup
script configures the JVM to uses a web-application-aware implementation of the
[[http://download.oracle.com/javase/6/docs/api/java/util/logging/LogManager.html|JUL
LogManager]]. This Tomcat logging infrastructure is called JULI, and one can
still distinguish its Apache Commons Logging heritage, but the complex
configuration has been edited out and the package name changed.
+
+ {{http://public.m-plify.net/TomcatLogging.png}}
+
+ Web applications can get logging service by using the Servlet API logging
(which not recommended), the JUL interface (which ultimately goes to JULI) or
any other preferred interface for which they furnish the jar files and the
appropriate configuration (see the respective descriptions for
[[http://logging.apache.org/log4j/|Log4J]], [[http://www.slf4j.org/|SLF4J]],
[[http://logback.qos.ch/|logback]] or
[[http://commons.apache.org/logging/|Apache Commons Logging]] for example).
+
+ To additionally log information about requests going to the web application,
"Valves" can be configured in the server.xml file, as described in detail
[[http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html|here]]. For
example, inside the tag:
+
.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.22
On 08/04/2011 10:13 PM, Mark Thomas wrote: On 29/07/2011 11:06, jean-frederic clere wrote: Hi, Native 1.1.22 is available for testing. Compared with 1.1.21 it just fix typos in docs and the packaging script. If you want to take a look, the final source distribution can be downloaded from: http://tomcat.apache.org/dev/dist/tomcat-connectors/native/1.1.22/source Win32/Win64 binaries are available at: http://tomcat.apache.org/dev/dist/tomcat-connectors/native/1.1.22/binaries/ So here's the vote. It will be closed in about 72 hours (or sooner if enough votes are encountered) The 72 hours have passed and sufficient votes were cast for this release. Usually the person calling the vote closes it but this is holding up the Tomcat 7.0.20 release so I intend to close the vote and do the release tomorrow morning unless someone objects or gets to it before me. I am on holidays (well moving from one remote location to another) so if you NEED the release please do it, otherwise I will do it on Monday. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51619] New: Absolutely no cookies in Javascript variable
https://issues.apache.org/bugzilla/show_bug.cgi?id=51619 Bug #: 51619 Summary: Absolutely no cookies in Javascript variable Product: Tomcat 7 Version: 7.0.14 Platform: Macintosh Status: NEW Severity: critical Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: belyk...@gmail.com Classification: Unclassified Tomcat 7.0.14 at localhost. I have a strange problem when accessing servlet on Tomcat 7.0.14 server with Safari and Google Chrome browsers. There is no cookies. No JSESSIONID, nothing in Javascript: document.cookie variable. But i see that cookie JSESSIONID is registered in "Show cookies" Safari preferences area. When i access Tomcat 6.0.30 with all this browsers all things work as expected. -- 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
