craigmcc 02/02/12 10:54:03
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Update MBean Name creation for Ajp13Connector so that the corresponding
MBean can be created.
Revision Changes Path
1.23 +30 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MBeanUtils.java 7 Feb 2002 23:59:50 -0000 1.22
+++ MBeanUtils.java 12 Feb 2002 18:54:02 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.22 2002/02/07 23:59:50 amyroh Exp $
- * $Revision: 1.22 $
- * $Date: 2002/02/07 23:59:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.23 2002/02/12 18:54:02 craigmcc Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/02/12 18:54:02 $
*
* ====================================================================
*
@@ -99,6 +99,7 @@
import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.valves.ValveBase;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -108,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.22 $ $Date: 2002/02/07 23:59:50 $
+ * @version $Revision: 1.23 $ $Date: 2002/02/12 18:54:02 $
*/
public class MBeanUtils {
@@ -123,6 +124,8 @@
* is a class name, and the second element is the managed bean name.
*/
private static String exceptions[][] = {
+ { "org.apache.ajp.tomcat4.Ajp13Connector",
+ "Ajp13Connector" },
{ "org.apache.catalina.core.StandardDefaultContext",
"DefaultContext" },
{ "org.apache.catalina.connector.http10.HttpConnector",
@@ -172,14 +175,19 @@
// Deal with exceptions to the standard rule
String className = component.getClass().getName();
for (int i = 0; i < exceptions.length; i++) {
- if (className.equals(exceptions[i][0]))
+ if (className.equals(exceptions[i][0])) {
+ System.out.println("EXC " + className + " --> " +
+ exceptions[i][1]);
return (exceptions[i][1]);
+ }
}
// Perform the standard transformation
int period = className.lastIndexOf('.');
if (period >= 0)
className = className.substring(period + 1);
+ System.out.println("STD " + component.getClass().getName() + " --> " +
+ className);
return (className);
}
@@ -707,6 +715,23 @@
",port=" + httpConnector.getPort() +
",address=" + httpConnector.getAddress());
return (name);
+ } else if ("org.apache.ajp.tomcat4.Ajp13Connector".equals
+ (connector.getClass().getName())) {
+ try {
+ String address = (String)
+ PropertyUtils.getSimpleProperty(connector, "address");
+ Integer port = (Integer)
+ PropertyUtils.getSimpleProperty(connector, "port");
+ name = new ObjectName(domain + ":type=Connector" +
+ ",service=" +
+ connector.getService().getName() +
+ ",port=" + port +
+ ",address=" + address);
+ return (name);
+ } catch (Exception e) {
+ throw new MalformedObjectNameException
+ ("Cannot create object name for " + connector);
+ }
} else {
throw new MalformedObjectNameException
("Cannot create object name for " + connector);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
