Author: trustin Date: 2010-04-07 22:40:34 -0400 (Wed, 07 Apr 2010) New Revision: 5844 Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceMXBean.java Removed: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceInfo.java Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ConnectionMXBean.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/EndpointMXBean.java Log: * Added more counters to ConnectionMXBean * ServiceInfo has been replaced with ServiceMXBean * EndpointMXBean exposes the list of ConnectionMXBeans and ServiceMXBeans * ConnectionMXBean and ServiceMXBean exposes the name of the parent EndpointMXBean Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ConnectionMXBean.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ConnectionMXBean.java 2010-04-06 16:36:12 UTC (rev 5843) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ConnectionMXBean.java 2010-04-08 02:40:34 UTC (rev 5844) @@ -21,7 +21,12 @@ */ package org.jboss.remoting3.management; +import javax.management.ObjectName; + public interface ConnectionMXBean { + + ObjectName getEndpoint(); + Counters getRequestCounters(); Counters getClientCounters(); Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/EndpointMXBean.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/EndpointMXBean.java 2010-04-06 16:36:12 UTC (rev 5843) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/EndpointMXBean.java 2010-04-08 02:40:34 UTC (rev 5844) @@ -23,10 +23,15 @@ import java.util.List; +import javax.management.ObjectName; + public interface EndpointMXBean { + + List<ObjectName> getServices(); + List<ObjectName> getConnections(); + Counters getRequestCounters(); + Counters getConnectionCounters(); Counters getClientCounters(); - - List<ServiceInfo> getServices(); } Deleted: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceInfo.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceInfo.java 2010-04-06 16:36:12 UTC (rev 5843) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceInfo.java 2010-04-08 02:40:34 UTC (rev 5844) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.remoting3.management; - -import java.beans.ConstructorProperties; -import java.util.Map; - -public class ServiceInfo { - private final String instanceName; - private final String serviceType; - private final String requestType; - private final String replyType; - private final Map<String, String> options; - - @ConstructorProperties({ - "instanceName", "serviceType", "requestType", "replyType", "options"}) - public ServiceInfo( - String instanceName, String serviceType, - String requestType, String replyType, Map<String, String> options) { - this.instanceName = instanceName; - this.serviceType = serviceType; - this.requestType = requestType; - this.replyType = replyType; - this.options = options; - } - - public String getInstanceName() { - return instanceName; - } - - public String getServiceType() { - return serviceType; - } - - public String getRequestType() { - return requestType; - } - - public String getReplyType() { - return replyType; - } - - public Map<String, String> getOptions() { - return options; - } -} Copied: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceMXBean.java (from rev 5843, remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceInfo.java) =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceMXBean.java (rev 0) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/management/ServiceMXBean.java 2010-04-08 02:40:34 UTC (rev 5844) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.remoting3.management; + +import java.util.Map; + +import javax.management.ObjectName; + +public interface ServiceMXBean { + + ObjectName getEndpoint(); + + String getInstanceName(); + String getServiceType(); + String getRequestType(); + String getReplyType(); + Map<String, String> getOptions(); + + Counters getRequestCounters(); +}