Author: markt
Date: Fri Feb 3 12:13:50 2012
New Revision: 1240113
URL: http://svn.apache.org/viewvc?rev=1240113&view=rev
Log:
Remove deprecated methods
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1240113&r1=1240112&r2=1240113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Feb 3
12:13:50 2012
@@ -1497,41 +1497,4 @@ public class MBeanUtils {
}
}
-
-
- /**
- * Determine the name of the domain to register MBeans for from a given
- * Service.
- *
- * @param service
- *
- * @deprecated To be removed since to creates a circular dependency. Will
- * be replaced in Tomcat 8 by a new method on {@link
- * Service}.
- */
- @Deprecated
- public static String getDomain(Service service) {
-
- // Null service -> return null
- if (service == null) {
- return null;
- }
-
- String domain = null;
-
- Container engine = service.getContainer();
-
- // Use the engine name first
- if (engine != null) {
- domain = engine.getName();
- }
-
- // No engine or no engine name, use the service name
- if (domain == null) {
- domain = service.getName();
- }
-
- // No service name, use null
- return domain;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
