[jboss-osgi-commits] JBoss-OSGI SVN: r97029 - in projects/jboss-osgi/projects/bundles/microcontainer/trunk: src/main/java/org/jboss/osgi/microcontainer and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-11-26 09:41:11 -0500 (Thu, 26 Nov 2009) New Revision: 97029 Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java Log: Fix exports for BP Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 14:39:22 UTC (rev 97028) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 14:41:11 UTC (rev 97029) @@ -39,19 +39,47 @@ <!-- Properties --> <properties> + <version.javassist>3.9.0.GA</version.javassist> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx> <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi> - <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding> + <version.jboss.reflect>2.0.2.GA</version.jboss.reflect> + <version.jboss.xb>2.0.2.Beta3</version.jboss.xb> <version.osgi>4.2.0</version.osgi> </properties> <!-- Dependencies --> <dependencies> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${version.javassist}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${version.jboss.microcontainer}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${version.jboss.xb}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> @@ -62,11 +90,6 @@ <version>${version.jboss.osgi.jmx}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding</artifactId> - <version>${version.jboss.osgi.xml.binding}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.runtime.deployers}</version> @@ -77,17 +100,6 @@ <version>${version.jboss.osgi.deployment}</version> </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.deployers}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <!-- Provided Dependencies --> <dependency> <groupId>org.osgi</groupId> @@ -134,23 +146,12 @@ org.osgi.util.tracker, <!-- import --> - javassist*, - org.jboss.beans.info.*, - org.jboss.classadapter.spi, - org.jboss.config.*, - org.jboss.deployers.*, - org.jboss.joinpoint.*, org.jboss.logging, - org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.deployment.deployer, - org.jboss.osgi.jbossxb;version=2.0, + org.jboss.osgi.deployment.deployer;version=1.0, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.util;version=1.0, - org.jboss.reflect.*, - org.jboss.util.*, - org.jboss.virtual*, - org.jboss.xb.*, + org.jboss.virtual;version="[2.1,2.2)", <!-- optional --> @@ -161,6 +162,7 @@ <DynamicImport-Package>*</DynamicImport-Package> <Embed-Transitive>true</Embed-Transitive> <Embed-Dependency> + javassist;inline=false, jboss-classloader;inline=false, jboss-classloading;inline=false, jboss-classloading-spi;inline=false, @@ -179,12 +181,15 @@ jboss-metatype;inline=false, jboss-mdr;inline=false, jboss-osgi-deployers;inline=false, + jboss-reflect;inline=false, jboss-kernel;inline=false, + jbossxb;inline=false, </Embed-Dependency> <_exportcontents> + org.jboss.beans.metadata*;version=2.0.9, + org.jboss.dependency.spi*;version=2.0.9, org.jboss.kernel.spi*;version=2.0.9, - org.jboss.dependency*;version=2.0.9, - org.jboss.deployers*;version=2.0.5, + org.jboss.reflect.spi;version=2.0.2, </_exportcontents> </instructions> </configuration> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-26 14:39:22 UTC (rev 97028) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-26 14:41:11 UTC (rev 97029) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.osgi.jbossxb.XMLBindingCapability; import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.service.MicrocontainerService; @@ -45,7 +44,6 @@ { super(MicrocontainerService.class.getName()); - addDependency(new XMLBindingCapability()); addDependency(new JMXCapability()); addBundle("bundles/jboss-osgi-microcontainer.jar"); Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-11-26 14:39:22 UTC (rev 97028) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-11-26 14:41:11 UTC (rev 97029) @@ -23,24 +23,17 @@ //$Id$ -import static org.osgi.framework.Constants.OBJECTCLASS; - import java.net.URL; -import java.util.Arrays; -import java.util.List; import javax.management.MBeanServer; import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.osgi.jbossxb.XMLBindingService; import org.jboss.osgi.microcontainer.AbstractMicrocontainerService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.virtual.VFS; import org.osgi.framework.BundleContext; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; @@ -82,54 +75,28 @@ installBean(controller, BEAN_KERNEL, kernel); installBean(controller, BEAN_KERNEL_CONTROLLER, controller); - // Setup a filter to track both services - Filter filter; - try - { - String jmxService = "(" + OBJECTCLASS + "=" + MBeanServer.class.getName() + ")"; - String xmlService = "(" + OBJECTCLASS + "=" + XMLBindingService.class.getName() + ")"; - filter = context.createFilter("(|" + jmxService + xmlService + ")"); - } - catch (InvalidSyntaxException ex) - { - throw new IllegalArgumentException("Invalid filter syntax"); - } - // Register the MicrocontainerServiceMBean - ServiceTracker tracker = new ServiceTracker(context, filter, null) + ServiceTracker tracker = new ServiceTracker(context, MBeanServer.class.getName(), null) { - XMLBindingService xmlService; - MBeanServer mbeanServer; - @Override public Object addingService(ServiceReference sref) { - Object service = super.addingService(sref); - - List<String> classList = Arrays.asList((String[])sref.getProperty(OBJECTCLASS)); - if (classList.contains(MBeanServer.class.getName())) - mbeanServer = (MBeanServer)service; + MBeanServer mbeanServer = (MBeanServer)super.addingService(sref); - if (classList.contains(XMLBindingService.class.getName())) - xmlService = (XMLBindingService)service; + // Install the MBeanServer + installBean(controller, BEAN_MBEAN_SERVER, mbeanServer); - if (mbeanServer != null && xmlService != null) - { - // Install the MBeanServer - installBean(controller, BEAN_MBEAN_SERVER, mbeanServer); + // Deploy the deployer beans + URL deployersURL = context.getBundle().getResource("META-INF/base-deployers-beans.xml"); + deployer.deploy(deployersURL); - // Deploy the deployer beans - URL deployersURL = context.getBundle().getResource("META-INF/base-deployers-beans.xml"); - deployer.deploy(deployersURL); + // Register the MicrocontainerService + context.registerService(MicrocontainerService.class.getName(), mcServiceImpl, null); - // Register the MicrocontainerService - context.registerService(MicrocontainerService.class.getName(), mcServiceImpl, null); + // Register the MicrocontainerServiceMBean + registerMicrocontainerServiceMBean(mbeanServer); - // Register the MicrocontainerServiceMBean - registerMicrocontainerServiceMBean(mbeanServer); - } - - return service; + return mbeanServer; } }; tracker.open();