This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 54f1fcb No functional change. Refactor Contained. Align 10.0.x, 9.0.x & 8.5.x 54f1fcb is described below commit 54f1fcba9fe53885163ef81606c0365ff5611789 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Mar 29 13:54:19 2021 +0100 No functional change. Refactor Contained. Align 10.0.x, 9.0.x & 8.5.x --- java/org/apache/catalina/Cluster.java | 23 ++-------------------- java/org/apache/catalina/Pipeline.java | 16 +-------------- java/org/apache/catalina/Realm.java | 22 ++------------------- .../org/apache/catalina/core/StandardPipeline.java | 3 +-- 4 files changed, 6 insertions(+), 58 deletions(-) diff --git a/java/org/apache/catalina/Cluster.java b/java/org/apache/catalina/Cluster.java index 1ae57e1..e76f1dd 100644 --- a/java/org/apache/catalina/Cluster.java +++ b/java/org/apache/catalina/Cluster.java @@ -28,9 +28,7 @@ package org.apache.catalina; * @author Bip Thelin * @author Remy Maucherat */ -public interface Cluster { - - // ------------------------------------------------------------- Properties +public interface Cluster extends Contained { /** * Return the name of the cluster that this Server is currently @@ -49,22 +47,6 @@ public interface Cluster { */ public void setClusterName(String clusterName); - /** - * Set the Container associated with our Cluster - * - * @param container The Container to use - */ - public void setContainer(Container container); - - /** - * Get the Container associated with our Cluster - * - * @return The Container associated with our Cluster - */ - public Container getContainer(); - - - // --------------------------------------------------------- Public Methods /** * Create a new manager which will use this cluster to replicate its @@ -86,14 +68,13 @@ public interface Cluster { */ public void registerManager(Manager manager); + /** * Removes a manager from the cluster * @param manager Manager */ public void removeManager(Manager manager); - // --------------------------------------------------------- Cluster Wide Deployments - /** * Execute a periodic task, such as reloading, etc. This method will be diff --git a/java/org/apache/catalina/Pipeline.java b/java/org/apache/catalina/Pipeline.java index a9c8ebe..58d2670 100644 --- a/java/org/apache/catalina/Pipeline.java +++ b/java/org/apache/catalina/Pipeline.java @@ -36,7 +36,7 @@ import java.util.Set; * @author Craig R. McClanahan * @author Peter Donald */ -public interface Pipeline { +public interface Pipeline extends Contained { /** * @return the Valve instance that has been distinguished as the basic @@ -124,20 +124,6 @@ public interface Pipeline { /** - * @return the Container with which this Pipeline is associated. - */ - public Container getContainer(); - - - /** - * Set the Container with which this Pipeline is associated. - * - * @param container The new associated container - */ - public void setContainer(Container container); - - - /** * Identifies the Valves, if any, in this Pipeline that do not support * async. * diff --git a/java/org/apache/catalina/Realm.java b/java/org/apache/catalina/Realm.java index cfe69c4..17ed927 100644 --- a/java/org/apache/catalina/Realm.java +++ b/java/org/apache/catalina/Realm.java @@ -35,30 +35,14 @@ import org.ietf.jgss.GSSContext; * * @author Craig R. McClanahan */ -public interface Realm { - - - // ------------------------------------------------------------- Properties - - /** - * @return the Container with which this Realm has been associated. - */ - public Container getContainer(); - - - /** - * Set the Container with which this Realm has been associated. - * - * @param container The associated Container - */ - public void setContainer(Container container); - +public interface Realm extends Contained { /** * @return the CredentialHandler configured for this Realm. */ public CredentialHandler getCredentialHandler(); + /** * Set the CredentialHandler to be used by this Realm. * @@ -67,8 +51,6 @@ public interface Realm { public void setCredentialHandler(CredentialHandler credentialHandler); - // --------------------------------------------------------- Public Methods - /** * Add a property change listener to this component. * diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java index 9394b1c..dadd49b 100644 --- a/java/org/apache/catalina/core/StandardPipeline.java +++ b/java/org/apache/catalina/core/StandardPipeline.java @@ -48,8 +48,7 @@ import org.apache.tomcat.util.res.StringManager; * * @author Craig R. McClanahan */ -public class StandardPipeline extends LifecycleBase - implements Pipeline, Contained { +public class StandardPipeline extends LifecycleBase implements Pipeline { private static final Log log = LogFactory.getLog(StandardPipeline.class); private static final StringManager sm = StringManager.getManager(Constants.Package); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org