Author: markt
Date: Fri Feb 11 15:29:34 2011
New Revision: 1069836
URL: http://svn.apache.org/viewvc?rev=1069836&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1069836&r1=1069835&r2=1069836&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Feb
11 15:29:34 2011
@@ -274,27 +274,6 @@ public class SimpleTcpCluster extends Li
}
/**
- * @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 <Manager> " +
- "element inside the <Cluster> 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 Li
*/
@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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
