svn commit: r1200391 - in /karaf/trunk/management/mbeans/services/src/main: java/org/apache/karaf/management/mbeans/services/ java/org/apache/karaf/management/mbeans/services/internal/ resources/OSGI-INF/blueprint/

[jbonofre]

Author: jbonofre
Date: Thu Nov 10 15:50:08 2011
New Revision: 1200391

URL: http://svn.apache.org/viewvc?rev=1200391&view=rev
Log:
[KARAF-946] Normalize the service MBean

Modified:
    
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
    
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
    
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml

Modified: 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java?rev=1200391&r1=1200390&r2=1200391&view=diff
==============================================================================
--- 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
 (original)
+++ 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
 Thu Nov 10 15:50:08 2011
@@ -23,9 +23,9 @@ import javax.management.openmbean.Tabula
  */
 public interface ServicesMBean {
 
-    TabularData list() throws Exception;
-    TabularData list(boolean inUse) throws Exception;
-    TabularData list(long bundleId) throws Exception;
-    TabularData list(long bundleId, boolean inUse) throws Exception;
+    TabularData getService() throws Exception;
+    TabularData getService(boolean inUse) throws Exception;
+    TabularData getService(long bundleId) throws Exception;
+    TabularData getService(long bundleId, boolean inUse) throws Exception;
 
 }

Modified: 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java?rev=1200391&r1=1200390&r2=1200391&view=diff
==============================================================================
--- 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
 (original)
+++ 
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
 Thu Nov 10 15:50:08 2011
@@ -38,19 +38,19 @@ public class ServicesMBeanImpl extends S
         super(ServicesMBean.class);
     }
 
-    public TabularData list() throws Exception {
-        return list(-1, false);
+    public TabularData getService() throws Exception {
+        return getService(-1, false);
     }
 
-    public TabularData list(boolean inUse) throws Exception {
-        return list(-1, inUse);
+    public TabularData getService(boolean inUse) throws Exception {
+        return getService(-1, inUse);
     }
 
-    public TabularData list(long bundleId) throws Exception {
-        return list(bundleId, false);
+    public TabularData getService(long bundleId) throws Exception {
+        return getService(bundleId, false);
     }
 
-    public TabularData list(long bundleId, boolean inUse) throws Exception {
+    public TabularData getService(long bundleId, boolean inUse) throws 
Exception {
         CompositeType serviceType = new CompositeType("Service", "OSGi 
Service",
                 new String[]{ "Interfaces", "Properties" },
                 new String[]{ "Interfaces class name of the service", 
"Properties of the service" },

Modified: 
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml?rev=1200391&r1=1200390&r2=1200391&view=diff
==============================================================================
--- 
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml
 (original)
+++ 
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml
 Thu Nov 10 15:50:08 2011
@@ -28,7 +28,7 @@
     <bean id="mbeanRegistrer" 
class="org.apache.karaf.management.MBeanRegistrer">
         <property name="mbeans">
             <map>
-                <entry 
value="org.apache.karaf:type=services,name=${karaf.name}" 
key-ref="servicesMBean"/>
+                <entry 
value="org.apache.karaf:type=service,name=${karaf.name}" 
key-ref="servicesMBean"/>
             </map>
         </property>
     </bean>