You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2010/04/30 01:55:14 UTC
svn commit: r939514 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha:
./ session/ tcp/ util/
Author: kkolinko
Date: Thu Apr 29 23:55:14 2010
New Revision: 939514
URL: http://svn.apache.org/viewvc?rev=939514&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)
Corrected JavaDoc in ReplicatedSession and SimpleRcpReplicationManager classes.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Thu Apr 29 23:55:14 2010
@@ -34,7 +34,7 @@ import org.apache.juli.logging.Log;
* different cluster implementations
*
* @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public interface CatalinaCluster extends Cluster {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Thu Apr 29 23:55:14 2010
@@ -22,7 +22,7 @@ package org.apache.catalina.ha;
* different deployment implementations
*
* @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
*/
import org.apache.catalina.LifecycleException;
import java.io.IOException;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java Thu Apr 29 23:55:14 2010
@@ -33,7 +33,7 @@ import org.apache.catalina.util.StringMa
*
* @author Peter Rossbach
* @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public abstract class ClusterListener implements ChannelListener {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Thu Apr 29 23:55:14 2010
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.R
*
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class ClusterRuleSet extends RuleSetBase {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java Thu Apr 29 23:55:14 2010
@@ -23,7 +23,7 @@ import org.apache.catalina.Valve;
* with a small addition of being able to reference the cluster component in the container it sits in.
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public interface ClusterValve extends Valve{
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java Thu Apr 29 23:55:14 2010
@@ -23,7 +23,7 @@ package org.apache.catalina.ha;
* package.
*
* @author Bip Thelin
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public final class Constants {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Thu Apr 29 23:55:14 2010
@@ -30,7 +30,7 @@ import org.apache.catalina.Container;
/**
*
* @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public abstract class ClusterManagerBase extends ManagerBase implements Lifecycle, PropertyChangeListener, ClusterManager{
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Thu Apr 29 23:55:14 2010
@@ -27,7 +27,7 @@ import org.apache.catalina.ha.*;
* Receive replicated SessionMessage form other cluster node.
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class ClusterSessionListener extends ClusterListener {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Apr 29 23:55:14 2010
@@ -62,7 +62,7 @@ import org.apache.catalina.ha.ClusterMan
* @author Craig R. McClanahan
* @author Jean-Francois Arcand
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class DeltaManager extends ClusterManagerBase{
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Apr 29 23:55:14 2010
@@ -56,7 +56,7 @@ import java.util.concurrent.atomic.Atomi
* track of deltas during a request.
*
* @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class DeltaSession extends StandardSession implements Externalizable,ClusterSession,ReplicatedMapEntry {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu Apr 29 23:55:14 2010
@@ -94,7 +94,7 @@ import org.apache.catalina.valves.ValveB
* requested sessions are migrated.
*
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class JvmRouteBinderValve extends ValveBase implements ClusterValve, Lifecycle {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java Thu Apr 29 23:55:14 2010
@@ -33,7 +33,7 @@ import org.apache.catalina.ha.*;
* node is failed.
*
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class JvmRouteSessionIDBinderListener extends ClusterListener {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java Thu Apr 29 23:55:14 2010
@@ -29,16 +29,16 @@ package org.apache.catalina.ha.session;
* A full description of this implementation can be found under
* <href="http://www.filip.net/tomcat/">Filip's Tomcat Page</a><BR>
*
- * Copyright: See apache license
- * @author Filip Hanik
- * @version $Revision$ $Date$
+ * Copyright: See apache license<BR>
+ *
* Description:<BR>
* The ReplicatedSession class is a simple extension of the StandardSession class
* It overrides a few methods (setAttribute, removeAttribute, expire, access) and has
* hooks into the InMemoryReplicationManager to broadcast and receive events from the cluster.<BR>
* This class inherits the readObjectData and writeObject data methods from the StandardSession
* and does not contain any serializable elements in addition to the inherited ones from the StandardSession
- *
+ * @author Filip Hanik
+ * @version $Id$
*/
import org.apache.catalina.Manager;
import java.io.IOException;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java Thu Apr 29 23:55:14 2010
@@ -40,7 +40,7 @@ import org.apache.catalina.util.StringMa
* The GenericPrincipal does NOT implement serializable and I didn't want to
* change that implementation hence I implemented this one instead.
* @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class SerializablePrincipal implements java.io.Serializable {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java Thu Apr 29 23:55:14 2010
@@ -24,7 +24,7 @@ import org.apache.catalina.ha.ClusterMes
*
* @author Peter Rossbach
*
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class SessionIDMessage extends ClusterMessageBase implements ClusterMessage {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java Thu Apr 29 23:55:14 2010
@@ -25,7 +25,7 @@ import org.apache.catalina.ha.ClusterMes
* @author Filip Hanik
* @author Peter Rossbach
*
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class SessionMessageImpl extends ClusterMessageBase implements SessionMessage, java.io.Serializable {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java Thu Apr 29 23:55:14 2010
@@ -41,11 +41,8 @@ import org.apache.catalina.Loader;
* A full description of this implementation can be found under
* <href="http://www.filip.net/tomcat/">Filip's Tomcat Page</a><BR>
*
- * Copyright: See apache license
- * Company: www.filip.net
- * @author <a href="mailto:mail@filip.net">Filip Hanik</a>
- * @author Bela Ban (modifications for synchronous replication)
- * @version 1.0 for TC 4.0
+ * Copyright: See apache license<BR>
+ * Company: www.filip.net<BR>
* Description: The InMemoryReplicationManager is a session manager that replicated
* session information in memory.
* <BR><BR>
@@ -56,6 +53,9 @@ import org.apache.catalina.Loader;
* all defined in the SessionMessage class.<BR>
* When a session is replicated (not an attribute added/removed) the session is serialized into
* a byte array using the StandardSession.readObjectData, StandardSession.writeObjectData methods.
+ * @author <a href="mailto:mail@filip.net">Filip Hanik</a>
+ * @author Bela Ban (modifications for synchronous replication)
+ * @version 1.0 for TC 4.0
*/
public class SimpleTcpReplicationManager extends StandardManager implements ClusterManager
{
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java Thu Apr 29 23:55:14 2010
@@ -23,7 +23,7 @@ package org.apache.catalina.ha.tcp;
* package.
*
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class Constants {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Thu Apr 29 23:55:14 2010
@@ -57,7 +57,7 @@ import org.apache.catalina.valves.ValveB
* @author Craig R. McClanahan
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class ReplicationValve
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java Thu Apr 29 23:55:14 2010
@@ -21,7 +21,7 @@ import org.apache.catalina.tribes.Member
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class SendMessageData {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Thu Apr 29 23:55:14 2010
@@ -69,7 +69,7 @@ import org.apache.catalina.ha.session.Jv
* @author Filip Hanik
* @author Remy Maucherat
* @author Peter Rossbach
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public class SimpleTcpCluster
implements CatalinaCluster, Lifecycle, LifecycleListener, IDynamicProperty,
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java?rev=939514&r1=939513&r2=939514&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java Thu Apr 29 23:55:14 2010
@@ -21,7 +21,7 @@ import java.util.Iterator;
/**
* @author Peter Rossbach
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public interface IDynamicProperty {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org