svn commit: r1641780 - /tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
Author: markt
Date: Wed Nov 26 09:17:28 2014
New Revision: 1641780
URL: http://svn.apache.org/r1641780
Log:
Default to Java 8.
Review of 1641363 by kkolinko
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1641780r1=1641779r2=1641780view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Wed Nov 26
09:17:28 2014
@@ -315,7 +315,7 @@ public class JDTCompiler extends org.apa
} else {
log.warn(Unknown source VM + opt + ignored.);
settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_7);
+CompilerOptions.VERSION_1_8);
}
} else {
// Default to 1.8
@@ -361,7 +361,7 @@ public class JDTCompiler extends org.apa
} else {
log.warn(Unknown target VM + opt + ignored.);
settings.put(CompilerOptions.OPTION_TargetPlatform,
-CompilerOptions.VERSION_1_7);
+CompilerOptions.VERSION_1_8);
}
} else {
// Default to 1.8
@@ -464,8 +464,5 @@ public class JDTCompiler extends org.apa
if (! options.isSmapSuppressed()) {
SmapUtil.installSmap(smap);
}
-
}
-
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57263] New: NoClassDefFoundError: sun/management/ExtendedPlatformComponent with JDK 1.8.0_40-ea-b15
https://issues.apache.org/bugzilla/show_bug.cgi?id=57263 Bug ID: 57263 Summary: NoClassDefFoundError: sun/management/ExtendedPlatformComponent with JDK 1.8.0_40-ea-b15 Product: Tomcat 7 Version: 7.0.57 Hardware: Macintosh Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: bclo...@pivotal.io As part of my work (so not running this in production!), I'm testing the latest JDK8 early access versions. java version 1.8.0_40-ea Java(TM) SE Runtime Environment (build 1.8.0_40-ea-b15) Java HotSpot(TM) 64-Bit Server VM (build 25.40-b18, mixed mode) I get the following exception: Using CATALINA_BASE: /Users/bclozel/devtools/apache-tomcat-7.0.57 Using CATALINA_HOME: /Users/bclozel/devtools/apache-tomcat-7.0.57 Using CATALINA_TMPDIR: /Users/bclozel/devtools/apache-tomcat-7.0.57/temp Using JRE_HOME: /Library/Java/JavaVirtualMachines/jdk1.8.0_40.jdk/Contents/Home Using CLASSPATH: /Users/bclozel/devtools/apache-tomcat-7.0.57/bin/bootstrap.jar:/Users/bclozel/devtools/apache-tomcat-7.0.57/bin/tomcat-juli.jar nov. 26, 2014 10:14:37 AM org.apache.catalina.startup.Bootstrap initClassLoaders GRAVE: Class loader creation threw exception java.lang.NoClassDefFoundError: sun/management/ExtendedPlatformComponent at java.lang.management.ManagementFactory.getPlatformMBeanServer(ManagementFactory.java:494) at org.apache.catalina.startup.Bootstrap.createClassLoader(Bootstrap.java:157) at org.apache.catalina.startup.Bootstrap.initClassLoaders(Bootstrap.java:90) at org.apache.catalina.startup.Bootstrap.init(Bootstrap.java:226) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:425) In two different occasions: * when launching an embedded tomcat * or easier to reproduce, when shutting down a tomcat instance with tomcat/bin/shutdown.sh Note: I can't reproduce this issue on Tomcat 8.0.15 -- 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
[Bug 57263] NoClassDefFoundError: sun/management/ExtendedPlatformComponent with JDK 1.8.0_40-ea-b15
https://issues.apache.org/bugzilla/show_bug.cgi?id=57263 bclozel bclo...@pivotal.io changed: What|Removed |Added OS||All --- Comment #1 from bclozel bclo...@pivotal.io --- Note: I can't reproduce this issue with Tomcat 8.0.15 standalone, but I can when using it in embedded mode. -- 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
[Bug 57263] NoClassDefFoundError: sun/management/ExtendedPlatformComponent with JDK 1.8.0_40-ea-b15
https://issues.apache.org/bugzilla/show_bug.cgi?id=57263 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas ma...@apache.org --- Looks like a JVM packaging bug on OSX: http://tomcat.markmail.org/thread/kpkgz6j6xofsuzi7 This is one for Apple. -- 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
[Bug 57263] NoClassDefFoundError: sun/management/ExtendedPlatformComponent with JDK 1.8.0_40-ea-b15
https://issues.apache.org/bugzilla/show_bug.cgi?id=57263 --- Comment #3 from bclozel bclo...@pivotal.io --- Thanks, missed that message in the ML... -- 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: JSR 236 with tomcat 8
Hi, Its like I am asking you for a candy and you are advising me to buy a football because someone is giving candy free with a football. Do you have a version of TomEE which is based on Java EE 7? I will be happy to use it for testing my framework with a Java EE 7 compliant application server. - Shailendra From: jeano...@gmail.com Date: Tue, 25 Nov 2014 10:57:21 + Subject: Re: FW: JSR 236 with tomcat 8 To: dev@tomcat.apache.org Hi, works out of the box in TomEE. JLouis Le Tue Nov 25 2014 at 11:55:42, shailendra singh shailendra...@outlook.com a écrit : After posting my question to Tomcat users mailing list I realized that I should have posted my question to this mailing list. Hence this email. Some of the information is already mentioned in my previous email which I sent to Tomcat users mailing list. Basically I am trying to figure out what is the proper way to do multi threading in a servlet container like tomcat. Java EE spec mentions that it should be done using JSR 236 api but I am unable to find a way to do so as it seems that available implementations for this JSR have dependency on EJB api. So if JSR 236 is for doing multi threading in an application server then what is/are the options for servlet containers like tomcat? - Shailendra From: shailendra...@outlook.com To: us...@tomcat.apache.org Subject: RE: JSR 236 with tomcat 8 Date: Tue, 25 Nov 2014 05:53:46 + JSR 236 seems to be only way to create managed threads in Java EE servlet/ejb containers. I am working on a framework (piston - http://github.com/koyadume/piston-master) which I am supporting on tomcat only. Since this framework is based on Java EE 7, I can't use TomEE at this moment. I would like to split some tasks in multiple parallel tasks in my framework. As it is advised not to create own threads in a Java EE servlet/containers, I would like to avoid using Java SE concurrency utilities to solve this issue. This is the issue which JSR 236 tries to solve. Hopefully this makes my intention clear. Date: Mon, 24 Nov 2014 22:36:55 -0500 Subject: Re: JSR 236 with tomcat 8 From: john.d.am...@gmail.com To: us...@tomcat.apache.org Concurrency utils is specific to app servers, where applications are generally unable to create or manage threads. This is an old EJB limitation. This limitation is not present in servlet containers. Why do you think you need them? On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh shailendra...@outlook.com wrote: Hi, I am looking for a way to use JSR 236 with tomcat 8. Can someone please suggest a way to achieve this? - Shailendra - To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org For additional commands, e-mail: users-h...@tomcat.apache.org
RE: JSR 236 with tomcat 8
Hi, Thank you for first responding to my similar query on your blog and then here. - Shailendra http://in.linkedin.com/in/lnkshailendra http://github.com/koyadume http://pistonportal.wordpress.com From: rmannibu...@gmail.com Date: Tue, 25 Nov 2014 12:02:50 +0100 Subject: Re: FW: JSR 236 with tomcat 8 To: dev@tomcat.apache.org Hi Tomcat doesn't prevent you to use threads so you can use whatever you want like ExecutorServices etc... Romain Manni-Bucau @rmannibucau http://www.tomitribe.com http://rmannibucau.wordpress.com https://github.com/rmannibucau 2014-11-25 11:57 GMT+01:00 Jean-Louis MONTEIRO jeano...@gmail.com: Hi, works out of the box in TomEE. JLouis Le Tue Nov 25 2014 at 11:55:42, shailendra singh shailendra...@outlook.com a écrit : After posting my question to Tomcat users mailing list I realized that I should have posted my question to this mailing list. Hence this email. Some of the information is already mentioned in my previous email which I sent to Tomcat users mailing list. Basically I am trying to figure out what is the proper way to do multi threading in a servlet container like tomcat. Java EE spec mentions that it should be done using JSR 236 api but I am unable to find a way to do so as it seems that available implementations for this JSR have dependency on EJB api. So if JSR 236 is for doing multi threading in an application server then what is/are the options for servlet containers like tomcat? - Shailendra From: shailendra...@outlook.com To: us...@tomcat.apache.org Subject: RE: JSR 236 with tomcat 8 Date: Tue, 25 Nov 2014 05:53:46 + JSR 236 seems to be only way to create managed threads in Java EE servlet/ejb containers. I am working on a framework (piston - http://github.com/koyadume/piston-master) which I am supporting on tomcat only. Since this framework is based on Java EE 7, I can't use TomEE at this moment. I would like to split some tasks in multiple parallel tasks in my framework. As it is advised not to create own threads in a Java EE servlet/containers, I would like to avoid using Java SE concurrency utilities to solve this issue. This is the issue which JSR 236 tries to solve. Hopefully this makes my intention clear. Date: Mon, 24 Nov 2014 22:36:55 -0500 Subject: Re: JSR 236 with tomcat 8 From: john.d.am...@gmail.com To: us...@tomcat.apache.org Concurrency utils is specific to app servers, where applications are generally unable to create or manage threads. This is an old EJB limitation. This limitation is not present in servlet containers. Why do you think you need them? On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh shailendra...@outlook.com wrote: Hi, I am looking for a way to use JSR 236 with tomcat 8. Can someone please suggest a way to achieve this? - Shailendra - To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org For additional commands, e-mail: users-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: JSR 236 with tomcat 8
This question is more about extending the tomcat and not about using the tomcat. So I posted it to this mailing list. It will be really helpful if some guidelines can be published to help people understand when they should post their questions to this mailing list. Don't want to bother the dev team unless its absolutely required. - Shailendra http://in.linkedin.com/in/lnkshailendra http://github.com/koyadume http://pistonportal.wordpress.com Date: Tue, 25 Nov 2014 11:38:51 + From: ma...@apache.org To: dev@tomcat.apache.org Subject: Re: FW: JSR 236 with tomcat 8 On 25/11/2014 10:54, shailendra singh wrote: After posting my question to Tomcat users mailing list I realized that I should have posted my question to this mailing list. Hence this email. Nope. This belongs on the users list, not the dev list. Mark Some of the information is already mentioned in my previous email which I sent to Tomcat users mailing list. Basically I am trying to figure out what is the proper way to do multi threading in a servlet container like tomcat. Java EE spec mentions that it should be done using JSR 236 api but I am unable to find a way to do so as it seems that available implementations for this JSR have dependency on EJB api. So if JSR 236 is for doing multi threading in an application server then what is/are the options for servlet containers like tomcat? - Shailendra From: shailendra...@outlook.com To: us...@tomcat.apache.org Subject: RE: JSR 236 with tomcat 8 Date: Tue, 25 Nov 2014 05:53:46 + JSR 236 seems to be only way to create managed threads in Java EE servlet/ejb containers. I am working on a framework (piston - http://github.com/koyadume/piston-master) which I am supporting on tomcat only. Since this framework is based on Java EE 7, I can't use TomEE at this moment. I would like to split some tasks in multiple parallel tasks in my framework. As it is advised not to create own threads in a Java EE servlet/containers, I would like to avoid using Java SE concurrency utilities to solve this issue. This is the issue which JSR 236 tries to solve. Hopefully this makes my intention clear. Date: Mon, 24 Nov 2014 22:36:55 -0500 Subject: Re: JSR 236 with tomcat 8 From: john.d.am...@gmail.com To: us...@tomcat.apache.org Concurrency utils is specific to app servers, where applications are generally unable to create or manage threads. This is an old EJB limitation. This limitation is not present in servlet containers. Why do you think you need them? On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh shailendra...@outlook.com wrote: Hi, I am looking for a way to use JSR 236 with tomcat 8. Can someone please suggest a way to achieve this? - Shailendra - To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org For additional commands, e-mail: users-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57265] New: Tomcat 8 hiden behind NGINX fails to send file when using NIO connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=57265 Bug ID: 57265 Summary: Tomcat 8 hiden behind NGINX fails to send file when using NIO connector Product: Tomcat 8 Version: 8.0.15 Hardware: PC OS: Linux Status: NEW Severity: major Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: jaros...@kamenik.cz We have moved Tomcat 8 server behind the nginx balancing server and have started experiencing this problem: org.apache.tomcat.util.net.NioEndpoint$NioBufferHandler@2001a157 26-Nov-2014 11:37:04.476 SEVERE [http-nio-8443-ClientPoller-0] org.apache.tomcat.util.net.NioEndpoint$Poller.processSendfile java.lang.IllegalArgumentException: You can only read using the application read buffer provided by the handler. at org.apache.tomcat.util.net.SecureNioChannel.write(SecureNioChannel.java:489) at sun.nio.ch.FileChannelImpl.transferToArbitraryChannel(FileChannelImpl.java:534) at sun.nio.ch.FileChannelImpl.transferTo(FileChannelImpl.java:583) at org.apache.tomcat.util.net.NioEndpoint$Poller.processSendfile(NioEndpoint.java:1200) at org.apache.tomcat.util.net.NioEndpoint$Poller.processKey(NioEndpoint.java:1122) at org.apache.tomcat.util.net.NioEndpoint$Poller.run(NioEndpoint.java:1087) at java.lang.Thread.run(Thread.java:745) Problem occurres irregularly when loading lots of scripts refencenced by homepage. It seems to be ok with useSendfile=false. I have tried to add some slow logging (with flushing output) to code and it lowers occurrence rate, so it looks like some race condition problem. -- 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
[Bug 57267] New: Document /save command in ManagerServlet and StoreConfig feature
https://issues.apache.org/bugzilla/show_bug.cgi?id=57267 Bug ID: 57267 Summary: Document /save command in ManagerServlet and StoreConfig feature Product: Tomcat 8 Version: 8.0.15 Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com The ManagerServlet in manager web application supports command /save, which is undocumented neither in manager-howto.html, nor listed in javadoc of ManagerServlet. There is no documentation of StoreConfigLifecycleListener in http://tomcat.apache.org/tomcat-8.0-doc/config/listeners.html The /save command itself is rather old (it is present in Tomcat 6 code and likely in 5.5 as well), but the storeconfig feature was missing from Tomcat 6 and 7 and was re-introduced in Tomcat 8 (r1442161). It needs documentation. -- 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
[Bug 56397] Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 Pierre Viret pierre.vi...@gmail.com changed: What|Removed |Added Attachment #32151|0 |1 is obsolete|| --- Comment #46 from Pierre Viret pierre.vi...@gmail.com --- Created attachment 32229 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32229action=edit patch for tomcat-maven-layout created with svn diff -x -u - Updated the version of the poems to 9.0.0-SNAPSHOT - created tomcat-tests component containing all the tests - add a 'utils' artifact created by the web examples component and needed by the tests (for TestCookieFilter) I have tried to split the test into the components but it's quite complicated because of the dependencies. So I have simply added a new component with all the tests so that it is possible to start the tests using maven (one can select the tests to be run using -Dtest=xyz) or with the IDE. This is not optimal yet but I think this is a good starting point. -- 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: r1641855 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaSession.java
Author: rjung
Date: Wed Nov 26 16:55:26 2014
New Revision: 1641855
URL: http://svn.apache.org/r1641855
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50950
Prevent NotSerializableException caused by trying to replicate the Subject when
running a cluster under a security manager.
Backport of r1101361 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641855r1=1641854r2=1641855view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 16:55:26 2014
@@ -32,6 +32,10 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+bug50950/bug: Correct possible NotSerializableException for an
+authenticated session when running with a security manager. (markt)
+ /fix
+ fix
Be consistent with locks on sessionCreationTiming,
sessionExpirationTiming in DeltaManager.resetStatistics(). (rjung)
/fix
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641855r1=1641854r2=1641855view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 16:55:26 2014
@@ -600,7 +600,9 @@ public class DeltaSession extends Standa
try {
lock();
super.setAttribute(name,value, notify);
-if (addDeltaRequest (deltaRequest != null))
deltaRequest.setAttribute(name, value);
+if (addDeltaRequest deltaRequest != null !exclude(name)) {
+deltaRequest.setAttribute(name, value);
+}
} finally {
unlock();
}
@@ -776,7 +778,9 @@ public class DeltaSession extends Standa
if (value == null) return;
super.removeAttributeInternal(name,notify);
-if (addDeltaRequest (deltaRequest != null))
deltaRequest.removeAttribute(name);
+if (addDeltaRequest deltaRequest != null !exclude(name)) {
+deltaRequest.removeAttribute(name);
+}
}finally {
unlock();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641859 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/session/
Author: rjung
Date: Wed Nov 26 17:12:12 2014
New Revision: 1641859
URL: http://svn.apache.org/r1641859
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042
Don't notify session creation listeners when changing session ID on
authentication
Backport of r1135497 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/DeltaSession.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641859r1=1641858r2=1641859view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:12:12 2014
@@ -32,6 +32,10 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+bug51042/bug: Donapos;t trigger session creation listeners when a
+session ID is changed as part of the authentication process. (markt)
+ /fix
+ fix
bug50950/bug: Correct possible NotSerializableException for an
authenticated session when running with a security manager. (markt)
/fix
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=1641859r1=1641858r2=1641859view=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
Wed Nov 26 17:12:12 2014
@@ -1677,12 +1677,7 @@ public class DeltaManager extends Cluste
session.setMaxInactiveInterval(getMaxInactiveInterval());
session.setExpireTolerance(this.expireTolerance);
session.access();
-if(notifySessionListenersOnReplication) {
-session.setId(msg.getSessionID());
-} else {
-session.setIdInternal(msg.getSessionID());
-add(session);
-}
+session.setId(msg.getSessionID(), notifySessionListenersOnReplication);
session.resetDeltaRequest();
session.endAccess();
@@ -1758,12 +1753,7 @@ public class DeltaManager extends Cluste
if (session != null) {
String newSessionID = deserializeSessionId(msg.getSession());
session.setPrimarySession(false);
-if(notifySessionListenersOnReplication) {
-session.setId(newSessionID);
-} else {
-session.setIdInternal(newSessionID);
-add(session);
-}
+session.setId(newSessionID, notifyListenersOnReplication);
}
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641859r1=1641858r2=1641859view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 17:12:12 2014
@@ -160,17 +160,17 @@ public class DeltaSession extends Standa
this.isPrimarySession = primarySession;
}
+
/**
- * Set the session identifier for this session without notify listeners.
- *
- * @param id
- *The new session identifier
+ * {@inheritDoc}
*/
-public void setIdInternal(String id) {
-this.id = id;
+@Override
+public void setId(String id, boolean notify) {
+super.setId(id, notify);
resetDeltaRequest();
}
+
/**
* Set the session identifier for this session.
*
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=1641859r1=1641858r2=1641859view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
svn commit: r1641860 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java src/share/org/apache/catalina/cluster/session/DeltaSessi
Author: rjung
Date: Wed Nov 26 17:17:57 2014
New Revision: 1641860
URL: http://svn.apache.org/r1641860
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while handleSESSION_CREATED
is being processed.
Backport of r1137962 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641860r1=1641859r2=1641860view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:17:57 2014
@@ -32,6 +32,10 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+bug51306/bug: Avoid NPE when handleSESSION_EXPIRED is processed
+while handleSESSION_CREATED is being processed. (kfujino)
+ /fix
+ fix
bug51042/bug: Donapos;t trigger session creation listeners when a
session ID is changed as part of the authentication process. (markt)
/fix
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=1641860r1=1641859r2=1641860view=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
Wed Nov 26 17:17:57 2014
@@ -1674,7 +1674,7 @@ public class DeltaManager extends Cluste
session.setPrimarySession(false);
session.setCreationTime(msg.getTimestamp());
// use container maxInactiveInterval so that session will expire
correctly in case of primary transfer
-session.setMaxInactiveInterval(getMaxInactiveInterval());
+session.setMaxInactiveInterval(getMaxInactiveInterval(), false);
session.setExpireTolerance(this.expireTolerance);
session.access();
session.setId(msg.getSessionID(), notifySessionListenersOnReplication);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641860r1=1641859r2=1641860view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 17:17:57 2014
@@ -328,7 +328,8 @@ public class DeltaSession extends Standa
return;
-if(expiredId != null manager instanceof DeltaManager) {
+if(notifyCluster expiredId != null manager != null
+manager instanceof DeltaManager) {
DeltaManager dmanager = (DeltaManager)manager;
CatalinaCluster cluster = dmanager.getCluster();
ClusterMessage msg = dmanager.requestCompleted(expiredId,
true);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641864 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java src/share/org/apache/catalina/cluster/session/mbeans-des
Author: rjung
Date: Wed Nov 26 17:25:57 2014
New Revision: 1641864
URL: http://svn.apache.org/r1641864
Log:
The change in session ID is notified to not the session listener but the
container event listener.
Backport of r1152894 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/mbeans-descriptors.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=1641864r1=1641863r2=1641864view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:25:57 2014
@@ -32,6 +32,11 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+The change in session ID is notified to the container event listener on
+the backup node in cluster. This notification is controlled by
+notifyContainerListenersOnReplication. (kfujino)
+ /fix
+ fix
bug51306/bug: Avoid NPE when handleSESSION_EXPIRED is processed
while handleSESSION_CREATED is being processed. (kfujino)
/fix
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=1641864r1=1641863r2=1641864view=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
Wed Nov 26 17:25:57 2014
@@ -117,6 +117,7 @@ public class DeltaManager extends Cluste
private boolean expireSessionsOnShutdown = false;
private boolean notifyListenersOnReplication = true;
private boolean notifySessionListenersOnReplication = true;
+private boolean notifyContainerListenersOnReplication = true;
private volatile boolean stateTransfered = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -525,6 +526,14 @@ public class DeltaManager extends Cluste
this.notifyListenersOnReplication = notifyListenersOnReplication;
}
+public boolean isNotifyContainerListenersOnReplication() {
+return notifyContainerListenersOnReplication;
+}
+
+public void setNotifyContainerListenersOnReplication(
+boolean notifyContainerListenersOnReplication) {
+this.notifyContainerListenersOnReplication =
notifyContainerListenersOnReplication;
+}
/**
* @return Returns the defaultMode.
@@ -1753,7 +1762,15 @@ public class DeltaManager extends Cluste
if (session != null) {
String newSessionID = deserializeSessionId(msg.getSession());
session.setPrimarySession(false);
-session.setId(newSessionID, notifyListenersOnReplication);
+session.setId(newSessionID, false);
+if (notifyContainerListenersOnReplication) {
+Container c = getContainer();
+if (c instanceof StandardContext) {
+((StandardContext) getContainer()).fireContainerEvent(
+Context.CHANGE_SESSION_ID_EVENT,
+new String[] {msg.getSessionID(), newSessionID});
+}
+}
}
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml?rev=1641864r1=1641863r2=1641864view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
Wed Nov 26 17:25:57 2014
@@ -311,6 +311,11 @@
description=Send session start/stop events on backup nodes
type=boolean /
+attribute name=notifyContainerListenersOnReplication
+ is=true
+ description=Send container events on backup nodes
+ type=boolean/
+
attribute name=sendAllSessions
is=true
description=Send all sessions at one big block
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional
svn commit: r1641865 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaRequest.java src/share/org/apache/catalina/cluster/session/DeltaSessi
Author: rjung
Date: Wed Nov 26 17:29:24 2014
New Revision: 1641865
URL: http://svn.apache.org/r1641865
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50771
Ensure HttpServletRequest#getAuthType() returns the name of the authentication
scheme
if request has already been authenticated.
Backport of r1153318 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641865r1=1641864r2=1641865view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:29:24 2014
@@ -32,6 +32,11 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+bug50771/bug: Ensure HttpServletRequest#getAuthType() returns the
+name of the authentication scheme if request has already been
+authenticated. (kfujino)
+ /fix
+ fix
The change in session ID is notified to the container event listener on
the backup node in cluster. This notification is controlled by
notifyContainerListenersOnReplication. (kfujino)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java?rev=1641865r1=1641864r2=1641865view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
Wed Nov 26 17:29:24 2014
@@ -51,6 +51,7 @@ public class DeltaRequest implements Ext
public static final int TYPE_PRINCIPAL = 1;
public static final int TYPE_ISNEW = 2;
public static final int TYPE_MAXINTERVAL = 3;
+public static final int TYPE_AUTHTYPE = 4;
public static final int ACTION_SET = 0;
public static final int ACTION_REMOVE = 1;
@@ -58,6 +59,7 @@ public class DeltaRequest implements Ext
public static final String NAME_PRINCIPAL = __SET__PRINCIPAL__;
public static final String NAME_MAXINTERVAL = __SET__MAXINTERVAL__;
public static final String NAME_ISNEW = __SET__ISNEW__;
+public static final String NAME_AUTHTYPE = __SET__AUTHTYPE__;
private String sessionId;
private LinkedList actions = new LinkedList();
@@ -116,6 +118,11 @@ public class DeltaRequest implements Ext
addAction(TYPE_ISNEW,action,NAME_ISNEW,new Boolean(n));
}
+public void setAuthType(String authType) {
+int action = (authType==null)?ACTION_REMOVE:ACTION_SET;
+addAction(TYPE_AUTHTYPE,action,NAME_AUTHTYPE, authType);
+}
+
protected synchronized void addAction(int type,
int action,
String name,
@@ -180,6 +187,14 @@ public class DeltaRequest implements Ext
session.setPrincipal(p,false);
break;
}//case
+case TYPE_AUTHTYPE: {
+String authType = null;
+if ( info.getAction() == ACTION_SET ) {
+authType = (String)info.getValue();
+}
+session.setAuthType(authType,false);
+break;
+}//case
default : throw new
java.lang.IllegalArgumentException(Invalid attribute info type=+info);
}//switch
}//for
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641865r1=1641864r2=1641865view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 17:29:24 2014
@@ -261,6 +261,28 @@ public class DeltaSession extends Standa
}
/**
+ * Set the authentication type used to authenticate our cached
+ * Principal, if any.
+ *
+ * @param authType The new cached authentication type
+ */
+@Override
+public void setAuthType(String authType) {
+setAuthType(authType, true);
+}
+
+public void
svn commit: r1641866 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java src/share/org/apache/catalina/cluster/session/Delt
Author: rjung
Date: Wed Nov 26 17:34:37 2014
New Revision: 1641866
URL: http://svn.apache.org/r1641866
Log:
Fine grained control of session attribute
replication in clusters.
- Allow to overwrite the check for distributability
of session attributes by session implementations.
- New cluster manager attribute sessionAttributeFilter
allows to filter which session attributes are
replicated using a regular expression applied to the
attribute name.
Merge of r1172233-1172234,r1172236,r1175158,r1175190
from trunk respectively r1172259 and r1175194
from TC7
Backport of r1175196 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641866r1=1641865r2=1641866view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:34:37 2014
@@ -31,6 +31,11 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ add
+New cluster manager attribute codesessionAttributeFilter/code
+allows to filter which session attributes are replicated using a
+regular expression applied to the attribute name. (rjung)
+ /add
fix
bug50771/bug: Ensure HttpServletRequest#getAuthType() returns the
name of the authentication scheme if request has already been
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java?rev=1641866r1=1641865r2=1641866view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
Wed Nov 26 17:34:37 2014
@@ -17,15 +17,17 @@
package org.apache.catalina.cluster.session;
-import org.apache.catalina.cluster.ClusterManager;
import java.beans.PropertyChangeListener;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.session.ManagerBase;
-import org.apache.catalina.Loader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.apache.catalina.cluster.session.ReplicationStream;
+import java.util.regex.Pattern;
+
import org.apache.catalina.Container;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Loader;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.cluster.session.ReplicationStream;
/**
*
@@ -36,6 +38,64 @@ import org.apache.catalina.Container;
public abstract class ClusterManagerBase extends ManagerBase implements
Lifecycle, PropertyChangeListener, ClusterManager{
+/**
+ * The pattern used for including session attributes to
+ * replication, e.g. code^(userName|sessionHistory)$/code.
+ * If not set, all session attributes will be eligible for replication.
+ */
+private String sessionAttributeFilter = null;
+
+/**
+ * The compiled pattern used for including session attributes to
+ * replication, e.g. code^(userName|sessionHistory)$/code.
+ * If not set, all session attributes will be eligible for replication.
+ */
+private Pattern sessionAttributePattern = null;
+
+
+/**
+ * Return the string pattern used for including session attributes
+ * to replication.
+ *
+ * @return the sessionAttributeFilter
+ */
+public String getSessionAttributeFilter() {
+return sessionAttributeFilter;
+}
+
+/**
+ * Set the pattern used for including session attributes to replication.
+ * If not set, all session attributes will be eligible for replication.
+ * p
+ * E.g. code^(userName|sessionHistory)$/code
+ * /p
+ *
+ * @param sessionAttributeFilter
+ *the filter name pattern to set
+ */
+public void setSessionAttributeFilter(String sessionAttributeFilter) {
+if (sessionAttributeFilter == null
+|| sessionAttributeFilter.trim().equals()) {
+this.sessionAttributeFilter = null;
+sessionAttributePattern = null;
+} else {
+this.sessionAttributeFilter = sessionAttributeFilter;
+sessionAttributePattern = Pattern.compile(sessionAttributeFilter);
+}
+}
+
+/**
+ * Check whether the given
svn commit: r1641867 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
Author: rjung Date: Wed Nov 26 17:36:17 2014 New Revision: 1641867 URL: http://svn.apache.org/r1641867 Log: Fix merge error in r1641866. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java?rev=1641867r1=1641866r2=1641867view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java Wed Nov 26 17:36:17 2014 @@ -25,9 +25,10 @@ import java.util.regex.Pattern; import org.apache.catalina.Container; import org.apache.catalina.Lifecycle; import org.apache.catalina.Loader; -import org.apache.catalina.ha.ClusterManager; +import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.session.ManagerBase; import org.apache.catalina.cluster.session.ReplicationStream; +import org.apache.catalina.cluster.session.ReplicationStream; /** * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641868 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
Author: rjung
Date: Wed Nov 26 17:40:33 2014
New Revision: 1641868
URL: http://svn.apache.org/r1641868
Log:
Merged revision 1178684 from tomcat/trunk:
In GenericPrincipal, SerializablePrincipal:
Do not sort lists that have only one element
Backport of r1195564 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641868r1=1641867r2=1641868view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:40:33 2014
@@ -31,6 +31,10 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ update
+In GenericPrincipal, SerializablePrincipal: Do not sort lists of roles
+that have only one element. (kkolinko)
+ /update
add
New cluster manager attribute codesessionAttributeFilter/code
allows to filter which session attributes are replicated using a
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java?rev=1641868r1=1641867r2=1641868view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
Wed Nov 26 17:40:33 2014
@@ -110,7 +110,7 @@ public class SerializablePrincipal impl
if (roles != null) {
this.roles = new String[roles.size()];
this.roles = roles.toArray(this.roles);
-if (this.roles.length 0)
+if (this.roles.length 1)
Arrays.sort(this.roles);
}
if (userPrincipal instanceof Serializable) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641869 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaSession.java
Author: rjung
Date: Wed Nov 26 17:43:10 2014
New Revision: 1641869
URL: http://svn.apache.org/r1641869
Log:
Merged revision 1189386 from tomcat/trunk:
In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call.
It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true).
Backport of r1195604 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641869r1=1641868r2=1641869view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:43:10 2014
@@ -31,6 +31,10 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ fix
+Fix unneeded duplicate coderesetDeltaRequest()/code call in
+codeDeltaSession.setId(String)/code. (kkolinko)
+ /fix
update
In GenericPrincipal, SerializablePrincipal: Do not sort lists of roles
that have only one element. (kkolinko)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641869r1=1641868r2=1641869view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 17:43:10 2014
@@ -178,7 +178,7 @@ public class DeltaSession extends Standa
*The new session identifier
*/
public void setId(String id) {
-super.setId(id);
+super.setId(id, true);
resetDeltaRequest();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641870 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/session/
Author: rjung
Date: Wed Nov 26 17:52:14 2014
New Revision: 1641870
URL: http://svn.apache.org/r1641870
Log:
When Context manager does not exist, no context manager message is replied in
order to avoid timeout (default 60 sec) of GET_ALL_SESSIONS sync phase.
Backport of r1195848 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/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/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641870r1=1641869r2=1641870view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:52:14 2014
@@ -31,6 +31,11 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ add
+When Context manager does not exist, no context manager message is
+replied in order to avoid timeout (default 60 sec) of
+GET_ALL_SESSIONS sync phase. (kfujino)
+ /add
fix
Fix unneeded duplicate coderesetDeltaRequest()/code call in
codeDeltaSession.setId(String)/code. (kkolinko)
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=1641870r1=1641869r2=1641870view=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
Wed Nov 26 17:52:14 2014
@@ -87,10 +87,21 @@ public class ClusterSessionListener exte
}
} else {
ClusterManager mgr = (ClusterManager) managers.get(ctxname);
-if (mgr != null)
+if (mgr != null) {
mgr.messageDataReceived(msg);
-else if (log.isErrorEnabled())
-log.error(Context manager doesn't exist: + ctxname);
+} else {
+if (log.isWarnEnabled())
+log.warn(Context manager doesn't exist: + ctxname);
+
+// A no context manager message is replied in order to
avoid
+// timeout of GET_ALL_SESSIONS sync phase.
+if (msg.getEventType() ==
SessionMessage.EVT_GET_ALL_SESSIONS) {
+SessionMessage replymsg = new
SessionMessageImpl(ctxname,
+
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
+null,
NO-CONTEXT-MANAGER,NO-CONTEXT-MANAGER- + ctxname);
+cluster.send(replymsg, msg.getAddress());
+}
+}
}
}
}
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=1641870r1=1641869r2=1641870view=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
Wed Nov 26 17:52:14 2014
@@ -119,6 +119,7 @@ public class DeltaManager extends Cluste
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
private volatile boolean stateTransfered = false ;
+private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
private boolean sendClusterDomainOnly = true ;
@@ -158,6 +159,7 @@ public class DeltaManager extends Cluste
private long counterReceive_EVT_SESSION_DELTA = 0;
private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long
svn commit: r1641871 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java src/share/org/apache/catalina/cluster/session/mbeans-des
Author: rjung
Date: Wed Nov 26 17:55:45 2014
New Revision: 1641871
URL: http://svn.apache.org/r1641871
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52488
s/exipre/expire/g
Backport of r1233433 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/mbeans-descriptors.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=1641871r1=1641870r2=1641871view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:55:45 2014
@@ -31,6 +31,10 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ fix
+bug52488/bug: Correct typos: exipre - expire. Based on a patch by
+prockter. (markt)
+ /fix
add
When Context manager does not exist, no context manager message is
replied in order to avoid timeout (default 60 sec) of
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=1641871r1=1641870r2=1641871view=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
Wed Nov 26 17:55:45 2014
@@ -1492,7 +1492,7 @@ public class DeltaManager extends Cluste
}
/**
- * Exipre all find sessions.
+ * Expire all find sessions.
*/
public void expireAllLocalSessions()
{
@@ -1516,7 +1516,7 @@ public class DeltaManager extends Cluste
}//end if
}//for
long timeEnd = System.currentTimeMillis();
-if(log.isDebugEnabled()) log.debug(End expire sessions + getName()
+ exipre processingTime + (timeEnd - timeNow) + expired direct sessions:
+ expireDirect + expired direct sessions: + expireIndirect);
+if(log.isDebugEnabled()) log.debug(End expire sessions + getName()
+ expire processingTime + (timeEnd - timeNow) + expired direct sessions:
+ expireDirect + expired direct sessions: + expireIndirect);
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml?rev=1641871r1=1641870r2=1641871view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml
Wed Nov 26 17:55:45 2014
@@ -308,7 +308,7 @@
attribute name=expireSessionsOnShutdown
is=true
- description=exipre all sessions cluster wide as one node goes down
+ description=expire all sessions cluster wide as one node goes down
type=boolean /
attribute name=notifyListenersOnReplication
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641874 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/authenticator/
Author: rjung
Date: Wed Nov 26 18:13:41 2014
New Revision: 1641874
URL: http://svn.apache.org/r1641874
Log:
Replicate Principal in ClusterSingleSignOn.
Backport of r1305758 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
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/authenticator/SingleSignOnMessage.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641874r1=1641873r2=1641874view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 18:13:41 2014
@@ -32,6 +32,9 @@
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
fix
+Replicate principal in ClusterSingleSignOn. (kfujino)
+ /fix
+ fix
bug52488/bug: Correct typos: exipre - expire. Based on a patch by
prockter. (markt)
/fix
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java?rev=1641874r1=1641873r2=1641874view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
Wed Nov 26 18:13:41 2014
@@ -21,8 +21,8 @@ package org.apache.catalina.cluster.auth
import java.security.Principal;
-import org.apache.catalina.Container;
import org.apache.catalina.Cluster;
+import org.apache.catalina.Container;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
@@ -33,6 +33,8 @@ import org.apache.catalina.authenticator
import org.apache.catalina.cluster.CatalinaCluster;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.cluster.session.SerializablePrincipal;
+import org.apache.catalina.realm.GenericPrincipal;
/**
* A strongValve/strong that supports a single sign on user experience on
@@ -245,7 +247,7 @@ public class ClusterSingleSignOn
*/
protected void register(String ssoId, Principal principal, String authType,
String username, String password) {
-sendSSOIdWithAuth(ssoId,
+sendSSOIdWithAuth(ssoId, principal,
authType, username, password,
SingleSignOnMessage.REGISTER_SESSION);
registerLocal(ssoId, principal, authType, username, password);
@@ -284,7 +286,7 @@ public class ClusterSingleSignOn
*/
protected void update(String ssoId, Principal principal, String authType,
String username, String password) {
-sendSSOIdWithAuth(ssoId,
+sendSSOIdWithAuth(ssoId, principal,
authType, username, password,
SingleSignOnMessage.UPDATE_SESSION);
updateLocal(ssoId, principal, authType, username, password);
@@ -345,7 +347,7 @@ public class ClusterSingleSignOn
* @param password the password (if any) used for the authentication
* @param actionSSO Action type
*/
-protected void sendSSOIdWithAuth(String ssoId,String authType,
+protected void sendSSOIdWithAuth(String ssoId, Principal principal, String
authType,
String username, String password, int action) {
if (cluster != null) {
messageNumber++;
@@ -355,6 +357,13 @@ public class ClusterSingleSignOn
msg.setAuthType(authType);
msg.setUsername(username);
msg.setPassword(password);
+
+SerializablePrincipal sp = null;
+if (principal instanceof GenericPrincipal) {
+sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
+msg.setPrincipal(sp);
+}
+
send(msg,action);
}
}
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=1641874r1=1641873r2=1641874view=diff
==
---
svn commit: r1641876 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java src/share/org/apache/catalina/cluster/session/SimpleTcpR
Author: rjung
Date: Wed Nov 26 18:16:59 2014
New Revision: 1641876
URL: http://svn.apache.org/r1641876
Log:
Note: technically, the actual patch differs from proposal (r1346675):
in Tomcat 7 the changes are in ManagerBase,
in Tomcat 6 the same code belongs to specific manager implementations.
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53230
Change ManagerBase to throw TooManyActiveSessionsException instead of
IllegalStateException to allow for custom error page.
Backport of r1353128 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
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/SimpleTcpReplicationManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641876r1=1641875r2=1641876view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 18:16:59 2014
@@ -31,6 +31,12 @@
body
section name=Tomcat OACC 0.1 (rjung)
subsection name=Cluster
+ update
+bug53230/bug: Change session managers to throw
+TooManyActiveSessionsException instead of IllegalStateException
+when the maximum number of sessions has been exceeded and a new
+session will not be created. (schultz/kkolinko)
+ /update
fix
Replicate principal in ClusterSingleSignOn. (kfujino)
/fix
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=1641876r1=1641875r2=1641876view=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
Wed Nov 26 18:16:59 2014
@@ -45,6 +45,7 @@ import org.apache.catalina.cluster.Clust
import org.apache.catalina.cluster.Member;
import org.apache.catalina.cluster.tcp.ReplicationValve;
import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.TooManyActiveSessionsException;
import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -632,7 +633,9 @@ public class DeltaManager extends Cluste
public Session createSession(String sessionId, boolean distribute) {
if ((maxActiveSessions = 0) (sessions.size() =
maxActiveSessions)) {
rejectedSessions++;
-throw new
IllegalStateException(sm.getString(deltaManager.createSession.ise));
+throw new TooManyActiveSessionsException(
+sm.getString(deltaManager.createSession.ise),
+maxActiveSessions);
}
DeltaSession session = (DeltaSession) super.createSession(sessionId) ;
session.setExpireTolerance(this.expireTolerance);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=1641876r1=1641875r2=1641876view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Wed Nov 26 18:16:59 2014
@@ -28,6 +28,7 @@ import org.apache.catalina.cluster.Clust
import org.apache.catalina.cluster.Member;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.session.StandardManager;
+import org.apache.catalina.session.TooManyActiveSessionsException;
/**
* Title:Tomcat Session Replication for Tomcat 4.0 BR
@@ -204,9 +205,11 @@ implements ClusterManager
//inherited from the basic manager
if ((getMaxActiveSessions() = 0)
- (sessions.size() = getMaxActiveSessions()))
-throw new
IllegalStateException(sm.getString(standardManager.createSession.ise));
-
+ (sessions.size() = getMaxActiveSessions())) {
+throw new TooManyActiveSessionsException(
+sm.getString(standardManager.createSession.ise),
+getMaxActiveSessions());
+}
Session session = new ReplicatedSession(this);
svn commit: r1641879 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: ClusterManager.java ClusterMessageBase.java tcp/SimpleTcpCluster.java
Author: rjung
Date: Wed Nov 26 18:30:08 2014
New Revision: 1641879
URL: http://svn.apache.org/r1641879
Log:
Fix Javadoc
Backport of r1561630 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java?rev=1641879r1=1641878r2=1641879view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
Wed Nov 26 18:30:08 2014
@@ -84,7 +84,7 @@ public interface ClusterManager extends
public boolean isSendClusterDomainOnly();
/**
-* @param sendClusterDomainOnly Flag value.
+* @param domainReplication Flag value.
* @since 5.5.10
*/
public void setSendClusterDomainOnly(boolean sendClusterDomainOnly);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java?rev=1641879r1=1641878r2=1641879view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
Wed Nov 26 18:30:08 2014
@@ -18,18 +18,6 @@ package org.apache.catalina.cluster;
import org.apache.catalina.cluster.Member;
-
-/**
- * pTitle: /p
- *
- * pDescription: /p
- *
- *
- * pCompany: /p
- *
- * @author not attributable
- * @version 1.0
- */
public class ClusterMessageBase implements ClusterMessage {
private static final long serialVersionUID = 1L;
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=1641879r1=1641878r2=1641879view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Wed Nov 26 18:30:08 2014
@@ -373,7 +373,7 @@ public class SimpleTcpCluster implements
/**
* add cluster message listener and register cluster to this listener
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#addClusterListener(org.apache.catalina.cluster.MessageListener)
+ * @see
org.apache.catalina.cluster.CatalinaCluster#addClusterListener(org.apache.catalina.cluster.ClusterListener)
*/
public void addClusterListener(MessageListener listener) {
if (listener != null !clusterListeners.contains(listener)) {
@@ -385,7 +385,7 @@ public class SimpleTcpCluster implements
/**
* remove message listener and deregister Cluster from listener
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#removeClusterListener(org.apache.catalina.cluster.MessageListener)
+ * @see
org.apache.catalina.cluster.CatalinaCluster#removeClusterListener(org.apache.catalina.cluster.ClusterListener)
*/
public void removeClusterListener(MessageListener listener) {
if (listener != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641882 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Author: rjung
Date: Wed Nov 26 18:38:25 2014
New Revision: 1641882
URL: http://svn.apache.org/r1641882
Log:
Javadoc fixes
Backport of r1561770 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=1641882r1=1641881r2=1641882view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Wed Nov 26 18:38:25 2014
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.cluster.tcp;
import java.beans.PropertyChangeSupport;
@@ -538,6 +537,7 @@ public class SimpleTcpCluster implements
* @param name
*Context Name of this manager
* @see org.apache.catalina.Cluster#createManager(java.lang.String)
+ * @see #registerManager(Manager)
* @see DeltaManager#start()
*/
public synchronized Manager createManager(String name) {
@@ -570,6 +570,8 @@ public class SimpleTcpCluster implements
/**
* remove an application form cluster replication bus
+ *
+ * @see org.apache.catalina.cluster.CatalinaCluster#removeManager(Manager)
*/
public void removeManager(Manager manager) {
if (manager != null manager instanceof ClusterManager ) {
@@ -1006,7 +1008,7 @@ public class SimpleTcpCluster implements
/**
* send message to all cluster members same cluster domain
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage)
+ * @see org.apache.catalina.cluster.CatalinaCluster#send(ClusterMessage)
*/
public void sendClusterDomain(ClusterMessage msg) {
long start = 0;
@@ -1032,7 +1034,7 @@ public class SimpleTcpCluster implements
* send message to all cluster members
* @param msg message to transfer
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage)
+ * @see org.apache.catalina.cluster.CatalinaCluster#send(ClusterMessage)
*/
public void send(ClusterMessage msg) {
send(msg, null);
@@ -1043,8 +1045,7 @@ public class SimpleTcpCluster implements
*
* @param msg message to transfer
* @param dest Receiver member with name
- * @see
org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage,
- * org.apache.catalina.cluster.Member)
+ * @see org.apache.catalina.cluster.CatalinaCluster#send(ClusterMessage,
Member)
* @see McastService#findMemberByName(String)
*/
public void sendToMember(ClusterMessage msg, String dest) {
@@ -1061,8 +1062,7 @@ public class SimpleTcpCluster implements
*
* @param msg message to transfer
* @param dest Receiver member
- * @see
org.apache.catalina.cluster.CatalinaCluster#send(org.apache.catalina.cluster.ClusterMessage,
- * org.apache.catalina.cluster.Member)
+ * @see org.apache.catalina.cluster.CatalinaCluster#send(ClusterMessage,
Member)
*/
public void send(ClusterMessage msg, Member dest) {
long start = 0;
@@ -1093,7 +1093,7 @@ public class SimpleTcpCluster implements
/**
* New cluster member is registered
*
- * @see
org.apache.catalina.cluster.MembershipListener#memberAdded(org.apache.catalina.cluster.Member)
+ * @see MembershipListener#memberAdded(Member)
*/
public void memberAdded(Member member) {
try {
@@ -1113,7 +1113,7 @@ public class SimpleTcpCluster implements
/**
* Cluster member is gone
*
- * @see
org.apache.catalina.cluster.MembershipListener#memberDisappeared(org.apache.catalina.cluster.Member)
+ * @see MembershipListener#memberDisappeared(Member)
*/
public void memberDisappeared(Member member) {
if (log.isInfoEnabled())
@@ -1134,11 +1134,11 @@ public class SimpleTcpCluster implements
// messages
/**
- * notify all listeners from receiving a new message is not ClusterMessage
- * emitt Failure Event to LifecylceListener
+ * Notify all listeners from receiving a new message is not ClusterMessage
+ * and emit Failure Event to LifecylceListener
*
- * @param message
- *receveived Message
+ * @param msg
+ *received Message
*/
public void receive(ClusterMessage message) {
-
To unsubscribe, e-mail:
svn commit: r1641884 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Author: rjung
Date: Wed Nov 26 18:57:48 2014
New Revision: 1641884
URL: http://svn.apache.org/r1641884
Log:
Fix Javadoc warnings
Backport of r1561778 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java?rev=1641884r1=1641883r2=1641884view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Wed Nov 26 18:57:48 2014
@@ -421,7 +421,7 @@ public class ReplicationTransmitter impl
/**
* Send data to one member
* FIXME set filtering messages
- * @see
org.apache.catalina.cluster.ClusterSender#sendMessage(org.apache.catalina.cluster.ClusterMessage,
org.apache.catalina.cluster.Member)
+ * @see
org.apache.catalina.cluster.ClusterSender#sendMessage(org.apache.catalina.cluster.ClusterMessage,
Member)
*/
public void sendMessage(ClusterMessage message, Member member)
throws java.io.IOException {
@@ -674,7 +674,7 @@ public class ReplicationTransmitter impl
* add new cluster member and create sender ( s. replicationMode) transfer
* current properties to sender
*
- * @see
org.apache.catalina.cluster.ClusterSender#add(org.apache.catalina.cluster.Member)
+ * @see org.apache.catalina.cluster.ClusterSender#add(Member)
*/
public synchronized void add(Member member) {
try {
@@ -694,7 +694,7 @@ public class ReplicationTransmitter impl
/**
* remove sender from transmitter. ( deregister mbean and disconnect
sender )
*
- * @see
org.apache.catalina.cluster.ClusterSender#remove(org.apache.catalina.cluster.Member)
+ * @see org.apache.catalina.cluster.ClusterSender#remove(Member)
*/
public synchronized void remove(Member member) {
String key = getKey(member);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641893 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: ./ authenticator/ deploy/ io/ mcast/ membership/ session/ tcp/ util/
Author: rjung Date: Wed Nov 26 19:17:47 2014 New Revision: 1641893 URL: http://svn.apache.org/r1641893 Log: Remove $Id, $Revision keywords. Backport of r1564359 and r1564369 from TC6. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterDeployer.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterReceiver.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterRuleSet.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterValve.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/Constants.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/Member.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipService.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ObjectReader.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/SocketObjectReader.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/Constants.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.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/DeltaManager.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.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/tcp/AsyncSocketSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterData.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/Constants.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
svn commit: r1641898 - in /tomcat/sandbox/tomcat-oacc/trunk: ./ docs/ etc/ src/share/org/apache/catalina/authenticator/ src/share/org/apache/catalina/cluster/ src/share/org/apache/catalina/cluster/aut
Author: rjung Date: Wed Nov 26 19:35:42 2014 New Revision: 1641898 URL: http://svn.apache.org/r1641898 Log: Further removal of Id and Revision tags. Remove svn:keywords property. Backport of rr1564372 from TC6. Modified: tomcat/sandbox/tomcat-oacc/trunk/BUILDING.txt (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/LICENSE (props changed) tomcat/sandbox/tomcat-oacc/trunk/NOTICE (props changed) tomcat/sandbox/tomcat-oacc/trunk/PROPOSALS.txt (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/RELEASE-PLAN.txt (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/build.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/index.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/project.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java (contents, props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterDeployer.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessage.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterReceiver.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterRuleSet.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterSender.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterSession.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterValve.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/Constants.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings.properties (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/Member.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipService.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MessageListener.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileChangeListener.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessage.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/UndeployMessage.java (props changed) tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java (props changed)
svn commit: r1641899 - in /tomcat/sandbox/tomcat-oacc/trunk: NOTICE build.xml docs/tomcat-oacc-docs.xsl
Author: rjung
Date: Wed Nov 26 19:38:55 2014
New Revision: 1641899
URL: http://svn.apache.org/r1641899
Log:
Update Copyright year and fix NOTICE formulation.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/NOTICE
tomcat/sandbox/tomcat-oacc/trunk/build.xml
tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl
Modified: tomcat/sandbox/tomcat-oacc/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/NOTICE?rev=1641899r1=1641898r2=1641899view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/NOTICE (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/NOTICE Wed Nov 26 19:38:55 2014
@@ -1,5 +1,5 @@
Apache Tomcat OACC
-Copyright 1999-2012 The Apache Software Foundation
+Copyright 1999-2014 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=1641899r1=1641898r2=1641899view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Wed Nov 26 19:38:55 2014
@@ -163,7 +163,7 @@
version=true
windowtitle=Catalina Cluster Internal API Documentation
doctitle=Catalina Cluster API
- bottom=Copyright amp;#169; 2000-2012 Apache Software Foundation. All
Rights Reserved.
+ bottom=Copyright amp;#169; 2000-2014 Apache Software Foundation. All
Rights Reserved.
/
/target
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=1641899r1=1641898r2=1641899view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/tomcat-oacc-docs.xsl Wed Nov 26
19:38:55 2014
@@ -154,7 +154,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 1999-2012, Apache Software Foundation
+Copyright #169; 1999-2014, Apache Software Foundation
/em/font/div
/td/tr
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641901 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina: authenticator/SingleSignOnEntry.java cluster/ClusterManager.java cluster/tcp/SimpleTcpCluster.java
Author: rjung
Date: Wed Nov 26 19:44:42 2014
New Revision: 1641901
URL: http://svn.apache.org/r1641901
Log:
More Javadoc fixes.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=1641901r1=1641900r2=1641901view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
Wed Nov 26 19:44:42 2014
@@ -29,8 +29,8 @@ import org.apache.catalina.authenticator
*
* @author B Stansberry, based on work by Craig R. McClanahan
*
- * @see SingleSignOn
- * @see AuthenticatorBase#reauthenticateFromSSO
+ * @see org.apache.catalina.authenticator.SingleSignOn
+ * @see
org.apache.catalina.authenticator.AuthenticatorBase#reauthenticateFromSSO
*/
public class SingleSignOnEntry
{
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java?rev=1641901r1=1641900r2=1641901view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterManager.java
Wed Nov 26 19:44:42 2014
@@ -84,7 +84,7 @@ public interface ClusterManager extends
public boolean isSendClusterDomainOnly();
/**
-* @param domainReplication Flag value.
+* @param sendClusterDomainOnly Flag value.
* @since 5.5.10
*/
public void setSendClusterDomainOnly(boolean sendClusterDomainOnly);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=1641901r1=1641900r2=1641901view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Wed Nov 26 19:44:42 2014
@@ -372,7 +372,7 @@ public class SimpleTcpCluster implements
/**
* add cluster message listener and register cluster to this listener
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#addClusterListener(org.apache.catalina.cluster.ClusterListener)
+ * @see
org.apache.catalina.cluster.CatalinaCluster#addClusterListener(org.apache.catalina.cluster.MessageListener)
*/
public void addClusterListener(MessageListener listener) {
if (listener != null !clusterListeners.contains(listener)) {
@@ -384,7 +384,7 @@ public class SimpleTcpCluster implements
/**
* remove message listener and deregister Cluster from listener
*
- * @see
org.apache.catalina.cluster.CatalinaCluster#removeClusterListener(org.apache.catalina.cluster.ClusterListener)
+ * @see
org.apache.catalina.cluster.CatalinaCluster#removeClusterListener(org.apache.catalina.cluster.MessageListener)
*/
public void removeClusterListener(MessageListener listener) {
if (listener != null) {
@@ -1137,7 +1137,7 @@ public class SimpleTcpCluster implements
* Notify all listeners from receiving a new message is not ClusterMessage
* and emit Failure Event to LifecylceListener
*
- * @param msg
+ * @param message
*received Message
*/
public void receive(ClusterMessage message) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641933 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
Author: rjung Date: Wed Nov 26 20:55:01 2014 New Revision: 1641933 URL: http://svn.apache.org/r1641933 Log: Remove duplicate import line. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java?rev=1641933r1=1641932r2=1641933view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java Wed Nov 26 20:55:01 2014 @@ -28,7 +28,6 @@ import org.apache.catalina.Loader; import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.session.ManagerBase; import org.apache.catalina.cluster.session.ReplicationStream; -import org.apache.catalina.cluster.session.ReplicationStream; /** * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641934 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Author: rjung
Date: Wed Nov 26 20:55:43 2014
New Revision: 1641934
URL: http://svn.apache.org/r1641934
Log:
Sync with TC 6, more use of super class.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641934r1=1641933r2=1641934view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 20:55:43 2014
@@ -335,113 +335,25 @@ public class DeltaSession extends Standa
}
public void expire(boolean notify, boolean notifyCluster) {
-String expiredId = getIdInternal();
-// Check to see if expire is in progress or has previously been called
-if (expiring || !isValid)
+if (expiring)
return;
+String expiredId = getIdInternal();
-synchronized (this) {
-// Check again, now we are inside the sync so this code only runs
once
-// Double check locking - expiring and isValid need to be volatile
-if (expiring || !isValid)
-return;
-
-if (manager == null)
-return;
-
-
-if(notifyCluster expiredId != null manager != null
-manager instanceof DeltaManager) {
-DeltaManager dmanager = (DeltaManager)manager;
-CatalinaCluster cluster = dmanager.getCluster();
-ClusterMessage msg = dmanager.requestCompleted(expiredId,
true);
-if (msg != null) {
-if(dmanager.isSendClusterDomainOnly()) {
-cluster.sendClusterDomain(msg);
-} else {
-cluster.send(msg);
-}
-}
-}
-
-// Mark this session as being expired
-expiring = true;
-
-// Notify interested application event listeners
-// FIXME - Assumes we call listeners in reverse order
-Context context = (Context) manager.getContainer();
-Object listeners[] = context.getApplicationLifecycleListeners();
-if (notify (listeners != null)) {
-HttpSessionEvent event =
-new HttpSessionEvent(getSession());
-for (int i = 0; i listeners.length; i++) {
-int j = (listeners.length - 1) - i;
-if (!(listeners[j] instanceof HttpSessionListener))
-continue;
-HttpSessionListener listener =
-(HttpSessionListener) listeners[j];
-try {
-fireContainerEvent(context,
- beforeSessionDestroyed,
- listener);
-listener.sessionDestroyed(event);
-fireContainerEvent(context,
- afterSessionDestroyed,
- listener);
-} catch (Throwable t) {
-try {
-fireContainerEvent(context,
- afterSessionDestroyed,
- listener);
-} catch (Exception e) {
-;
-}
-manager.getContainer().getLogger().error
-(sm.getString(standardSession.sessionEvent), t);
-}
-}
-}
-if (ACTIVITY_CHECK) {
-accessCount.set(0);
-}
-setValid(false);
-
-/*
- * Compute how long this session has been alive, and update
- * session manager's related properties accordingly
- */
-long timeNow = System.currentTimeMillis();
-int timeAlive = (int) ((timeNow - creationTime)/1000);
-synchronized (manager) {
-if (timeAlive manager.getSessionMaxAliveTime()) {
-manager.setSessionMaxAliveTime(timeAlive);
+if(notifyCluster expiredId != null manager != null
+ manager instanceof DeltaManager) {
+DeltaManager dmanager = (DeltaManager)manager;
+CatalinaCluster cluster = dmanager.getCluster();
+ClusterMessage msg = dmanager.requestCompleted(expiredId, true);
+if (msg != null) {
+
[Bug 57256] Stackoverflow
https://issues.apache.org/bugzilla/show_bug.cgi?id=57256 --- Comment #3 from Christopher Schultz ch...@christopherschultz.net --- Bugzilla is not a support forum. Please join the users' mailing list to have a discussion. -- 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: r1641957 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Wed Nov 26 22:19:39 2014 New Revision: 1641957 URL: http://svn.apache.org/r1641957 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=1641957r1=1641956r2=1641957view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 26 22:19:39 2014 @@ -48,6 +48,7 @@ PATCHES PROPOSED TO BACKPORT: (fix duplicate ';' and use generics in declaration of a local variable). https://issues.apache.org/bugzilla/attachment.cgi?id=32226 +1: kkolinko + +1: schultz, and I withdraw above proposal if this one is accepted -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641969 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml manager-howto.xml
Author: kkolinko Date: Thu Nov 27 00:20:15 2014 New Revision: 1641969 URL: http://svn.apache.org/r1641969 Log: CTR: docs Improving documentation for the manager webapp I am starting with some typos. These are from r993008 and r1641737. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.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=1641969r1=1641968r2=1641969view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 27 00:20:15 2014 @@ -58,6 +58,9 @@ declaration into web application instead of enabling it globally. Correct documentation for cgiPathPrefix. (kkolinko) /fix + update +Improve Tomcat Manager documentation. (kkolinko) + /update /changelog /subsection /section Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641969r1=1641968r2=1641969view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 00:20:15 2014 @@ -66,7 +66,7 @@ the following functions:/p directory (unless it was deployed from file system)./li /ul -pA default Tomcat installation includes the manager. To add an instance of the +pA default Tomcat installation includes the Manager. To add an instance of the Manager web application codeContext/code to a new host install the codemanager.xml/code context configuration file in the code$CATALINA_BASE/conf/[enginename]/[hostname]/code folder. Here is an @@ -124,14 +124,14 @@ disabled by default./p pTo enable access to the Manager web application, you must either create a new username/password combination and associate one of the manager roles with it, or add a manager role to some existing username/password combination. There -are four roles defined by the manager application:/p +are four roles defined by the Manager application:/p ul liemmanager-gui/em - Allows access to the html interface/li liemmanager-script/em - Allows access to the plain text interface/li liemmanager-jmx/em - Allows access to the JMX proxy interface/li liemmanager-status/em - Allows access to the read-only status pages/li /ul -pThe manager application is configured to use the CSRF prevention filter. For +pThe Manager application is configured to use the CSRF prevention filter. For this filter to be effective, any user assigned the codemanager-gui/code role must not be assigned the codemanager-script/code nor the codemanager-jmx/code roles./p @@ -172,7 +172,7 @@ BASIC authentication. The username and as long as they identify a valid user in the users database who possesses the appropriate role./p -pIn addition to the password restrictions the manager web application +pIn addition to the password restrictions the Manager web application could be restricted by the remote IP address or host by adding a codeRemoteAddrValve/code or codeRemoteHostValve/code. Here is an example of restricting access to the localhost by IP address:/p @@ -325,7 +325,7 @@ This command is the logical opposite of pThis can be used to deploy a previous version of a web application, which has been deployed using the codetag/code attribute. Note that the work -directory for the manager webapp will contain the previously deployed WARs; +directory for the Manager webapp will contain the previously deployed WARs; removing it would make the deployment fail./p source http://localhost:8080/manager/deploy?path=/footooamp;tag=footag @@ -948,7 +948,7 @@ The same information is available for bo appropriate./p/li lipemKeep-Alive/em : The thread keeps the connection open to the client in case the client sends another request. If another request -is recieved, the next stage will br Parse and Prepare Requst. If no +is received, the next stage will be Parse and Prepare Request. If no request is received before the keep alive times out, the connection will be closed and the next stage will be Ready./p/li lipemReady/em : The thread is at rest and ready to be - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641970 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Thu Nov 27 00:34:06 2014 New Revision: 1641970 URL: http://svn.apache.org/r1641970 Log: CTR: docs Improving documentation for the manager webapp Correction: The default configuration uses UserDatabaseRealm, not MemoryRealm. Add DataSourceRealm. Backport of r1641656 from tomcat/trunk (included in r1641734 of Tomcat 7) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1641656 Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641970r1=1641969r2=1641970view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 00:34:06 2014 @@ -137,11 +137,13 @@ must not be assigned the codemanager-s codemanager-jmx/code roles./p pExactly where roles are associated to users depends on which -codeRealm/code implementation you are using:/p +a href=config/realm.htmlRealm implementation/a you are using:/p ul -liemMemoryRealm/em - If you have not customized your -code$CATALINA_BASE/conf/server.xml/code to select a different one, -Tomcat 6 defaults to an XML-format file stored at +liemUserDatabaseRealm/em plus emMemoryUserDatabase/em, or emMemoryRealm/em +#8212; The emUserDatabaseRealm/em and emMemoryUserDatabase/em are +configured in the default code$CATALINA_BASE/conf/server.xml/code. +Both emMemoryUserDatabase/em and emMemoryRealm/em read an +XML-format file by default stored at code$CATALINA_BASE/conf/tomcat-users.xml/code, which can be edited with any text editor. This file contains an XML codelt;usergt;/code for each individual user, which might @@ -154,12 +156,13 @@ must not be assigned the codemanager-s add a role, e.g. strongmanager-gui/strong, to the comma-delimited coderoles/code attribute for one or more existing users, and/or create new users with that assigned role./li -liemJDBCRealm/em - Your user and role information is stored in +liemDataSourceRealm/em or emJDBCRealm/em +#8212; Your user and role information is stored in a database accessed via JDBC. Add the required role(s) to one or more existing users, and/or create one or more new users with the required role(s) assigned, following the standard procedures for your environment./li -liemJNDIRealm/em - Your user and role information is stored in +liemJNDIRealm/em #8212; Your user and role information is stored in a directory server accessed via LDAP. Add the required role(s) to one or more existing users, and/or create one or more new users with the required role(s) assigned, following the standard procedures for your - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641981 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: kkolinko Date: Thu Nov 27 01:14:10 2014 New Revision: 1641981 URL: http://svn.apache.org/r1641981 Log: Improving manager documentation. Better wording. Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641981r1=1641980r2=1641981view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Thu Nov 27 01:14:10 2014 @@ -136,16 +136,16 @@ web application. The available roles are attacks, but the text and JMX interfaces cannot be protected. It means that users who are allowed access to the text and JMX interfaces have to be cautious when accessing the Manager application with a web browser. -To maintain -the CSRF protection:/p +To maintain the CSRF protection:/p ul liIf you use web browser to access the Manager application using a user that has either strongmanager-script/strong or strongmanager-jmx/strong roles (for example for testing - the plain text or JMX interfaces), do not visit other sites - where you may fall victim to a CSRF attack, and you MUST close all windows - of the browser afterwards to terminate the session./li + the plain text or JMX interfaces), you MUST close all windows + of the browser afterwards to terminate the session. + If you do not close the browser and visit other sites, you may become + victim of a CSRF attack./li liIt is recommended to never grant the strongmanager-script/strong or strongmanager-jmx/strong roles to users that have the strongmanager-gui/strong role./li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641987 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Thu Nov 27 01:29:40 2014 New Revision: 1641987 URL: http://svn.apache.org/r1641987 Log: CTR: docs Improving documentation for the manager webapp - Add section on HTML interface with a link to a document. - Correct URL to be /html instead of /html/. - Expand explanation on CSRF feature. - Document deprecated manager role, that still exist in Tomcat 6. Includes changes from r1641660, r1641692, r1641981 of tomcat/trunk, r1224618, r1641734 of Tomcat 7. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1641660,1641692 Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641987r1=1641986r2=1641987view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 01:29:40 2014 @@ -87,7 +87,7 @@ example:/p ul liAs an application with a user interface you use in your browser. Here is an example URL where you can replace codelocalhost/code with -your website host name: codehttp://localhost/manager/html//code ./li +your website host name: codehttp://localhost:8080/manager/html/code ./li liA minimal version using HTTP requests only which is suitable for use by scripts setup by system administrators. Commands are given as part of the request URI, and responses are in the form of simple text that can be easily @@ -115,28 +115,65 @@ With Ant/a for more information./li anyone on the Internet to execute the Manager application on your server. Therefore, the Manager application is shipped with the requirement that anyone who attempts to use it must authenticate themselves, using a username and -password that have the appropriate role associated with them. +password that have one of strongmanager-**/strong roles associated with +them (the role name depends on what functionality is required). Further, there is no username in the default users file -(code$CATALINA_BASE/conf/tomcat-users.xml/code) that is assigned an -appropriate role. Therefore, access to the Manager application is completely -disabled by default./p +(code$CATALINA_BASE/conf/tomcat-users.xml/code) that is assigned to those +roles. Therefore, access to the Manager application is completely disabled +by default./p -pTo enable access to the Manager web application, you must either create -a new username/password combination and associate one of the manager roles with -it, or add a manager role to some existing username/password combination. There -are four roles defined by the Manager application:/p -ul -liemmanager-gui/em - Allows access to the html interface/li -liemmanager-script/em - Allows access to the plain text interface/li -liemmanager-jmx/em - Allows access to the JMX proxy interface/li -liemmanager-status/em - Allows access to the read-only status pages/li -/ul -pThe Manager application is configured to use the CSRF prevention filter. For -this filter to be effective, any user assigned the codemanager-gui/code role -must not be assigned the codemanager-script/code nor the -codemanager-jmx/code roles./p +pYou can find the role names in the codeweb.xml/code file of the Manager +web application. The available roles are:/p + +ul + listrongmanager-gui/strong #8212; Access to the HTML interface./li + listrongmanager-status/strong #8212; Access to the Server Status +page only./li + listrongmanager-script/strong #8212; Access to the tools-friendly +plain text interface that is described in this document, +and to the Server Status page./li + listrongmanager-jmx/strong #8212; Access to JMX proxy interface +and to the Server Status page./li + listrongmanager/strong (deprecated) #8212; Combines the above four +roles, allows access everywhere where one of the above roles is allowed. +Do not use it. Use one of the above specific strongmanager-**/strong +roles or a combination of them./li +/ul + +pThe HTML interface is protected against CSRF (Cross-Site Request Forgery) +attacks, but the text and JMX interfaces cannot be protected. It means that +users who are allowed access to the text and JMX interfaces have to be cautious +when accessing the Manager application with a web browser. +To maintain the CSRF protection:/p -pExactly where roles are associated to users depends on which +ul + liIf you use web browser to access the Manager application using + a user that has either strongmanager-script/strong or + strongmanager-jmx/strong or strongmanager/strong role, + you MUST close all windows + of the browser afterwards to terminate the session. + If you do not close the browser and visit other sites, you may become
svn commit: r1641988 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Thu Nov 27 01:30:54 2014 New Revision: 1641988 URL: http://svn.apache.org/r1641988 Log: Improving manager documentation. Better wording. Merged r1641981 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- Merged /tomcat/trunk:r1641981 Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641988r1=1641987r2=1641988view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 01:30:54 2014 @@ -136,16 +136,16 @@ web application. The available roles are attacks, but the text and JMX interfaces cannot be protected. It means that users who are allowed access to the text and JMX interfaces have to be cautious when accessing the Manager application with a web browser. -To maintain -the CSRF protection:/p +To maintain the CSRF protection:/p ul liIf you use web browser to access the Manager application using a user that has either strongmanager-script/strong or strongmanager-jmx/strong roles (for example for testing - the plain text or JMX interfaces), do not visit other sites - where you may fall victim to a CSRF attack, and you MUST close all windows - of the browser afterwards to terminate the session./li + the plain text or JMX interfaces), you MUST close all windows + of the browser afterwards to terminate the session. + If you do not close the browser and visit other sites, you may become + victim of a CSRF attack./li liIt is recommended to never grant the strongmanager-script/strong or strongmanager-jmx/strong roles to users that have the strongmanager-gui/strong role./li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1641989 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Thu Nov 27 01:32:03 2014 New Revision: 1641989 URL: http://svn.apache.org/r1641989 Log: Improving manager documentation. Better wording. Merged r1641988 from tomcat/tc8.0.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1641981 Merged /tomcat/tc8.0.x/trunk:r1641988 Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641989r1=1641988r2=1641989view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 01:32:03 2014 @@ -136,16 +136,16 @@ web application. The available roles are attacks, but the text and JMX interfaces cannot be protected. It means that users who are allowed access to the text and JMX interfaces have to be cautious when accessing the Manager application with a web browser. -To maintain -the CSRF protection:/p +To maintain the CSRF protection:/p ul liIf you use web browser to access the Manager application using a user that has either strongmanager-script/strong or strongmanager-jmx/strong roles (for example for testing - the plain text or JMX interfaces), do not visit other sites - where you may fall victim to a CSRF attack, and you MUST close all windows - of the browser afterwards to terminate the session./li + the plain text or JMX interfaces), you MUST close all windows + of the browser afterwards to terminate the session. + If you do not close the browser and visit other sites, you may become + victim of a CSRF attack./li liIt is recommended to never grant the strongmanager-script/strong or strongmanager-jmx/strong roles to users that have the strongmanager-gui/strong role./li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
