svn commit: r1544539 - in /karaf/trunk/bundle/core/src/main: java/org/apache/karaf/bundle/core/internal/Bundles.java java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java resources/OSGI-INF/blueprint/blueprint.xml

[jb...@apache.org]

Author: jbonofre
Date: Fri Nov 22 13:54:50 2013
New Revision: 1544539

URL: http://svn.apache.org/r1544539
Log:
[KARAF-2264] Rename Bundles to BundlesMBeanImpl

Added:
    karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
      - copied, changed from r1544536, karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java
Removed:
    karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java
Modified:
    karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Copied: karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java (from r1544536, karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java?p2=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java&p1=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java&r1=1544536&r2=1544539&rev=1544539&view=diff
==============================================================================
--- karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java (original)
+++ karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java Fri Nov 22 13:54:50 2013
@@ -44,15 +44,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Bundles MBean implementation.
+ * BundlesMBean implementation.
  */
-public class Bundles extends StandardMBean implements BundlesMBean {
-    private Logger LOG = LoggerFactory.getLogger(Bundles.class);
+public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
+    private Logger LOG = LoggerFactory.getLogger(BundlesMBeanImpl.class);
 
     private BundleContext bundleContext;
     private final BundleService bundleService;
 
-    public Bundles(BundleContext bundleContext, BundleService bundleService) throws NotCompliantMBeanException {
+    public BundlesMBeanImpl(BundleContext bundleContext, BundleService bundleService) throws NotCompliantMBeanException {
         super(BundlesMBean.class);
         this.bundleContext = bundleContext;
         this.bundleService = bundleService;
@@ -69,7 +69,7 @@ public class Bundles extends StandardMBe
                     new String[]{"ID", "Name", "Version", "Start Level", "State"},
                     new String[]{"ID of the Bundle", "Name of the Bundle", "Version of the Bundle", "Start Level of the Bundle", "Current State of the Bundle"},
                     new OpenType[]{SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING});
-            TabularType tableType = new TabularType("Bundles", "Tables of all Bundles", bundleType, new String[]{"ID"});
+            TabularType tableType = new TabularType("BundlesMBeanImpl", "Tables of all BundlesMBeanImpl", bundleType, new String[]{"ID"});
             TabularData table = new TabularDataSupport(tableType);
 
             Bundle[] bundles = bundleContext.getBundles();

Modified: karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1544539&r1=1544538&r2=1544539&view=diff
==============================================================================
--- karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Fri Nov 22 13:54:50 2013
@@ -33,7 +33,7 @@
     <bean id="blueprintListener" class="org.apache.karaf.bundle.core.internal.BlueprintListener" />
 
 
-    <bean id="bundlesMBean" class="org.apache.karaf.bundle.core.internal.Bundles">
+    <bean id="bundlesMBean" class="org.apache.karaf.bundle.core.internal.BundlesMBeanImpl">
         <argument ref="blueprintBundleContext" />
         <argument ref="bundleService" />
     </bean>