From 1556beda55580ac4c9a286b8c2812fe4ba615f37 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 11 Feb 2011 15:29:34 +0000 Subject: [PATCH] Remove deprecated code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1069836 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 26 ++++------------------ 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index ae1b8c563..f263f54b4 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -274,27 +274,6 @@ public class SimpleTcpCluster extends LifecycleBase } /** - * @deprecated use getManagerTemplate().getClass().getName() instead. - * @return String - */ - @Deprecated - public String getManagerClassName() { - return managerTemplate.getClass().getName(); - } - - /** - * @deprecated use nested <Manager> element inside the cluster config instead. - * @param managerClassName String - */ - @Deprecated - public void setManagerClassName( - @SuppressWarnings("unused") String managerClassName) { - log.warn("setManagerClassName is deprecated, use nested " + - "element inside the element instead, this request " + - "will be ignored."); - } - - /** * Add cluster valve * Cluster Valves are only add to container when cluster is started! * @param valve The new cluster Valve. @@ -527,7 +506,10 @@ public class SimpleTcpCluster extends LifecycleBase */ @Override public synchronized Manager createManager(String name) { - if (log.isDebugEnabled()) log.debug("Creating ClusterManager for context " + name + " using class " + getManagerClassName()); + if (log.isDebugEnabled()) { + log.debug("Creating ClusterManager for context " + name + + " using class " + getManagerTemplate().getClass().getName()); + } Manager manager = null; try { manager = managerTemplate.cloneFromTemplate(); -- 2.11.0