Author: cschneider Date: Tue Apr 3 15:34:50 2012 New Revision: 1308983 URL: http://svn.apache.org/viewvc?rev=1308983&view=rev Log: KARAF-1302 Use JMX Whiteboard for bundle mbean
Added: karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java - copied, changed from r1308973, karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java - copied, changed from r1308973, karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml - copied, changed from r1308973, karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml Removed: karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml karaf/trunk/pom.xml Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1308983&r1=1308982&r2=1308983&view=diff ============================================================================== --- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original) +++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Apr 3 15:34:50 2012 @@ -177,7 +177,6 @@ <feature name="management" description="Provide a JMX MBeanServer and a set of MBeans in Karaf" version="${project.version}"> <bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.system/org.apache.karaf.system.management/${project.version}</bundle> - <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.management/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle> Copied: karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java (from r1308973, karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java) URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java?p2=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java&p1=karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java&r1=1308973&r2=1308983&rev=1308983&view=diff ============================================================================== --- karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java (original) +++ karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java Tue Apr 3 15:34:50 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.bundle.management; +package org.apache.karaf.bundle.core; import javax.management.openmbean.TabularData; Copied: karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java (from r1308973, karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java) URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java?p2=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java&p1=karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java&r1=1308973&r2=1308983&rev=1308983&view=diff ============================================================================== --- karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java (original) +++ karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java Tue Apr 3 15:34:50 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.bundle.management.internal; +package org.apache.karaf.bundle.core.internal; import java.io.InputStream; import java.net.URL; @@ -34,7 +34,7 @@ import javax.management.openmbean.Tabula import org.apache.karaf.bundle.core.BundleInfo; import org.apache.karaf.bundle.core.BundleService; -import org.apache.karaf.bundle.management.BundlesMBean; +import org.apache.karaf.bundle.core.BundlesMBean; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.startlevel.BundleStartLevel; @@ -45,13 +45,13 @@ import org.slf4j.LoggerFactory; /** * Bundles MBean implementation. */ -public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean { - private Logger LOG = LoggerFactory.getLogger(BundlesMBeanImpl.class); +public class Bundles extends StandardMBean implements BundlesMBean { + private Logger LOG = LoggerFactory.getLogger(Bundles.class); private BundleContext bundleContext; private final BundleService bundleService; - public BundlesMBeanImpl(BundleContext bundleContext, BundleService bundleService) throws NotCompliantMBeanException { + public Bundles(BundleContext bundleContext, BundleService bundleService) throws NotCompliantMBeanException { super(BundlesMBean.class); this.bundleContext = bundleContext; this.bundleService = bundleService; Copied: karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (from r1308973, karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml&r1=1308973&r2=1308983&rev=1308983&view=diff ============================================================================== --- karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml (original) +++ karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 3 15:34:50 2012 @@ -17,7 +17,10 @@ limitations under the License. --> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"> + + <ext:property-placeholder /> <bean id="bundleService" class="org.apache.karaf.bundle.core.internal.BundleServiceImpl"> <argument ref="blueprintBundleContext"/> @@ -36,4 +39,15 @@ </interfaces> </service> + <bean id="bundlesMBean" class="org.apache.karaf.bundle.core.internal.Bundles"> + <argument ref="blueprintBundleContext" /> + <argument ref="bundleService" /> + </bean> + + <service ref="bundlesMBean" auto-export="interfaces"> + <service-properties> + <entry key="jmx.objectname" value="org.apache.karaf:type=bundle,name=${karaf.name}"/> + </service-properties> + </service> + </blueprint> Modified: karaf/trunk/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1308983&r1=1308982&r2=1308983&view=diff ============================================================================== --- karaf/trunk/pom.xml (original) +++ karaf/trunk/pom.xml Tue Apr 3 15:34:50 2012 @@ -349,11 +349,6 @@ <artifactId>org.apache.karaf.bundle.command</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.karaf.bundle</groupId> - <artifactId>org.apache.karaf.bundle.management</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.karaf.package</groupId>