This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 4ffefef477 Remove author tags for Craig R. McClanahan at his request
4ffefef477 is described below

commit 4ffefef4772e6c8f67c4c1e13c7689c566368c2d
Author: Mark Thomas <[email protected]>
AuthorDate: Sat Sep 27 14:25:30 2025 +0100

    Remove author tags for Craig R. McClanahan at his request
---
 java/org/apache/catalina/Authenticator.java                |  2 --
 java/org/apache/catalina/Contained.java                    |  2 --
 java/org/apache/catalina/Container.java                    |  2 --
 java/org/apache/catalina/ContainerEvent.java               |  2 --
 java/org/apache/catalina/ContainerListener.java            |  2 --
 java/org/apache/catalina/ContainerServlet.java             |  2 --
 java/org/apache/catalina/Context.java                      |  2 --
 java/org/apache/catalina/Engine.java                       |  2 --
 java/org/apache/catalina/Globals.java                      |  2 --
 java/org/apache/catalina/Group.java                        |  2 --
 java/org/apache/catalina/Host.java                         |  2 --
 java/org/apache/catalina/Lifecycle.java                    |  2 --
 java/org/apache/catalina/LifecycleEvent.java               |  2 --
 java/org/apache/catalina/LifecycleException.java           |  2 --
 java/org/apache/catalina/LifecycleListener.java            |  2 --
 java/org/apache/catalina/Loader.java                       |  2 --
 java/org/apache/catalina/Manager.java                      |  2 --
 java/org/apache/catalina/Pipeline.java                     |  2 --
 java/org/apache/catalina/Realm.java                        |  2 --
 java/org/apache/catalina/Role.java                         |  2 --
 java/org/apache/catalina/Server.java                       |  2 --
 java/org/apache/catalina/Service.java                      |  2 --
 java/org/apache/catalina/Session.java                      |  2 --
 java/org/apache/catalina/SessionEvent.java                 |  2 --
 java/org/apache/catalina/SessionListener.java              |  2 --
 java/org/apache/catalina/Store.java                        |  2 --
 java/org/apache/catalina/User.java                         |  2 --
 java/org/apache/catalina/UserDatabase.java                 |  2 --
 java/org/apache/catalina/Valve.java                        |  2 --
 java/org/apache/catalina/Wrapper.java                      |  2 --
 java/org/apache/catalina/ant/AbstractCatalinaTask.java     |  2 --
 java/org/apache/catalina/ant/DeployTask.java               |  2 --
 java/org/apache/catalina/ant/ListTask.java                 |  2 --
 java/org/apache/catalina/ant/ReloadTask.java               |  2 --
 java/org/apache/catalina/ant/ResourcesTask.java            |  2 --
 java/org/apache/catalina/ant/StartTask.java                |  2 --
 java/org/apache/catalina/ant/StopTask.java                 |  2 --
 java/org/apache/catalina/ant/UndeployTask.java             |  2 --
 .../apache/catalina/authenticator/AuthenticatorBase.java   |  2 --
 .../apache/catalina/authenticator/BasicAuthenticator.java  |  2 --
 .../apache/catalina/authenticator/DigestAuthenticator.java |  2 --
 .../apache/catalina/authenticator/FormAuthenticator.java   |  2 --
 .../catalina/authenticator/NonLoginAuthenticator.java      |  2 --
 .../apache/catalina/authenticator/SSLAuthenticator.java    |  2 --
 java/org/apache/catalina/authenticator/SavedRequest.java   |  2 --
 java/org/apache/catalina/authenticator/SingleSignOn.java   |  2 --
 java/org/apache/catalina/connector/Connector.java          |  2 --
 java/org/apache/catalina/connector/CoyoteAdapter.java      |  2 --
 java/org/apache/catalina/connector/Request.java            |  3 ---
 java/org/apache/catalina/connector/RequestFacade.java      |  2 --
 java/org/apache/catalina/connector/Response.java           |  1 -
 java/org/apache/catalina/core/ApplicationContext.java      |  2 --
 java/org/apache/catalina/core/ApplicationDispatcher.java   |  2 --
 java/org/apache/catalina/core/ApplicationFilterChain.java  |  2 --
 java/org/apache/catalina/core/ApplicationFilterConfig.java |  2 --
 java/org/apache/catalina/core/ApplicationHttpRequest.java  |  2 --
 java/org/apache/catalina/core/ApplicationHttpResponse.java |  2 --
 java/org/apache/catalina/core/ApplicationRequest.java      |  2 --
 java/org/apache/catalina/core/ApplicationResponse.java     |  2 --
 java/org/apache/catalina/core/ContainerBase.java           |  2 --
 java/org/apache/catalina/core/StandardContext.java         |  2 --
 java/org/apache/catalina/core/StandardContextValve.java    |  2 --
 java/org/apache/catalina/core/StandardEngine.java          |  2 --
 java/org/apache/catalina/core/StandardEngineValve.java     |  2 --
 java/org/apache/catalina/core/StandardHost.java            |  2 --
 java/org/apache/catalina/core/StandardHostValve.java       |  2 --
 java/org/apache/catalina/core/StandardPipeline.java        |  2 --
 java/org/apache/catalina/core/StandardServer.java          |  2 --
 java/org/apache/catalina/core/StandardService.java         |  2 --
 java/org/apache/catalina/core/StandardWrapper.java         |  2 --
 java/org/apache/catalina/core/StandardWrapperValve.java    |  2 --
 java/org/apache/catalina/filters/Constants.java            |  2 --
 java/org/apache/catalina/filters/RemoteAddrFilter.java     |  2 --
 java/org/apache/catalina/filters/RemoteHostFilter.java     |  2 --
 java/org/apache/catalina/filters/RequestDumperFilter.java  |  2 --
 java/org/apache/catalina/ha/session/DeltaManager.java      |  2 --
 java/org/apache/catalina/ha/tcp/ReplicationValve.java      |  2 --
 java/org/apache/catalina/loader/WebappClassLoaderBase.java |  1 -
 java/org/apache/catalina/loader/WebappLoader.java          |  2 --
 java/org/apache/catalina/manager/ManagerServlet.java       |  2 --
 .../apache/catalina/manager/host/HostManagerServlet.java   |  2 --
 java/org/apache/catalina/mbeans/ClassNameMBean.java        |  2 --
 .../catalina/mbeans/DataSourceUserDatabaseMBean.java       |  2 --
 .../catalina/mbeans/GlobalResourcesLifecycleListener.java  |  2 --
 java/org/apache/catalina/mbeans/GroupMBean.java            |  2 --
 java/org/apache/catalina/mbeans/MBeanUtils.java            |  2 --
 .../apache/catalina/mbeans/MemoryUserDatabaseMBean.java    |  2 --
 java/org/apache/catalina/mbeans/RoleMBean.java             |  2 --
 .../apache/catalina/mbeans/SparseUserDatabaseMBean.java    |  2 --
 java/org/apache/catalina/mbeans/UserMBean.java             |  2 --
 java/org/apache/catalina/realm/DataSourceRealm.java        |  1 -
 java/org/apache/catalina/realm/GenericPrincipal.java       |  2 --
 java/org/apache/catalina/realm/JAASCallbackHandler.java    |  2 --
 java/org/apache/catalina/realm/JAASMemoryLoginModule.java  |  2 --
 java/org/apache/catalina/realm/JAASRealm.java              |  2 --
 java/org/apache/catalina/realm/JNDIRealm.java              |  1 -
 java/org/apache/catalina/realm/MemoryRealm.java            |  2 --
 java/org/apache/catalina/realm/MemoryRuleSet.java          |  2 --
 java/org/apache/catalina/realm/RealmBase.java              |  2 --
 java/org/apache/catalina/realm/UserDatabaseRealm.java      |  2 --
 java/org/apache/catalina/servlets/CGIServlet.java          |  5 -----
 java/org/apache/catalina/servlets/DefaultServlet.java      |  2 --
 java/org/apache/catalina/session/Constants.java            |  2 --
 java/org/apache/catalina/session/FileStore.java            |  2 --
 java/org/apache/catalina/session/ManagerBase.java          |  2 --
 .../org/apache/catalina/session/PersistentManagerBase.java |  2 --
 java/org/apache/catalina/session/StandardManager.java      |  2 --
 java/org/apache/catalina/session/StandardSession.java      |  2 --
 java/org/apache/catalina/startup/Bootstrap.java            |  2 --
 java/org/apache/catalina/startup/Catalina.java             |  2 --
 java/org/apache/catalina/startup/ClassLoaderFactory.java   |  2 --
 java/org/apache/catalina/startup/Constants.java            |  2 --
 java/org/apache/catalina/startup/ContextConfig.java        |  2 --
 java/org/apache/catalina/startup/ContextRuleSet.java       |  2 --
 .../apache/catalina/startup/CopyParentClassLoaderRule.java |  2 --
 java/org/apache/catalina/startup/EngineConfig.java         |  2 --
 java/org/apache/catalina/startup/EngineRuleSet.java        |  2 --
 java/org/apache/catalina/startup/ExpandWar.java            |  2 --
 java/org/apache/catalina/startup/HomesUserDatabase.java    |  2 --
 java/org/apache/catalina/startup/HostConfig.java           |  2 --
 java/org/apache/catalina/startup/HostRuleSet.java          |  2 --
 java/org/apache/catalina/startup/NamingRuleSet.java        |  2 --
 java/org/apache/catalina/startup/PasswdUserDatabase.java   |  2 --
 java/org/apache/catalina/startup/Tool.java                 |  2 --
 java/org/apache/catalina/startup/UserConfig.java           |  2 --
 java/org/apache/catalina/startup/UserDatabase.java         |  2 --
 java/org/apache/catalina/tribes/io/ReplicationStream.java  |  2 --
 java/org/apache/catalina/users/AbstractGroup.java          |  2 --
 java/org/apache/catalina/users/AbstractRole.java           |  2 --
 java/org/apache/catalina/users/AbstractUser.java           |  2 --
 java/org/apache/catalina/users/Constants.java              |  2 --
 .../catalina/users/DataSourceUserDatabaseFactory.java      |  2 --
 java/org/apache/catalina/users/GenericGroup.java           |  2 --
 java/org/apache/catalina/users/GenericRole.java            |  2 --
 java/org/apache/catalina/users/GenericUser.java            |  2 --
 java/org/apache/catalina/users/MemoryUserDatabase.java     |  2 --
 .../apache/catalina/users/MemoryUserDatabaseFactory.java   |  2 --
 java/org/apache/catalina/util/CharsetMapper.java           |  2 --
 java/org/apache/catalina/util/CustomObjectInputStream.java |  2 --
 java/org/apache/catalina/util/ParameterMap.java            |  2 --
 java/org/apache/catalina/util/RequestUtil.java             |  2 --
 java/org/apache/catalina/util/ResourceSet.java             |  2 --
 java/org/apache/catalina/util/ServerInfo.java              |  2 --
 java/org/apache/catalina/util/URLEncoder.java              |  2 --
 .../org/apache/catalina/valves/AbstractAccessLogValve.java |  2 --
 java/org/apache/catalina/valves/Constants.java             |  2 --
 java/org/apache/catalina/valves/ErrorReportValve.java      |  1 -
 java/org/apache/catalina/valves/RemoteAddrValve.java       |  2 --
 java/org/apache/catalina/valves/RemoteHostValve.java       |  2 --
 java/org/apache/catalina/valves/RequestFilterValve.java    |  2 --
 java/org/apache/catalina/valves/ValveBase.java             |  2 --
 .../org/apache/juli/logging/LogConfigurationException.java |  2 --
 java/org/apache/juli/logging/LogFactory.java               |  2 --
 java/org/apache/naming/factory/MailSessionFactory.java     |  2 --
 java/org/apache/tomcat/util/buf/HexUtils.java              |  2 --
 .../tomcat/util/descriptor/web/ApplicationParameter.java   |  2 --
 java/org/apache/tomcat/util/descriptor/web/ContextEjb.java |  2 --
 .../tomcat/util/descriptor/web/ContextEnvironment.java     |  2 --
 .../apache/tomcat/util/descriptor/web/ContextLocalEjb.java |  2 --
 .../apache/tomcat/util/descriptor/web/ContextResource.java |  2 --
 .../tomcat/util/descriptor/web/ContextResourceEnvRef.java  |  2 --
 .../tomcat/util/descriptor/web/ContextTransaction.java     |  2 --
 java/org/apache/tomcat/util/descriptor/web/ErrorPage.java  |  2 --
 java/org/apache/tomcat/util/descriptor/web/FilterDef.java  |  2 --
 java/org/apache/tomcat/util/descriptor/web/FilterMap.java  |  2 --
 .../org/apache/tomcat/util/descriptor/web/LoginConfig.java |  2 --
 .../tomcat/util/descriptor/web/MessageDestination.java     |  2 --
 .../tomcat/util/descriptor/web/MessageDestinationRef.java  |  2 --
 .../tomcat/util/descriptor/web/SecurityCollection.java     |  2 --
 .../tomcat/util/descriptor/web/SecurityConstraint.java     |  2 --
 java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java |  2 --
 java/org/apache/tomcat/util/modeler/AttributeInfo.java     |  2 --
 .../apache/tomcat/util/modeler/BaseAttributeFilter.java    |  2 --
 java/org/apache/tomcat/util/modeler/BaseModelMBean.java    |  2 --
 .../tomcat/util/modeler/BaseNotificationBroadcaster.java   |  2 --
 java/org/apache/tomcat/util/modeler/FeatureInfo.java       |  2 --
 java/org/apache/tomcat/util/modeler/ManagedBean.java       |  2 --
 java/org/apache/tomcat/util/modeler/NotificationInfo.java  |  2 --
 java/org/apache/tomcat/util/modeler/OperationInfo.java     |  2 --
 java/org/apache/tomcat/util/modeler/ParameterInfo.java     |  2 --
 java/org/apache/tomcat/util/modeler/Registry.java          |  2 --
 java/org/apache/tomcat/util/modeler/RegistryMBean.java     |  2 --
 java/org/apache/tomcat/util/net/jsse/JSSESupport.java      |  1 -
 .../org/apache/tomcat/jdbc/pool/DataSourceFactory.java     |  1 -
 webapps/docs/appdev/deployment.xml                         |  1 -
 webapps/docs/appdev/index.xml                              | 14 --------------
 webapps/docs/appdev/installation.xml                       |  1 -
 webapps/docs/appdev/introduction.xml                       |  1 -
 webapps/docs/appdev/processes.xml                          |  1 -
 webapps/docs/appdev/sample/src/mypackage/Hello.java        |  2 --
 webapps/docs/appdev/source.xml                             |  1 -
 webapps/docs/class-loader-howto.xml                        |  1 -
 webapps/docs/config/context.xml                            |  1 -
 webapps/docs/config/engine.xml                             |  1 -
 webapps/docs/config/host.xml                               |  1 -
 webapps/docs/config/http.xml                               |  1 -
 webapps/docs/config/index.xml                              |  1 -
 webapps/docs/config/loader.xml                             |  1 -
 webapps/docs/config/manager.xml                            |  1 -
 webapps/docs/config/realm.xml                              |  1 -
 webapps/docs/config/server.xml                             |  1 -
 webapps/docs/config/service.xml                            |  1 -
 webapps/docs/config/valve.xml                              |  1 -
 webapps/docs/index.xml                                     |  1 -
 webapps/docs/jndi-resources-howto.xml                      |  1 -
 webapps/docs/manager-howto.xml                             |  1 -
 webapps/docs/proxy-howto.xml                               |  1 -
 webapps/docs/realm-howto.xml                               |  1 -
 .../examples/WEB-INF/classes/filters/ExampleFilter.java    |  2 --
 .../WEB-INF/classes/listeners/ContextListener.java         |  2 --
 .../WEB-INF/classes/listeners/SessionListener.java         |  2 --
 webapps/examples/WEB-INF/classes/util/HTMLFilter.java      |  2 --
 .../WEB-INF/classes/validators/DebugValidator.java         |  2 --
 213 files changed, 413 deletions(-)

