svn commit: r956203 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: authenticator/ClusterSingleSignOnListener.java session/ClusterSessionListener.java session/JvmRouteSes
Author: rjung
Date: Sat Jun 19 09:22:54 2010
New Revision: 956203
URL: http://svn.apache.org/viewvc?rev=956203&view=rev
Log:
Fix missing message text and logging with unexpected
logger issues in cluster listeners.
Backport of r946107 (trunk) and r952022 (TC 6).
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java?rev=956203&r1=956202&r2=956203&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
Sat Jun 19 09:22:54 2010
@@ -24,6 +24,8 @@ import org.apache.catalina.Session;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.session.ClusterListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SingleSignOnMessage form other cluster node.
@@ -32,6 +34,9 @@ import org.apache.catalina.cluster.sessi
*/
public class ClusterSingleSignOnListener extends ClusterListener {
+private static final Log log =
+LogFactory.getLog(ClusterSingleSignOnListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java?rev=956203&r1=956202&r2=956203&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
Sat Jun 19 09:22:54 2010
@@ -21,6 +21,8 @@ import java.util.Map;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SessionMessage form other cluster node.
@@ -29,7 +31,10 @@ import org.apache.catalina.cluster.Clust
* @version $Id$
*/
public class ClusterSessionListener extends ClusterListener {
-
+
+private static final Log log =
+LogFactory.getLog(ClusterSessionListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java?rev=956203&r1=956202&r2=956203&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
Sat Jun 19 09:22:54 2010
@@ -26,6 +26,9 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.Session;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.core.StandardEngine;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* Receive SessionID cluster change from other backup node after primary
session
@@ -36,6 +39,12 @@ import org.apache.catalina.core.Standard
*/
public class JvmRouteSessionIDBinderListener extends ClusterListener {
+private static final Log log =
+LogFactory.getLog(JvmRouteSessionIDBinderListener.class);
+
+private static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
/**
* The descriptive information about this implementation.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Java Servlet 3.0, Java Server Pages 2.2 & Expression Languag... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 4 mins 56 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-19062010.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-19062010-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-19062010-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-19062010.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/srv/gump/public/workspa ce/apache-commons/dbcp -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-19062010.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/publ ic/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar: /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-19062010.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-19062010.jar:/srv/gump/public/workspace/junit/dist/ju
svn commit: r956209 - /tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Author: markt
Date: Sat Jun 19 09:41:35 2010
New Revision: 956209
URL: http://svn.apache.org/viewvc?rev=956209&view=rev
Log:
Fix Gump failure
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=956209&r1=956208&r2=956209&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Sat
Jun 19 09:41:35 2010
@@ -148,7 +148,7 @@ public class TestRemoteIpFilter extends
// PREPARE
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("protocolHeader", "x-forwarded-proto");
-filterDef.addInitParameter("remoteIPHeader", "x-my-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-my-forwarded-for");
filterDef.addInitParameter("httpServerPort", "8080");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -213,7 +213,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -244,7 +244,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -276,7 +276,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
filterDef.setFilter(remoteIpFilter);
@@ -309,7 +309,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "127\\.0\\.0\\.1,
192\\.168\\..*, another-internal-proxy");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -340,7 +340,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -371,7 +371,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for");
+filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -402,7 +402,7 @@ public class TestRemoteIpFilter extends
FilterDef filterDef = new FilterDef();
filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
-
svn commit: r956210 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: rjung
Date: Sat Jun 19 10:03:18 2010
New Revision: 956210
URL: http://svn.apache.org/viewvc?rev=956210&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48379
Make session cookie name, domain and path configurable
per context.
Backport of r953025 from TC6.
Caution: this change makes OACC incompatible with
TC 6 prior to 6.0.27.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=956210&r1=956209&r2=956210&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Sat Jun 19 10:03:18 2010
@@ -459,25 +459,40 @@ public class JvmRouteBinderValve extends
Context context = request.getContext();
if (context.getCookies()) {
// set a new session cookie
-Cookie newCookie = new Cookie(Globals.SESSION_COOKIE_NAME,
-sessionId);
+String scName = context.getSessionCookieName();
+if (scName == null) {
+scName = Globals.SESSION_COOKIE_NAME;
+}
+Cookie newCookie = new Cookie(scName, sessionId);
+
newCookie.setMaxAge(-1);
+
String contextPath = null;
-if (!response.getConnector().getEmptySessionPath()
-&& (context != null)) {
-contextPath = context.getEncodedPath();
+if (!response.getConnector().getEmptySessionPath() &&
+(context != null)) {
+if (context.getSessionCookiePath() != null) {
+contextPath = context.getSessionCookiePath();
+} else {
+contextPath = context.getEncodedPath();
+}
}
if ((contextPath != null) && (contextPath.length() > 0)) {
newCookie.setPath(contextPath);
} else {
newCookie.setPath("/");
}
+
+if (context.getSessionCookieDomain() != null) {
+newCookie.setDomain(context.getSessionCookieDomain());
+}
+
if (request.isSecure()) {
newCookie.setSecure(true);
}
+
if (log.isDebugEnabled()) {
Object[] args = new Object[] {sessionId,
-Globals.SESSION_COOKIE_NAME,
+newCookie.getName(),
newCookie.getPath(),
new Boolean(newCookie.getSecure()),
new Boolean(context.getUseHttpOnly())};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.27
2010/6/15 jean-frederic clere : > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.27/ > > According to the release process, the 6.0.27 build corresponding to the > tag TOMCAT_6_0_27 is: [x] Stable There is a problem with the KEYS file, though: the key used to sign the release (ID=D3262722) is not present in http://people.apache.org/~jfclere/tomcat-6/v6.0.27/KEYS though it is present in http://www.apache.org/dist/tomcat/tomcat-6/KEYS Type Bits/KeyID Date User ID pub 4096R/D3262722 2009-11-05 Jean-Frederic Clere (Apache signing key) It is absent in the following SVN files as well: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/KEYS http://svn.apache.org/repos/asf/tomcat/trunk/KEYS Comparing http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/KEYS http://www.apache.org/dist/tomcat/tomcat-6/KEYS the differences in dist/.KEYS vs ../tc6.0.x/trunk/KEYS are: 1) 1024-bit key of Remy Maucherat was removed 2) changed name in 4096-bit subkey of 1024-bit key of Remy: using UTF-8 instead of old single-byte encoding. 3) 4096-bit key of Jean-Frederic Clere was added. 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: r956227 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Sat Jun 19 14:23:29 2010 New Revision: 956227 URL: http://svn.apache.org/viewvc?rev=956227&view=rev Log: Update changelog 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=956227&r1=956226&r2=956227&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sat Jun 19 14:23:29 2010 @@ -33,8 +33,7 @@ - + @@ -60,6 +59,15 @@ + + + +49445: When session ID is changed after authentication, +ensure the DeltaManager replicates the change in ID to the other nodes +in the cluster. (kfujino) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49445] After session ID is changed on authentication, the session replication does not work.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 Mark Thomas changed: What|Removed |Added Component|Cluster |Cluster Version|trunk |unspecified Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #3 from Mark Thomas 2010-06-19 10:24:32 EDT --- Since this is fixed in 7.0.x (it will be included in 7.0.1 onwards) move this issue to 6.0.x -- 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: r956230 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml
Author: markt Date: Sat Jun 19 14:45:51 2010 New Revision: 956230 URL: http://svn.apache.org/viewvc?rev=956230&view=rev Log: Add a section on STRICT_SERVLET_COMPLIANCE Modified: tomcat/site/trunk/docs/migration.html tomcat/site/trunk/xdocs/migration.xml Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=956230&r1=956229&r2=956230&view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Sat Jun 19 14:45:51 2010 @@ -737,6 +737,44 @@ compatibility problems. + + + + + + + + +System properties + + + + + + + + +The org.apache.catalina.STRICT_SERVLET_COMPLIANCE system +property has been modified to provide greater control over its effects. Each +behavioural change is now controlled by a dedicated system property. The +default behaviour is unchanged. The +org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property +now controls whether or not specification compliant defaults are used for +the other system properties. Even if +org.apache.catalina.STRICT_SERVLET_COMPLIANCE is +true, setting the individual system properties will always take +priority. + + + + + + + + + + + Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=956230&r1=956229&r2=956230&view=diff == --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Sat Jun 19 14:45:51 2010 @@ -209,6 +209,21 @@ compatibility problems. + + +The org.apache.catalina.STRICT_SERVLET_COMPLIANCE system +property has been modified to provide greater control over its effects. Each +behavioural change is now controlled by a dedicated system property. The +default behaviour is unchanged. The +org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property +now controls whether or not specification compliant defaults are used for +the other system properties. Even if +org.apache.catalina.STRICT_SERVLET_COMPLIANCE is +true, setting the individual system properties will always take +priority. + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49468] New: Application stops working with errno=11
https://issues.apache.org/bugzilla/show_bug.cgi?id=49468 Summary: Application stops working with errno=11 Product: Tomcat Connectors Version: 1.2.30 Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: n...@jammconsulting.com I have Tomcat 6.0.26 running behind Apache 2.2.3 using mod_jk 1.2.30. Occasionally, my application stops responding and I see these errors in the mod_jk log: [Fri Jun 18 15:30:17.614 2010] [394:47652193829632] [info] ajp_connection_tcp_get_message::jk_ajp_common.c (1230): (tomcat) can't receive the response header message from tomcat, network problems or tomcat (127.0.0.1:8009) is down (errno=11) [Fri Jun 18 15:30:17.614 2010] [394:47652193829632] [error] ajp_get_reply::jk_ajp_common.c (2055): (tomcat) Tomcat is down or refused connection. No response has been sent to the client (yet) [Fri Jun 18 15:30:17.614 2010] [394:47652193829632] [info] ajp_service::jk_ajp_common.c (2540): (tomcat) sending request to tomcat failed (recoverable), (attempt=1) [Fri Jun 18 15:31:19.711 2010] [394:47652193829632] [info] ajp_connection_tcp_get_message::jk_ajp_common.c (1230): (tomcat) can't receive the response header message from tomcat, network problems or tomcat (127.0.0.1:8009) is down (errno=11) [Fri Jun 18 15:31:19.711 2010] [394:47652193829632] [error] ajp_get_reply::jk_ajp_common.c (2055): (tomcat) Tomcat is down or refused connection. No response has been sent to the client (yet) [Fri Jun 18 15:31:19.711 2010] [394:47652193829632] [info] ajp_service::jk_ajp_common.c (2540): (tomcat) sending request to tomcat failed (recoverable), (attempt=2) [Fri Jun 18 15:31:19.711 2010] [394:47652193829632] [error] ajp_service::jk_ajp_common.c (2559): (tomcat) connecting to tomcat failed. [Fri Jun 18 15:31:19.711 2010] [394:47652193829632] [info] jk_handler::mod_jk.c (2618): Service error=0 for worker=tomcat According to Rainer Jung, errno 11 is EAGAIN which should not be treated as an error. -- 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 49468] Application stops working with errno=11
https://issues.apache.org/bugzilla/show_bug.cgi?id=49468 --- Comment #1 from Neil Aggarwal 2010-06-19 11:21:37 EDT --- Created an attachment (id=25618) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25618) workers properties file -- 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 49469] New: Workers status page has negative number of connections
https://issues.apache.org/bugzilla/show_bug.cgi?id=49469 Summary: Workers status page has negative number of connections Product: Tomcat Connectors Version: 1.2.30 Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P3 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: n...@jammconsulting.com Created an attachment (id=25619) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25619) Screenshot of worker status page showing negative connections When I took a look at my workers status page, it has -48 for the number of connections. It should be positive or zero so there must be something wrong in the calculation somewhere. I am using Tomcat 6.0.26 behind Apache 2.2.3 on a CentOS 5.5 server. -- 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: r956240 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/catalina.policy webapps/docs/changelog.xml webapps/docs/security-manager-howto.xml
Author: markt Date: Sat Jun 19 15:43:44 2010 New Revision: 956240 URL: http://svn.apache.org/viewvc?rev=956240&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49213 Additional permissions required by Manager app Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/catalina.policy tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 19 15:43:44 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,78
DO NOT REPLY [Bug 49213] Manager application doesn't work in security mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=49213 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-06-19 11:44:30 EDT --- This has been fixed in 6.0.x and will be included in 6.0.28 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
Re: [VOTE] Release Apache Tomcat 7.0.0 as beta
On 13/06/2010 23:15, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.0 release is now available for voting. So far we have two votes for beta (Tim and I). We still need one positive vote before 7.0.0 can be released. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956241 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sat Jun 19 15:48:49 2010
New Revision: 956241
URL: http://svn.apache.org/viewvc?rev=956241&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=956241&r1=956240&r2=956241&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 19 15:48:49 2010
@@ -132,16 +132,17 @@ PATCHES PROPOSED TO BACKPORT:
of "long time".
2) I see no way to turn off this feature or filter the output.
- Additional patch:
+ Additional patch related to
+ https://issues.apache.org/bugzilla/show_bug.cgi?id=49213
The Manager is in ${catalina.base}.
http://svn.apache.org/viewvc?view=revision&revision=955655
- +1: kkolinko
+ +1: kkolinko, markt
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445
The change in session ID is notified to other node.
http://svn.apache.org/viewvc?view=revision&revision=955190
- +1: kfujino
+ +1: kfujino, markt
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956245 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: rjung
Date: Sat Jun 19 15:59:13 2010
New Revision: 956245
URL: http://svn.apache.org/viewvc?rev=956245&view=rev
Log:
Only use new API for configurable session cookie,
if it is available. Try to stay runtime compatible
with a range of 6.0 versions.
Followup to r953025.
The method using the API is deprecated anyways.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=956245&r1=956244&r2=956245&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Sat Jun 19 15:59:13 2010
@@ -17,6 +17,7 @@
package org.apache.catalina.cluster.session;
import java.io.IOException;
+import java.lang.reflect.Method;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -459,18 +460,30 @@ public class JvmRouteBinderValve extends
Context context = request.getContext();
if (context.getCookies()) {
// set a new session cookie
-String scName = context.getSessionCookieName();
-if (scName == null) {
-scName = Globals.SESSION_COOKIE_NAME;
+String scName = Globals.SESSION_COOKIE_NAME;
+/* Check for TC 6.0.27+ API */
+Boolean hasCookieAPI = false;
+Class clazz = context.getClass();
+try {
+Method method =
clazz.getDeclaredMethod("getSessionCookieName",
+new Class[] {});
+hasCookieAPI = true;
+} catch (NoSuchMethodException e) {
+ // IGNORE
+} catch (SecurityException e) {
+ // IGNORE
+}
+if (hasCookieAPI && context.getSessionCookieName() != null) {
+scName = context.getSessionCookieName();
}
Cookie newCookie = new Cookie(scName, sessionId);
-
+
newCookie.setMaxAge(-1);
-
+
String contextPath = null;
if (!response.getConnector().getEmptySessionPath() &&
(context != null)) {
-if (context.getSessionCookiePath() != null) {
+if (hasCookieAPI && context.getSessionCookiePath() !=
null) {
contextPath = context.getSessionCookiePath();
} else {
contextPath = context.getEncodedPath();
@@ -481,8 +494,8 @@ public class JvmRouteBinderValve extends
} else {
newCookie.setPath("/");
}
-
-if (context.getSessionCookieDomain() != null) {
+
+if (hasCookieAPI && context.getSessionCookieDomain() != null) {
newCookie.setDomain(context.getSessionCookieDomain());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956246 - in /tomcat/sandbox/tomcat-oacc/trunk: BUILDING.txt build.properties.default
Author: rjung
Date: Sat Jun 19 16:00:59 2010
New Revision: 956246
URL: http://svn.apache.org/viewvc?rev=956246&view=rev
Log:
Version 6.0.14 is a bit outdated for examples.
Not sure whether we are actually still compatible
with 6.0.14.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt
tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
Modified: tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt?rev=956246&r1=956245&r2=956246&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt Sat Jun 19 16:00:59 2010
@@ -111,17 +111,17 @@ a source distribution, do the following:
# path, we'll do that in build.xml automatically.
#
# Windows style
-catalina.home=C:/Programme/apache-tomcat-6.0.14
+catalina.home=C:/Programme/apache-tomcat-6.0.26
# Unix style
-# catalina.home=/usr/local/apache-tomcat-6.0.14
+# catalina.home=/usr/local/apache-tomcat-6.0.26
#
# We also need to know, where the tomcat-juli.jar is.
# This should be the full path including any sub directories.
#
# Windows style
-catalina.extras=C:/Programme/apache-tomcat-6.0.14/bin
+catalina.extras=C:/Programme/apache-tomcat-6.0.26/bin
# Unix style
-#catalina.extras=/usr/local/apache-tomcat-6.0.14/bin
+#catalina.extras=/usr/local/apache-tomcat-6.0.26/bin
* For some more variables you can define, see the existing file
${oacc.source}/build.properties.default.
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.properties.default?rev=956246&r1=956245&r2=956246&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.properties.default Sat Jun 19
16:00:59 2010
@@ -31,14 +31,14 @@
# Tomcat build directory. Don't add the /lib to the
# path, we'll do that in build.xml automatically.
#
-catalina.home=C:/Programme/apache-tomcat-6.0.14
-#catalina.home=/usr/local/apache-tomcat-6.0.14
+catalina.home=C:/Programme/apache-tomcat-6.0.26
+#catalina.home=/usr/local/apache-tomcat-6.0.26
#
# We also need to know, where the tomcat-juli.jar is.
# This should be the full path including any sub directories.
#
-catalina.extras=C:/Programme/apache-tomcat-6.0.14/bin
-#catalina.extras=/usr/local/apache-tomcat-6.0.14/bin
+catalina.extras=C:/Programme/apache-tomcat-6.0.26/bin
+#catalina.extras=/usr/local/apache-tomcat-6.0.26/bin
# Only needed if you want to run the test suite
junit.jar=C:/Programme/junit-4.4/junit-4.4.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956252 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt
Date: Sat Jun 19 16:53:36 2010
New Revision: 956252
URL: http://svn.apache.org/viewvc?rev=956252&view=rev
Log:
When using a Loader configured with searchExternalFirst="true" failure to find
the class in an external repository should not prevent searching of the local
repositories.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=956252&r1=956251&r2=956252&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sat Jun
19 16:53:36 2010
@@ -1122,6 +1122,8 @@ public class WebappClassLoader
if (hasExternalRepositories && searchExternalFirst) {
try {
clazz = super.findClass(name);
+} catch(ClassNotFoundException cnfe) {
+// Ignore - will search internal repositories next
} catch(AccessControlException ace) {
log.warn("WebappClassLoader.findClassInternal(" + name
+ ") security exception: " + ace.getMessage(),
ace);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=956252&r1=956251&r2=956252&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jun 19 16:53:36 2010
@@ -46,6 +46,12 @@
package definition restrictions defined in the catalina.properties
file.
(markt)
+
+When using a Loader configured with
+searchExternalFirst="true" failure to find the
+class in an external repository should not prevent searching of the
+local repositories. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956253 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sat Jun 19 16:54:56 2010
New Revision: 956253
URL: http://svn.apache.org/viewvc?rev=956253&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=956253&r1=956252&r2=956253&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 19 16:54:56 2010
@@ -77,10 +77,8 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=936823
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936823.patch
+1: rjung
- -1: markt - The new block
- if (hasExternalRepositories && searchExternalFirst) {...}
- needs to silently swallow CNFE to have same behaviour as previous
- code
+ +1: markt if r956252 is also applied
+ -1:
Expose the new WebappLoader flag in the VirtualWebappLoader,
but allow alternative name searchVirtualFirst to make it
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956265 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session: DeltaManager.java LocalStrings.properties SessionMessage.java SessionMessageImpl.java mbeans-d
Author: rjung
Date: Sat Jun 19 18:16:57 2010
New Revision: 956265
URL: http://svn.apache.org/viewvc?rev=956265&view=rev
Log:
Notify other nodes of session id changes.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49445
Backport of r955190 from trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessage.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=956265&r1=956264&r2=956265&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Sat Jun 19 18:16:57 2010
@@ -147,19 +147,21 @@ public class DeltaManager extends Cluste
private long sessionReplaceCounter = 0 ;
long processingTime = 0;
private long counterReceive_EVT_GET_ALL_SESSIONS = 0 ;
-private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterReceive_EVT_ALL_SESSION_DATA = 0 ;
private long counterReceive_EVT_SESSION_CREATED = 0 ;
private long counterReceive_EVT_SESSION_EXPIRED = 0;
private long counterReceive_EVT_SESSION_ACCESSED = 0 ;
private long counterReceive_EVT_SESSION_DELTA = 0;
+private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
+private long counterReceive_EVT_CHANGE_SESSION_ID = 0 ;
private long counterSend_EVT_GET_ALL_SESSIONS = 0 ;
+private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterSend_EVT_SESSION_CREATED = 0;
private long counterSend_EVT_SESSION_DELTA = 0 ;
private long counterSend_EVT_SESSION_ACCESSED = 0;
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
-private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
+private long counterSend_EVT_CHANGE_SESSION_ID = 0;
private int counterNoStateTransfered = 0 ;
@@ -254,7 +256,14 @@ public class DeltaManager extends Cluste
public int getCounterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE() {
return counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE;
}
-
+
+/**
+ * @return Returns the counterSend_EVT_CHANGE_SESSION_ID.
+ */
+public long getCounterSend_EVT_CHANGE_SESSION_ID() {
+return counterSend_EVT_CHANGE_SESSION_ID;
+}
+
/**
* @return Returns the counterReceive_EVT_ALL_SESSION_DATA.
*/
@@ -304,7 +313,14 @@ public class DeltaManager extends Cluste
public int getCounterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE() {
return counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE;
}
-
+
+/**
+ * @return Returns the counterReceive_EVT_CHANGE_SESSION_ID.
+ */
+public long getCounterReceive_EVT_CHANGE_SESSION_ID() {
+return counterReceive_EVT_CHANGE_SESSION_ID;
+}
+
/**
* @return Returns the processingTime.
*/
@@ -636,6 +652,65 @@ public class DeltaManager extends Cluste
}
/**
+ * Change the session ID of the current session to a new randomly generated
+ * session ID.
+ *
+ * @param session The session to change the session ID for
+ */
+@Override
+public void changeSessionId(Session session) {
+changeSessionId(session, true);
+}
+
+public void changeSessionId(Session session, boolean notify) {
+// original sessionID
+String orgSessionID = session.getId();
+super.changeSessionId(session);
+if (notify) {
+// changed sessionID
+String newSessionID = session.getId();
+try {
+// serialize sessionID
+byte[] data = serializeSessionId(newSessionID);
+// notify change sessionID
+SessionMessage msg = new SessionMessageImpl(getName(),
+SessionMessage.EVT_CHANGE_SESSION_ID, data,
+orgSessionID, orgSessionID + "-"
++ System.currentTimeMillis());
+counterSend_EVT_CHANGE_SESSION_ID++;
+send(msg);
+} catch (IOException e) {
+log.error(sm.getString("deltaManager.unableSerializeSessionID",
+newSessionID), e);
+
svn commit: r956268 - /tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl
Author: rjung
Date: Sat Jun 19 18:35:24 2010
New Revision: 956268
URL: http://svn.apache.org/viewvc?rev=956268&view=rev
Log:
Documentation stylesheet improvements.
This includes the following:
- Support element to provide references to
revision numbers (r631321, r918396)
- Use CSS rules to provide printer-friendly layout:
class="noPrint" (r717913)
For compatibility, generation of a separate printer-friendly
version of the docs with XSLT is still supported.
- Support for generation of table of contents using the
tag (r918073)
- Provide disambiguation for anchor names, when there are
subsections with the same name inside of different sections.
See config/valve.html for an example. (r918916)
- Use underscores instead of spaces in anchor names for
sections, subsections.
To preserve compatibility each (sub)section will generate
two anchors: the old one and the new one, if they differ. (r941356)
Backport of r941413 from Tomcat 5.5.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl?rev=956268&r1=956267&r2=956268&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl Sat Jun 19
18:35:24 2010
@@ -40,6 +40,7 @@
http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
+ http://svn.apache.org/viewvc?view=rev&rev='"/>
@@ -71,6 +72,10 @@
+
+ .noPrint {display: none;}
+ td#mainBody {width: 100%;}
+
-
-
-
+
APACHE LOGO
@@ -129,44 +132,15 @@
LEFT SIDE NAVIGATION
-
+
RIGHT SIDE MAIN BODY
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- print-friendlyversion
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -216,11 +190,15 @@
+
+
+
-
+ ()
+
@@ -234,13 +212,22 @@
+
+
+
+
+
+
-
+ ()
+
@@ -251,6 +238,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -260,35 +272,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -441,6 +453,12 @@
+
+
+
+
+ r
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956269 - /tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
Author: rjung Date: Sat Jun 19 18:36:05 2010 New Revision: 956269 URL: http://svn.apache.org/viewvc?rev=956269&view=rev Log: Update Changelog. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=956269&r1=956268&r2=956269&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Sat Jun 19 18:36:05 2010 @@ -31,6 +31,39 @@ + +Documentation stylesheet improvements: +use CSS styles to provide printer-friendly layout, +support generation of TOC tables, +support links to revision numbers, +use underscores instead of spaces in anchor names. +Port from Tomcat 5.5. (rjung) + + +49445: Notify other nodes of session id changes. +Port from Tomcat 7.0. (rjung) + + +48379: Make session cookie name, domain and path configurable +per context. (rjung) +Port from Tomcat 6.0. (rjung) + + +Fix missing message text and logging with unexpected logger +issues in cluster listeners. +Port from Tomcat 6.0. (rjung) + + +48717: When a node joins a cluster and it receives all the +current sessions, ensure the sessionCreated event is fired if the +Manager is configured to replicate session events. +Port from Tomcat 5.5. (rjung) + + +49170: Prevent multiple transfer of some sessions +during startup. +Port from Tomcat 5.5. (rjung) + 48248: Use volatile since field is accessed by multiple threads. Port from Tomcat 7.0. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.27
On 15/06/2010 09:24, jean-frederic clere wrote: > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.27/ > > According to the release process, the 6.0.27 build corresponding to the > tag TOMCAT_6_0_27 is: > [ ] Broken > [ ] Alpha > [ ] Beta > [X] Stable Signatures all valid. Signing key in ASF WoT. Minor niggle: - Tag does not exactly agree with src distribution. Version numbers in build.properties.default are different. Happy to just edit the tag. Servlet TCK passes for BIO, NIO & APR/native with security manager JSP TCK passes with a security manager. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
