From: kkolinko Date: Thu, 29 Apr 2010 13:43:39 +0000 (+0000) Subject: Replace $Date$ with $Id$ because of its i18n and timezone issues X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a211d317ce78c6b31461af66e8fb3e281987d00b;p=tomcat7.0 Replace $Date$ with $Id$ because of its i18n and timezone issues (http://subversion.tigris.org/issues/show_bug.cgi?id=2332) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939305 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/Authenticator.java b/java/org/apache/catalina/Authenticator.java index 6975d8add..7a6349e2e 100644 --- a/java/org/apache/catalina/Authenticator.java +++ b/java/org/apache/catalina/Authenticator.java @@ -32,7 +32,7 @@ import org.apache.catalina.deploy.LoginConfig; * provides some sort of authentication service. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Authenticator { diff --git a/java/org/apache/catalina/Cluster.java b/java/org/apache/catalina/Cluster.java index 6a594ce29..663992737 100644 --- a/java/org/apache/catalina/Cluster.java +++ b/java/org/apache/catalina/Cluster.java @@ -29,7 +29,7 @@ package org.apache.catalina; * @author Bip Thelin * @author Remy Maucherat * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface Cluster { diff --git a/java/org/apache/catalina/Contained.java b/java/org/apache/catalina/Contained.java index a67a67220..8123150fe 100644 --- a/java/org/apache/catalina/Contained.java +++ b/java/org/apache/catalina/Contained.java @@ -25,7 +25,7 @@ package org.apache.catalina; * * @author Craig R. McClanahan * @author Peter Donald - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Contained { diff --git a/java/org/apache/catalina/Container.java b/java/org/apache/catalina/Container.java index c7cfa17c7..daeaffcee 100644 --- a/java/org/apache/catalina/Container.java +++ b/java/org/apache/catalina/Container.java @@ -78,7 +78,7 @@ import org.apache.juli.logging.Log; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Container extends Lifecycle { diff --git a/java/org/apache/catalina/ContainerEvent.java b/java/org/apache/catalina/ContainerEvent.java index 01261f6bc..f859732e8 100644 --- a/java/org/apache/catalina/ContainerEvent.java +++ b/java/org/apache/catalina/ContainerEvent.java @@ -26,7 +26,7 @@ import java.util.EventObject; * General event for notifying listeners of significant changes on a Container. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ContainerEvent diff --git a/java/org/apache/catalina/ContainerListener.java b/java/org/apache/catalina/ContainerListener.java index e9402b19c..45aa13abb 100644 --- a/java/org/apache/catalina/ContainerListener.java +++ b/java/org/apache/catalina/ContainerListener.java @@ -27,7 +27,7 @@ package org.apache.catalina; * LifecycleEvents, not ContainerEvents. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface ContainerListener { diff --git a/java/org/apache/catalina/ContainerServlet.java b/java/org/apache/catalina/ContainerServlet.java index 1fe3affad..e0f3906ec 100644 --- a/java/org/apache/catalina/ContainerServlet.java +++ b/java/org/apache/catalina/ContainerServlet.java @@ -27,7 +27,7 @@ package org.apache.catalina; * this servlet is put into service. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface ContainerServlet { diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 4539b7070..6ea4f3b80 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -56,7 +56,7 @@ import org.apache.catalina.util.CharsetMapper; *

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Context extends Container { diff --git a/java/org/apache/catalina/Engine.java b/java/org/apache/catalina/Engine.java index 2e845d1cf..1dbc0e154 100644 --- a/java/org/apache/catalina/Engine.java +++ b/java/org/apache/catalina/Engine.java @@ -41,7 +41,7 @@ package org.apache.catalina; * should throw IllegalArgumentException. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Engine extends Container { diff --git a/java/org/apache/catalina/Globals.java b/java/org/apache/catalina/Globals.java index 6c11e586a..d36226cd8 100644 --- a/java/org/apache/catalina/Globals.java +++ b/java/org/apache/catalina/Globals.java @@ -23,7 +23,7 @@ package org.apache.catalina; * Global constants that are applicable to multiple packages within Catalina. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Globals { diff --git a/java/org/apache/catalina/Group.java b/java/org/apache/catalina/Group.java index e4ad0e2e6..298333bfb 100644 --- a/java/org/apache/catalina/Group.java +++ b/java/org/apache/catalina/Group.java @@ -29,7 +29,7 @@ import java.util.Iterator; * inherits the {@link Role}s assigned to the group.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/Host.java b/java/org/apache/catalina/Host.java index 07499cd16..7ea914055 100644 --- a/java/org/apache/catalina/Host.java +++ b/java/org/apache/catalina/Host.java @@ -41,7 +41,7 @@ package org.apache.catalina; * of Context (representing an individual servlet context). * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Host extends Container { diff --git a/java/org/apache/catalina/InstanceEvent.java b/java/org/apache/catalina/InstanceEvent.java index 1fe6a6fef..4338b5b23 100644 --- a/java/org/apache/catalina/InstanceEvent.java +++ b/java/org/apache/catalina/InstanceEvent.java @@ -32,7 +32,7 @@ import javax.servlet.ServletResponse; * as opposed to the Wrapper component that manages it. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class InstanceEvent diff --git a/java/org/apache/catalina/InstanceListener.java b/java/org/apache/catalina/InstanceListener.java index d9062d990..d7b85f1d7 100644 --- a/java/org/apache/catalina/InstanceListener.java +++ b/java/org/apache/catalina/InstanceListener.java @@ -25,7 +25,7 @@ package org.apache.catalina; * is managing that instance. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface InstanceListener { diff --git a/java/org/apache/catalina/Lifecycle.java b/java/org/apache/catalina/Lifecycle.java index 2ba8514e7..58ccd691f 100644 --- a/java/org/apache/catalina/Lifecycle.java +++ b/java/org/apache/catalina/Lifecycle.java @@ -72,7 +72,7 @@ package org.apache.catalina; * TODO: Not all components may transition from STOPPED to STARTING_PREP * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Lifecycle { diff --git a/java/org/apache/catalina/LifecycleEvent.java b/java/org/apache/catalina/LifecycleEvent.java index 9364cf1e8..55e6e4b92 100644 --- a/java/org/apache/catalina/LifecycleEvent.java +++ b/java/org/apache/catalina/LifecycleEvent.java @@ -29,7 +29,7 @@ import java.util.EventObject; * Tomcat 3.x. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class LifecycleEvent diff --git a/java/org/apache/catalina/LifecycleException.java b/java/org/apache/catalina/LifecycleException.java index 20d4427c7..1bbb8aed3 100644 --- a/java/org/apache/catalina/LifecycleException.java +++ b/java/org/apache/catalina/LifecycleException.java @@ -25,7 +25,7 @@ package org.apache.catalina; * operation of the application containing this component. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class LifecycleException extends Exception { diff --git a/java/org/apache/catalina/LifecycleListener.java b/java/org/apache/catalina/LifecycleListener.java index 3bdc67744..faf2d0916 100644 --- a/java/org/apache/catalina/LifecycleListener.java +++ b/java/org/apache/catalina/LifecycleListener.java @@ -27,7 +27,7 @@ package org.apache.catalina; * Lifecycle interface. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface LifecycleListener { diff --git a/java/org/apache/catalina/Loader.java b/java/org/apache/catalina/Loader.java index 46d685350..0aaa5a1ce 100644 --- a/java/org/apache/catalina/Loader.java +++ b/java/org/apache/catalina/Loader.java @@ -50,7 +50,7 @@ import java.beans.PropertyChangeListener; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Loader { diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java index 450c6f423..deed104ea 100644 --- a/java/org/apache/catalina/Manager.java +++ b/java/org/apache/catalina/Manager.java @@ -40,7 +40,7 @@ import java.io.IOException; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Manager { diff --git a/java/org/apache/catalina/Pipeline.java b/java/org/apache/catalina/Pipeline.java index d863b810d..6d46045d6 100644 --- a/java/org/apache/catalina/Pipeline.java +++ b/java/org/apache/catalina/Pipeline.java @@ -36,7 +36,7 @@ package org.apache.catalina; * * @author Craig R. McClanahan * @author Peter Donald - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Pipeline { diff --git a/java/org/apache/catalina/Realm.java b/java/org/apache/catalina/Realm.java index 42ad4028c..5cfdb8503 100644 --- a/java/org/apache/catalina/Realm.java +++ b/java/org/apache/catalina/Realm.java @@ -34,7 +34,7 @@ import org.apache.catalina.deploy.SecurityConstraint; * Container. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Realm { diff --git a/java/org/apache/catalina/Role.java b/java/org/apache/catalina/Role.java index eddd0afab..fa7f216db 100644 --- a/java/org/apache/catalina/Role.java +++ b/java/org/apache/catalina/Role.java @@ -27,7 +27,7 @@ import java.security.Principal; * environments like JAAS that want to deal with Principals.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/Server.java b/java/org/apache/catalina/Server.java index 092d5b278..4f8cf244c 100644 --- a/java/org/apache/catalina/Server.java +++ b/java/org/apache/catalina/Server.java @@ -42,7 +42,7 @@ import org.apache.catalina.deploy.NamingResources; * class in its constructor(s). * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Server extends Lifecycle { diff --git a/java/org/apache/catalina/Service.java b/java/org/apache/catalina/Service.java index fb759fd36..14329793a 100644 --- a/java/org/apache/catalina/Service.java +++ b/java/org/apache/catalina/Service.java @@ -31,7 +31,7 @@ import org.apache.catalina.connector.Connector; * and classes on the system class path. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Service extends Lifecycle { diff --git a/java/org/apache/catalina/Session.java b/java/org/apache/catalina/Session.java index b80592048..3299114ef 100644 --- a/java/org/apache/catalina/Session.java +++ b/java/org/apache/catalina/Session.java @@ -31,7 +31,7 @@ import javax.servlet.http.HttpSession; * between requests for a particular user of a web application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Session { diff --git a/java/org/apache/catalina/SessionEvent.java b/java/org/apache/catalina/SessionEvent.java index 0e2ab73c3..3c0efc5b3 100644 --- a/java/org/apache/catalina/SessionEvent.java +++ b/java/org/apache/catalina/SessionEvent.java @@ -26,7 +26,7 @@ import java.util.EventObject; * General event for notifying listeners of significant changes on a Session. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class SessionEvent diff --git a/java/org/apache/catalina/SessionListener.java b/java/org/apache/catalina/SessionListener.java index 33272503b..e9009c41a 100644 --- a/java/org/apache/catalina/SessionListener.java +++ b/java/org/apache/catalina/SessionListener.java @@ -25,7 +25,7 @@ package org.apache.catalina; * Interface defining a listener for significant Session generated events. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface SessionListener { diff --git a/java/org/apache/catalina/Store.java b/java/org/apache/catalina/Store.java index a9ddab0c3..a2938c9a8 100644 --- a/java/org/apache/catalina/Store.java +++ b/java/org/apache/catalina/Store.java @@ -31,7 +31,7 @@ import java.io.IOException; * server or context restarts. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Store { diff --git a/java/org/apache/catalina/User.java b/java/org/apache/catalina/User.java index 0d6010a44..191b42d8d 100644 --- a/java/org/apache/catalina/User.java +++ b/java/org/apache/catalina/User.java @@ -30,7 +30,7 @@ import java.util.Iterator; * of specific {@link Role}s.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/UserDatabase.java b/java/org/apache/catalina/UserDatabase.java index 82e759c89..0805a6cb1 100644 --- a/java/org/apache/catalina/UserDatabase.java +++ b/java/org/apache/catalina/UserDatabase.java @@ -29,7 +29,7 @@ import java.util.Iterator; * referenced by a {@link Realm} for authentication and access control.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/Valve.java b/java/org/apache/catalina/Valve.java index e2a29fc4d..af2ef85aa 100644 --- a/java/org/apache/catalina/Valve.java +++ b/java/org/apache/catalina/Valve.java @@ -40,7 +40,7 @@ import org.apache.catalina.connector.Response; * @author Craig R. McClanahan * @author Gunnar Rjnning * @author Peter Donald - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Valve { diff --git a/java/org/apache/catalina/Wrapper.java b/java/org/apache/catalina/Wrapper.java index 5c4cdeae8..5fb007263 100644 --- a/java/org/apache/catalina/Wrapper.java +++ b/java/org/apache/catalina/Wrapper.java @@ -45,7 +45,7 @@ import javax.servlet.UnavailableException; * IllegalArgumentException. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface Wrapper extends Container { diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java b/java/org/apache/catalina/ant/AbstractCatalinaTask.java index 1a3744909..411811dd8 100644 --- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java +++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.Project; * undeploying applications. These tasks require Ant 1.4 or later. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java index 326a70e4b..5faa67258 100644 --- a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java +++ b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java @@ -46,7 +46,7 @@ import org.apache.tools.ant.types.RedirectorElement; * * * @author Gabriele Garuglieri - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5 */ diff --git a/java/org/apache/catalina/ant/DeployTask.java b/java/org/apache/catalina/ant/DeployTask.java index 4231e6232..6c84edf10 100644 --- a/java/org/apache/catalina/ant/DeployTask.java +++ b/java/org/apache/catalina/ant/DeployTask.java @@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException; * the Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class DeployTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/ListTask.java b/java/org/apache/catalina/ant/ListTask.java index 523f7ec5e..6cf128d15 100644 --- a/java/org/apache/catalina/ant/ListTask.java +++ b/java/org/apache/catalina/ant/ListTask.java @@ -27,7 +27,7 @@ import org.apache.tools.ant.BuildException; * Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class ListTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/ReloadTask.java b/java/org/apache/catalina/ant/ReloadTask.java index d450275ae..275f4b439 100644 --- a/java/org/apache/catalina/ant/ReloadTask.java +++ b/java/org/apache/catalina/ant/ReloadTask.java @@ -30,7 +30,7 @@ import org.apache.tools.ant.BuildException; * Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class ReloadTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/ResourcesTask.java b/java/org/apache/catalina/ant/ResourcesTask.java index 4d5c1c10d..43309369b 100644 --- a/java/org/apache/catalina/ant/ResourcesTask.java +++ b/java/org/apache/catalina/ant/ResourcesTask.java @@ -27,7 +27,7 @@ import org.apache.tools.ant.BuildException; * the Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class ResourcesTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/RolesTask.java b/java/org/apache/catalina/ant/RolesTask.java index 54b7ec3a8..a3e4d034c 100644 --- a/java/org/apache/catalina/ant/RolesTask.java +++ b/java/org/apache/catalina/ant/RolesTask.java @@ -27,7 +27,7 @@ import org.apache.tools.ant.BuildException; * Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class RolesTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/ServerinfoTask.java b/java/org/apache/catalina/ant/ServerinfoTask.java index e05038f66..0f137624d 100644 --- a/java/org/apache/catalina/ant/ServerinfoTask.java +++ b/java/org/apache/catalina/ant/ServerinfoTask.java @@ -27,7 +27,7 @@ import org.apache.tools.ant.BuildException; * supported by the Tomcat manager application. * * @author Vivek Chopra - * @version $Revision$ $Date$ + * @version $Id$ */ public class ServerinfoTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/StartTask.java b/java/org/apache/catalina/ant/StartTask.java index 95fa0c51e..51f2d719f 100644 --- a/java/org/apache/catalina/ant/StartTask.java +++ b/java/org/apache/catalina/ant/StartTask.java @@ -30,7 +30,7 @@ import org.apache.tools.ant.BuildException; * Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class StartTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/StopTask.java b/java/org/apache/catalina/ant/StopTask.java index 1224c300e..4ceed3742 100644 --- a/java/org/apache/catalina/ant/StopTask.java +++ b/java/org/apache/catalina/ant/StopTask.java @@ -30,7 +30,7 @@ import org.apache.tools.ant.BuildException; * Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class StopTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/UndeployTask.java b/java/org/apache/catalina/ant/UndeployTask.java index dfab340ef..85f902324 100644 --- a/java/org/apache/catalina/ant/UndeployTask.java +++ b/java/org/apache/catalina/ant/UndeployTask.java @@ -27,7 +27,7 @@ import org.apache.tools.ant.BuildException; * the Tomcat manager application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ public class UndeployTask extends AbstractCatalinaTask { diff --git a/java/org/apache/catalina/ant/ValidatorTask.java b/java/org/apache/catalina/ant/ValidatorTask.java index d3fde1dcc..f3a611a22 100644 --- a/java/org/apache/catalina/ant/ValidatorTask.java +++ b/java/org/apache/catalina/ant/ValidatorTask.java @@ -36,7 +36,7 @@ import org.xml.sax.InputSource; * schema validation. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.0 */ diff --git a/java/org/apache/catalina/ant/jmx/Arg.java b/java/org/apache/catalina/ant/jmx/Arg.java index e5c4a8d1b..b9af42983 100644 --- a/java/org/apache/catalina/ant/jmx/Arg.java +++ b/java/org/apache/catalina/ant/jmx/Arg.java @@ -20,7 +20,7 @@ package org.apache.catalina.ant.jmx; /** * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ public class Arg { diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java index 5ec6c45d1..33e8ef92d 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java @@ -85,7 +85,7 @@ import org.apache.tools.ant.taskdefs.condition.Condition; * NOTE: For numeric expressions the type must be set and use xml entities as operations.
* As type we currently support long and double. * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 * */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java index c6a3c87b7..b252935ee 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java @@ -64,7 +64,7 @@ import org.apache.tools.ant.taskdefs.condition.Condition; * * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 * */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java index c9e1b81d5..99aa67d9a 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java @@ -52,7 +52,7 @@ import org.apache.tools.ant.BuildException; * These tasks require Ant 1.6 or later interface. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java index 01b0692f9..7004aef6d 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java @@ -87,7 +87,7 @@ import org.apache.tools.ant.BuildException; * These tasks require Ant 1.6 or later interface. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java index 399c7e49f..e49acddab 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java @@ -56,7 +56,7 @@ import org.apache.tools.ant.BuildException; * These tasks require Ant 1.6 or later interface. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index ef7d8fe64..5f0593080 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -58,7 +58,7 @@ import org.apache.tools.ant.BuildException; * These tasks require Ant 1.6 or later interface. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java index d92ef78ac..b86112a86 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java @@ -85,7 +85,7 @@ import org.apache.tools.ant.Project; * : These tasks require Ant 1.6 or later interface. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.10 */ diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index e98dd8ef9..775362c5b 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -70,7 +70,7 @@ import org.apache.juli.logging.LogFactory; * requests. Requests of any other type will simply be passed through. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java b/java/org/apache/catalina/authenticator/BasicAuthenticator.java index 95a0a29b9..a325771c1 100644 --- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java +++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java @@ -41,7 +41,7 @@ import org.apache.tomcat.util.buf.MessageBytes; * and Digest Access Authentication." * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class BasicAuthenticator diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java index 399eef0ed..4886c657e 100644 --- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java +++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java @@ -44,7 +44,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class DigestAuthenticator diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java b/java/org/apache/catalina/authenticator/FormAuthenticator.java index 99c7038b6..4b31f7f50 100644 --- a/java/org/apache/catalina/authenticator/FormAuthenticator.java +++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java @@ -50,7 +50,7 @@ import org.apache.tomcat.util.http.MimeHeaders; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class FormAuthenticator diff --git a/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java b/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java index 749a38af8..d97afb8f3 100644 --- a/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java +++ b/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java @@ -33,7 +33,7 @@ import org.apache.catalina.deploy.LoginConfig; * only security constraints not involving user authentication. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class NonLoginAuthenticator diff --git a/java/org/apache/catalina/authenticator/SSLAuthenticator.java b/java/org/apache/catalina/authenticator/SSLAuthenticator.java index 0bc2e0d16..e703c752e 100644 --- a/java/org/apache/catalina/authenticator/SSLAuthenticator.java +++ b/java/org/apache/catalina/authenticator/SSLAuthenticator.java @@ -37,7 +37,7 @@ import org.apache.catalina.deploy.LoginConfig; * that utilizes SSL certificates to identify client users. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class SSLAuthenticator diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java b/java/org/apache/catalina/authenticator/SavedRequest.java index dcde172a4..6d76a02b7 100644 --- a/java/org/apache/catalina/authenticator/SavedRequest.java +++ b/java/org/apache/catalina/authenticator/SavedRequest.java @@ -39,7 +39,7 @@ import org.apache.tomcat.util.buf.ByteChunk; * internal collection classes is performed. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class SavedRequest { diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java index 026d7585b..c5b4b9c01 100644 --- a/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -55,7 +55,7 @@ import org.apache.catalina.valves.ValveBase; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class SingleSignOn extends ValveBase implements SessionListener { diff --git a/java/org/apache/catalina/connector/ClientAbortException.java b/java/org/apache/catalina/connector/ClientAbortException.java index 53c52a708..d5e246750 100644 --- a/java/org/apache/catalina/connector/ClientAbortException.java +++ b/java/org/apache/catalina/connector/ClientAbortException.java @@ -25,7 +25,7 @@ import java.io.IOException; * of a request by a remote client. * * @author Glenn L. Nielsen - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ClientAbortException extends IOException { diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java index 92c49a50c..65f901c01 100644 --- a/java/org/apache/catalina/connector/Connector.java +++ b/java/org/apache/catalina/connector/Connector.java @@ -46,7 +46,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 7ba0610e0..1a9e74c50 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -53,7 +53,7 @@ import org.apache.tomcat.util.net.SocketStatus; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class CoyoteAdapter implements Adapter { diff --git a/java/org/apache/catalina/connector/CoyotePrincipal.java b/java/org/apache/catalina/connector/CoyotePrincipal.java index 1341c6993..c49d7d517 100644 --- a/java/org/apache/catalina/connector/CoyotePrincipal.java +++ b/java/org/apache/catalina/connector/CoyotePrincipal.java @@ -25,7 +25,7 @@ import java.security.Principal; * is used to represent principals authenticated at the protocol handler level. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class CoyotePrincipal diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index d15d7ff7c..36503cd12 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -97,7 +97,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Remy Maucherat * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class Request diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java index f3ed48bd0..3ea889074 100644 --- a/java/org/apache/catalina/connector/RequestFacade.java +++ b/java/org/apache/catalina/connector/RequestFacade.java @@ -54,7 +54,7 @@ import org.apache.catalina.security.SecurityUtil; * @author Craig R. McClanahan * @author Remy Maucherat * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ @SuppressWarnings("deprecation") diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 2e62653ef..32b9954f1 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -61,7 +61,7 @@ import org.apache.tomcat.util.net.URL; * * @author Remy Maucherat * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class Response diff --git a/java/org/apache/catalina/connector/ResponseFacade.java b/java/org/apache/catalina/connector/ResponseFacade.java index 0083acfa0..e7394deab 100644 --- a/java/org/apache/catalina/connector/ResponseFacade.java +++ b/java/org/apache/catalina/connector/ResponseFacade.java @@ -41,7 +41,7 @@ import org.apache.catalina.security.SecurityUtil; * * @author Remy Maucherat * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ @SuppressWarnings("deprecation") public class ResponseFacade diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java index 5a86c4823..d25302e83 100644 --- a/java/org/apache/catalina/core/ApplicationContext.java +++ b/java/org/apache/catalina/core/ApplicationContext.java @@ -87,7 +87,7 @@ import org.apache.catalina.Globals; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class ApplicationContext diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java b/java/org/apache/catalina/core/ApplicationContextFacade.java index 4e1f5f794..4541abb8e 100644 --- a/java/org/apache/catalina/core/ApplicationContextFacade.java +++ b/java/org/apache/catalina/core/ApplicationContextFacade.java @@ -55,7 +55,7 @@ import org.apache.catalina.security.SecurityUtil; * * @author Remy Maucherat * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ApplicationContextFacade diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java index 3324c70df..b30c4b0cd 100644 --- a/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -62,7 +62,7 @@ import org.apache.tomcat.util.res.StringManager; * javax.servlet.ServletResponseWrapper. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ final class ApplicationDispatcher diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 438d92c92..24cc30528 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -50,7 +50,7 @@ import org.apache.tomcat.util.res.StringManager; * method itself. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ final class ApplicationFilterChain implements FilterChain, CometFilterChain { diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java index 205568f86..283af9616 100644 --- a/java/org/apache/catalina/core/ApplicationFilterConfig.java +++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java @@ -52,7 +52,7 @@ import org.apache.tomcat.util.modeler.Registry; * is first started. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ApplicationFilterConfig implements FilterConfig, Serializable { diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java index 9079d8011..a38b6c8e3 100644 --- a/java/org/apache/catalina/core/ApplicationHttpRequest.java +++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java @@ -56,7 +56,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ class ApplicationHttpRequest extends HttpServletRequestWrapper { diff --git a/java/org/apache/catalina/core/ApplicationHttpResponse.java b/java/org/apache/catalina/core/ApplicationHttpResponse.java index 6ef81647c..17f300fbf 100644 --- a/java/org/apache/catalina/core/ApplicationHttpResponse.java +++ b/java/org/apache/catalina/core/ApplicationHttpResponse.java @@ -42,7 +42,7 @@ import org.apache.tomcat.util.res.StringManager; * keep these two classes in synchronization when making changes! * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ class ApplicationHttpResponse extends HttpServletResponseWrapper { diff --git a/java/org/apache/catalina/core/ApplicationRequest.java b/java/org/apache/catalina/core/ApplicationRequest.java index 7775706c2..b260e443e 100644 --- a/java/org/apache/catalina/core/ApplicationRequest.java +++ b/java/org/apache/catalina/core/ApplicationRequest.java @@ -43,7 +43,7 @@ import org.apache.tomcat.util.res.StringManager; * keep these two classes in synchronization when making changes! * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ class ApplicationRequest extends ServletRequestWrapper { diff --git a/java/org/apache/catalina/core/ApplicationResponse.java b/java/org/apache/catalina/core/ApplicationResponse.java index 845972dec..3c40b200e 100644 --- a/java/org/apache/catalina/core/ApplicationResponse.java +++ b/java/org/apache/catalina/core/ApplicationResponse.java @@ -40,7 +40,7 @@ import org.apache.tomcat.util.res.StringManager; * keep these two classes in synchronization when making changes! * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ class ApplicationResponse extends ServletResponseWrapper { diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index be188e180..e81ab5826 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -38,7 +38,7 @@ import org.apache.tomcat.jni.Library; * * @author Remy Maucherat * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java index 4b0e3bc01..06c1c2606 100644 --- a/java/org/apache/catalina/core/DefaultInstanceManager.java +++ b/java/org/apache/catalina/core/DefaultInstanceManager.java @@ -52,7 +52,7 @@ import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.InstanceManager; /** - * @version $Rev$ $Date$ + * @version $Id$ */ public class DefaultInstanceManager implements InstanceManager { diff --git a/java/org/apache/catalina/core/DummyRequest.java b/java/org/apache/catalina/core/DummyRequest.java index bf5802f18..44d6a4117 100644 --- a/java/org/apache/catalina/core/DummyRequest.java +++ b/java/org/apache/catalina/core/DummyRequest.java @@ -59,7 +59,7 @@ import org.apache.tomcat.util.buf.MessageBytes; * JSP precompilation. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class DummyRequest diff --git a/java/org/apache/catalina/core/DummyResponse.java b/java/org/apache/catalina/core/DummyResponse.java index 6ca847bd1..fb22b6c2a 100644 --- a/java/org/apache/catalina/core/DummyResponse.java +++ b/java/org/apache/catalina/core/DummyResponse.java @@ -39,7 +39,7 @@ import org.apache.catalina.connector.Request; * Dummy response object, used for JSP precompilation. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class DummyResponse diff --git a/java/org/apache/catalina/core/JasperListener.java b/java/org/apache/catalina/core/JasperListener.java index def74db30..4486b1fb2 100644 --- a/java/org/apache/catalina/core/JasperListener.java +++ b/java/org/apache/catalina/core/JasperListener.java @@ -31,7 +31,7 @@ import org.apache.juli.logging.LogFactory; * started. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java index 94a9518b4..8d5640ee0 100644 --- a/java/org/apache/catalina/core/NamingContextListener.java +++ b/java/org/apache/catalina/core/NamingContextListener.java @@ -75,7 +75,7 @@ import org.apache.tomcat.util.modeler.Registry; * with each context and server. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class NamingContextListener diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 3db671887..df4f06911 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -120,7 +120,7 @@ import org.apache.tomcat.util.scan.StandardJarScanner; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardContext diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java index 71935891a..71aeaa1de 100644 --- a/java/org/apache/catalina/core/StandardContextValve.java +++ b/java/org/apache/catalina/core/StandardContextValve.java @@ -45,7 +45,7 @@ import org.apache.tomcat.util.buf.MessageBytes; * when processing HTTP requests. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ final class StandardContextValve diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java index d1d5172da..1a72d3600 100644 --- a/java/org/apache/catalina/core/StandardEngine.java +++ b/java/org/apache/catalina/core/StandardEngine.java @@ -47,7 +47,7 @@ import org.apache.tomcat.util.modeler.modules.MbeansSource; * You can set the jvmRoute direct or with the System.property jvmRoute. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardEngine diff --git a/java/org/apache/catalina/core/StandardEngineValve.java b/java/org/apache/catalina/core/StandardEngineValve.java index d181ca1ff..ebc00ccaf 100644 --- a/java/org/apache/catalina/core/StandardEngineValve.java +++ b/java/org/apache/catalina/core/StandardEngineValve.java @@ -40,7 +40,7 @@ import org.apache.catalina.valves.ValveBase; * when processing HTTP requests. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ final class StandardEngineValve diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java index fffe1c178..657b39c20 100644 --- a/java/org/apache/catalina/core/StandardHost.java +++ b/java/org/apache/catalina/core/StandardHost.java @@ -49,7 +49,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardHost diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java index 6ebf5d45b..d0757a865 100644 --- a/java/org/apache/catalina/core/StandardHostValve.java +++ b/java/org/apache/catalina/core/StandardHostValve.java @@ -50,7 +50,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ final class StandardHostValve diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java index 2d79adf40..c933ce2d9 100644 --- a/java/org/apache/catalina/core/StandardServer.java +++ b/java/org/apache/catalina/core/StandardServer.java @@ -54,7 +54,7 @@ import org.apache.tomcat.util.modeler.Registry; * (but not required) when deploying and starting Catalina. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class StandardServer extends LifecycleBase implements Server, MBeanRegistration { diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index 95c239747..b61645292 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -74,7 +74,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardWrapper extends ContainerBase diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java b/java/org/apache/catalina/core/StandardWrapperFacade.java index fe58e50b2..e209a4739 100644 --- a/java/org/apache/catalina/core/StandardWrapperFacade.java +++ b/java/org/apache/catalina/core/StandardWrapperFacade.java @@ -29,7 +29,7 @@ import javax.servlet.ServletContext; * Facade for the StandardWrapper object. * * @author Remy Maucharat - * @version $Revision$ $Date$ + * @version $Id$ */ public final class StandardWrapperFacade diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index 6d11baccc..991e39ec5 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -46,7 +46,7 @@ import org.apache.tomcat.util.log.SystemLogHandler; * StandardWrapper container implementation. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ final class StandardWrapperValve diff --git a/java/org/apache/catalina/deploy/ApplicationParameter.java b/java/org/apache/catalina/deploy/ApplicationParameter.java index 884c983d7..02ce79119 100644 --- a/java/org/apache/catalina/deploy/ApplicationParameter.java +++ b/java/org/apache/catalina/deploy/ApplicationParameter.java @@ -29,7 +29,7 @@ import java.io.Serializable; * to modify the application deployment descriptor itself. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ApplicationParameter implements Serializable { diff --git a/java/org/apache/catalina/deploy/ContextEjb.java b/java/org/apache/catalina/deploy/ContextEjb.java index 808dab0c8..b4451e142 100644 --- a/java/org/apache/catalina/deploy/ContextEjb.java +++ b/java/org/apache/catalina/deploy/ContextEjb.java @@ -26,7 +26,7 @@ package org.apache.catalina.deploy; * * @author Craig R. McClanahan * @author Peter Rossbach (pero@apache.org) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextEjb extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextEnvironment.java b/java/org/apache/catalina/deploy/ContextEnvironment.java index 70f2b4a0f..127d4f3ca 100644 --- a/java/org/apache/catalina/deploy/ContextEnvironment.java +++ b/java/org/apache/catalina/deploy/ContextEnvironment.java @@ -24,7 +24,7 @@ package org.apache.catalina.deploy; * an <env-entry> element in the deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextEnvironment extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextLocalEjb.java b/java/org/apache/catalina/deploy/ContextLocalEjb.java index 20b50ad8e..0b2617f51 100644 --- a/java/org/apache/catalina/deploy/ContextLocalEjb.java +++ b/java/org/apache/catalina/deploy/ContextLocalEjb.java @@ -26,7 +26,7 @@ package org.apache.catalina.deploy; * * @author Craig R. McClanahan * @author Peter Rossbach (pero@apache.org) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextLocalEjb extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextResource.java b/java/org/apache/catalina/deploy/ContextResource.java index fae943ee1..e53eea2ad 100644 --- a/java/org/apache/catalina/deploy/ContextResource.java +++ b/java/org/apache/catalina/deploy/ContextResource.java @@ -26,7 +26,7 @@ package org.apache.catalina.deploy; * * @author Craig R. McClanahan * @author Peter Rossbach (pero@apache.org) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextResource extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextResourceEnvRef.java b/java/org/apache/catalina/deploy/ContextResourceEnvRef.java index 3e96e8d96..fe46c2718 100644 --- a/java/org/apache/catalina/deploy/ContextResourceEnvRef.java +++ b/java/org/apache/catalina/deploy/ContextResourceEnvRef.java @@ -25,7 +25,7 @@ package org.apache.catalina.deploy; * * @author Craig R. McClanahan * @author Peter Rossbach (pero@apache.org) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextResourceEnvRef extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextResourceLink.java b/java/org/apache/catalina/deploy/ContextResourceLink.java index 76dd54bb8..f295f203b 100644 --- a/java/org/apache/catalina/deploy/ContextResourceLink.java +++ b/java/org/apache/catalina/deploy/ContextResourceLink.java @@ -26,7 +26,7 @@ package org.apache.catalina.deploy; * * @author Remy Maucherat * @author Peter Rossbach (Peter Rossbach (pero@apache.org)) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextResourceLink extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java index d451a7034..c61cd5b09 100644 --- a/java/org/apache/catalina/deploy/ContextService.java +++ b/java/org/apache/catalina/deploy/ContextService.java @@ -27,7 +27,7 @@ import java.util.HashMap; * deployment descriptor. * * @author Fabien Carrion - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextService extends ResourceBase { diff --git a/java/org/apache/catalina/deploy/ContextTransaction.java b/java/org/apache/catalina/deploy/ContextTransaction.java index 2968bf900..7fe2e5a1f 100644 --- a/java/org/apache/catalina/deploy/ContextTransaction.java +++ b/java/org/apache/catalina/deploy/ContextTransaction.java @@ -28,7 +28,7 @@ import java.util.Iterator; * an <res-env-refy> element in the deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextTransaction implements Serializable { diff --git a/java/org/apache/catalina/deploy/ErrorPage.java b/java/org/apache/catalina/deploy/ErrorPage.java index f83ad2cb7..8c90403d3 100644 --- a/java/org/apache/catalina/deploy/ErrorPage.java +++ b/java/org/apache/catalina/deploy/ErrorPage.java @@ -29,7 +29,7 @@ import java.io.Serializable; * deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ErrorPage implements Serializable { diff --git a/java/org/apache/catalina/deploy/FilterDef.java b/java/org/apache/catalina/deploy/FilterDef.java index 3b1d13254..4b9a32f0f 100644 --- a/java/org/apache/catalina/deploy/FilterDef.java +++ b/java/org/apache/catalina/deploy/FilterDef.java @@ -31,7 +31,7 @@ import javax.servlet.Filter; * in a <filter> element in the deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class FilterDef implements Serializable { diff --git a/java/org/apache/catalina/deploy/FilterMap.java b/java/org/apache/catalina/deploy/FilterMap.java index d81e599a8..a93e83b94 100644 --- a/java/org/apache/catalina/deploy/FilterMap.java +++ b/java/org/apache/catalina/deploy/FilterMap.java @@ -33,7 +33,7 @@ import javax.servlet.DispatcherType; * a URL pattern or a servlet name. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class FilterMap implements Serializable { diff --git a/java/org/apache/catalina/deploy/InjectionTarget.java b/java/org/apache/catalina/deploy/InjectionTarget.java index d5fb0451b..53003f6ca 100644 --- a/java/org/apache/catalina/deploy/InjectionTarget.java +++ b/java/org/apache/catalina/deploy/InjectionTarget.java @@ -21,7 +21,7 @@ package org.apache.catalina.deploy; /** - * @version $Rev$ $Date$ + * @version $Id$ */ public class InjectionTarget { private String targetClass; diff --git a/java/org/apache/catalina/deploy/LoginConfig.java b/java/org/apache/catalina/deploy/LoginConfig.java index 67ce86ce0..1f8e28cd4 100644 --- a/java/org/apache/catalina/deploy/LoginConfig.java +++ b/java/org/apache/catalina/deploy/LoginConfig.java @@ -29,7 +29,7 @@ import java.io.Serializable; * deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class LoginConfig implements Serializable { diff --git a/java/org/apache/catalina/deploy/MessageDestination.java b/java/org/apache/catalina/deploy/MessageDestination.java index f10cb9285..aba7013cf 100644 --- a/java/org/apache/catalina/deploy/MessageDestination.java +++ b/java/org/apache/catalina/deploy/MessageDestination.java @@ -25,7 +25,7 @@ package org.apache.catalina.deploy; * in the deployment descriptor.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since Tomcat 5.0 */ diff --git a/java/org/apache/catalina/deploy/MessageDestinationRef.java b/java/org/apache/catalina/deploy/MessageDestinationRef.java index 51fdfdf7c..c38672009 100644 --- a/java/org/apache/catalina/deploy/MessageDestinationRef.java +++ b/java/org/apache/catalina/deploy/MessageDestinationRef.java @@ -25,7 +25,7 @@ package org.apache.catalina.deploy; * in the deployment descriptor.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since Tomcat 5.0 */ diff --git a/java/org/apache/catalina/deploy/NamingResources.java b/java/org/apache/catalina/deploy/NamingResources.java index b7e3280da..770f3ebe5 100644 --- a/java/org/apache/catalina/deploy/NamingResources.java +++ b/java/org/apache/catalina/deploy/NamingResources.java @@ -35,7 +35,7 @@ import org.apache.catalina.Server; * Naming Context and their associated JNDI context. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class NamingResources implements Serializable { diff --git a/java/org/apache/catalina/deploy/ResourceBase.java b/java/org/apache/catalina/deploy/ResourceBase.java index 4602b2913..cb7b74c34 100644 --- a/java/org/apache/catalina/deploy/ResourceBase.java +++ b/java/org/apache/catalina/deploy/ResourceBase.java @@ -29,7 +29,7 @@ import java.util.ArrayList; * Representation of an Context element * * @author Peter Rossbach (pero@apache.org) - * @version $Revision$ $Date$ + * @version $Id$ */ public class ResourceBase implements Serializable, Injectable { diff --git a/java/org/apache/catalina/deploy/SecurityCollection.java b/java/org/apache/catalina/deploy/SecurityCollection.java index b2d0f7469..05fa12b78 100644 --- a/java/org/apache/catalina/deploy/SecurityCollection.java +++ b/java/org/apache/catalina/deploy/SecurityCollection.java @@ -36,7 +36,7 @@ import java.io.Serializable; * this class is synchronized. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class SecurityCollection implements Serializable { diff --git a/java/org/apache/catalina/deploy/SecurityConstraint.java b/java/org/apache/catalina/deploy/SecurityConstraint.java index f927d48f8..bb69a3eac 100644 --- a/java/org/apache/catalina/deploy/SecurityConstraint.java +++ b/java/org/apache/catalina/deploy/SecurityConstraint.java @@ -43,7 +43,7 @@ import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic; * this class is synchronized. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class SecurityConstraint implements Serializable { diff --git a/java/org/apache/catalina/deploy/SecurityRoleRef.java b/java/org/apache/catalina/deploy/SecurityRoleRef.java index 01f0720c7..c2d270ca4 100644 --- a/java/org/apache/catalina/deploy/SecurityRoleRef.java +++ b/java/org/apache/catalina/deploy/SecurityRoleRef.java @@ -25,7 +25,7 @@ package org.apache.catalina.deploy; * in the deployment descriptor.

* * @author Mark Thomas - * @version $Revision$ $Date$ + * @version $Id$ * @since Tomcat 5.5 */ diff --git a/java/org/apache/catalina/filters/Constants.java b/java/org/apache/catalina/filters/Constants.java index 76ed31c21..6b0cd511b 100644 --- a/java/org/apache/catalina/filters/Constants.java +++ b/java/org/apache/catalina/filters/Constants.java @@ -24,7 +24,7 @@ package org.apache.catalina.filters; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Constants { diff --git a/java/org/apache/catalina/ha/CatalinaCluster.java b/java/org/apache/catalina/ha/CatalinaCluster.java index 884b882c4..5c629e0ff 100644 --- a/java/org/apache/catalina/ha/CatalinaCluster.java +++ b/java/org/apache/catalina/ha/CatalinaCluster.java @@ -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 { diff --git a/java/org/apache/catalina/ha/ClusterDeployer.java b/java/org/apache/catalina/ha/ClusterDeployer.java index 4d38eec17..9bfaf9602 100644 --- a/java/org/apache/catalina/ha/ClusterDeployer.java +++ b/java/org/apache/catalina/ha/ClusterDeployer.java @@ -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; diff --git a/java/org/apache/catalina/ha/ClusterListener.java b/java/org/apache/catalina/ha/ClusterListener.java index 89e75d635..4df3cf3c9 100644 --- a/java/org/apache/catalina/ha/ClusterListener.java +++ b/java/org/apache/catalina/ha/ClusterListener.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Peter Rossbach * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class ClusterListener implements ChannelListener { diff --git a/java/org/apache/catalina/ha/ClusterRuleSet.java b/java/org/apache/catalina/ha/ClusterRuleSet.java index 8592a482c..167c2af62 100644 --- a/java/org/apache/catalina/ha/ClusterRuleSet.java +++ b/java/org/apache/catalina/ha/ClusterRuleSet.java @@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * * @author Filip Hanik * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class ClusterRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/ha/ClusterValve.java b/java/org/apache/catalina/ha/ClusterValve.java index f2f268e9f..f33efb625 100644 --- a/java/org/apache/catalina/ha/ClusterValve.java +++ b/java/org/apache/catalina/ha/ClusterValve.java @@ -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{ /** diff --git a/java/org/apache/catalina/ha/Constants.java b/java/org/apache/catalina/ha/Constants.java index bbbf6ff97..cc59d526b 100644 --- a/java/org/apache/catalina/ha/Constants.java +++ b/java/org/apache/catalina/ha/Constants.java @@ -23,7 +23,7 @@ package org.apache.catalina.ha; * package. * * @author Bip Thelin - * @version $Revision$, $Date$ + * @version $Id$ */ public final class Constants { diff --git a/java/org/apache/catalina/ha/session/ClusterManagerBase.java b/java/org/apache/catalina/ha/session/ClusterManagerBase.java index 90a50f176..1d8208828 100644 --- a/java/org/apache/catalina/ha/session/ClusterManagerBase.java +++ b/java/org/apache/catalina/ha/session/ClusterManagerBase.java @@ -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{ diff --git a/java/org/apache/catalina/ha/session/ClusterSessionListener.java b/java/org/apache/catalina/ha/session/ClusterSessionListener.java index e41273f0a..f4148846f 100644 --- a/java/org/apache/catalina/ha/session/ClusterSessionListener.java +++ b/java/org/apache/catalina/ha/session/ClusterSessionListener.java @@ -25,7 +25,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 { diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index d88ebd065..4b78a674d 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -63,7 +63,7 @@ import org.apache.catalina.ha.ClusterManager; * @author Craig R. McClanahan * @author Jean-Francois Arcand * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class DeltaManager extends ClusterManagerBase{ diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java index fd70a4446..105bc4457 100644 --- a/java/org/apache/catalina/ha/session/DeltaSession.java +++ b/java/org/apache/catalina/ha/session/DeltaSession.java @@ -57,7 +57,7 @@ import java.util.concurrent.atomic.AtomicInteger; * track of deltas during a request. * * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public class DeltaSession extends StandardSession implements Externalizable,ClusterSession,ReplicatedMapEntry { diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java index 410e04361..49eb0d4ae 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java +++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java @@ -90,7 +90,7 @@ import org.apache.catalina.valves.ValveBase; * requested sessions are migrated. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class JvmRouteBinderValve extends ValveBase implements ClusterValve { diff --git a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java index b506895a6..a78448955 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java +++ b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java @@ -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 { diff --git a/java/org/apache/catalina/ha/session/ReplicatedSession.java b/java/org/apache/catalina/ha/session/ReplicatedSession.java index 632668c49..995425e90 100644 --- a/java/org/apache/catalina/ha/session/ReplicatedSession.java +++ b/java/org/apache/catalina/ha/session/ReplicatedSession.java @@ -18,6 +18,12 @@ package org.apache.catalina.ha.session; +import org.apache.catalina.Manager; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.security.Principal; + /** * Title: Tomcat Session Replication for Tomcat 4.0
* Description: A very simple straight forward implementation of @@ -29,9 +35,8 @@ package org.apache.catalina.ha.session; * A full description of this implementation can be found under * Filip's Tomcat Page
* - * Copyright: See apache license - * @author Filip Hanik - * @version $Revision$ $Date$ + * Copyright: See apache license
+ * * Description:
* The ReplicatedSession class is a simple extension of the StandardSession class * It overrides a few methods (setAttribute, removeAttribute, expire, access) and has @@ -39,13 +44,9 @@ package org.apache.catalina.ha.session; * 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; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.security.Principal; - public class ReplicatedSession extends org.apache.catalina.session.StandardSession implements org.apache.catalina.ha.ClusterSession{ diff --git a/java/org/apache/catalina/ha/session/SerializablePrincipal.java b/java/org/apache/catalina/ha/session/SerializablePrincipal.java index 90bbaf33e..f56ada612 100644 --- a/java/org/apache/catalina/ha/session/SerializablePrincipal.java +++ b/java/org/apache/catalina/ha/session/SerializablePrincipal.java @@ -40,7 +40,7 @@ import org.apache.tomcat.util.res.StringManager; * 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 { diff --git a/java/org/apache/catalina/ha/session/SessionIDMessage.java b/java/org/apache/catalina/ha/session/SessionIDMessage.java index 52d80addd..24da67e2b 100644 --- a/java/org/apache/catalina/ha/session/SessionIDMessage.java +++ b/java/org/apache/catalina/ha/session/SessionIDMessage.java @@ -23,7 +23,7 @@ import org.apache.catalina.ha.ClusterMessageBase; * * @author Peter Rossbach * - * @version $Revision$ $Date$ + * @version $Id$ */ public class SessionIDMessage extends ClusterMessageBase { diff --git a/java/org/apache/catalina/ha/session/SessionMessageImpl.java b/java/org/apache/catalina/ha/session/SessionMessageImpl.java index 6550bc25c..587598295 100644 --- a/java/org/apache/catalina/ha/session/SessionMessageImpl.java +++ b/java/org/apache/catalina/ha/session/SessionMessageImpl.java @@ -25,7 +25,7 @@ import org.apache.catalina.ha.ClusterMessageBase; * @author Filip Hanik * @author Peter Rossbach * - * @version $Revision$ $Date$ + * @version $Id$ */ public class SessionMessageImpl extends ClusterMessageBase implements SessionMessage { diff --git a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java index 989f3eab2..38d011f12 100644 --- a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java +++ b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java @@ -44,11 +44,9 @@ import org.apache.catalina.Loader; * A full description of this implementation can be found under * Filip's Tomcat Page
* - * Copyright: See apache license - * Company: www.filip.net - * @author Filip Hanik - * @author Bela Ban (modifications for synchronous replication) - * @version 1.0 for TC 4.0 + * Copyright: See apache license
+ * Company: www.filip.net
+ * * Description: The InMemoryReplicationManager is a session manager that replicated * session information in memory. *

@@ -59,6 +57,10 @@ import org.apache.catalina.Loader; * all defined in the SessionMessage class.
* 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 Filip Hanik + * @author Bela Ban (modifications for synchronous replication) + * @version 1.0 for TC 4.0 */ public class SimpleTcpReplicationManager extends StandardManager implements ClusterManager { diff --git a/java/org/apache/catalina/ha/tcp/Constants.java b/java/org/apache/catalina/ha/tcp/Constants.java index 6d3f7a6ac..35d1725d0 100644 --- a/java/org/apache/catalina/ha/tcp/Constants.java +++ b/java/org/apache/catalina/ha/tcp/Constants.java @@ -23,7 +23,7 @@ package org.apache.catalina.ha.tcp; * package. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class Constants { diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index bd4146e66..4bbb34ad8 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -57,7 +57,7 @@ import org.apache.catalina.valves.ValveBase; * @author Craig R. McClanahan * @author Filip Hanik * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class ReplicationValve diff --git a/java/org/apache/catalina/ha/tcp/SendMessageData.java b/java/org/apache/catalina/ha/tcp/SendMessageData.java index 53ba2f49c..097ddf29f 100644 --- a/java/org/apache/catalina/ha/tcp/SendMessageData.java +++ b/java/org/apache/catalina/ha/tcp/SendMessageData.java @@ -21,7 +21,7 @@ import org.apache.catalina.tribes.Member; /** * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class SendMessageData { diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 0c8bee9c6..eb6eb15e5 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -70,7 +70,7 @@ import org.apache.catalina.ha.jmx.ClusterJmxHelper; * @author Filip Hanik * @author Remy Maucherat * @author Peter Rossbach - * @version $Revision$, $Date$ + * @version $Id$ */ public class SimpleTcpCluster extends LifecycleBase implements CatalinaCluster, LifecycleListener, IDynamicProperty, diff --git a/java/org/apache/catalina/ha/util/IDynamicProperty.java b/java/org/apache/catalina/ha/util/IDynamicProperty.java index 9e0b99f1d..f3cee1cfc 100644 --- a/java/org/apache/catalina/ha/util/IDynamicProperty.java +++ b/java/org/apache/catalina/ha/util/IDynamicProperty.java @@ -21,7 +21,7 @@ import java.util.Iterator; /** * @author Peter Rossbach - * @version $Revision$, $Date$ + * @version $Id$ */ public interface IDynamicProperty { diff --git a/java/org/apache/catalina/loader/ResourceEntry.java b/java/org/apache/catalina/loader/ResourceEntry.java index 5fd178635..8938d2ed5 100644 --- a/java/org/apache/catalina/loader/ResourceEntry.java +++ b/java/org/apache/catalina/loader/ResourceEntry.java @@ -26,7 +26,7 @@ import java.util.jar.Manifest; * Resource entry. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class ResourceEntry { diff --git a/java/org/apache/catalina/loader/StandardClassLoader.java b/java/org/apache/catalina/loader/StandardClassLoader.java index 7af05709f..0e63346c2 100644 --- a/java/org/apache/catalina/loader/StandardClassLoader.java +++ b/java/org/apache/catalina/loader/StandardClassLoader.java @@ -27,7 +27,7 @@ import java.net.URLClassLoader; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardClassLoader diff --git a/java/org/apache/catalina/loader/StandardClassLoaderMBean.java b/java/org/apache/catalina/loader/StandardClassLoaderMBean.java index db9a884a0..cc5826447 100644 --- a/java/org/apache/catalina/loader/StandardClassLoaderMBean.java +++ b/java/org/apache/catalina/loader/StandardClassLoaderMBean.java @@ -22,7 +22,7 @@ package org.apache.catalina.loader; * MBean interface for StandardClassLoader, to allow JMX remote management. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public interface StandardClassLoaderMBean { } diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java index 484d6cfcd..6577c9be9 100644 --- a/java/org/apache/catalina/loader/WebappClassLoader.java +++ b/java/org/apache/catalina/loader/WebappClassLoader.java @@ -115,7 +115,7 @@ import org.apache.tomcat.util.IntrospectionUtils; * * @author Remy Maucherat * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class WebappClassLoader extends URLClassLoader diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java index aaaaea155..149bf9f3c 100644 --- a/java/org/apache/catalina/loader/WebappLoader.java +++ b/java/org/apache/catalina/loader/WebappLoader.java @@ -77,7 +77,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class WebappLoader extends LifecycleBase diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java index e171bb15b..6ce201062 100644 --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java @@ -71,7 +71,7 @@ import org.apache.tomcat.util.http.fileupload.ParameterParser; * @author Bip Thelin * @author Malcolm Edgar * @author Glenn L. Nielsen -* @version $Revision$, $Date$ +* @version $Id$ * @see ManagerServlet */ diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index 19905ab50..29ee747d9 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -152,7 +152,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class ManagerServlet diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java index 7336ba148..088f52fb6 100644 --- a/java/org/apache/catalina/manager/StatusManagerServlet.java +++ b/java/org/apache/catalina/manager/StatusManagerServlet.java @@ -45,7 +45,7 @@ import org.apache.tomcat.util.modeler.Registry; * This servlet will display a complete status of the HTTP/1.1 connector. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StatusManagerServlet diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java index 17069c95c..d8f2e74ad 100644 --- a/java/org/apache/catalina/manager/StatusTransformer.java +++ b/java/org/apache/catalina/manager/StatusTransformer.java @@ -41,7 +41,7 @@ import org.apache.tomcat.util.ExceptionUtils; * use XSLT, that is unnecessarily complex. * * @author Peter Lin - * @version $Revision$ $Date$ + * @version $Id$ */ public class StatusTransformer { diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java index 362b5d44c..e5bcda497 100644 --- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java @@ -57,7 +57,7 @@ import org.apache.catalina.util.ServerInfo; * @author Malcolm Edgar * @author Glenn L. Nielsen * @author Peter Rossbach -* @version $Revision$, $Date$ +* @version $Id$ * @see ManagerServlet */ diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java index e3167a0b3..5d0a46ca1 100644 --- a/java/org/apache/catalina/manager/host/HostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java @@ -88,7 +88,7 @@ import org.apache.catalina.core.ContainerBase; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class HostManagerServlet diff --git a/java/org/apache/catalina/mbeans/ClassNameMBean.java b/java/org/apache/catalina/mbeans/ClassNameMBean.java index b36d8a8b9..7821e2d6d 100644 --- a/java/org/apache/catalina/mbeans/ClassNameMBean.java +++ b/java/org/apache/catalina/mbeans/ClassNameMBean.java @@ -34,7 +34,7 @@ import org.apache.tomcat.util.modeler.BaseModelMBean; * qualified class name of the managed object as its value.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ClassNameMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/ConnectorMBean.java b/java/org/apache/catalina/mbeans/ConnectorMBean.java index 1c36a2f82..2fb3df5aa 100644 --- a/java/org/apache/catalina/mbeans/ConnectorMBean.java +++ b/java/org/apache/catalina/mbeans/ConnectorMBean.java @@ -34,7 +34,7 @@ import org.apache.tomcat.util.IntrospectionUtils; * org.apache.coyote.tomcat5.CoyoteConnector component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class ConnectorMBean extends ClassNameMBean { diff --git a/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java b/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java index bf584ad77..8ada14e08 100644 --- a/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java +++ b/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java @@ -36,7 +36,7 @@ import org.apache.tomcat.util.modeler.BaseModelMBean; * org.apache.catalina.deploy.ContextEnvironment component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextEnvironmentMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java b/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java index 14cf26734..2419ccd5f 100644 --- a/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java +++ b/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java @@ -36,7 +36,7 @@ import org.apache.tomcat.util.modeler.BaseModelMBean; * org.apache.catalina.deploy.ContextResourceLink component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextResourceLinkMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/ContextResourceMBean.java b/java/org/apache/catalina/mbeans/ContextResourceMBean.java index 461140271..74dcdb655 100644 --- a/java/org/apache/catalina/mbeans/ContextResourceMBean.java +++ b/java/org/apache/catalina/mbeans/ContextResourceMBean.java @@ -36,7 +36,7 @@ import org.apache.tomcat.util.modeler.BaseModelMBean; * org.apache.catalina.deploy.ContextResource component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextResourceMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java index 62cf94b26..1406d85ce 100644 --- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java @@ -43,7 +43,7 @@ import org.apache.tomcat.util.modeler.Registry; * management. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/mbeans/GroupMBean.java b/java/org/apache/catalina/mbeans/GroupMBean.java index a3613c8f7..ff5050032 100644 --- a/java/org/apache/catalina/mbeans/GroupMBean.java +++ b/java/org/apache/catalina/mbeans/GroupMBean.java @@ -39,7 +39,7 @@ import org.apache.tomcat.util.modeler.Registry; * org.apache.catalina.Group component.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class GroupMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java index 66802bc1d..53196e36b 100644 --- a/java/org/apache/catalina/mbeans/MBeanFactory.java +++ b/java/org/apache/catalina/mbeans/MBeanFactory.java @@ -57,7 +57,7 @@ import org.apache.catalina.valves.ValveBase; * org.apache.catalina.core.StandardServer component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class MBeanFactory { diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java index a315a8735..7581774db 100644 --- a/java/org/apache/catalina/mbeans/MBeanUtils.java +++ b/java/org/apache/catalina/mbeans/MBeanUtils.java @@ -65,7 +65,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class MBeanUtils { diff --git a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java index c098d301f..454c3f3f4 100644 --- a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java +++ b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java @@ -40,7 +40,7 @@ import org.apache.tomcat.util.modeler.Registry; * org.apache.catalina.users.MemoryUserDatabase component.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class MemoryUserDatabaseMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/NamingResourcesMBean.java b/java/org/apache/catalina/mbeans/NamingResourcesMBean.java index dfb41489a..49347767d 100644 --- a/java/org/apache/catalina/mbeans/NamingResourcesMBean.java +++ b/java/org/apache/catalina/mbeans/NamingResourcesMBean.java @@ -37,7 +37,7 @@ import org.apache.tomcat.util.modeler.Registry; * org.apache.catalina.deploy.NamingResources component.

* * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class NamingResourcesMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/RoleMBean.java b/java/org/apache/catalina/mbeans/RoleMBean.java index ca2e43067..d47031a1d 100644 --- a/java/org/apache/catalina/mbeans/RoleMBean.java +++ b/java/org/apache/catalina/mbeans/RoleMBean.java @@ -32,7 +32,7 @@ import org.apache.tomcat.util.modeler.Registry; * org.apache.catalina.Role component.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class RoleMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java index 5cd2b70d1..39c0f5c52 100644 --- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java @@ -58,7 +58,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Amy Roh - * @version $Revision$ $Date$ + * @version $Id$ */ public class ServerLifecycleListener diff --git a/java/org/apache/catalina/mbeans/UserMBean.java b/java/org/apache/catalina/mbeans/UserMBean.java index 718bbbef4..ce5328117 100644 --- a/java/org/apache/catalina/mbeans/UserMBean.java +++ b/java/org/apache/catalina/mbeans/UserMBean.java @@ -39,7 +39,7 @@ import org.apache.tomcat.util.modeler.Registry; * org.apache.catalina.User component.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class UserMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/realm/Constants.java b/java/org/apache/catalina/realm/Constants.java index 6507c4245..db836c2a4 100644 --- a/java/org/apache/catalina/realm/Constants.java +++ b/java/org/apache/catalina/realm/Constants.java @@ -24,7 +24,7 @@ package org.apache.catalina.realm; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Constants { diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java b/java/org/apache/catalina/realm/GenericPrincipal.java index 6e6a36884..82824ccb4 100644 --- a/java/org/apache/catalina/realm/GenericPrincipal.java +++ b/java/org/apache/catalina/realm/GenericPrincipal.java @@ -31,7 +31,7 @@ import javax.security.auth.login.LoginContext; * is available for use by Realm implementations. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class GenericPrincipal implements Principal { diff --git a/java/org/apache/catalina/realm/JAASCallbackHandler.java b/java/org/apache/catalina/realm/JAASCallbackHandler.java index 07ace7d46..56a48945e 100644 --- a/java/org/apache/catalina/realm/JAASCallbackHandler.java +++ b/java/org/apache/catalina/realm/JAASCallbackHandler.java @@ -44,7 +44,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Craig R. McClanahan * @author Andrew R. Jaquith - * @version $Revision$ $Date$ + * @version $Id$ */ public class JAASCallbackHandler implements CallbackHandler { diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java index 15bfebbf1..35e8aa5c4 100644 --- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java +++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java @@ -67,7 +67,7 @@ import org.apache.tomcat.util.digester.Digester; * the functionality required of a Realm implementation.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule { diff --git a/java/org/apache/catalina/realm/JAASRealm.java b/java/org/apache/catalina/realm/JAASRealm.java index c6b3d906e..0ee4cbe4c 100644 --- a/java/org/apache/catalina/realm/JAASRealm.java +++ b/java/org/apache/catalina/realm/JAASRealm.java @@ -122,7 +122,7 @@ org.foobar.auth.DatabaseLoginModule REQUIRED * * @author Craig R. McClanahan * @author Yoav Shapira - * @version $Revision$ $Date$ + * @version $Id$ */ public class JAASRealm diff --git a/java/org/apache/catalina/realm/JDBCRealm.java b/java/org/apache/catalina/realm/JDBCRealm.java index f517639f1..d978b76f8 100644 --- a/java/org/apache/catalina/realm/JDBCRealm.java +++ b/java/org/apache/catalina/realm/JDBCRealm.java @@ -48,7 +48,7 @@ import org.apache.tomcat.util.ExceptionUtils; * @author Craig R. McClanahan * @author Carson McDonald * @author Ignacio Ortega -* @version $Revision$ $Date$ +* @version $Id$ */ public class JDBCRealm diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index c20f6fefb..d7f26a3fa 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -169,7 +169,7 @@ import org.apache.tomcat.util.buf.CharChunk; * * @author John Holman * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class JNDIRealm extends RealmBase { diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java index 96df059db..9334f94c9 100644 --- a/java/org/apache/catalina/realm/MemoryRealm.java +++ b/java/org/apache/catalina/realm/MemoryRealm.java @@ -42,7 +42,7 @@ import org.apache.tomcat.util.digester.Digester; * synchronization is performed around accesses to the principals collection. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class MemoryRealm extends RealmBase { diff --git a/java/org/apache/catalina/realm/MemoryRuleSet.java b/java/org/apache/catalina/realm/MemoryRuleSet.java index 66cba134e..08cfebc80 100644 --- a/java/org/apache/catalina/realm/MemoryRuleSet.java +++ b/java/org/apache/catalina/realm/MemoryRuleSet.java @@ -30,7 +30,7 @@ import org.xml.sax.Attributes; * XML file processed by MemoryRealm.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class MemoryRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index d5f6f7718..573db55a2 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -65,7 +65,7 @@ import org.apache.tomcat.util.modeler.Registry; * location) are identical to those currently supported by Tomcat 3.X. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class RealmBase extends LifecycleBase diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java b/java/org/apache/catalina/realm/UserDatabaseRealm.java index 23b949f46..cf1a32a9e 100644 --- a/java/org/apache/catalina/realm/UserDatabaseRealm.java +++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java @@ -43,7 +43,7 @@ import org.apache.catalina.util.LifecycleBase; * of UserDatabase that we should consult.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java index ed1f9756b..589806782 100644 --- a/java/org/apache/catalina/security/SecurityClassLoad.java +++ b/java/org/apache/catalina/security/SecurityClassLoad.java @@ -25,7 +25,7 @@ package org.apache.catalina.security; * * @author Glenn L. Nielsen * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public final class SecurityClassLoad { diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java index 060438bff..018339e2d 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -234,7 +234,7 @@ import org.apache.catalina.util.IOTools; * * @author Martin T Dengler [root@martindengler.com] * @author Amy Roh - * @version $Revision$, $Date$ + * @version $Id$ * @since Tomcat 4.0 * */ @@ -636,7 +636,7 @@ public final class CGIServlet extends HttpServlet { *

*

* - * @version $Revision$, $Date$ + * @version $Id$ * @since Tomcat 4.0 * */ @@ -1380,7 +1380,7 @@ public final class CGIServlet extends HttpServlet { * and setResponse methods, respectively. *

* - * @version $Revision$, $Date$ + * @version $Id$ */ protected class CGIRunner { diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index b94dbed0f..ca1133111 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -75,7 +75,7 @@ import org.apache.naming.resources.ResourceAttributes; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class DefaultServlet diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java index 5c033eed7..c314de894 100644 --- a/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/java/org/apache/catalina/servlets/WebdavServlet.java @@ -113,7 +113,7 @@ import org.xml.sax.SAXException; * http://host:port/context/webdavedit/content * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class WebdavServlet diff --git a/java/org/apache/catalina/session/FileStore.java b/java/org/apache/catalina/session/FileStore.java index 28da3441f..06ff96902 100644 --- a/java/org/apache/catalina/session/FileStore.java +++ b/java/org/apache/catalina/session/FileStore.java @@ -45,7 +45,7 @@ import org.apache.catalina.util.CustomObjectInputStream; * saved are still subject to being expired based on inactivity. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class FileStore extends StoreBase { diff --git a/java/org/apache/catalina/session/JDBCStore.java b/java/org/apache/catalina/session/JDBCStore.java index a2f6c37b2..37a7a15f2 100644 --- a/java/org/apache/catalina/session/JDBCStore.java +++ b/java/org/apache/catalina/session/JDBCStore.java @@ -47,7 +47,7 @@ import java.util.Properties; * saved are still subject to being expired based on inactivity. * * @author Bip Thelin - * @version $Revision$, $Date$ + * @version $Id$ */ public class JDBCStore extends StoreBase { diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index 1eebb6044..2c19d60b0 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -63,7 +63,7 @@ import org.apache.tomcat.util.modeler.Registry; * be subclassed to create more sophisticated Manager implementations. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class ManagerBase extends LifecycleBase diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index 41066a1e5..d9bac7b70 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -50,7 +50,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class PersistentManagerBase extends ManagerBase diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java index 9b974b46b..5daaaae35 100644 --- a/java/org/apache/catalina/session/StandardManager.java +++ b/java/org/apache/catalina/session/StandardManager.java @@ -60,7 +60,7 @@ import org.apache.tomcat.util.ExceptionUtils; * * @author Craig R. McClanahan * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardManager extends ManagerBase diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 52448b45b..40a955da4 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -78,7 +78,7 @@ import org.apache.catalina.security.SecurityUtil; * @author Craig R. McClanahan * @author Sean Legassick * @author Jon S. Stevens - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardSession diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java b/java/org/apache/catalina/session/StandardSessionFacade.java index 1d52a7e95..9d3fe60d9 100644 --- a/java/org/apache/catalina/session/StandardSessionFacade.java +++ b/java/org/apache/catalina/session/StandardSessionFacade.java @@ -30,7 +30,7 @@ import javax.servlet.http.HttpSessionContext; * Facade for the StandardSession object. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class StandardSessionFacade diff --git a/java/org/apache/catalina/session/StoreBase.java b/java/org/apache/catalina/session/StoreBase.java index 7892cc75f..14ad0816e 100644 --- a/java/org/apache/catalina/session/StoreBase.java +++ b/java/org/apache/catalina/session/StoreBase.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * support most of the functionality required by a Store. * * @author Bip Thelin - * @version $Revision$, $Date$ + * @version $Id$ */ public abstract class StoreBase extends LifecycleBase implements Store { diff --git a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java index 83d4feb02..0f9b2281d 100644 --- a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java +++ b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java @@ -26,7 +26,7 @@ import javax.servlet.ServletOutputStream; * SsiInclude * * @author Bip Thelin - * @version $Revision$, $Date$ + * @version $Id$ * @see ServletOutputStream and ByteArrayOutputStream */ public class ByteArrayServletOutputStream extends ServletOutputStream { diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java index ca3154faf..e234b7101 100644 --- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java +++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java @@ -39,7 +39,7 @@ import org.apache.tomcat.util.ExceptionUtils; * * @author Bip Thelin * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class ResponseIncludeWrapper extends HttpServletResponseWrapper { /** diff --git a/java/org/apache/catalina/ssi/SSICommand.java b/java/org/apache/catalina/ssi/SSICommand.java index 969b78f63..8c9ca65a2 100644 --- a/java/org/apache/catalina/ssi/SSICommand.java +++ b/java/org/apache/catalina/ssi/SSICommand.java @@ -25,7 +25,7 @@ import java.io.PrintWriter; * @author Bip Thelin * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public interface SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIConfig.java b/java/org/apache/catalina/ssi/SSIConfig.java index 77266af2c..6a52c2b30 100644 --- a/java/org/apache/catalina/ssi/SSIConfig.java +++ b/java/org/apache/catalina/ssi/SSIConfig.java @@ -25,7 +25,7 @@ import java.io.PrintWriter; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public final class SSIConfig implements SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIEcho.java b/java/org/apache/catalina/ssi/SSIEcho.java index 31dd7b489..5deb3d909 100644 --- a/java/org/apache/catalina/ssi/SSIEcho.java +++ b/java/org/apache/catalina/ssi/SSIEcho.java @@ -25,7 +25,7 @@ import java.io.PrintWriter; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIEcho implements SSICommand { protected final static String DEFAULT_ENCODING = "entity"; diff --git a/java/org/apache/catalina/ssi/SSIExec.java b/java/org/apache/catalina/ssi/SSIExec.java index 159ea9b66..589478644 100644 --- a/java/org/apache/catalina/ssi/SSIExec.java +++ b/java/org/apache/catalina/ssi/SSIExec.java @@ -30,7 +30,7 @@ import org.apache.catalina.util.IOTools; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIExec implements SSICommand { protected SSIInclude ssiInclude = new SSIInclude(); diff --git a/java/org/apache/catalina/ssi/SSIExternalResolver.java b/java/org/apache/catalina/ssi/SSIExternalResolver.java index 10872792e..a37294283 100644 --- a/java/org/apache/catalina/ssi/SSIExternalResolver.java +++ b/java/org/apache/catalina/ssi/SSIExternalResolver.java @@ -25,7 +25,7 @@ import java.util.Date; * servlet ) * * @author Dan Sandberg - * @version $Revision$, $Date$ + * @version $Id$ */ public interface SSIExternalResolver { /** diff --git a/java/org/apache/catalina/ssi/SSIFilter.java b/java/org/apache/catalina/ssi/SSIFilter.java index a182796f4..ed500e94a 100644 --- a/java/org/apache/catalina/ssi/SSIFilter.java +++ b/java/org/apache/catalina/ssi/SSIFilter.java @@ -43,7 +43,7 @@ import org.apache.catalina.Globals; * from within web.xml. * * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ * @see org.apache.catalina.ssi.SSIServlet */ public class SSIFilter implements Filter { diff --git a/java/org/apache/catalina/ssi/SSIFlastmod.java b/java/org/apache/catalina/ssi/SSIFlastmod.java index a664e8081..7986ba572 100644 --- a/java/org/apache/catalina/ssi/SSIFlastmod.java +++ b/java/org/apache/catalina/ssi/SSIFlastmod.java @@ -29,7 +29,7 @@ import org.apache.catalina.util.Strftime; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public final class SSIFlastmod implements SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIFsize.java b/java/org/apache/catalina/ssi/SSIFsize.java index a9b1bd780..36eb72aa4 100644 --- a/java/org/apache/catalina/ssi/SSIFsize.java +++ b/java/org/apache/catalina/ssi/SSIFsize.java @@ -27,7 +27,7 @@ import java.text.DecimalFormat; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public final class SSIFsize implements SSICommand { protected final static int ONE_KILOBYTE = 1024; diff --git a/java/org/apache/catalina/ssi/SSIInclude.java b/java/org/apache/catalina/ssi/SSIInclude.java index d2bd4cb6f..441aa900c 100644 --- a/java/org/apache/catalina/ssi/SSIInclude.java +++ b/java/org/apache/catalina/ssi/SSIInclude.java @@ -26,7 +26,7 @@ import java.io.PrintWriter; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public final class SSIInclude implements SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIMediator.java b/java/org/apache/catalina/ssi/SSIMediator.java index e32737217..84be1ad0c 100644 --- a/java/org/apache/catalina/ssi/SSIMediator.java +++ b/java/org/apache/catalina/ssi/SSIMediator.java @@ -37,7 +37,7 @@ import org.apache.tomcat.util.http.HttpMessages; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIMediator { protected final static String DEFAULT_CONFIG_ERR_MSG = "[an error occurred while processing this directive]"; diff --git a/java/org/apache/catalina/ssi/SSIPrintenv.java b/java/org/apache/catalina/ssi/SSIPrintenv.java index 69084af02..07aaaa1df 100644 --- a/java/org/apache/catalina/ssi/SSIPrintenv.java +++ b/java/org/apache/catalina/ssi/SSIPrintenv.java @@ -25,7 +25,7 @@ import java.util.Iterator; * * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIPrintenv implements SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIProcessor.java b/java/org/apache/catalina/ssi/SSIProcessor.java index 761354dc0..615409258 100644 --- a/java/org/apache/catalina/ssi/SSIProcessor.java +++ b/java/org/apache/catalina/ssi/SSIProcessor.java @@ -31,7 +31,7 @@ import org.apache.catalina.util.IOTools; * * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIProcessor { /** The start pattern */ diff --git a/java/org/apache/catalina/ssi/SSIServlet.java b/java/org/apache/catalina/ssi/SSIServlet.java index b0558e11b..fe98163ba 100644 --- a/java/org/apache/catalina/ssi/SSIServlet.java +++ b/java/org/apache/catalina/ssi/SSIServlet.java @@ -39,7 +39,7 @@ import org.apache.catalina.Globals; * @author Amy Roh * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIServlet extends HttpServlet { /** Debug level for this servlet. */ diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java index db542b3b9..bd690eb48 100644 --- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java +++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java @@ -39,7 +39,7 @@ import org.apache.coyote.Constants; * * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIServletExternalResolver implements SSIExternalResolver { protected final String VARIABLE_NAMES[] = {"AUTH_TYPE", "CONTENT_LENGTH", diff --git a/java/org/apache/catalina/ssi/SSISet.java b/java/org/apache/catalina/ssi/SSISet.java index 4fa022479..b867768d0 100644 --- a/java/org/apache/catalina/ssi/SSISet.java +++ b/java/org/apache/catalina/ssi/SSISet.java @@ -24,7 +24,7 @@ import java.io.PrintWriter; * @author Paul Speed * @author Dan Sandberg * @author David Becker - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSISet implements SSICommand { /** diff --git a/java/org/apache/catalina/ssi/SSIStopProcessingException.java b/java/org/apache/catalina/ssi/SSIStopProcessingException.java index 819f33f6e..51caabcc9 100644 --- a/java/org/apache/catalina/ssi/SSIStopProcessingException.java +++ b/java/org/apache/catalina/ssi/SSIStopProcessingException.java @@ -24,7 +24,7 @@ package org.apache.catalina.ssi; * * @author Paul Speed * @author Dan Sandberg - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSIStopProcessingException extends Exception { // No specific functionality for this class diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java index 76c5de058..0b59517ee 100644 --- a/java/org/apache/catalina/startup/Bootstrap.java +++ b/java/org/apache/catalina/startup/Bootstrap.java @@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactory; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Bootstrap { diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java index a0e3d3163..c83c194e8 100644 --- a/java/org/apache/catalina/startup/Catalina.java +++ b/java/org/apache/catalina/startup/Catalina.java @@ -59,7 +59,7 @@ import org.xml.sax.InputSource; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class Catalina extends Embedded { diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java b/java/org/apache/catalina/startup/CatalinaProperties.java index e6f6c0739..ca74bcc04 100644 --- a/java/org/apache/catalina/startup/CatalinaProperties.java +++ b/java/org/apache/catalina/startup/CatalinaProperties.java @@ -32,7 +32,7 @@ import org.apache.tomcat.util.ExceptionUtils; * Utility class to read the bootstrap Catalina configuration. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class CatalinaProperties { diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java index 4eba147db..f58089f75 100644 --- a/java/org/apache/catalina/startup/ClassLoaderFactory.java +++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java @@ -45,7 +45,7 @@ import org.apache.juli.logging.LogFactory; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ClassLoaderFactory { diff --git a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java index a5c283684..6e0a4c83c 100644 --- a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java +++ b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java @@ -85,7 +85,7 @@ public class ClusterRuleSetFactory { * * @author Filip Hanik * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public static class DefaultClusterRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/Constants.java b/java/org/apache/catalina/startup/Constants.java index 134b3c0d1..c9c804173 100644 --- a/java/org/apache/catalina/startup/Constants.java +++ b/java/org/apache/catalina/startup/Constants.java @@ -24,7 +24,7 @@ package org.apache.catalina.startup; * * @author Craig R. McClanahan * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Constants { diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index b2b4cf76e..27b9307a4 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -99,7 +99,7 @@ import org.xml.sax.SAXParseException; * * @author Craig R. McClanahan * @author Jean-Francois Arcand - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextConfig diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java b/java/org/apache/catalina/startup/ContextRuleSet.java index a44ce9325..3abe86738 100644 --- a/java/org/apache/catalina/startup/ContextRuleSet.java +++ b/java/org/apache/catalina/startup/ContextRuleSet.java @@ -28,7 +28,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * Context definition element.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ContextRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java index 18d396050..dcb70392a 100644 --- a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java +++ b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java @@ -32,7 +32,7 @@ import org.xml.sax.Attributes; * Container).

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class CopyParentClassLoaderRule extends Rule { diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java index 71f908a0a..2f7b5fa43 100644 --- a/java/org/apache/catalina/startup/Embedded.java +++ b/java/org/apache/catalina/startup/Embedded.java @@ -100,7 +100,7 @@ import org.apache.tomcat.util.log.SystemLogHandler; * of how Tomcat is set up and launched as an Embedded application. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class Embedded extends StandardService { diff --git a/java/org/apache/catalina/startup/EngineConfig.java b/java/org/apache/catalina/startup/EngineConfig.java index ff148d8d2..e7646970a 100644 --- a/java/org/apache/catalina/startup/EngineConfig.java +++ b/java/org/apache/catalina/startup/EngineConfig.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * of that Engine, and the associated defined contexts. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class EngineConfig diff --git a/java/org/apache/catalina/startup/EngineRuleSet.java b/java/org/apache/catalina/startup/EngineRuleSet.java index 66dff68ad..c73a6d683 100644 --- a/java/org/apache/catalina/startup/EngineRuleSet.java +++ b/java/org/apache/catalina/startup/EngineRuleSet.java @@ -30,7 +30,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * HostRuleSet.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class EngineRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java b/java/org/apache/catalina/startup/HomesUserDatabase.java index 7157cd446..ce4073999 100644 --- a/java/org/apache/catalina/startup/HomesUserDatabase.java +++ b/java/org/apache/catalina/startup/HomesUserDatabase.java @@ -30,7 +30,7 @@ import java.util.Enumeration; * to our constructor to be "home" directories for those users. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class HomesUserDatabase diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index 9e8cc608e..daafaecc5 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -61,7 +61,7 @@ import org.apache.tomcat.util.modeler.Registry; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class HostConfig implements LifecycleListener { diff --git a/java/org/apache/catalina/startup/HostRuleSet.java b/java/org/apache/catalina/startup/HostRuleSet.java index 450aa52c8..714193ee5 100644 --- a/java/org/apache/catalina/startup/HostRuleSet.java +++ b/java/org/apache/catalina/startup/HostRuleSet.java @@ -30,7 +30,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * ContextRuleSet.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class HostRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/NamingRuleSet.java b/java/org/apache/catalina/startup/NamingRuleSet.java index 12f7ca626..c1433c3e9 100644 --- a/java/org/apache/catalina/startup/NamingRuleSet.java +++ b/java/org/apache/catalina/startup/NamingRuleSet.java @@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class NamingRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java b/java/org/apache/catalina/startup/PasswdUserDatabase.java index 37ed303e2..4b8ea101d 100644 --- a/java/org/apache/catalina/startup/PasswdUserDatabase.java +++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java @@ -31,7 +31,7 @@ import java.util.Enumeration; * that processes the /etc/passwd file on a Unix system. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class PasswdUserDatabase diff --git a/java/org/apache/catalina/startup/RealmRuleSet.java b/java/org/apache/catalina/startup/RealmRuleSet.java index e11005321..bb569d216 100644 --- a/java/org/apache/catalina/startup/RealmRuleSet.java +++ b/java/org/apache/catalina/startup/RealmRuleSet.java @@ -28,7 +28,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * element. This RuleSet supports Realms such as the * CombinedRealm that used nested Realms.

* - * @version $Revision$ $Date$ + * @version $Id$ */ public class RealmRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/TldRuleSet.java b/java/org/apache/catalina/startup/TldRuleSet.java index c71a1d760..8aef41416 100644 --- a/java/org/apache/catalina/startup/TldRuleSet.java +++ b/java/org/apache/catalina/startup/TldRuleSet.java @@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; * descriptor resource.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class TldRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/startup/Tool.java b/java/org/apache/catalina/startup/Tool.java index c72fa1d21..dbbe0669f 100644 --- a/java/org/apache/catalina/startup/Tool.java +++ b/java/org/apache/catalina/startup/Tool.java @@ -67,7 +67,7 @@ import org.apache.juli.logging.LogFactory; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Tool { diff --git a/java/org/apache/catalina/startup/UserConfig.java b/java/org/apache/catalina/startup/UserConfig.java index bde24c81d..34862b72a 100644 --- a/java/org/apache/catalina/startup/UserConfig.java +++ b/java/org/apache/catalina/startup/UserConfig.java @@ -38,7 +38,7 @@ import org.apache.tomcat.util.res.StringManager; * xxxxx is the username of the owning user for that web application * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class UserConfig diff --git a/java/org/apache/catalina/startup/UserDatabase.java b/java/org/apache/catalina/startup/UserDatabase.java index 72ca09208..e680da1f1 100644 --- a/java/org/apache/catalina/startup/UserDatabase.java +++ b/java/org/apache/catalina/startup/UserDatabase.java @@ -27,7 +27,7 @@ import java.util.Enumeration; * current server platform. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public interface UserDatabase { diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java index 1b427ca96..6c917d00a 100644 --- a/java/org/apache/catalina/startup/WebAnnotationSet.java +++ b/java/org/apache/catalina/startup/WebAnnotationSet.java @@ -39,7 +39,7 @@ import org.apache.catalina.deploy.MessageDestinationRef; * classes (/WEB-INF/classes and /WEB-INF/lib).

* * @author Fabien Carrion - * @version $Revision$ $Date$ + * @version $Id$ */ public class WebAnnotationSet { diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java index e8f590ac9..3f786c80f 100644 --- a/java/org/apache/catalina/startup/WebRuleSet.java +++ b/java/org/apache/catalina/startup/WebRuleSet.java @@ -43,7 +43,7 @@ import org.xml.sax.Attributes; * deployment descriptor (/WEB-INF/web.xml) resource.

* * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class WebRuleSet extends RuleSetBase { diff --git a/java/org/apache/catalina/tribes/ByteMessage.java b/java/org/apache/catalina/tribes/ByteMessage.java index 14181798f..58551874f 100644 --- a/java/org/apache/catalina/tribes/ByteMessage.java +++ b/java/org/apache/catalina/tribes/ByteMessage.java @@ -37,7 +37,7 @@ import java.io.ObjectOutput; * so that you can decide with the ChannelListener.accept() whether this message was intended * for you. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class ByteMessage implements Serializable, Externalizable { diff --git a/java/org/apache/catalina/tribes/Channel.java b/java/org/apache/catalina/tribes/Channel.java index a13dda98e..1dbbccc42 100644 --- a/java/org/apache/catalina/tribes/Channel.java +++ b/java/org/apache/catalina/tribes/Channel.java @@ -66,7 +66,7 @@ import java.io.Serializable; * * For example usage @see org.apache.catalina.tribes.group.GroupChannel * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface Channel { diff --git a/java/org/apache/catalina/tribes/ChannelException.java b/java/org/apache/catalina/tribes/ChannelException.java index fc7747111..a67dfc8d1 100644 --- a/java/org/apache/catalina/tribes/ChannelException.java +++ b/java/org/apache/catalina/tribes/ChannelException.java @@ -27,7 +27,7 @@ import java.util.ArrayList; * the application can retrieve what recipients failed by using the getFaultyMembers() * method. This way, an application will always know if a message was delivered successfully or not. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class ChannelException extends Exception { diff --git a/java/org/apache/catalina/tribes/ChannelInterceptor.java b/java/org/apache/catalina/tribes/ChannelInterceptor.java index b5c851490..2f75734c8 100644 --- a/java/org/apache/catalina/tribes/ChannelInterceptor.java +++ b/java/org/apache/catalina/tribes/ChannelInterceptor.java @@ -26,7 +26,7 @@ import org.apache.catalina.tribes.group.InterceptorPayload; * Interceptors are tied together in a linked list. * @see org.apache.catalina.tribes.group.ChannelInterceptorBase * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface ChannelInterceptor extends MembershipListener, Heartbeat { diff --git a/java/org/apache/catalina/tribes/ChannelReceiver.java b/java/org/apache/catalina/tribes/ChannelReceiver.java index 32c53e497..d889ccfec 100644 --- a/java/org/apache/catalina/tribes/ChannelReceiver.java +++ b/java/org/apache/catalina/tribes/ChannelReceiver.java @@ -24,7 +24,7 @@ package org.apache.catalina.tribes; * at the bottom layer, the IO layer (for layers see the javadoc for the {@link Channel} interface). * This class may optionally implement a thread pool for parallel processing of incoming messages. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface ChannelReceiver extends Heartbeat { public static final int MAX_UDP_SIZE = 65535; diff --git a/java/org/apache/catalina/tribes/ChannelSender.java b/java/org/apache/catalina/tribes/ChannelSender.java index 815bc0852..412a10044 100644 --- a/java/org/apache/catalina/tribes/ChannelSender.java +++ b/java/org/apache/catalina/tribes/ChannelSender.java @@ -25,7 +25,7 @@ package org.apache.catalina.tribes; * The channel sender must support "silent" members, ie, be able to send a message to a member * that is not in the membership, but is part of the destination parameter * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface ChannelSender extends Heartbeat { diff --git a/java/org/apache/catalina/tribes/Constants.java b/java/org/apache/catalina/tribes/Constants.java index 57ccb8ea9..bb0d5b2a9 100644 --- a/java/org/apache/catalina/tribes/Constants.java +++ b/java/org/apache/catalina/tribes/Constants.java @@ -24,7 +24,7 @@ package org.apache.catalina.tribes; * * @author Bip Thelin * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public final class Constants { diff --git a/java/org/apache/catalina/tribes/ManagedChannel.java b/java/org/apache/catalina/tribes/ManagedChannel.java index dc5df3956..1600538a0 100644 --- a/java/org/apache/catalina/tribes/ManagedChannel.java +++ b/java/org/apache/catalina/tribes/ManagedChannel.java @@ -23,7 +23,7 @@ import java.util.Iterator; * A managed channel interface gives you access to the components of the channels * such as senders, receivers, interceptors etc for configurations purposes * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface ManagedChannel extends Channel { diff --git a/java/org/apache/catalina/tribes/Member.java b/java/org/apache/catalina/tribes/Member.java index 0707d81d4..24fd22f75 100644 --- a/java/org/apache/catalina/tribes/Member.java +++ b/java/org/apache/catalina/tribes/Member.java @@ -27,7 +27,7 @@ package org.apache.catalina.tribes; * since a member that has crashed and the starts up again on the same port/host is * not guaranteed to be the same member, so no state transfers will ever be confused * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/tribes/MembershipListener.java b/java/org/apache/catalina/tribes/MembershipListener.java index be320190e..95e36416d 100644 --- a/java/org/apache/catalina/tribes/MembershipListener.java +++ b/java/org/apache/catalina/tribes/MembershipListener.java @@ -23,7 +23,7 @@ package org.apache.catalina.tribes; * when a member has joined the group and when a member has disappeared (crashed) * * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/tribes/MembershipService.java b/java/org/apache/catalina/tribes/MembershipService.java index ec81fe500..cb6f49d00 100644 --- a/java/org/apache/catalina/tribes/MembershipService.java +++ b/java/org/apache/catalina/tribes/MembershipService.java @@ -23,7 +23,7 @@ package org.apache.catalina.tribes; * The MembershipService interface is the membership component * at the bottom layer, the IO layer (for layers see the javadoc for the {@link Channel} interface).
* @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java index 6e7e6748c..a352c457f 100644 --- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java +++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java @@ -39,7 +39,7 @@ import org.apache.catalina.tribes.util.Arrays; * the sender and the receiver. * This is the last interceptor in the chain. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class ChannelCoordinator extends ChannelInterceptorBase implements MessageListener { private ChannelReceiver clusterReceiver = new NioReceiver(); diff --git a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java index a92a089e4..0c96fcfa7 100644 --- a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java +++ b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java @@ -26,7 +26,7 @@ import org.apache.juli.logging.LogFactory; /** * Abstract class for the interceptor base class. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public abstract class ChannelInterceptorBase implements ChannelInterceptor { diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java index 0d9c3c2f6..4f572d14e 100644 --- a/java/org/apache/catalina/tribes/group/GroupChannel.java +++ b/java/org/apache/catalina/tribes/group/GroupChannel.java @@ -53,7 +53,7 @@ import org.apache.juli.logging.LogFactory; * The channel has an chain of interceptors that can modify the message or perform other logic.
* It manages a complete group, both membership and replication. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class GroupChannel extends ChannelInterceptorBase implements ManagedChannel { private static final Log log = LogFactory.getLog(GroupChannel.class); diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java b/java/org/apache/catalina/tribes/io/ChannelData.java index 7572986b8..f5dcbead3 100644 --- a/java/org/apache/catalina/tribes/io/ChannelData.java +++ b/java/org/apache/catalina/tribes/io/ChannelData.java @@ -32,7 +32,7 @@ import java.sql.Timestamp; * interceptors, the message data can be manipulated as each interceptor seems appropriate. * @author Peter Rossbach * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ * */ public class ChannelData implements ChannelMessage { diff --git a/java/org/apache/catalina/tribes/io/ListenCallback.java b/java/org/apache/catalina/tribes/io/ListenCallback.java index 183d578c8..c97989b5d 100644 --- a/java/org/apache/catalina/tribes/io/ListenCallback.java +++ b/java/org/apache/catalina/tribes/io/ListenCallback.java @@ -28,7 +28,7 @@ import org.apache.catalina.tribes.ChannelMessage; * when data has been received. The interface does not care about * objects and marshalling and just passes the bytes straight through. * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public interface ListenCallback { diff --git a/java/org/apache/catalina/tribes/io/ObjectReader.java b/java/org/apache/catalina/tribes/io/ObjectReader.java index 001bff39a..5af6af901 100644 --- a/java/org/apache/catalina/tribes/io/ObjectReader.java +++ b/java/org/apache/catalina/tribes/io/ObjectReader.java @@ -35,7 +35,7 @@ import org.apache.juli.logging.LogFactory; * for message encoding and decoding. * * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class ObjectReader { diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java b/java/org/apache/catalina/tribes/io/ReplicationStream.java index 14a57cde9..456b81466 100644 --- a/java/org/apache/catalina/tribes/io/ReplicationStream.java +++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java @@ -33,7 +33,7 @@ import java.lang.reflect.Proxy; * @author Craig R. McClanahan * @author Bip Thelin * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public final class ReplicationStream extends ObjectInputStream { diff --git a/java/org/apache/catalina/tribes/io/XByteBuffer.java b/java/org/apache/catalina/tribes/io/XByteBuffer.java index 26e2846d0..171001bd9 100644 --- a/java/org/apache/catalina/tribes/io/XByteBuffer.java +++ b/java/org/apache/catalina/tribes/io/XByteBuffer.java @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger; *
  • END_DATA - 7 bytes - TLF2003
    • * * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class XByteBuffer { diff --git a/java/org/apache/catalina/tribes/membership/Constants.java b/java/org/apache/catalina/tribes/membership/Constants.java index 0879fcb27..33b772c2e 100644 --- a/java/org/apache/catalina/tribes/membership/Constants.java +++ b/java/org/apache/catalina/tribes/membership/Constants.java @@ -26,7 +26,7 @@ import org.apache.catalina.tribes.util.Arrays; * package. * * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ * @author Filip Hanik */ diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java index 0bbbb4cfe..2d8c5c4f3 100644 --- a/java/org/apache/catalina/tribes/membership/McastService.java +++ b/java/org/apache/catalina/tribes/membership/McastService.java @@ -41,7 +41,7 @@ import org.apache.catalina.tribes.util.UUIDGenerator; * If a node fails to send out a heartbeat, the node will be dismissed. * * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java index c739e277d..e29d8e018 100644 --- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java +++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java @@ -46,7 +46,7 @@ import org.apache.catalina.tribes.util.ExecutorFactory; * Need to fix this, could use java.nio and only need one thread to send and receive, or * just use a timeout on the receive * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class McastServiceImpl { diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java b/java/org/apache/catalina/tribes/membership/MemberImpl.java index 80ced1a2d..22128329a 100644 --- a/java/org/apache/catalina/tribes/membership/MemberImpl.java +++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java @@ -32,7 +32,7 @@ import org.apache.catalina.tribes.transport.SenderState; * Carries the host, and port of the this or other cluster nodes. * * @author Filip Hanik - * @version $Revision$, $Date$ + * @version $Id$ */ public class MemberImpl implements Member, java.io.Externalizable { diff --git a/java/org/apache/catalina/tribes/membership/Membership.java b/java/org/apache/catalina/tribes/membership/Membership.java index d96434e31..f4039e23e 100644 --- a/java/org/apache/catalina/tribes/membership/Membership.java +++ b/java/org/apache/catalina/tribes/membership/Membership.java @@ -35,7 +35,7 @@ import java.util.Comparator; * * @author Filip Hanik * @author Peter Rossbach - * @version $Revision$, $Date$ + * @version $Id$ */ public class Membership { diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java index 4590ece82..b63352b44 100644 --- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java +++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java @@ -24,7 +24,7 @@ import org.apache.catalina.tribes.io.ListenCallback; /** * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class AbstractRxTask implements Runnable { diff --git a/java/org/apache/catalina/tribes/transport/Constants.java b/java/org/apache/catalina/tribes/transport/Constants.java index 6192403ea..c798940ec 100644 --- a/java/org/apache/catalina/tribes/transport/Constants.java +++ b/java/org/apache/catalina/tribes/transport/Constants.java @@ -25,7 +25,7 @@ import org.apache.catalina.tribes.io.XByteBuffer; * package. * @author Filip Hanik * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class Constants { diff --git a/java/org/apache/catalina/tribes/transport/MultiPointSender.java b/java/org/apache/catalina/tribes/transport/MultiPointSender.java index e1b1c4a17..77288c203 100644 --- a/java/org/apache/catalina/tribes/transport/MultiPointSender.java +++ b/java/org/apache/catalina/tribes/transport/MultiPointSender.java @@ -22,7 +22,7 @@ import org.apache.catalina.tribes.Member; /** * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.16 */ diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java index 471d8dc23..49f4d80a9 100644 --- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java +++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java @@ -30,7 +30,7 @@ import org.apache.catalina.tribes.transport.nio.PooledParallelSender; * type * * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public class ReplicationTransmitter implements ChannelSender { diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java index 25a626efc..7d6601ab2 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java @@ -31,7 +31,7 @@ import org.apache.juli.logging.LogFactory; /** * * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public class BioReceiver extends ReceiverBase implements Runnable { diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java index 997de7122..d001a8777 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java @@ -42,7 +42,7 @@ import org.apache.juli.logging.LogFactory; * * @author Filip Hanik * - * @version $Revision$, $Date$ + * @version $Id$ */ public class BioReplicationTask extends AbstractRxTask { diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java index dbf776913..08b983e9a 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java @@ -38,7 +38,7 @@ import org.apache.catalina.tribes.util.StringManager; * * @author Peter Rossbach * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ * @since 5.5.16 */ public class BioSender extends AbstractSender { diff --git a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java index 735b3309d..4fa8d13b5 100644 --- a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java +++ b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java @@ -33,7 +33,7 @@ import org.apache.catalina.tribes.Channel; /** * * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ * */ public class MultipointBioSender extends AbstractSender implements MultiPointSender { diff --git a/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java b/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java index 77c74e0c2..dc042432e 100644 --- a/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java +++ b/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java @@ -30,7 +30,7 @@ import org.apache.catalina.tribes.group.InterceptorPayload; * FIXME add i18n support to log messages * @author Rainer Jung * @author Peter Rossbach - * @version $Revision$ $Date$ + * @version $Id$ */ public class FastQueue { diff --git a/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java b/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java index 8bea3d186..1cf45279a 100644 --- a/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java +++ b/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java @@ -30,7 +30,7 @@ import org.apache.catalina.tribes.group.InterceptorPayload; * @author Rainer Jung * @author Peter Rossbach * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java index 3c805a860..b216ad6f5 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java @@ -43,7 +43,7 @@ import java.nio.channels.ClosedSelectorException; /** * @author Filip Hanik - * @version $Revision$ $Date$ + * @version $Id$ */ public class NioReceiver extends ReceiverBase implements Runnable { diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java index e16d12af4..3d564263d 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java @@ -51,7 +51,7 @@ import org.apache.catalina.tribes.util.Logs; * * @author Filip Hanik * - * @version $Revision$, $Date$ + * @version $Id$ */ public class NioReplicationTask extends AbstractRxTask { diff --git a/java/org/apache/catalina/tribes/util/StringManager.java b/java/org/apache/catalina/tribes/util/StringManager.java index bc671b01b..15cb1af5c 100644 --- a/java/org/apache/catalina/tribes/util/StringManager.java +++ b/java/org/apache/catalina/tribes/util/StringManager.java @@ -42,7 +42,7 @@ import java.util.ResourceBundle; *

    Please see the documentation for java.util.ResourceBundle for * more information. * - * @version $Revision$ $Date$ + * @version $Id$ * * @author James Duncan Davidson [duncan@eng.sun.com] * @author James Todd [gonzo@eng.sun.com] diff --git a/java/org/apache/catalina/users/AbstractGroup.java b/java/org/apache/catalina/users/AbstractGroup.java index a45a55b5c..86f2b763a 100644 --- a/java/org/apache/catalina/users/AbstractGroup.java +++ b/java/org/apache/catalina/users/AbstractGroup.java @@ -31,7 +31,7 @@ import org.apache.catalina.UserDatabase; *

    Convenience base class for {@link Group} implementations.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/AbstractRole.java b/java/org/apache/catalina/users/AbstractRole.java index 83aa863cc..528a2746c 100644 --- a/java/org/apache/catalina/users/AbstractRole.java +++ b/java/org/apache/catalina/users/AbstractRole.java @@ -27,7 +27,7 @@ import org.apache.catalina.UserDatabase; *

    Convenience base class for {@link Role} implementations.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/AbstractUser.java b/java/org/apache/catalina/users/AbstractUser.java index de19f3622..58c0ecd8b 100644 --- a/java/org/apache/catalina/users/AbstractUser.java +++ b/java/org/apache/catalina/users/AbstractUser.java @@ -29,7 +29,7 @@ import org.apache.catalina.User; *

    Convenience base class for {@link User} implementations.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/Constants.java b/java/org/apache/catalina/users/Constants.java index a0b34875a..d85fd2cdf 100644 --- a/java/org/apache/catalina/users/Constants.java +++ b/java/org/apache/catalina/users/Constants.java @@ -24,7 +24,7 @@ package org.apache.catalina.users; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/MemoryGroup.java b/java/org/apache/catalina/users/MemoryGroup.java index 348a1810b..7454c9142 100644 --- a/java/org/apache/catalina/users/MemoryGroup.java +++ b/java/org/apache/catalina/users/MemoryGroup.java @@ -32,7 +32,7 @@ import org.apache.catalina.UserDatabase; * {@link MemoryUserDatabase} implementation of {@link UserDatabase}.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/MemoryRole.java b/java/org/apache/catalina/users/MemoryRole.java index 0e73b4593..ca13bd9a5 100644 --- a/java/org/apache/catalina/users/MemoryRole.java +++ b/java/org/apache/catalina/users/MemoryRole.java @@ -27,7 +27,7 @@ import org.apache.catalina.UserDatabase; * {@link MemoryUserDatabase} implementation of {@link UserDatabase}.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/MemoryUser.java b/java/org/apache/catalina/users/MemoryUser.java index 4a62985df..60401b338 100644 --- a/java/org/apache/catalina/users/MemoryUser.java +++ b/java/org/apache/catalina/users/MemoryUser.java @@ -32,7 +32,7 @@ import org.apache.catalina.util.RequestUtil; * {@link MemoryUserDatabase} implementation of {@link UserDatabase}.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 201d204cb..30a961663 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -46,7 +46,7 @@ import org.xml.sax.Attributes; * and uses a specified XML file for its persistent storage.

    * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java index 25be116c9..72e0a04f5 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java +++ b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java @@ -45,7 +45,7 @@ import javax.naming.spi.ObjectFactory; * * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ * @since 4.1 */ diff --git a/java/org/apache/catalina/util/CharsetMapper.java b/java/org/apache/catalina/util/CharsetMapper.java index 80378b12f..fce0f968b 100644 --- a/java/org/apache/catalina/util/CharsetMapper.java +++ b/java/org/apache/catalina/util/CharsetMapper.java @@ -33,7 +33,7 @@ import java.util.Properties; * your own version for a particular web application. * * @author Craig R. McClanahan - * @version $Date$ $Version$ + * @version $Id$ */ public class CharsetMapper { diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java b/java/org/apache/catalina/util/CustomObjectInputStream.java index 543b65d0f..41130297a 100644 --- a/java/org/apache/catalina/util/CustomObjectInputStream.java +++ b/java/org/apache/catalina/util/CustomObjectInputStream.java @@ -30,7 +30,7 @@ import java.lang.reflect.Proxy; * * @author Craig R. McClanahan * @author Bip Thelin - * @version $Revision$, $Date$ + * @version $Id$ */ public final class CustomObjectInputStream diff --git a/java/org/apache/catalina/util/Enumerator.java b/java/org/apache/catalina/util/Enumerator.java index 0524f1f80..acc555bbf 100644 --- a/java/org/apache/catalina/util/Enumerator.java +++ b/java/org/apache/catalina/util/Enumerator.java @@ -35,7 +35,7 @@ import java.util.NoSuchElementException; * Constructors are provided to easily create such wrappers. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Enumerator implements Enumeration { diff --git a/java/org/apache/catalina/util/Extension.java b/java/org/apache/catalina/util/Extension.java index 94d232293..a3329fdea 100644 --- a/java/org/apache/catalina/util/Extension.java +++ b/java/org/apache/catalina/util/Extension.java @@ -41,7 +41,7 @@ import java.util.StringTokenizer; * @author Craig McClanahan * @author Justyna Horwat * @author Greg Murray - * @version $Revision$ $Date$ + * @version $Id$ */ public final class Extension { diff --git a/java/org/apache/catalina/util/ExtensionValidator.java b/java/org/apache/catalina/util/ExtensionValidator.java index b26116ff4..d3442fa1a 100644 --- a/java/org/apache/catalina/util/ExtensionValidator.java +++ b/java/org/apache/catalina/util/ExtensionValidator.java @@ -49,7 +49,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Greg Murray * @author Justyna Horwat - * @version $Revision$ $Date$ + * @version $Id$ * */ public final class ExtensionValidator { diff --git a/java/org/apache/catalina/util/MD5Encoder.java b/java/org/apache/catalina/util/MD5Encoder.java index ee2415b19..331ca36eb 100644 --- a/java/org/apache/catalina/util/MD5Encoder.java +++ b/java/org/apache/catalina/util/MD5Encoder.java @@ -27,7 +27,7 @@ package org.apache.catalina.util; * of the digest. * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public final class MD5Encoder { diff --git a/java/org/apache/catalina/util/MIME2Java.java b/java/org/apache/catalina/util/MIME2Java.java index 2d0c81cf6..b029431d0 100644 --- a/java/org/apache/catalina/util/MIME2Java.java +++ b/java/org/apache/catalina/util/MIME2Java.java @@ -466,7 +466,7 @@ import java.util.*; * * * - * @version $Revision$ $Date$ + * @version $Id$ * @author TAMURA Kent <kent@trl.ibm.co.jp> */ public class MIME2Java { diff --git a/java/org/apache/catalina/util/ManifestResource.java b/java/org/apache/catalina/util/ManifestResource.java index 5b672627a..bf09d485f 100644 --- a/java/org/apache/catalina/util/ManifestResource.java +++ b/java/org/apache/catalina/util/ManifestResource.java @@ -27,7 +27,7 @@ import java.util.ArrayList; * * @author Greg Murray * @author Justyna Horwat - * @version $Revision$ $Date$ + * @version $Id$ * */ public class ManifestResource { diff --git a/java/org/apache/catalina/util/ParameterMap.java b/java/org/apache/catalina/util/ParameterMap.java index 5d1c8918b..e1b9b77d5 100644 --- a/java/org/apache/catalina/util/ParameterMap.java +++ b/java/org/apache/catalina/util/ParameterMap.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * ParmaeterMap instance is not locked. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ParameterMap extends HashMap { diff --git a/java/org/apache/catalina/util/RequestUtil.java b/java/org/apache/catalina/util/RequestUtil.java index b1357e80f..1aab53974 100644 --- a/java/org/apache/catalina/util/RequestUtil.java +++ b/java/org/apache/catalina/util/RequestUtil.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Craig R. McClanahan * @author Tim Tye - * @version $Revision$ $Date$ + * @version $Id$ */ public final class RequestUtil { diff --git a/java/org/apache/catalina/util/ResourceSet.java b/java/org/apache/catalina/util/ResourceSet.java index 6a71b13cd..465528dfe 100644 --- a/java/org/apache/catalina/util/ResourceSet.java +++ b/java/org/apache/catalina/util/ResourceSet.java @@ -33,7 +33,7 @@ import org.apache.tomcat.util.res.StringManager; * is not locked. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class ResourceSet extends HashSet { diff --git a/java/org/apache/catalina/util/ServerInfo.java b/java/org/apache/catalina/util/ServerInfo.java index 1bf254a7b..0aa1c3841 100644 --- a/java/org/apache/catalina/util/ServerInfo.java +++ b/java/org/apache/catalina/util/ServerInfo.java @@ -28,7 +28,7 @@ import java.util.Properties; * when integrating Tomcat. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public class ServerInfo { diff --git a/java/org/apache/catalina/util/Strftime.java b/java/org/apache/catalina/util/Strftime.java index 862a5d6d6..a6ecdedd9 100644 --- a/java/org/apache/catalina/util/Strftime.java +++ b/java/org/apache/catalina/util/Strftime.java @@ -40,7 +40,7 @@ import java.util.TimeZone; * * @author Bip Thelin * @author Dan Sandberg - * @version $Revision$, $Date$ + * @version $Id$ */ public class Strftime { protected static Properties translate; diff --git a/java/org/apache/catalina/util/StringParser.java b/java/org/apache/catalina/util/StringParser.java index 2b804b8d0..fa63bc8cb 100644 --- a/java/org/apache/catalina/util/StringParser.java +++ b/java/org/apache/catalina/util/StringParser.java @@ -28,7 +28,7 @@ package org.apache.catalina.util; * method with the appropriate saved offset values. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class StringParser { diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java index 1fb23bcba..33ee40858 100644 --- a/java/org/apache/catalina/valves/AccessLogValve.java +++ b/java/org/apache/catalina/valves/AccessLogValve.java @@ -115,7 +115,7 @@ import org.apache.juli.logging.LogFactory; * @author Takayuki Kaneko * @author Peter Rossbach * - * @version $Revision$ $Date$ + * @version $Id$ */ public class AccessLogValve extends ValveBase { diff --git a/java/org/apache/catalina/valves/CometConnectionManagerValve.java b/java/org/apache/catalina/valves/CometConnectionManagerValve.java index 58025f819..f839f0c6b 100644 --- a/java/org/apache/catalina/valves/CometConnectionManagerValve.java +++ b/java/org/apache/catalina/valves/CometConnectionManagerValve.java @@ -52,7 +52,7 @@ import org.apache.tomcat.util.res.StringManager; *

    This Valve should be attached to a Context.

    * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class CometConnectionManagerValve extends ValveBase diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java index 18d3aae37..bdb1d3d6d 100644 --- a/java/org/apache/catalina/valves/ErrorReportValve.java +++ b/java/org/apache/catalina/valves/ErrorReportValve.java @@ -46,7 +46,7 @@ import org.apache.tomcat.util.res.StringManager; * @author Nicola Ken Barozzi Aisa * @author Stefano Mazzocchi * @author Yoav Shapira - * @version $Revision$ $Date$ + * @version $Id$ */ public class ErrorReportValve extends ValveBase { diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java index 6229aafef..54a41f623 100644 --- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java +++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java @@ -125,7 +125,7 @@ import org.apache.juli.logging.LogFactory; * @author Tim Funk * @author Peter Rossbach * - * @version $Revision$ $Date$ + * @version $Id$ */ public class ExtendedAccessLogValve extends AccessLogValve { diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java index 8ba1127ac..93ae98c9a 100644 --- a/java/org/apache/catalina/valves/PersistentValve.java +++ b/java/org/apache/catalina/valves/PersistentValve.java @@ -44,7 +44,7 @@ import org.apache.tomcat.util.res.StringManager; * per session at any one time. * * @author Jean-Frederic Clere - * @version $Revision$ $Date$ + * @version $Id$ */ public class PersistentValve extends ValveBase { diff --git a/java/org/apache/catalina/valves/RemoteAddrValve.java b/java/org/apache/catalina/valves/RemoteAddrValve.java index 7df3faa2c..a3775488a 100644 --- a/java/org/apache/catalina/valves/RemoteAddrValve.java +++ b/java/org/apache/catalina/valves/RemoteAddrValve.java @@ -30,7 +30,7 @@ import org.apache.catalina.connector.Response; * based on the string representation of the remote client's IP address. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class RemoteAddrValve diff --git a/java/org/apache/catalina/valves/RemoteHostValve.java b/java/org/apache/catalina/valves/RemoteHostValve.java index ce983209e..0ff7e4c1b 100644 --- a/java/org/apache/catalina/valves/RemoteHostValve.java +++ b/java/org/apache/catalina/valves/RemoteHostValve.java @@ -30,7 +30,7 @@ import org.apache.catalina.connector.Response; * based on the remote client's host name. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public final class RemoteHostValve diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java index 72e964423..55e6e9a29 100644 --- a/java/org/apache/catalina/valves/RequestFilterValve.java +++ b/java/org/apache/catalina/valves/RequestFilterValve.java @@ -62,7 +62,7 @@ import org.apache.tomcat.util.res.StringManager; * of the filtering you wish to perform. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class RequestFilterValve diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java index f09c0eef1..5f0d34618 100644 --- a/java/org/apache/catalina/valves/SSLValve.java +++ b/java/org/apache/catalina/valves/SSLValve.java @@ -42,7 +42,7 @@ import org.apache.catalina.connector.Response; * * * @author Jean-Frederic Clere - * @version $Revision$, $Date$ + * @version $Id$ */ public class SSLValve diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java b/java/org/apache/catalina/valves/SemaphoreValve.java index 644ba246a..9b95dab71 100644 --- a/java/org/apache/catalina/valves/SemaphoreValve.java +++ b/java/org/apache/catalina/valves/SemaphoreValve.java @@ -38,7 +38,7 @@ import org.apache.catalina.util.LifecycleBase; * of the concurrency control you wish to perform.

    * * @author Remy Maucherat - * @version $Revision$ $Date$ + * @version $Id$ */ public class SemaphoreValve extends ValveBase { diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index 76ee3164a..4408bc090 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -55,7 +55,7 @@ import org.apache.juli.logging.LogFactory; * management and lifecycle support. * * @author Craig R. McClanahan - * @version $Revision$ $Date$ + * @version $Id$ */ public abstract class ValveBase extends LifecycleBase