diff --git a/java/org/apache/catalina/Authenticator.java 
b/java/org/apache/catalina/Authenticator.java
index e314b5dd84..f5f7a883e2 100644
--- a/java/org/apache/catalina/Authenticator.java
+++ b/java/org/apache/catalina/Authenticator.java
@@ -27,8 +27,6 @@ import org.apache.catalina.connector.Request;
 /**
  * An <b>Authenticator</b> is a component (usually a Valve or Container) that 
provides some sort of authentication
  * service.
- *
- * @author Craig R. McClanahan
  */
 public interface Authenticator {
 
diff --git a/java/org/apache/catalina/Contained.java 
b/java/org/apache/catalina/Contained.java
index 891026e55e..003b277a29 100644
--- a/java/org/apache/catalina/Contained.java
+++ b/java/org/apache/catalina/Contained.java
@@ -21,8 +21,6 @@ package org.apache.catalina;
  * Decoupling interface which specifies that an implementing class is 
associated with at most one
  * <strong>Container</strong> instance.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Peter Donald
  */
 public interface Contained {
diff --git a/java/org/apache/catalina/Container.java 
b/java/org/apache/catalina/Container.java
index 981d8c5439..92ffbb3c13 100644
--- a/java/org/apache/catalina/Container.java
+++ b/java/org/apache/catalina/Container.java
@@ -60,8 +60,6 @@ import org.apache.juli.logging.Log;
  * <li><b>Resources</b> - JNDI directory context enabling access to static 
resources, enabling custom linkages to
  * existing server components when Catalina is embedded in a larger server.
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public interface Container extends Lifecycle {
diff --git a/java/org/apache/catalina/ContainerEvent.java 
b/java/org/apache/catalina/ContainerEvent.java
index 9dfa26ca9b..8b91159c99 100644
--- a/java/org/apache/catalina/ContainerEvent.java
+++ b/java/org/apache/catalina/ContainerEvent.java
@@ -21,8 +21,6 @@ import java.util.EventObject;
 
 /**
  * General event for notifying listeners of significant changes on a Container.
- *
- * @author Craig R. McClanahan
  */
 public final class ContainerEvent extends EventObject {
 
diff --git a/java/org/apache/catalina/ContainerListener.java 
b/java/org/apache/catalina/ContainerListener.java
index 81c063f9b0..b82a12c8b6 100644
--- a/java/org/apache/catalina/ContainerListener.java
+++ b/java/org/apache/catalina/ContainerListener.java
@@ -20,8 +20,6 @@ package org.apache.catalina;
 /**
  * Interface defining a listener for significant Container generated events. 
Note that "container start" and "container
  * stop" events are normally LifecycleEvents, not ContainerEvents.
- *
- * @author Craig R. McClanahan
  */
 public interface ContainerListener {
 
diff --git a/java/org/apache/catalina/ContainerServlet.java 
b/java/org/apache/catalina/ContainerServlet.java
index c69bc5ea83..38a5d2914b 100644
--- a/java/org/apache/catalina/ContainerServlet.java
+++ b/java/org/apache/catalina/ContainerServlet.java
@@ -20,8 +20,6 @@ package org.apache.catalina;
  * A <b>ContainerServlet</b> is a servlet that has access to Catalina internal 
functionality, and is loaded from the
  * Catalina class loader instead of the web application class loader. The 
property setter methods must be called by the
  * container whenever a new instance of this servlet is put into service.
- *
- * @author Craig R. McClanahan
  */
 public interface ContainerServlet {
 
diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index f346c76458..ad137e7ff2 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -61,8 +61,6 @@ import org.apache.tomcat.util.http.CookieProcessor;
  * The child containers attached to a Context are generally implementations of 
Wrapper (representing individual servlet
  * definitions).
  * <p>
- *
- * @author Craig R. McClanahan
  */
 public interface Context extends Container, ContextBind {
 
diff --git a/java/org/apache/catalina/Engine.java 
b/java/org/apache/catalina/Engine.java
index 61da35f55d..7d7727dbf3 100644
--- a/java/org/apache/catalina/Engine.java
+++ b/java/org/apache/catalina/Engine.java
@@ -32,8 +32,6 @@ package org.apache.catalina;
  * <p>
  * If used, an Engine is always the top level Container in a Catalina 
hierarchy. Therefore, the implementation's
  * <code>setParent()</code> method should throw 
<code>IllegalArgumentException</code>.
- *
- * @author Craig R. McClanahan
  */
 public interface Engine extends Container {
 
diff --git a/java/org/apache/catalina/Globals.java 
b/java/org/apache/catalina/Globals.java
index fc72440406..e3237d5c43 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -18,8 +18,6 @@ package org.apache.catalina;
 
 /**
  * Global constants that are applicable to multiple packages within Catalina.
- *
- * @author Craig R. McClanahan
  */
 public final class Globals {
 
diff --git a/java/org/apache/catalina/Group.java 
b/java/org/apache/catalina/Group.java
index 18a28399df..1862c9a98f 100644
--- a/java/org/apache/catalina/Group.java
+++ b/java/org/apache/catalina/Group.java
@@ -25,8 +25,6 @@ import java.util.Iterator;
  * group inherits the {@link Role}s assigned to the group.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public interface Group extends Principal {
diff --git a/java/org/apache/catalina/Host.java 
b/java/org/apache/catalina/Host.java
index 14950fa93a..2ed42c4332 100644
--- a/java/org/apache/catalina/Host.java
+++ b/java/org/apache/catalina/Host.java
@@ -37,8 +37,6 @@ import java.util.regex.Pattern;
  * <p>
  * The child containers attached to a Host are generally implementations of 
Context (representing an individual servlet
  * context).
- *
- * @author Craig R. McClanahan
  */
 public interface Host extends Container {
 
diff --git a/java/org/apache/catalina/Lifecycle.java 
b/java/org/apache/catalina/Lifecycle.java
index 58aa0eb1c0..6792b2f0e0 100644
--- a/java/org/apache/catalina/Lifecycle.java
+++ b/java/org/apache/catalina/Lifecycle.java
@@ -75,8 +75,6 @@ package org.apache.catalina;
  *
  * The {@link LifecycleEvent}s fired during state changes are defined in the 
methods that trigger the changed. No
  * {@link LifecycleEvent}s are fired if the attempted transition is not valid.
- *
- * @author Craig R. McClanahan
  */
 public interface Lifecycle {
 
diff --git a/java/org/apache/catalina/LifecycleEvent.java 
b/java/org/apache/catalina/LifecycleEvent.java
index 21b274c7f9..8121cf347c 100644
--- a/java/org/apache/catalina/LifecycleEvent.java
+++ b/java/org/apache/catalina/LifecycleEvent.java
@@ -21,8 +21,6 @@ import java.util.EventObject;
 
 /**
  * General event for notifying listeners of significant changes on a component 
that implements the Lifecycle interface.
- *
- * @author Craig R. McClanahan
  */
 public final class LifecycleEvent extends EventObject {
 
diff --git a/java/org/apache/catalina/LifecycleException.java 
b/java/org/apache/catalina/LifecycleException.java
index 81e4951de5..8a2a0eb595 100644
--- a/java/org/apache/catalina/LifecycleException.java
+++ b/java/org/apache/catalina/LifecycleException.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * General purpose exception that is thrown to indicate a lifecycle related 
problem. Such exceptions should generally be
  * considered fatal to the operation of the application containing this 
component.
- *
- * @author Craig R. McClanahan
  */
 public final class LifecycleException extends Exception {
 
diff --git a/java/org/apache/catalina/LifecycleListener.java 
b/java/org/apache/catalina/LifecycleListener.java
index 55c03194a2..0a2e70e763 100644
--- a/java/org/apache/catalina/LifecycleListener.java
+++ b/java/org/apache/catalina/LifecycleListener.java
@@ -21,8 +21,6 @@ package org.apache.catalina;
  * Interface defining a listener for significant events (including "component 
start" and "component stop") generated by
  * a component that implements the Lifecycle interface. The listener will be 
fired after the associated state change has
  * taken place.
- *
- * @author Craig R. McClanahan
  */
 public interface LifecycleListener {
 
diff --git a/java/org/apache/catalina/Loader.java 
b/java/org/apache/catalina/Loader.java
index 75b21c476a..12f4160390 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -35,8 +35,6 @@ import java.beans.PropertyChangeListener;
  * <li>Based on a policy chosen by the implementation, must call the 
<code>Context.reload()</code> method on the owning
  * <code>Context</code> when a change to one or more of the class files loaded 
by this class loader is detected.
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public interface Loader {
 
diff --git a/java/org/apache/catalina/Manager.java 
b/java/org/apache/catalina/Manager.java
index bee4054205..aea805a95a 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -31,8 +31,6 @@ import java.io.IOException;
  * <li>Must allow a call to <code>stop()</code> to be followed by a call to 
<code>start()</code> on the same
  * <code>Manager</code> instance.
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public interface Manager {
 
diff --git a/java/org/apache/catalina/Pipeline.java 
b/java/org/apache/catalina/Pipeline.java
index f2fb8b0476..7d521ff7d2 100644
--- a/java/org/apache/catalina/Pipeline.java
+++ b/java/org/apache/catalina/Pipeline.java
@@ -31,8 +31,6 @@ import java.util.Set;
  * that will always be executed last. Other Valves will be executed in the 
order that they were added, before the basic
  * Valve is executed.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Peter Donald
  */
 public interface Pipeline extends Contained {
diff --git a/java/org/apache/catalina/Realm.java 
b/java/org/apache/catalina/Realm.java
index 2528442db4..09b3733908 100644
--- a/java/org/apache/catalina/Realm.java
+++ b/java/org/apache/catalina/Realm.java
@@ -32,8 +32,6 @@ import org.ietf.jgss.GSSName;
  * A <b>Realm</b> is a read-only facade for an underlying security realm used 
to authenticate individual users, and
  * identify the security roles associated with those users. Realms can be 
attached at any Container level, but will
  * typically only be attached to a Context, or higher level, Container.
- *
- * @author Craig R. McClanahan
  */
 public interface Realm extends Contained {
 
diff --git a/java/org/apache/catalina/Role.java 
b/java/org/apache/catalina/Role.java
index 9c18711db3..d3d019a9c8 100644
--- a/java/org/apache/catalina/Role.java
+++ b/java/org/apache/catalina/Role.java
@@ -26,8 +26,6 @@ import java.security.Principal;
  * <code>Principals</code>.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public interface Role extends Principal {
diff --git a/java/org/apache/catalina/Server.java 
b/java/org/apache/catalina/Server.java
index dd64b019bf..0170e6d5af 100644
--- a/java/org/apache/catalina/Server.java
+++ b/java/org/apache/catalina/Server.java
@@ -34,8 +34,6 @@ import org.apache.catalina.startup.Catalina;
  * In between, the implementation must open a server socket on the port number 
specified by the <code>port</code>
  * property. When a connection is accepted, the first line is read and 
compared with the specified shutdown command. If
  * the command matches, shutdown of the server is initiated.
- *
- * @author Craig R. McClanahan
  */
 public interface Server extends Lifecycle {
 
diff --git a/java/org/apache/catalina/Service.java 
b/java/org/apache/catalina/Service.java
index 8eb1888581..802d758506 100644
--- a/java/org/apache/catalina/Service.java
+++ b/java/org/apache/catalina/Service.java
@@ -26,8 +26,6 @@ import org.apache.catalina.mapper.Mapper;
  * <p>
  * A given JVM can contain any number of Service instances; however, they are 
completely independent of each other and
  * share only the basic JVM facilities and classes on the system class path.
- *
- * @author Craig R. McClanahan
  */
 public interface Service extends Lifecycle {
 
diff --git a/java/org/apache/catalina/Session.java 
b/java/org/apache/catalina/Session.java
index 9801f1d4e0..b49f1682a0 100644
--- a/java/org/apache/catalina/Session.java
+++ b/java/org/apache/catalina/Session.java
@@ -26,8 +26,6 @@ import jakarta.servlet.http.HttpSession;
 /**
  * A <b>Session</b> is the Catalina-internal facade for an 
<code>HttpSession</code> that is used to maintain state
  * information between requests for a particular user of a web application.
- *
- * @author Craig R. McClanahan
  */
 public interface Session {
 
diff --git a/java/org/apache/catalina/SessionEvent.java 
b/java/org/apache/catalina/SessionEvent.java
index 8a4a06f59f..567b4887c3 100644
--- a/java/org/apache/catalina/SessionEvent.java
+++ b/java/org/apache/catalina/SessionEvent.java
@@ -23,8 +23,6 @@ import java.util.EventObject;
 
 /**
  * General event for notifying listeners of significant changes on a Session.
- *
- * @author Craig R. McClanahan
  */
 public final class SessionEvent extends EventObject {
 
diff --git a/java/org/apache/catalina/SessionListener.java 
b/java/org/apache/catalina/SessionListener.java
index 47516abe02..df54240215 100644
--- a/java/org/apache/catalina/SessionListener.java
+++ b/java/org/apache/catalina/SessionListener.java
@@ -21,8 +21,6 @@ import java.util.EventListener;
 
 /**
  * Interface defining a listener for significant Session generated events.
- *
- * @author Craig R. McClanahan
  */
 public interface SessionListener extends EventListener {
 
diff --git a/java/org/apache/catalina/Store.java 
b/java/org/apache/catalina/Store.java
index 36181c8877..42d51c6fa4 100644
--- a/java/org/apache/catalina/Store.java
+++ b/java/org/apache/catalina/Store.java
@@ -25,8 +25,6 @@ import java.io.IOException;
  * A <b>Store</b> is the abstraction of a Catalina component that provides 
persistent storage and loading of Sessions
  * and their associated user data. Implementations are free to save and load 
the Sessions to any media they wish, but it
  * is assumed that saved Sessions are persistent across server or context 
restarts.
- *
- * @author Craig R. McClanahan
  */
 public interface Store {
 
diff --git a/java/org/apache/catalina/User.java 
b/java/org/apache/catalina/User.java
index 4c1235bb1a..6deb8f1f0a 100644
--- a/java/org/apache/catalina/User.java
+++ b/java/org/apache/catalina/User.java
@@ -26,8 +26,6 @@ import java.util.Iterator;
  * {@link Group}s through which they inherit additional security roles, and is 
optionally assigned a set of specific
  * {@link Role}s.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public interface User extends Principal {
diff --git a/java/org/apache/catalina/UserDatabase.java 
b/java/org/apache/catalina/UserDatabase.java
index 34826ba7c9..adbda89d2b 100644
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -23,8 +23,6 @@ import java.util.Iterator;
  * along with definitions of corresponding {@link Role}s, and referenced by a 
{@link Realm} for authentication and
  * access control.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public interface UserDatabase {
diff --git a/java/org/apache/catalina/Valve.java 
b/java/org/apache/catalina/Valve.java
index bf82a535dd..3a07b1a88b 100644
--- a/java/org/apache/catalina/Valve.java
+++ b/java/org/apache/catalina/Valve.java
@@ -31,8 +31,6 @@ import org.apache.catalina.connector.Response;
  * </p>
  * <b>HISTORICAL NOTE</b>: The "Valve" name was assigned to this concept 
because a valve is what you use in a real world
  * pipeline to control and/or modify flows through it.
- *
- * @author Craig R. McClanahan
  * @author Gunnar Rjnning
  * @author Peter Donald
  */
diff --git a/java/org/apache/catalina/Wrapper.java 
b/java/org/apache/catalina/Wrapper.java
index 441acd39c2..b529a1957c 100644
--- a/java/org/apache/catalina/Wrapper.java
+++ b/java/org/apache/catalina/Wrapper.java
@@ -36,8 +36,6 @@ import jakarta.servlet.UnavailableException;
  * <p>
  * Child Containers are not allowed on Wrapper implementations, so the 
<code>addChild()</code> method should throw an
  * <code>IllegalArgumentException</code>.
- *
- * @author Craig R. McClanahan
  */
 public interface Wrapper extends Container {
 
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 2ab752f8ca..329050f1c6 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -36,8 +36,6 @@ import org.apache.tools.ant.Project;
  * Abstract base class for Ant tasks that interact with the <em>Manager</em> 
web application for dynamically deploying
  * and undeploying applications. These tasks require Ant 1.4 or later.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
diff --git a/java/org/apache/catalina/ant/DeployTask.java 
b/java/org/apache/catalina/ant/DeployTask.java
index 404c6b7585..a8b2b43013 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -32,8 +32,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/deploy</code> command, supported by the 
Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class DeployTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/ListTask.java 
b/java/org/apache/catalina/ant/ListTask.java
index 378f04fcf9..14c065f62a 100644
--- a/java/org/apache/catalina/ant/ListTask.java
+++ b/java/org/apache/catalina/ant/ListTask.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/list</code> command, supported by the 
Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @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 23b824da0d..71bd650856 100644
--- a/java/org/apache/catalina/ant/ReloadTask.java
+++ b/java/org/apache/catalina/ant/ReloadTask.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/reload</code> command, supported by the 
Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class ReloadTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/ResourcesTask.java 
b/java/org/apache/catalina/ant/ResourcesTask.java
index 88dfa5c3a4..d1b53b14e1 100644
--- a/java/org/apache/catalina/ant/ResourcesTask.java
+++ b/java/org/apache/catalina/ant/ResourcesTask.java
@@ -26,8 +26,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/resources</code> command, supported by 
the Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class ResourcesTask extends AbstractCatalinaTask {
diff --git a/java/org/apache/catalina/ant/StartTask.java 
b/java/org/apache/catalina/ant/StartTask.java
index cbf68f1065..fd23916139 100644
--- a/java/org/apache/catalina/ant/StartTask.java
+++ b/java/org/apache/catalina/ant/StartTask.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/start</code> command, supported by the 
Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class StartTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/StopTask.java 
b/java/org/apache/catalina/ant/StopTask.java
index c0cf0c49dc..7dcb910dfc 100644
--- a/java/org/apache/catalina/ant/StopTask.java
+++ b/java/org/apache/catalina/ant/StopTask.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/stop</code> command, supported by the 
Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class StopTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/UndeployTask.java 
b/java/org/apache/catalina/ant/UndeployTask.java
index fd44b0a71f..267ed8f8b0 100644
--- a/java/org/apache/catalina/ant/UndeployTask.java
+++ b/java/org/apache/catalina/ant/UndeployTask.java
@@ -23,8 +23,6 @@ import org.apache.tools.ant.BuildException;
 /**
  * Ant task that implements the <code>/undeploy</code> command, supported by 
the Tomcat manager application.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class UndeployTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index f861bc1181..5fe03bd65e 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -86,8 +86,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * <b>USAGE CONSTRAINT</b>: This Valve is only useful when processing HTTP 
requests. Requests of any other type will
  * simply be passed through.
- *
- * @author Craig R. McClanahan
  */
 public abstract class AuthenticatorBase extends ValveBase implements 
Authenticator, RegistrationListener {
 
diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index 18d2da119a..fbf0a778b2 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -34,8 +34,6 @@ import org.apache.tomcat.util.buf.MessageBytes;
 /**
  * An <b>Authenticator</b> and <b>Valve</b> implementation of HTTP BASIC 
Authentication, as outlined in RFC 7617: "The
  * 'Basic' HTTP Authentication Scheme"
- *
- * @author Craig R. McClanahan
  */
 public class BasicAuthenticator extends AuthenticatorBase {
 
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index 49ed5fcba6..f7ab51acbe 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -48,8 +48,6 @@ import 
org.apache.tomcat.util.security.ConcurrentMessageDigest;
 /**
  * An <b>Authenticator</b> and <b>Valve</b> implementation of HTTP DIGEST 
Authentication, as outlined in RFC 7616: "HTTP
  * Digest Authentication"
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class DigestAuthenticator extends AuthenticatorBase {
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java 
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 55d26f0764..37e1c72e90 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -46,8 +46,6 @@ import org.apache.tomcat.util.http.MimeHeaders;
 /**
  * An <b>Authenticator</b> and <b>Valve</b> implementation of FORM BASED 
Authentication, as described in the Servlet API
  * Specification.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class FormAuthenticator extends AuthenticatorBase {
diff --git a/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java 
b/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
index 16f26046a4..bec67217c5 100644
--- a/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
@@ -25,8 +25,6 @@ import org.apache.catalina.connector.Request;
 /**
  * An <b>Authenticator</b> and <b>Valve</b> implementation that checks only 
security constraints not involving user
  * authentication.
- *
- * @author Craig R. McClanahan
  */
 public final class NonLoginAuthenticator extends AuthenticatorBase {
 
diff --git a/java/org/apache/catalina/authenticator/SSLAuthenticator.java 
b/java/org/apache/catalina/authenticator/SSLAuthenticator.java
index 2364399874..ba1ab2d3b9 100644
--- a/java/org/apache/catalina/authenticator/SSLAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SSLAuthenticator.java
@@ -42,8 +42,6 @@ import 
org.apache.tomcat.util.net.SSLHostConfig.CertificateVerification;
 /**
  * An <b>Authenticator</b> and <b>Valve</b> implementation of authentication 
that utilizes SSL certificates to identify
  * client users.
- *
- * @author Craig R. McClanahan
  */
 public class SSLAuthenticator extends AuthenticatorBase {
 
diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java 
b/java/org/apache/catalina/authenticator/SavedRequest.java
index 499a96944c..1a6fa631de 100644
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -36,8 +36,6 @@ import org.apache.tomcat.util.buf.ByteChunk;
  * <p>
  * <b>IMPLEMENTATION NOTE</b> - It is assumed that this object is accessed 
only from the context of a single thread, so
  * no synchronization around internal collection classes is performed.
- *
- * @author Craig R. McClanahan
  */
 public final class SavedRequest implements Serializable {
 
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java 
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index bd1d9d7dc3..c5fe8d853b 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -50,8 +50,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <li>The web applications themselves must use one of the standard 
Authenticators found in the
  * <code>org.apache.catalina.authenticator</code> package.</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public class SingleSignOn extends ValveBase {
 
diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 91f5f8ba74..5c5f9b5797 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -52,8 +52,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Implementation of a Coyote connector.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class Connector extends LifecycleMBeanBase {
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index d3b7f3e2b8..9aadb93d18 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -59,8 +59,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Implementation of a request processor which delegates the processing to a 
Coyote processor.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class CoyoteAdapter implements Adapter {
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index b76a0e1bb1..46c18ed5a3 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -123,9 +123,6 @@ import org.ietf.jgss.GSSException;
 
 /**
  * Wrapper object for the Coyote request.
- *
- * @author Remy Maucherat
- * @author Craig R. McClanahan
  */
 public class Request implements HttpServletRequest {
 
diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 4a8b3b99d7..789f510330 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -45,8 +45,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Facade class that wraps a Coyote request object. All methods are delegated 
to the wrapped request.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class RequestFacade implements HttpServletRequest {
diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 59eebea01e..af3db55409 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -64,7 +64,6 @@ import org.apache.tomcat.util.security.Escape;
  * Wrapper object for the Coyote response.
  *
  * @author Remy Maucherat
- * @author Craig R. McClanahan
  */
 public class Response implements HttpServletResponse {
 
diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index a3375588a7..f74bc79756 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -83,8 +83,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Standard implementation of <code>ServletContext</code> that represents a 
web application's execution environment. An
  * instance of this class is associated with each instance of 
<code>StandardContext</code>.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class ApplicationContext implements ServletContext {
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index e1bb5c60b2..2dc17975a9 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -54,8 +54,6 @@ import org.apache.tomcat.util.res.StringManager;
  * resource. This implementation allows application level servlets to wrap the 
request and/or response objects that are
  * passed on to the called resource, as long as the wrapping classes extend
  * <code>jakarta.servlet.ServletRequestWrapper</code> and 
<code>jakarta.servlet.ServletResponseWrapper</code>.
- *
- * @author Craig R. McClanahan
  */
 final class ApplicationDispatcher implements AsyncDispatcher, 
RequestDispatcher {
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index b9c04e1cac..5c1c31841e 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -35,8 +35,6 @@ import org.apache.tomcat.util.res.StringManager;
  * Implementation of <code>jakarta.servlet.FilterChain</code> used to manage 
the execution of a set of filters for a
  * particular request. When the set of defined filters has all been executed, 
the next call to <code>doFilter()</code>
  * will execute the servlet's <code>service()</code> method itself.
- *
- * @author Craig R. McClanahan
  */
 public final class ApplicationFilterChain implements FilterChain {
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index f493b581a0..f842eca918 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -48,8 +48,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Implementation of a <code>jakarta.servlet.FilterConfig</code> useful in 
managing the filter instances instantiated
  * when a web application is first started.
- *
- * @author Craig R. McClanahan
  */
 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 4d502f392d..a0fa94a01f 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -59,8 +59,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <strong>WARNING</strong>: Due to Java's lack of support for multiple 
inheritance, all of the logic in
  * <code>ApplicationRequest</code> is duplicated in 
<code>ApplicationHttpRequest</code>. Make sure that you keep these
  * two classes in synchronization when making changes!
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 class ApplicationHttpRequest extends HttpServletRequestWrapper {
diff --git a/java/org/apache/catalina/core/ApplicationHttpResponse.java 
b/java/org/apache/catalina/core/ApplicationHttpResponse.java
index 88e0115219..7b397dbd5c 100644
--- a/java/org/apache/catalina/core/ApplicationHttpResponse.java
+++ b/java/org/apache/catalina/core/ApplicationHttpResponse.java
@@ -33,8 +33,6 @@ import jakarta.servlet.http.HttpServletResponseWrapper;
  * <strong>WARNING</strong>: Due to Java's lack of support for multiple 
inheritance, all of the logic in
  * <code>ApplicationResponse</code> is duplicated in 
<code>ApplicationHttpResponse</code>. Make sure that you keep these
  * two classes in synchronization when making changes!
- *
- * @author Craig R. McClanahan
  */
 class ApplicationHttpResponse extends HttpServletResponseWrapper {
 
diff --git a/java/org/apache/catalina/core/ApplicationRequest.java 
b/java/org/apache/catalina/core/ApplicationRequest.java
index 355d41756f..85b2c17631 100644
--- a/java/org/apache/catalina/core/ApplicationRequest.java
+++ b/java/org/apache/catalina/core/ApplicationRequest.java
@@ -36,8 +36,6 @@ import jakarta.servlet.ServletRequestWrapper;
  * <strong>WARNING</strong>: Due to Java's lack of support for multiple 
inheritance, all of the logic in
  * <code>ApplicationRequest</code> is duplicated in 
<code>ApplicationHttpRequest</code>. Make sure that you keep these
  * two classes in synchronization when making changes!
- *
- * @author Craig R. McClanahan
  */
 class ApplicationRequest extends ServletRequestWrapper {
 
diff --git a/java/org/apache/catalina/core/ApplicationResponse.java 
b/java/org/apache/catalina/core/ApplicationResponse.java
index e793a27fb7..c2e91370e2 100644
--- a/java/org/apache/catalina/core/ApplicationResponse.java
+++ b/java/org/apache/catalina/core/ApplicationResponse.java
@@ -31,8 +31,6 @@ import jakarta.servlet.ServletResponseWrapper;
  * <strong>WARNING</strong>: Due to Java's lack of support for multiple 
inheritance, all of the logic in
  * <code>ApplicationResponse</code> is duplicated in 
<code>ApplicationHttpResponse</code>. Make sure that you keep these
  * two classes in synchronization when making changes!
- *
- * @author Craig R. McClanahan
  */
 class ApplicationResponse extends ServletResponseWrapper {
 
diff --git a/java/org/apache/catalina/core/ContainerBase.java 
b/java/org/apache/catalina/core/ContainerBase.java
index b5f30b7355..d49a35acc5 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -115,8 +115,6 @@ import org.apache.tomcat.util.threads.InlineExecutorService;
  * </tr>
  * </table>
  * Subclasses that fire additional events should document them in the class 
comments of the implementation class.
- *
- * @author Craig R. McClanahan
  */
 public abstract class ContainerBase extends LifecycleMBeanBase implements 
Container {
 
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index cdbfd7112e..bb68b52e1c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -138,8 +138,6 @@ import 
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor;
 /**
  * Standard implementation of the <b>Context</b> interface. Each child 
container must be a Wrapper implementation to
  * process the requests directed to a particular servlet.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class StandardContext extends ContainerBase implements Context, 
NotificationEmitter {
diff --git a/java/org/apache/catalina/core/StandardContextValve.java 
b/java/org/apache/catalina/core/StandardContextValve.java
index de36ca3c68..3ec82ad26c 100644
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -32,8 +32,6 @@ import org.apache.tomcat.util.buf.MessageBytes;
  * Valve that implements the default basic behavior for the 
<code>StandardContext</code> container implementation.
  * <p>
  * <b>USAGE CONSTRAINT</b>: This implementation is likely to be useful only 
when processing HTTP requests.
- *
- * @author Craig R. McClanahan
  */
 final class StandardContextValve extends ValveBase {
 
diff --git a/java/org/apache/catalina/core/StandardEngine.java 
b/java/org/apache/catalina/core/StandardEngine.java
index bc9c692ac7..14ed3fdb56 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -45,8 +45,6 @@ import org.apache.juli.logging.LogFactory;
 /**
  * Standard implementation of the <b>Engine</b> interface. Each child 
container must be a Host implementation to process
  * the specific fully qualified host name of that virtual host.
- *
- * @author Craig R. McClanahan
  */
 public class StandardEngine extends ContainerBase implements Engine {
 
diff --git a/java/org/apache/catalina/core/StandardEngineValve.java 
b/java/org/apache/catalina/core/StandardEngineValve.java
index 5c3f0cea03..546c8d46ac 100644
--- a/java/org/apache/catalina/core/StandardEngineValve.java
+++ b/java/org/apache/catalina/core/StandardEngineValve.java
@@ -29,8 +29,6 @@ import org.apache.catalina.valves.ValveBase;
  * Valve that implements the default basic behavior for the 
<code>StandardEngine</code> container implementation.
  * <p>
  * <b>USAGE CONSTRAINT</b>: This implementation is likely to be useful only 
when processing HTTP requests.
- *
- * @author Craig R. McClanahan
  */
 final class StandardEngineValve extends ValveBase {
 
diff --git a/java/org/apache/catalina/core/StandardHost.java 
b/java/org/apache/catalina/core/StandardHost.java
index 8dca56db3d..b5e5f02164 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -48,8 +48,6 @@ import org.apache.tomcat.util.ExceptionUtils;
 /**
  * Standard implementation of the <b>Host</b> interface. Each child container 
must be a Context implementation to
  * process the requests directed to a particular web application.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class StandardHost extends ContainerBase implements Host {
diff --git a/java/org/apache/catalina/core/StandardHostValve.java 
b/java/org/apache/catalina/core/StandardHostValve.java
index 93882ba535..d849f0b430 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -44,8 +44,6 @@ import org.apache.tomcat.util.res.StringManager;
  * Valve that implements the default basic behavior for the 
<code>StandardHost</code> container implementation.
  * <p>
  * <b>USAGE CONSTRAINT</b>: This implementation is likely to be useful only 
when processing HTTP requests.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 final class StandardHostValve extends ValveBase {
diff --git a/java/org/apache/catalina/core/StandardPipeline.java 
b/java/org/apache/catalina/core/StandardPipeline.java
index 3551178064..fb9ad89d5d 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -43,8 +43,6 @@ import org.apache.tomcat.util.res.StringManager;
  * This implementation assumes that no calls to <code>addValve()</code> or 
<code>removeValve</code> are allowed while a
  * request is currently being processed. Otherwise, the mechanism by which 
per-thread state is maintained will need to
  * be modified.
- *
- * @author Craig R. McClanahan
  */
 public class StandardPipeline extends LifecycleBase implements Pipeline {
 
diff --git a/java/org/apache/catalina/core/StandardServer.java 
b/java/org/apache/catalina/core/StandardServer.java
index 41fd72c54a..7cf61d6704 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -61,8 +61,6 @@ import org.apache.tomcat.util.threads.TaskThreadFactory;
 /**
  * Standard implementation of the <b>Server</b> interface, available for use 
(but not required) when deploying and
  * starting Catalina.
- *
- * @author Craig R. McClanahan
  */
 public final class StandardServer extends LifecycleMBeanBase implements Server 
{
 
diff --git a/java/org/apache/catalina/core/StandardService.java 
b/java/org/apache/catalina/core/StandardService.java
index d1dc4c8823..386f195891 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -46,8 +46,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Standard implementation of the <code>Service</code> interface. The 
associated Container is generally an instance of
  * Engine, but this is not required.
- *
- * @author Craig R. McClanahan
  */
 
 public class StandardService extends LifecycleMBeanBase implements Service {
diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index e61db72952..819e988a17 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -63,8 +63,6 @@ import org.apache.tomcat.util.modeler.Util;
 /**
  * Standard implementation of the <b>Wrapper</b> interface that represents an 
individual servlet definition. No child
  * Containers are allowed, and the parent Container must be a Context.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class StandardWrapper extends ContainerBase implements ServletConfig, 
Wrapper, NotificationEmitter {
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java 
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 2f391b111f..bf306a28cd 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -44,8 +44,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Valve that implements the default basic behavior for the 
<code>StandardWrapper</code> container implementation.
- *
- * @author Craig R. McClanahan
  */
 final class StandardWrapperValve extends ValveBase {
 
diff --git a/java/org/apache/catalina/filters/Constants.java 
b/java/org/apache/catalina/filters/Constants.java
index c893d8121c..350289b7be 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -20,8 +20,6 @@ import org.apache.tomcat.util.http.Method;
 
 /**
  * Manifest constants for this Java package.
- *
- * @author Craig R. McClanahan
  */
 public final class Constants {
 
diff --git a/java/org/apache/catalina/filters/RemoteAddrFilter.java 
b/java/org/apache/catalina/filters/RemoteAddrFilter.java
index 991bcf8e60..f335795c03 100644
--- a/java/org/apache/catalina/filters/RemoteAddrFilter.java
+++ b/java/org/apache/catalina/filters/RemoteAddrFilter.java
@@ -29,8 +29,6 @@ import org.apache.juli.logging.LogFactory;
 /**
  * Concrete implementation of <code>RequestFilter</code> that filters based on 
the string representation of the remote
  * client's IP address.
- *
- * @author Craig R. McClanahan
  */
 public final class RemoteAddrFilter extends RequestFilter {
 
diff --git a/java/org/apache/catalina/filters/RemoteHostFilter.java 
b/java/org/apache/catalina/filters/RemoteHostFilter.java
index 63c4a931cc..f77b57c120 100644
--- a/java/org/apache/catalina/filters/RemoteHostFilter.java
+++ b/java/org/apache/catalina/filters/RemoteHostFilter.java
@@ -28,8 +28,6 @@ import org.apache.juli.logging.LogFactory;
 
 /**
  * Concrete implementation of <code>RequestFilter</code> that filters based on 
the remote client's host name.
- *
- * @author Craig R. McClanahan
  */
 public final class RemoteHostFilter extends RequestFilter {
 
diff --git a/java/org/apache/catalina/filters/RequestDumperFilter.java 
b/java/org/apache/catalina/filters/RequestDumperFilter.java
index d612f5065f..aea7a68ae6 100644
--- a/java/org/apache/catalina/filters/RequestDumperFilter.java
+++ b/java/org/apache/catalina/filters/RequestDumperFilter.java
@@ -47,8 +47,6 @@ import org.apache.juli.logging.LogFactory;
  * <code>org.apache.catalina.filter.RequestDumperFilter</code> logger is 
directed to a dedicated file and that the
  * <code>org.apache.juli.VerbatimFormatter</code> is used.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class RequestDumperFilter extends GenericFilter {
 
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index ec60563d74..5c0b6aca04 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -50,8 +50,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * <b>IMPLEMENTATION NOTE </b>: Correct behavior of session storing and 
reloading depends upon external calls to the
  * <code>start()</code> and <code>stop()</code> methods of this class at the 
correct times.
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach
  */
 public class DeltaManager extends ClusterManagerBase {
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 76cdb01746..5194ea4347 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -59,8 +59,6 @@ import org.apache.tomcat.util.res.StringManager;
  * primaryIndicator=true, then the request attribute 
<i>org.apache.catalina.ha.tcp.isPrimarySession.</i> is set true,
  * when request processing is at sessions primary node.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach
  */
 public class ReplicationValve extends ValveBase implements ClusterValve {
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index ef2e0ba035..60c7530a37 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -103,7 +103,6 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
  * instrumentation of system or container classes or classes in other web apps.
  *
  * @author Remy Maucherat
- * @author Craig R. McClanahan
  */
 public abstract class WebappClassLoaderBase extends URLClassLoader
         implements Lifecycle, InstrumentableClassLoader, WebappProperties {
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 1d1c650f3d..e7a9005b70 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -54,8 +54,6 @@ import org.apache.tomcat.util.res.StringManager;
  * This class loader is configured via the Resources children of its Context 
prior to calling <code>start()</code>. When
  * a new class is required, these Resources will be consulted first to locate 
the class. If it is not present, the
  * system class loader will be used instead.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class WebappLoader extends LifecycleMBeanBase implements Loader {
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 68d6ac8e7f..64e72d57c3 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -146,8 +146,6 @@ import org.apache.tomcat.util.security.Escape;
  * <li><b>debug</b> - The debugging detail level that controls the amount of 
information that is logged by this servlet.
  * Default is zero.
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class ManagerServlet extends HttpServlet implements ContainerServlet {
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 69345fd84a..02c538dea4 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -77,8 +77,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <li><b>debug</b> - The debugging detail level that controls the amount of 
information that is logged by this servlet.
  * Default is zero.
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class HostManagerServlet extends HttpServlet implements 
ContainerServlet {
diff --git a/java/org/apache/catalina/mbeans/ClassNameMBean.java 
b/java/org/apache/catalina/mbeans/ClassNameMBean.java
index 40efc707c7..44d9e6a6e7 100644
--- a/java/org/apache/catalina/mbeans/ClassNameMBean.java
+++ b/java/org/apache/catalina/mbeans/ClassNameMBean.java
@@ -26,8 +26,6 @@ package org.apache.catalina.mbeans;
  * </p>
  *
  * @param <T> The type that this bean represents.
- *
- * @author Craig R. McClanahan
  */
 public class ClassNameMBean<T> extends BaseCatalinaMBean<T> {
 
diff --git a/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java 
b/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
index d5127efa25..7bb40bf187 100644
--- a/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
@@ -33,8 +33,6 @@ import org.apache.tomcat.util.modeler.Registry;
  * A <strong>ModelMBean</strong> implementation for the 
<code>org.apache.catalina.users.DataSourceUserDatabase</code>
  * component.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class DataSourceUserDatabaseMBean extends BaseModelMBean {
 
diff --git 
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java 
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index d4edd1fcb9..58c1f2b56c 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -45,8 +45,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * This listener must only be nested within {@link Server} elements.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class GlobalResourcesLifecycleListener implements LifecycleListener {
diff --git a/java/org/apache/catalina/mbeans/GroupMBean.java 
b/java/org/apache/catalina/mbeans/GroupMBean.java
index f0a46018f0..3ba26ec6ac 100644
--- a/java/org/apache/catalina/mbeans/GroupMBean.java
+++ b/java/org/apache/catalina/mbeans/GroupMBean.java
@@ -35,8 +35,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * A <strong>ModelMBean</strong> implementation for the 
<code>org.apache.catalina.Group</code> component.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class GroupMBean extends BaseModelMBean {
 
diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java 
b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 14ae69c32f..c6097e9704 100644
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -42,8 +42,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Public utility methods in support of the server side MBeans implementation.
- *
- * @author Craig R. McClanahan
  * @author Amy Roh
  */
 public class MBeanUtils {
diff --git a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java 
b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
index 950a56741b..5bab50e4d5 100644
--- a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
@@ -23,8 +23,6 @@ import org.apache.tomcat.util.modeler.ManagedBean;
  * A <strong>ModelMBean</strong> implementation for the 
<code>org.apache.catalina.users.MemoryUserDatabase</code>
  * component.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class MemoryUserDatabaseMBean extends SparseUserDatabaseMBean {
 
diff --git a/java/org/apache/catalina/mbeans/RoleMBean.java 
b/java/org/apache/catalina/mbeans/RoleMBean.java
index 7ffd9f42bb..7585b3c189 100644
--- a/java/org/apache/catalina/mbeans/RoleMBean.java
+++ b/java/org/apache/catalina/mbeans/RoleMBean.java
@@ -24,8 +24,6 @@ import org.apache.tomcat.util.modeler.Registry;
  * <p>
  * A <strong>ModelMBean</strong> implementation for the 
<code>org.apache.catalina.Role</code> component.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class RoleMBean extends BaseModelMBean {
 
diff --git a/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java 
b/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
index 6aef4d11f5..bc38e9b32f 100644
--- a/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
@@ -40,8 +40,6 @@ import org.apache.tomcat.util.res.StringManager;
  * register the corresponding user and make it available for management). All 
the MBeans created for users, groups and
  * roles are then discarded when save is invoked.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class SparseUserDatabaseMBean extends BaseModelMBean {
 
diff --git a/java/org/apache/catalina/mbeans/UserMBean.java 
b/java/org/apache/catalina/mbeans/UserMBean.java
index 5d9afa9494..0f52efaa27 100644
--- a/java/org/apache/catalina/mbeans/UserMBean.java
+++ b/java/org/apache/catalina/mbeans/UserMBean.java
@@ -35,8 +35,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * A <strong>ModelMBean</strong> implementation for the 
<code>org.apache.catalina.User</code> component.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class UserMBean extends BaseModelMBean {
 
diff --git a/java/org/apache/catalina/realm/DataSourceRealm.java 
b/java/org/apache/catalina/realm/DataSourceRealm.java
index 42d3cee775..edd9259571 100644
--- a/java/org/apache/catalina/realm/DataSourceRealm.java
+++ b/java/org/apache/catalina/realm/DataSourceRealm.java
@@ -36,7 +36,6 @@ import org.apache.naming.ContextBindings;
  * to set up the database and for configuration options.
  *
  * @author Glenn L. Nielsen
- * @author Craig R. McClanahan
  * @author Carson McDonald
  * @author Ignacio Ortega
  */
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java 
b/java/org/apache/catalina/realm/GenericPrincipal.java
index dfefb126ec..f94ff27538 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -34,8 +34,6 @@ import org.ietf.jgss.GSSCredential;
 /**
  * Generic implementation of <strong>java.security.Principal</strong> that is 
available for use by <code>Realm</code>
  * implementations.
- *
- * @author Craig R. McClanahan
  */
 public class GenericPrincipal implements TomcatPrincipal, Serializable {
 
diff --git a/java/org/apache/catalina/realm/JAASCallbackHandler.java 
b/java/org/apache/catalina/realm/JAASCallbackHandler.java
index 5694303408..d5aac69fb4 100644
--- a/java/org/apache/catalina/realm/JAASCallbackHandler.java
+++ b/java/org/apache/catalina/realm/JAASCallbackHandler.java
@@ -42,8 +42,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <code>javax.security.auth.callback.NameCallback</code> and
  * <code>javax.security.auth.callback.PasswordCallback</code>.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Andrew R. Jaquith
  */
 public class JAASCallbackHandler implements CallbackHandler {
diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 
b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
index 0f708ef762..3b26ba3bac 100644
--- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
+++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
@@ -66,8 +66,6 @@ import org.apache.tomcat.util.digester.Digester;
  * requirements of the <code>GenericPrincipal</code> constructor. It does not 
actually perform the functionality
  * required of a <code>Realm</code> implementation.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule {
     // We need to extend MemoryRealm to avoid class cast
diff --git a/java/org/apache/catalina/realm/JAASRealm.java 
b/java/org/apache/catalina/realm/JAASRealm.java
index deb60f6b61..bb0a869d2b 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -115,8 +115,6 @@ import org.apache.tomcat.util.file.ConfigurationSource;
  * <code>JAASCallbackHandler</code> will digest the password prior to passing 
it back to the
  * <code>LoginModule</code></li>
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Yoav Shapira
  */
 public class JAASRealm extends RealmBase {
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 033c52ba0e..1f9e19e343 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -137,7 +137,6 @@ import org.ietf.jgss.GSSName;
  * </ul>
  *
  * @author John Holman
- * @author Craig R. McClanahan
  */
 public class JNDIRealm extends RealmBase {
 
diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index 8b1fd7ec3e..028b8388fe 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -38,8 +38,6 @@ import org.apache.tomcat.util.file.ConfigFileLoader;
  * <strong>IMPLEMENTATION NOTE</strong>: It is assumed that the in-memory 
collection representing our defined users (and
  * their roles) is initialized at application startup and never modified 
again. Therefore, no thread synchronization is
  * performed around accesses to the principals collection.
- *
- * @author Craig R. McClanahan
  */
 public class MemoryRealm extends RealmBase {
 
diff --git a/java/org/apache/catalina/realm/MemoryRuleSet.java 
b/java/org/apache/catalina/realm/MemoryRuleSet.java
index e2217392ef..a130625787 100644
--- a/java/org/apache/catalina/realm/MemoryRuleSet.java
+++ b/java/org/apache/catalina/realm/MemoryRuleSet.java
@@ -25,8 +25,6 @@ import org.xml.sax.Attributes;
  * <p>
  * <strong>RuleSet</strong> for recognizing the users defined in the XML file 
processed by <code>MemoryRealm</code>.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class MemoryRuleSet implements RuleSet {
 
diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index 37c758150c..64d9685c25 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -69,8 +69,6 @@ import org.ietf.jgss.GSSName;
 /**
  * Simple implementation of <b>Realm</b> that reads an XML file to configure 
the valid users, passwords, and roles. The
  * file format (and default file location) are identical to those currently 
supported by Tomcat 3.X.
- *
- * @author Craig R. McClanahan
  */
 public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
 
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java 
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 6d3e1db664..c6268af710 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -40,8 +40,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * available through the JNDI resources configured for this instance of 
Catalina. Set the <code>resourceName</code>
  * parameter to the JNDI resources name for the configured instance of 
<code>UserDatabase</code> that we should consult.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class UserDatabaseRealm extends RealmBase {
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java 
b/java/org/apache/catalina/servlets/CGIServlet.java
index e216a9509b..1213314ba6 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -207,8 +207,6 @@ public final class CGIServlet extends HttpServlet {
     private static final Log log = LogFactory.getLog(CGIServlet.class);
     private static final StringManager sm = 
StringManager.getManager(CGIServlet.class);
 
-    /* some vars below copied from Craig R. McClanahan's InvokerServlet */
-
     @Serial
     private static final long serialVersionUID = 1L;
 
@@ -393,9 +391,6 @@ public final class CGIServlet extends HttpServlet {
 
     /**
      * Logs important Servlet API and container information.
-     * <p>
-     * Based on SnoopAllServlet by Craig R. McClanahan
-     * </p>
      *
      * @param req HttpServletRequest object used as source of information
      */
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index f1da1cdd01..7a17c7669a 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -127,8 +127,6 @@ import org.apache.tomcat.util.security.Escape;
  * Then a request to <code>/context/static/images/tomcat.jpg</code> will 
succeed while a request to
  * <code>/context/images/tomcat2.jpg</code> will fail.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class DefaultServlet extends HttpServlet {
diff --git a/java/org/apache/catalina/session/Constants.java 
b/java/org/apache/catalina/session/Constants.java
index 8ebc578ce8..bcd98999bd 100644
--- a/java/org/apache/catalina/session/Constants.java
+++ b/java/org/apache/catalina/session/Constants.java
@@ -22,8 +22,6 @@ import org.apache.catalina.valves.CrawlerSessionManagerValve;
 
 /**
  * Manifest constants for the <code>org.apache.catalina.session</code> package.
- *
- * @author Craig R. McClanahan
  */
 public class Constants {
 
diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 3f552371ce..4fc202a6fc 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -40,8 +40,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Concrete implementation of the <b>Store</b> interface that utilizes a file 
per saved Session in a configured
  * directory. Sessions that are saved are still subject to being expired based 
on inactivity.
- *
- * @author Craig R. McClanahan
  */
 public final class FileStore extends StoreBase {
 
diff --git a/java/org/apache/catalina/session/ManagerBase.java 
b/java/org/apache/catalina/session/ManagerBase.java
index 551663fe38..502beef7af 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -55,8 +55,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Minimal implementation of the <b>Manager</b> interface that supports no 
session persistence or distributable
  * capabilities. This class may be subclassed to create more sophisticated 
Manager implementations.
- *
- * @author Craig R. McClanahan
  */
 public abstract class ManagerBase extends LifecycleMBeanBase implements 
Manager {
 
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index f4ce7e0339..a7b866702a 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -38,8 +38,6 @@ import org.apache.juli.logging.LogFactory;
  * <p>
  * <b>IMPLEMENTATION NOTE</b>: Correct behavior of session storing and 
reloading depends upon external calls to the
  * {@link Lifecycle#start()} and {@link Lifecycle#stop()} methods of this 
class at the correct times.
- *
- * @author Craig R. McClanahan
  */
 public abstract class PersistentManagerBase extends ManagerBase implements 
StoreManager {
 
diff --git a/java/org/apache/catalina/session/StandardManager.java 
b/java/org/apache/catalina/session/StandardManager.java
index 0353359c79..31de1d4a0c 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -47,8 +47,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * <p>
  * <b>IMPLEMENTATION NOTE</b>: Correct behavior of session storing and 
reloading depends upon external calls to the
  * <code>start()</code> and <code>stop()</code> methods of this class at the 
correct times.
- *
- * @author Craig R. McClanahan
  */
 public class StandardManager extends ManagerBase {
 
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index a8e05e56bc..f35b01018e 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -64,8 +64,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * <b>IMPLEMENTATION NOTE</b>: If you add fields to this class, you must make 
sure that you carry them over in the
  * read/writeObject methods so that this class is properly serialized.
- *
- * @author Craig R. McClanahan
  * @author Sean Legassick
  * @author <a href="mailto:[email protected]";>Jon S. Stevens</a>
  */
diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index e0867ed773..e3d2a5f416 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -40,8 +40,6 @@ import org.apache.juli.logging.LogFactory;
  * regular execution of the container. The purpose of this roundabout approach 
is to keep the Catalina internal classes
  * (and any other classes they depend on, such as an XML parser) out of the 
system class path and therefore not visible
  * to application level classes.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public final class Bootstrap {
diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index 45f91e00e6..e3a3635294 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -65,8 +65,6 @@ import org.xml.sax.InputSource;
  * <li><b>start</b> - Start an instance of Catalina.</li>
  * <li><b>stop</b> - Stop the currently running instance of Catalina.</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class Catalina {
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java 
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index aad3280d3d..624280da25 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -43,8 +43,6 @@ import org.apache.juli.logging.LogFactory;
  * directories will be added to the class loader's repositories.</li>
  * <li><code>ClassLoader</code> instance that should become the parent of the 
new class loader.</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public final class ClassLoaderFactory {
 
diff --git a/java/org/apache/catalina/startup/Constants.java 
b/java/org/apache/catalina/startup/Constants.java
index 1a593803c3..df88d5aada 100644
--- a/java/org/apache/catalina/startup/Constants.java
+++ b/java/org/apache/catalina/startup/Constants.java
@@ -20,8 +20,6 @@ package org.apache.catalina.startup;
  * String constants for the startup package. <br>
  * Note that some values include a leading '/' and that some do not. This is 
intentional based on how the values are
  * used.
- *
- * @author Craig R. McClanahan
  */
 public final class Constants {
 
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index 7a36923145..e241278ca0 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -118,8 +118,6 @@ import org.xml.sax.SAXParseException;
 /**
  * Startup event listener for a <b>Context</b> that configures the properties 
of that Context, and the associated
  * defined servlets.
- *
- * @author Craig R. McClanahan
  */
 public class ContextConfig implements LifecycleListener {
 
diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java 
b/java/org/apache/catalina/startup/ContextRuleSet.java
index e7f9a6cf73..d65934cda5 100644
--- a/java/org/apache/catalina/startup/ContextRuleSet.java
+++ b/java/org/apache/catalina/startup/ContextRuleSet.java
@@ -21,8 +21,6 @@ import org.apache.tomcat.util.digester.RuleSet;
 
 /**
  * <strong>RuleSet</strong> for processing the contents of a Context 
definition element.
- *
- * @author Craig R. McClanahan
  */
 public class ContextRuleSet implements RuleSet {
 
diff --git a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java 
b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
index 69fb093d93..22581536c6 100644
--- a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
+++ b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
@@ -27,8 +27,6 @@ import org.xml.sax.Attributes;
 /**
  * Rule that copies the <code>parentClassLoader</code> property from the 
next-to-top item on the stack (which must be a
  * <code>Container</code>) to the top item on the stack (which must also be a 
<code>Container</code>).
- *
- * @author Craig R. McClanahan
  */
 public class CopyParentClassLoaderRule extends Rule {
 
diff --git a/java/org/apache/catalina/startup/EngineConfig.java 
b/java/org/apache/catalina/startup/EngineConfig.java
index 941c1cebb7..f218e8a049 100644
--- a/java/org/apache/catalina/startup/EngineConfig.java
+++ b/java/org/apache/catalina/startup/EngineConfig.java
@@ -29,8 +29,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Startup event listener for an <b>Engine</b> that configures the properties 
of that Engine, and the associated defined
  * contexts.
- *
- * @author Craig R. McClanahan
  */
 public class EngineConfig implements LifecycleListener {
 
diff --git a/java/org/apache/catalina/startup/EngineRuleSet.java 
b/java/org/apache/catalina/startup/EngineRuleSet.java
index c1720c6ecb..e4ef9d9488 100644
--- a/java/org/apache/catalina/startup/EngineRuleSet.java
+++ b/java/org/apache/catalina/startup/EngineRuleSet.java
@@ -22,8 +22,6 @@ import org.apache.tomcat.util.digester.RuleSet;
 /**
  * <strong>RuleSet</strong> for processing the contents of an Engine 
definition element. This <code>RuleSet</code> does
  * NOT include any rules for nested Host elements, which should be added via 
instances of <code>HostRuleSet</code>.
- *
- * @author Craig R. McClanahan
  */
 public class EngineRuleSet implements RuleSet {
 
diff --git a/java/org/apache/catalina/startup/ExpandWar.java 
b/java/org/apache/catalina/startup/ExpandWar.java
index 849d75dfdf..828b6994c3 100644
--- a/java/org/apache/catalina/startup/ExpandWar.java
+++ b/java/org/apache/catalina/startup/ExpandWar.java
@@ -40,8 +40,6 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Expand out a WAR in a Host's appBase.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  * @author Glenn L. Nielsen
  */
diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java 
b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 1813ced55f..ba4581efa0 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -25,8 +25,6 @@ import java.util.Map;
 /**
  * Concrete implementation of the <code>UserDatabase</code> interface 
considers all directories in a directory whose
  * pathname is specified to our constructor to be "home" directories for those 
users.
- *
- * @author Craig R. McClanahan
  */
 public final class HomesUserDatabase implements UserDatabase {
 
diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 43f2793f07..60629a0ee7 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -68,8 +68,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Startup event listener for a <b>Host</b> that configures the properties of 
that Host, and the associated defined
  * contexts.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class HostConfig implements LifecycleListener {
diff --git a/java/org/apache/catalina/startup/HostRuleSet.java 
b/java/org/apache/catalina/startup/HostRuleSet.java
index 8d7eca474c..6b21e49bbf 100644
--- a/java/org/apache/catalina/startup/HostRuleSet.java
+++ b/java/org/apache/catalina/startup/HostRuleSet.java
@@ -22,8 +22,6 @@ import org.apache.tomcat.util.digester.RuleSet;
 /**
  * <strong>RuleSet</strong> for processing the contents of a Host definition 
element. This <code>RuleSet</code> does NOT
  * include any rules for nested Context which should be added via instances of 
<code>ContextRuleSet</code>.
- *
- * @author Craig R. McClanahan
  */
 public class HostRuleSet implements RuleSet {
 
diff --git a/java/org/apache/catalina/startup/NamingRuleSet.java 
b/java/org/apache/catalina/startup/NamingRuleSet.java
index 3c230a35d5..d6b55bdfa9 100644
--- a/java/org/apache/catalina/startup/NamingRuleSet.java
+++ b/java/org/apache/catalina/startup/NamingRuleSet.java
@@ -21,8 +21,6 @@ import org.apache.tomcat.util.digester.RuleSet;
 
 /**
  * <strong>RuleSet</strong> for processing the JNDI Enterprise Naming Context 
resource declaration elements.
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public class NamingRuleSet implements RuleSet {
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java 
b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 638865f2a0..2d5d49f19d 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -30,8 +30,6 @@ import org.apache.naming.StringManager;
 /**
  * Concrete implementation of the <code>UserDatabase</code> interface that 
processes the <code>/etc/passwd</code> file
  * on a Unix system.
- *
- * @author Craig R. McClanahan
  */
 public final class PasswdUserDatabase implements UserDatabase {
 
diff --git a/java/org/apache/catalina/startup/Tool.java 
b/java/org/apache/catalina/startup/Tool.java
index 5be1580ce8..7b86ad0945 100644
--- a/java/org/apache/catalina/startup/Tool.java
+++ b/java/org/apache/catalina/startup/Tool.java
@@ -60,8 +60,6 @@ import org.apache.juli.logging.LogFactory;
  * <li><strong>${arguments}</strong> - Command line arguments to be passed to 
the application's <code>main()</code>
  * method.</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public final class Tool {
 
diff --git a/java/org/apache/catalina/startup/UserConfig.java 
b/java/org/apache/catalina/startup/UserConfig.java
index 87ef7d8e9c..a44530dbd2 100644
--- a/java/org/apache/catalina/startup/UserConfig.java
+++ b/java/org/apache/catalina/startup/UserConfig.java
@@ -40,8 +40,6 @@ import org.apache.tomcat.util.res.StringManager;
  * a web application in a directory with the specified name in their home 
directories. The context path of each deployed
  * application will be set to <code>~xxxxx</code>, where xxxxx is the username 
of the owning user for that web
  * application
- *
- * @author Craig R. McClanahan
  */
 public final class UserConfig implements LifecycleListener {
 
diff --git a/java/org/apache/catalina/startup/UserDatabase.java 
b/java/org/apache/catalina/startup/UserDatabase.java
index 0b0d08e5f8..f5d5aadf5b 100644
--- a/java/org/apache/catalina/startup/UserDatabase.java
+++ b/java/org/apache/catalina/startup/UserDatabase.java
@@ -22,8 +22,6 @@ import java.util.Enumeration;
 
 /**
  * Abstraction of the set of users defined by the operating system on the 
current server platform.
- *
- * @author Craig R. McClanahan
  */
 public interface UserDatabase {
 
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java 
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index 279b7a4a68..db6b9a82c6 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -28,8 +28,6 @@ import org.apache.catalina.tribes.util.StringManager;
 /**
  * Custom subclass of <code>ObjectInputStream</code> that loads from the class 
loader for this web application. This
  * allows classes defined only with the web application to be found correctly.
- *
- * @author Craig R. McClanahan
  * @author Bip Thelin
  */
 public final class ReplicationStream extends ObjectInputStream {
diff --git a/java/org/apache/catalina/users/AbstractGroup.java 
b/java/org/apache/catalina/users/AbstractGroup.java
index 8d4e4f74cd..320988e5b9 100644
--- a/java/org/apache/catalina/users/AbstractGroup.java
+++ b/java/org/apache/catalina/users/AbstractGroup.java
@@ -25,8 +25,6 @@ import org.apache.catalina.Group;
  * Convenience base class for {@link Group} implementations.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public abstract class AbstractGroup implements Group {
diff --git a/java/org/apache/catalina/users/AbstractRole.java 
b/java/org/apache/catalina/users/AbstractRole.java
index 610aedde73..d4bab61ac9 100644
--- a/java/org/apache/catalina/users/AbstractRole.java
+++ b/java/org/apache/catalina/users/AbstractRole.java
@@ -25,8 +25,6 @@ import org.apache.catalina.Role;
  * Convenience base class for {@link Role} implementations.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public abstract class AbstractRole implements Role {
diff --git a/java/org/apache/catalina/users/AbstractUser.java 
b/java/org/apache/catalina/users/AbstractUser.java
index a00ead6c80..5c732c3339 100644
--- a/java/org/apache/catalina/users/AbstractUser.java
+++ b/java/org/apache/catalina/users/AbstractUser.java
@@ -25,8 +25,6 @@ import org.apache.catalina.User;
  * Convenience base class for {@link User} implementations.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public abstract class AbstractUser implements User {
diff --git a/java/org/apache/catalina/users/Constants.java 
b/java/org/apache/catalina/users/Constants.java
index df7e150ca8..03089d7603 100644
--- a/java/org/apache/catalina/users/Constants.java
+++ b/java/org/apache/catalina/users/Constants.java
@@ -20,8 +20,6 @@ package org.apache.catalina.users;
 /**
  * Manifest constants for this Java package.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public final class Constants {
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java 
b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
index 83e936b88d..d782b69e02 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
@@ -40,8 +40,6 @@ import javax.sql.DataSource;
  * <li><strong>dataSourceName</strong> - JNDI name of the DataSource, which 
must be located in the same Context
  * environment as the UserDatabase</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  */
 public class DataSourceUserDatabaseFactory implements ObjectFactory {
 
diff --git a/java/org/apache/catalina/users/GenericGroup.java 
b/java/org/apache/catalina/users/GenericGroup.java
index 55de5ebfbe..cb86b287ee 100644
--- a/java/org/apache/catalina/users/GenericGroup.java
+++ b/java/org/apache/catalina/users/GenericGroup.java
@@ -33,8 +33,6 @@ import org.apache.catalina.UserDatabase;
  * </p>
  *
  * @param <UD> The specific type of UserDase with which this group is 
associated
- *
- * @author Craig R. McClanahan
  */
 public class GenericGroup<UD extends UserDatabase> extends AbstractGroup {
 
diff --git a/java/org/apache/catalina/users/GenericRole.java 
b/java/org/apache/catalina/users/GenericRole.java
index 0e48d0ba3d..9f8e21dd8c 100644
--- a/java/org/apache/catalina/users/GenericRole.java
+++ b/java/org/apache/catalina/users/GenericRole.java
@@ -26,8 +26,6 @@ import org.apache.catalina.UserDatabase;
  * </p>
  *
  * @param <UD> The specific type of UserDase with which this role is associated
- *
- * @author Craig R. McClanahan
  */
 public class GenericRole<UD extends UserDatabase> extends AbstractRole {
 
diff --git a/java/org/apache/catalina/users/GenericUser.java 
b/java/org/apache/catalina/users/GenericUser.java
index da8808bf73..644a59ae10 100644
--- a/java/org/apache/catalina/users/GenericUser.java
+++ b/java/org/apache/catalina/users/GenericUser.java
@@ -31,8 +31,6 @@ import org.apache.catalina.UserDatabase;
  * </p>
  *
  * @param <UD> The specific type of UserDase with which this role is associated
- *
- * @author Craig R. McClanahan
  */
 public class GenericUser<UD extends UserDatabase> extends AbstractUser {
 
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java 
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index da7369163e..f9b2a05539 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -57,8 +57,6 @@ import org.xml.sax.Attributes;
  * This class does not enforce what, in an RDBMS, would be called referential 
integrity. Concurrent modifications may
  * result in inconsistent data such as a User retaining a reference to a Role 
that has been removed from the database.
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 /*
diff --git a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java 
b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
index c39744ee87..69c762a12f 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
@@ -41,8 +41,6 @@ import javax.naming.spi.ObjectFactory;
  * to which it is stored. [conf/tomcat-users.xml]</li>
  * </ul>
  *
- * @author Craig R. McClanahan
- *
  * @since 4.1
  */
 public class MemoryUserDatabaseFactory implements ObjectFactory {
diff --git a/java/org/apache/catalina/util/CharsetMapper.java 
b/java/org/apache/catalina/util/CharsetMapper.java
index 37365280df..cf026598e7 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -30,8 +30,6 @@ import org.apache.tomcat.util.compat.JreCompat;
  * text (or generating output text) when the Content-Type header does not 
include one. You can customize the behavior of
  * this class by modifying the mapping data it loads, or by subclassing it (to 
change the algorithm) and then using your
  * own version for a particular web application.
- *
- * @author Craig R. McClanahan
  */
 public class CharsetMapper {
 
diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java 
b/java/org/apache/catalina/util/CustomObjectInputStream.java
index 85bf8ae263..ff84637888 100644
--- a/java/org/apache/catalina/util/CustomObjectInputStream.java
+++ b/java/org/apache/catalina/util/CustomObjectInputStream.java
@@ -33,8 +33,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Custom subclass of <code>ObjectInputStream</code> that loads from the class 
loader for this web application. This
  * allows classes defined only with the web application to be found correctly.
- *
- * @author Craig R. McClanahan
  * @author Bip Thelin
  */
 public final class CustomObjectInputStream extends ObjectInputStream {
diff --git a/java/org/apache/catalina/util/ParameterMap.java 
b/java/org/apache/catalina/util/ParameterMap.java
index ca1d65b8d9..b2d5252887 100644
--- a/java/org/apache/catalina/util/ParameterMap.java
+++ b/java/org/apache/catalina/util/ParameterMap.java
@@ -33,8 +33,6 @@ import org.apache.tomcat.util.res.StringManager;
  *
  * @param <K> The type of Key
  * @param <V> The type of Value
- *
- * @author Craig R. McClanahan
  */
 public final class ParameterMap<K, V> implements Map<K,V>, Serializable {
 
diff --git a/java/org/apache/catalina/util/RequestUtil.java 
b/java/org/apache/catalina/util/RequestUtil.java
index bc123387cb..f493eb7eb1 100644
--- a/java/org/apache/catalina/util/RequestUtil.java
+++ b/java/org/apache/catalina/util/RequestUtil.java
@@ -22,8 +22,6 @@ import org.apache.catalina.connector.Request;
 
 /**
  * General purpose request parsing and encoding utility methods.
- *
- * @author Craig R. McClanahan
  * @author Tim Tye
  */
 public final class RequestUtil {
diff --git a/java/org/apache/catalina/util/ResourceSet.java 
b/java/org/apache/catalina/util/ResourceSet.java
index 1214ed57e8..d843a81082 100644
--- a/java/org/apache/catalina/util/ResourceSet.java
+++ b/java/org/apache/catalina/util/ResourceSet.java
@@ -30,8 +30,6 @@ import org.apache.tomcat.util.res.StringManager;
  * modifications. When first created, a <code>ResourceMap</code> is not locked.
  *
  * @param <T> The type of elements in the Set
- *
- * @author Craig R. McClanahan
  */
 public final class ResourceSet<T> extends HashSet<T> {
 
diff --git a/java/org/apache/catalina/util/ServerInfo.java 
b/java/org/apache/catalina/util/ServerInfo.java
index 48c9935bcb..ae74d176da 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -25,8 +25,6 @@ import org.apache.tomcat.util.ExceptionUtils;
 
 /**
  * Simple utility module to make it easy to plug in the server identifier when 
integrating Tomcat.
- *
- * @author Craig R. McClanahan
  */
 public class ServerInfo {
 
diff --git a/java/org/apache/catalina/util/URLEncoder.java 
b/java/org/apache/catalina/util/URLEncoder.java
index 69d89663ab..4ac95d9927 100644
--- a/java/org/apache/catalina/util/URLEncoder.java
+++ b/java/org/apache/catalina/util/URLEncoder.java
@@ -26,8 +26,6 @@ import java.util.BitSet;
  * This class is very similar to the java.net.URLEncoder class. Unfortunately, 
with java.net.URLEncoder there is no way
  * to specify to the java.net.URLEncoder which characters should NOT be 
encoded. This code was moved from
  * DefaultServlet.java
- *
- * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
 public final class URLEncoder implements Cloneable {
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 01d2b93ac8..06ce7ef82c 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -132,8 +132,6 @@ import org.apache.tomcat.util.net.IPv6Utils;
  * For extended attributes coming from a getAttribute() call, it is you 
responsibility to ensure there are no newline or
  * control characters.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Jason Brittain
  * @author Remy Maucherat
  * @author Takayuki Kaneko
diff --git a/java/org/apache/catalina/valves/Constants.java 
b/java/org/apache/catalina/valves/Constants.java
index c19561fcf4..14273d09da 100644
--- a/java/org/apache/catalina/valves/Constants.java
+++ b/java/org/apache/catalina/valves/Constants.java
@@ -19,8 +19,6 @@ package org.apache.catalina.valves;
 
 /**
  * Manifest constants for the <code>org.apache.catalina.valves</code> package.
- *
- * @author Craig R. McClanahan
  */
 
 public final class Constants {
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 33f246eb7e..397ebd21ca 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -53,7 +53,6 @@ import org.apache.tomcat.util.security.Escape;
  * </p>
  *
  * @author Remy Maucherat
- * @author Craig R. McClanahan
  * @author <a href="mailto:[email protected]";>Nicola Ken Barozzi</a> Aisa
  * @author <a href="mailto:[email protected]";>Stefano Mazzocchi</a>
  * @author Yoav Shapira
diff --git a/java/org/apache/catalina/valves/RemoteAddrValve.java 
b/java/org/apache/catalina/valves/RemoteAddrValve.java
index d48fed2b27..de34f763e4 100644
--- a/java/org/apache/catalina/valves/RemoteAddrValve.java
+++ b/java/org/apache/catalina/valves/RemoteAddrValve.java
@@ -30,8 +30,6 @@ import org.apache.juli.logging.LogFactory;
 /**
  * Concrete implementation of <code>RequestFilterValve</code> that filters 
based on the string representation of the
  * remote client's IP address optionally combined with the server connector 
port number.
- *
- * @author Craig R. McClanahan
  */
 public final class RemoteAddrValve extends RequestFilterValve {
 
diff --git a/java/org/apache/catalina/valves/RemoteHostValve.java 
b/java/org/apache/catalina/valves/RemoteHostValve.java
index 58d28a1db8..c817ab6d0d 100644
--- a/java/org/apache/catalina/valves/RemoteHostValve.java
+++ b/java/org/apache/catalina/valves/RemoteHostValve.java
@@ -28,8 +28,6 @@ import org.apache.juli.logging.LogFactory;
 /**
  * Concrete implementation of <code>RequestFilterValve</code> that filters 
based on the remote client's host name
  * optionally combined with the server connector port number.
- *
- * @author Craig R. McClanahan
  */
 public final class RemoteHostValve extends RequestFilterValve {
 
diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java 
b/java/org/apache/catalina/valves/RequestFilterValve.java
index 9353c7d656..531d2202d3 100644
--- a/java/org/apache/catalina/valves/RequestFilterValve.java
+++ b/java/org/apache/catalina/valves/RequestFilterValve.java
@@ -53,8 +53,6 @@ import org.apache.juli.logging.Log;
  * authentication instead of denial.
  * <p>
  * This Valve may be attached to any Container, depending on the granularity 
of the filtering you wish to perform.
- *
- * @author Craig R. McClanahan
  */
 public abstract class RequestFilterValve extends ValveBase {
 
diff --git a/java/org/apache/catalina/valves/ValveBase.java 
b/java/org/apache/catalina/valves/ValveBase.java
index 8d69925229..aa210b2f9b 100644
--- a/java/org/apache/catalina/valves/ValveBase.java
+++ b/java/org/apache/catalina/valves/ValveBase.java
@@ -31,8 +31,6 @@ import org.apache.tomcat.util.res.StringManager;
  * Convenience base class for implementations of the <b>Valve</b> interface. A 
subclass <strong>MUST</strong> implement
  * an <code>invoke()</code> method to provide the required functionality, and 
<strong>MAY</strong> implement the
  * <code>Lifecycle</code> interface to provide configuration management and 
lifecycle support.
- *
- * @author Craig R. McClanahan
  */
 public abstract class ValveBase extends LifecycleMBeanBase implements 
Contained, Valve {
 
diff --git a/java/org/apache/juli/logging/LogConfigurationException.java 
b/java/org/apache/juli/logging/LogConfigurationException.java
index 4fb3f436e1..9e296ed1ce 100644
--- a/java/org/apache/juli/logging/LogConfigurationException.java
+++ b/java/org/apache/juli/logging/LogConfigurationException.java
@@ -24,8 +24,6 @@ import java.io.Serial;
  * An exception that is thrown only if a suitable <code>LogFactory</code> or 
<code>Log</code> instance cannot be created
  * by the corresponding factory methods.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class LogConfigurationException extends RuntimeException {
 
diff --git a/java/org/apache/juli/logging/LogFactory.java 
b/java/org/apache/juli/logging/LogFactory.java
index 327f0ec3af..35c8075e53 100644
--- a/java/org/apache/juli/logging/LogFactory.java
+++ b/java/org/apache/juli/logging/LogFactory.java
@@ -51,8 +51,6 @@ import aQute.bnd.annotation.spi.ServiceConsumer;
  * <strong>IMPLEMENTATION NOTE</strong> - This implementation is heavily based 
on the SAXParserFactory and
  * DocumentBuilderFactory implementations (corresponding to the JAXP 
pluggability APIs) found in Apache Xerces.
  * </p>
- *
- * @author Craig R. McClanahan
  * @author Costin Manolache
  * @author Richard A. Sitze
  */
diff --git a/java/org/apache/naming/factory/MailSessionFactory.java 
b/java/org/apache/naming/factory/MailSessionFactory.java
index e487cf9a75..b12f47a207 100644
--- a/java/org/apache/naming/factory/MailSessionFactory.java
+++ b/java/org/apache/naming/factory/MailSessionFactory.java
@@ -52,8 +52,6 @@ import jakarta.mail.Session;
  *           mail.smtp.host="mail.mycompany.com"
  *           /&gt;
  * </pre>
- *
- * @author Craig R. McClanahan
  */
 public class MailSessionFactory implements ObjectFactory {
 
diff --git a/java/org/apache/tomcat/util/buf/HexUtils.java 
b/java/org/apache/tomcat/util/buf/HexUtils.java
index 949de67448..a6b6746380 100644
--- a/java/org/apache/tomcat/util/buf/HexUtils.java
+++ b/java/org/apache/tomcat/util/buf/HexUtils.java
@@ -21,8 +21,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Tables useful when converting byte arrays to and from strings of 
hexadecimal digits. Code from Ajp11, from Apache's
  * JServ.
- *
- * @author Craig R. McClanahan
  */
 public final class HexUtils {
 
diff --git 
a/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java 
b/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java
index 81ccf15a4d..d6019bf9c3 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java
@@ -24,8 +24,6 @@ import java.io.Serializable;
  * Representation of a context initialization parameter that is configured in 
the server configuration file, rather than
  * the application deployment descriptor. This is convenient for establishing 
default values (which may be configured to
  * allow application overrides or not) without having to modify the 
application deployment descriptor itself.
- *
- * @author Craig R. McClanahan
  */
 public class ApplicationParameter implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
index 375b389ef1..0ab8989670 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * Representation of an EJB resource reference for a web application, as 
represented in a <code>&lt;ejb-ref&gt;</code>
  * element in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach ([email protected])
  */
 public class ContextEjb extends ResourceBase {
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java
index e28dce225f..7c26e1c623 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * Representation of an application environment entry, as represented in an 
<code>&lt;env-entry&gt;</code> element in
  * the deployment descriptor.
- *
- * @author Craig R. McClanahan
  */
 public class ContextEnvironment extends ResourceBase {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
index d593e6e6ce..1b8470b25b 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * Representation of a local EJB resource reference for a web application, as 
represented in a
  * <code>&lt;ejb-local-ref&gt;</code> element in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach ([email protected])
  */
 public class ContextLocalEjb extends ResourceBase {
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
index 073ae91656..22949713c4 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * Representation of a resource reference for a web application, as 
represented in a <code>&lt;resource-ref&gt;</code>
  * element in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach ([email protected])
  */
 public class ContextResource extends ResourceBase {
diff --git 
a/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java
index 0ae8d4c1c2..2a24698d79 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java
@@ -22,8 +22,6 @@ import java.io.Serial;
 /**
  * Representation of an application resource reference, as represented in an 
<code>&lt;res-env-ref&gt;</code> element in
  * the deployment descriptor.
- *
- * @author Craig R. McClanahan
  * @author Peter Rossbach ([email protected])
  */
 public class ContextResourceEnvRef extends ResourceBase {
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java 
b/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
index 174e4fcb0c..5542b020de 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
@@ -26,8 +26,6 @@ import java.util.Map;
 /**
  * Representation of an application resource reference, as represented in an 
<code>&lt;res-env-ref&gt;</code> element in
  * the deployment descriptor.
- *
- * @author Craig R. McClanahan
  */
 public class ContextTransaction implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java 
b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
index ff417fdd5c..98ee067055 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
@@ -25,8 +25,6 @@ import org.apache.tomcat.util.buf.UDecoder;
 /**
  * Representation of an error page element for a web application, as 
represented in a <code>&lt;error-page&gt;</code>
  * element in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  */
 public class ErrorPage extends XmlEncodingBase implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterDef.java 
b/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
index d530ecaa77..74137faa1a 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
@@ -29,8 +29,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Representation of a filter definition for a web application, as represented 
in a <code>&lt;filter&gt;</code> element
  * in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  */
 public class FilterDef implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java 
b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
index 685bb422ef..7b75b54725 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
@@ -30,8 +30,6 @@ import org.apache.tomcat.util.buf.UDecoder;
  * Representation of a filter mapping for a web application, as represented in 
a <code>&lt;filter-mapping&gt;</code>
  * element in the deployment descriptor. Each filter mapping must contain a 
filter name plus either a URL pattern or a
  * servlet name.
- *
- * @author Craig R. McClanahan
  */
 public class FilterMap extends XmlEncodingBase implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java 
b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
index a438e241c4..1de46d0025 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
+++ b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
@@ -24,8 +24,6 @@ import org.apache.tomcat.util.buf.UDecoder;
 /**
  * Representation of a login configuration element for a web application, as 
represented in a
  * <code>&lt;login-config&gt;</code> element in the deployment descriptor.
- *
- * @author Craig R. McClanahan
  */
 public class LoginConfig extends XmlEncodingBase implements Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java 
b/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java
index 04d0b68483..6ad59cc56e 100644
--- a/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java
+++ b/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java
@@ -25,8 +25,6 @@ import java.io.Serial;
  * <code>&lt;message-destination&gt;</code> element in the deployment 
descriptor.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since Tomcat 5.0
  */
 public class MessageDestination extends ResourceBase {
diff --git 
a/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java 
b/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java
index 1cb9544323..38fb5e5dd1 100644
--- a/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java
+++ b/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java
@@ -25,8 +25,6 @@ import java.io.Serial;
  * <code>&lt;message-destination-ref&gt;</code> element in the deployment 
descriptor.
  * </p>
  *
- * @author Craig R. McClanahan
- *
  * @since Tomcat 5.0
  */
 public class MessageDestinationRef extends ResourceBase {
diff --git a/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java 
b/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
index 6a2b273fad..2843c21cf3 100644
--- a/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
+++ b/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
@@ -31,8 +31,6 @@ import org.apache.tomcat.util.buf.UDecoder;
  * <b>WARNING</b>: It is assumed that instances of this class will be created 
and modified only within the context of a
  * single thread, before the instance is made visible to the remainder of the 
application. After that, only read access
  * is expected. Therefore, none of the read and write access within this class 
is synchronized.
- *
- * @author Craig R. McClanahan
  */
 public class SecurityCollection extends XmlEncodingBase implements 
Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java 
b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
index 279803953c..ccc558effd 100644
--- a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
+++ b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
@@ -45,8 +45,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <b>WARNING</b>: It is assumed that instances of this class will be created 
and modified only within the context of a
  * single thread, before the instance is made visible to the remainder of the 
application. After that, only read access
  * is expected. Therefore, none of the read and write access within this class 
is synchronized.
- *
- * @author Craig R. McClanahan
  */
 public class SecurityConstraint extends XmlEncodingBase implements 
Serializable {
 
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java 
b/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
index f092ec8d04..f44bf8d48d 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
@@ -34,8 +34,6 @@ import org.xml.sax.Attributes;
  * <strong>RuleSet</strong> for processing the contents of a web application 
deployment descriptor
  * (<code>/WEB-INF/web.xml</code>) resource.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class WebRuleSet implements RuleSet {
 
diff --git a/java/org/apache/tomcat/util/modeler/AttributeInfo.java 
b/java/org/apache/tomcat/util/modeler/AttributeInfo.java
index 15f83e59c3..41aeea3e3d 100644
--- a/java/org/apache/tomcat/util/modeler/AttributeInfo.java
+++ b/java/org/apache/tomcat/util/modeler/AttributeInfo.java
@@ -24,8 +24,6 @@ import javax.management.MBeanAttributeInfo;
  * <p>
  * Internal configuration information for an <code>Attribute</code> descriptor.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class AttributeInfo extends FeatureInfo {
     @Serial
diff --git a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java 
b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
index 9dfde130a2..9aca818a43 100644
--- a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
+++ b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
@@ -32,8 +32,6 @@ import javax.management.NotificationFilter;
  * <code>BaseModelMBean</code> to construct attribute change notification 
event filters when a filter is not supplied by
  * the application.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class BaseAttributeFilter implements NotificationFilter {
 
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java 
b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index 871a534387..5acee4563f 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -92,8 +92,6 @@ import org.apache.tomcat.util.res.StringManager;
  * </ul>
  * <li>Attribute caching is not supported</li>
  * </ul>
- *
- * @author Craig R. McClanahan
  * @author Costin Manolache
  */
 public class BaseModelMBean implements DynamicMBean, MBeanRegistration, 
ModelMBeanNotificationBroadcaster {
diff --git 
a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java 
b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
index 53289517b4..ccf7643349 100644
--- a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
+++ b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
@@ -30,8 +30,6 @@ import javax.management.NotificationListener;
 /**
  * Implementation of <code>NotificationBroadcaster</code> for attribute change 
notifications. This class is used by
  * <code>BaseModelMBean</code> to handle notifications of attribute change 
events to interested listeners.
- *
- * @author Craig R. McClanahan
  * @author Costin Manolache
  */
 
diff --git a/java/org/apache/tomcat/util/modeler/FeatureInfo.java 
b/java/org/apache/tomcat/util/modeler/FeatureInfo.java
index a2776a0d54..75c7232908 100644
--- a/java/org/apache/tomcat/util/modeler/FeatureInfo.java
+++ b/java/org/apache/tomcat/util/modeler/FeatureInfo.java
@@ -26,8 +26,6 @@ import javax.management.MBeanFeatureInfo;
  * Convenience base class for <code>AttributeInfo</code> and 
<code>OperationInfo</code> classes that will be used to
  * collect configuration information for the <code>ModelMBean</code> beans 
exposed for management.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class FeatureInfo implements Serializable {
     @Serial
diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java 
b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index 35987e847a..13d035515e 100644
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -45,8 +45,6 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * Internal configuration information for a managed bean (MBean) descriptor.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class ManagedBean implements java.io.Serializable {
 
diff --git a/java/org/apache/tomcat/util/modeler/NotificationInfo.java 
b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
index f131cef198..cfa481a264 100644
--- a/java/org/apache/tomcat/util/modeler/NotificationInfo.java
+++ b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
@@ -27,8 +27,6 @@ import javax.management.MBeanNotificationInfo;
  * <p>
  * Internal configuration information for a <code>Notification</code> 
descriptor.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class NotificationInfo extends FeatureInfo {
 
diff --git a/java/org/apache/tomcat/util/modeler/OperationInfo.java 
b/java/org/apache/tomcat/util/modeler/OperationInfo.java
index a76fc0623c..a27d382836 100644
--- a/java/org/apache/tomcat/util/modeler/OperationInfo.java
+++ b/java/org/apache/tomcat/util/modeler/OperationInfo.java
@@ -29,8 +29,6 @@ import javax.management.MBeanParameterInfo;
  * <p>
  * Internal configuration information for an <code>Operation</code> descriptor.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class OperationInfo extends FeatureInfo {
 
diff --git a/java/org/apache/tomcat/util/modeler/ParameterInfo.java 
b/java/org/apache/tomcat/util/modeler/ParameterInfo.java
index 730a85fdf1..7c8b073de2 100644
--- a/java/org/apache/tomcat/util/modeler/ParameterInfo.java
+++ b/java/org/apache/tomcat/util/modeler/ParameterInfo.java
@@ -25,8 +25,6 @@ import javax.management.MBeanParameterInfo;
  * <p>
  * Internal configuration information for a <code>Parameter</code> descriptor.
  * </p>
- *
- * @author Craig R. McClanahan
  */
 public class ParameterInfo extends FeatureInfo {
     @Serial
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java 
b/java/org/apache/tomcat/util/modeler/Registry.java
index cc27f18d53..0a2da987dd 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -45,8 +45,6 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  * Registry for modeler MBeans. This is the main entry point into modeler. It 
provides methods to create and manipulate
  * model mbeans and simplify their use. This class is itself a mbean.
- *
- * @author Craig R. McClanahan
  * @author Costin Manolache
  */
 public class Registry implements RegistryMBean, MBeanRegistration {
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java 
b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index 9e82cafb91..2b04329ba6 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -25,8 +25,6 @@ import javax.management.ObjectName;
  * Interface for modeler MBeans. This is the main entry point into modeler. It 
provides methods to create and manipulate
  * model mbeans and simplify their use. Starting with version 1.1, this is no 
longer a singleton and the static methods
  * are strongly deprecated. In a container environment we can expect different 
applications to use different registries.
- *
- * @author Craig R. McClanahan
  * @author Costin Manolache
  *
  * @since 1.1
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 
b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index 9bcd968163..26e45fb46b 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -39,7 +39,6 @@ import org.apache.tomcat.util.res.StringManager;
  * JSSESupport. Concrete implementation class for JSSE Support classes.
  *
  * @author EKR
- * @author Craig R. McClanahan Parts cribbed from JSSECertCompat Parts cribbed 
from CertificatesValve
  */
 public class JSSESupport implements SSLSupport, SSLSessionManager {
 
diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 16b96182a9..07db0e2eb3 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -51,7 +51,6 @@ import org.apache.juli.logging.LogFactory;
  *  <li>jmxEnabled - true of false, whether to register the pool with JMX.</li>
  *  <li>fairQueue - true of false, whether the pool should sacrifice a little 
bit of performance for true fairness.</li>
  * </ol>
- * @author Craig R. McClanahan
  * @author Dirk Verbeeck
  */
 public class DataSourceFactory implements ObjectFactory {
diff --git a/webapps/docs/appdev/deployment.xml 
b/webapps/docs/appdev/deployment.xml
index b3685f0765..92d64f1379 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Deployment</title>
   </properties>
 
diff --git a/webapps/docs/appdev/index.xml b/webapps/docs/appdev/index.xml
index cf45388c46..b6bd1afd2a 100644
--- a/webapps/docs/appdev/index.xml
+++ b/webapps/docs/appdev/index.xml
@@ -23,26 +23,12 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Table of Contents</title>
   </properties>
 
 <body>
 
 
-<section name="Preface">
-
-<p>This manual includes contributions from many members of the Tomcat Project
-developer community.  The following authors have provided significant content:
-</p>
-<ul>
-<li>Craig R. McClanahan
-    (<a href="mailto:[email protected]";>[email protected]</a>)</li>
-</ul>
-
-</section>
-
-
 <section name="Table of Contents">
 
 <p>The information presented is divided into the following sections:</p>
diff --git a/webapps/docs/appdev/installation.xml 
b/webapps/docs/appdev/installation.xml
index b232c1542d..10d474e8b6 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <author email="[email protected]">Yoav Shapira</author>
     <title>Installation</title>
   </properties>
diff --git a/webapps/docs/appdev/introduction.xml 
b/webapps/docs/appdev/introduction.xml
index b2cffff4ef..a4e6806a77 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Introduction</title>
   </properties>
 
diff --git a/webapps/docs/appdev/processes.xml 
b/webapps/docs/appdev/processes.xml
index c08fdf743a..c63956ad1c 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Development Processes</title>
   </properties>
 
diff --git a/webapps/docs/appdev/sample/src/mypackage/Hello.java 
b/webapps/docs/appdev/sample/src/mypackage/Hello.java
index 6105273251..96955cb7c8 100644
--- a/webapps/docs/appdev/sample/src/mypackage/Hello.java
+++ b/webapps/docs/appdev/sample/src/mypackage/Hello.java
@@ -30,8 +30,6 @@ import jakarta.servlet.http.HttpServletResponse;
  * execute servlets.  In the web application deployment descriptor,
  * this servlet must be mapped to correspond to the link in the
  * "index.html" file.
- *
- * @author Craig R. McClanahan &lt;[email protected]>
  */
 
 public final class Hello extends HttpServlet {
diff --git a/webapps/docs/appdev/source.xml b/webapps/docs/appdev/source.xml
index 016cdddd16..06a913d394 100644
--- a/webapps/docs/appdev/source.xml
+++ b/webapps/docs/appdev/source.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Source Organization</title>
   </properties>
 
diff --git a/webapps/docs/class-loader-howto.xml 
b/webapps/docs/class-loader-howto.xml
index fe241b69df..7cdda25c27 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -23,7 +23,6 @@
     &project;
 
     <properties>
-        <author email="[email protected]">Craig R. McClanahan</author>
         <author email="[email protected]">Yoav Shapira</author>
         <title>Class Loader How-To</title>
     </properties>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index bf9de1667b..0ef59bcc0b 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Context Container</title>
   </properties>
 
diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index 054eb78baa..7180e34bc4 100644
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Engine Container</title>
   </properties>
 
diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 3cb971c8a2..00c84e7db1 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <author email="[email protected]">Remy Maucherat</author>
     <author email="[email protected]">Yoav Shapira</author>
     <title>The Host Container</title>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 677684f1d7..a4fd062962 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <author email="[email protected]">Yoav Shapira</author>
     <title>The HTTP Connector</title>
   </properties>
diff --git a/webapps/docs/config/index.xml b/webapps/docs/config/index.xml
index 539967e4f0..eeae56aa38 100644
--- a/webapps/docs/config/index.xml
+++ b/webapps/docs/config/index.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>Overview</title>
   </properties>
 
diff --git a/webapps/docs/config/loader.xml b/webapps/docs/config/loader.xml
index 16cb521650..98c6299f7c 100644
--- a/webapps/docs/config/loader.xml
+++ b/webapps/docs/config/loader.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Loader Component</title>
   </properties>
 
diff --git a/webapps/docs/config/manager.xml b/webapps/docs/config/manager.xml
index 27ea0fa29a..90b0bf438c 100644
--- a/webapps/docs/config/manager.xml
+++ b/webapps/docs/config/manager.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <author email="[email protected]">Yoav Shapira</author>
     <title>The Manager Component</title>
   </properties>
diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml
index e98824965d..8aa9009a4e 100644
--- a/webapps/docs/config/realm.xml
+++ b/webapps/docs/config/realm.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Realm Component</title>
   </properties>
 
diff --git a/webapps/docs/config/server.xml b/webapps/docs/config/server.xml
index 89d03b1cb8..380a5c7304 100644
--- a/webapps/docs/config/server.xml
+++ b/webapps/docs/config/server.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Server Component</title>
   </properties>
 
diff --git a/webapps/docs/config/service.xml b/webapps/docs/config/service.xml
index bcca17f1a8..7ef3989e2c 100644
--- a/webapps/docs/config/service.xml
+++ b/webapps/docs/config/service.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Service Component</title>
   </properties>
 
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 8bbda41f6e..4e570fc9c0 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <title>The Valve Component</title>
   </properties>
 
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index cba8260247..af093654ef 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -23,7 +23,6 @@
   &project;
 
   <properties>
-    <author email="[email protected]">Craig R. McClanahan</author>
     <author email="[email protected]">Remy Maucherat</author>
     <author email="[email protected]">Yoav Shapira</author>
     <title>Documentation Index</title>
diff --git a/webapps/docs/jndi-resources-howto.xml 
b/webapps/docs/jndi-resources-howto.xml
index ab98b1eedf..9f85b47196 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -23,7 +23,6 @@
     &project;
 
     <properties>
-      <author email="[email protected]">Craig R. McClanahan</author>
       <author email="[email protected]">Yoav Shapira</author>
       <title>JNDI Resources How-To</title>
     </properties>
diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index e90a35e52a..02e0650422 100644
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -23,7 +23,6 @@
     &project;
 
     <properties>
-        <author email="[email protected]">Craig R. McClanahan</author>
         <title>Manager App How-To</title>
     </properties>
 
diff --git a/webapps/docs/proxy-howto.xml b/webapps/docs/proxy-howto.xml
index 704dcd8c69..cdacb429e3 100644
--- a/webapps/docs/proxy-howto.xml
+++ b/webapps/docs/proxy-howto.xml
@@ -23,7 +23,6 @@
     &project;
 
     <properties>
-        <author email="[email protected]">Craig R. McClanahan</author>
         <title>Proxy Support How-To</title>
     </properties>
 
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index c517b342df..c07a17ec9e 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -23,7 +23,6 @@
     &project;
 
     <properties>
-        <author email="[email protected]">Craig R. McClanahan</author>
         <author email="[email protected]">Yoav Shapira</author>
         <author email="[email protected]">Andrew R. Jaquith</author>
         <title>Realm Configuration How-To</title>
diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 
b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
index aeba5184e5..f2362f4bba 100644
--- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
@@ -38,8 +38,6 @@ import jakarta.servlet.ServletResponse;
  *     subsequently defined filters, and logs the result to the servlet
  *     context log for this application.
  * </ul>
- *
- * @author Craig McClanahan
  */
 public final class ExampleFilter extends GenericFilter {
 
diff --git a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java 
b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
index fd18175767..6e93b22863 100644
--- a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
+++ b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
@@ -29,8 +29,6 @@ import jakarta.servlet.ServletContextListener;
  * introduced in the 2.3 version of the Servlet API.  This listener
  * merely documents the occurrence of such events in the application log
  * associated with our servlet context.
- *
- * @author Craig R. McClanahan
  */
 public final class ContextListener
         implements ServletContextAttributeListener, ServletContextListener {
diff --git a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java 
b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
index 573a769c4c..b29c4f8037 100644
--- a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
+++ b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
@@ -29,8 +29,6 @@ import jakarta.servlet.http.HttpSessionListener;
  * introduced in the 2.3 version of the Servlet API. This listener merely
  * documents the occurrence of such events in the application log associated
  * with our servlet context.
- *
- * @author Craig R. McClanahan
  */
 public final class SessionListener implements ServletContextListener,
         HttpSessionAttributeListener, HttpSessionListener {
diff --git a/webapps/examples/WEB-INF/classes/util/HTMLFilter.java 
b/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
index 3d18d33be7..fd106e732e 100644
--- a/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
+++ b/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
@@ -18,8 +18,6 @@ package util;
 
 /**
  * HTML filter utility.
- *
- * @author Craig R. McClanahan
  * @author Tim Tye
  */
 public final class HTMLFilter {
diff --git a/webapps/examples/WEB-INF/classes/validators/DebugValidator.java 
b/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
index 359dfb840c..80268dab9c 100644
--- a/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+++ b/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
@@ -31,8 +31,6 @@ import jakarta.servlet.jsp.tagext.ValidationMessage;
  * <code>$CATALINA_HOME/logs/catalina.out</code>).  To utilize it, simply
  * include a <code>taglib</code> directive for this tag library at the top
  * of your JSP page.
- *
- * @author Craig McClanahan
  */
 public class DebugValidator extends TagLibraryValidator {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


Reply via email to