[jboss-osgi-commits] JBoss-OSGI SVN: r91586 - in projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main: resources and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 17:48:11 -0400 (Wed, 22 Jul 2009) New Revision: 91586 Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml Log: Register XMLBindingService Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-07-22 21:47:17 UTC (rev 91585) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-07-22 21:48:11 UTC (rev 91586) @@ -33,6 +33,7 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.logging.Logger; +import org.jboss.osgi.jbossxb.XMLBindingService; import org.jboss.osgi.microcontainer.MicrocontainerService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.DeployerService; @@ -94,11 +95,17 @@ context.registerService(MBeanServer.class.getName(), mbeanServer, null); log.debug("MBeanServer registered"); - // Register the InitialContext service - registerInitialContext(); + // Register the InitialContext + InitialContext initialContext = getInitialContext(); + context.registerService(InitialContext.class.getName(), initialContext, null); log.debug("InitialContext registered"); - // Preregister some beans + // Register the XMLBindingService + XMLBindingService xbService = new XMLBindingService(){}; + context.registerService(XMLBindingService.class.getName(), xbService, null); + log.debug("XMLBindingService registered"); + + // Preregister some MC beans installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, context); installBean(controller, BEAN_KERNEL, kernel); installBean(controller, BEAN_KERNEL_CONTROLLER, controller); @@ -125,12 +132,11 @@ unregisterMicrocontainerServiceMBean(mbeanServer); } - public void registerInitialContext() + private InitialContext getInitialContext() { try { - InitialContext initialContext = new InitialContext(); - context.registerService(InitialContext.class.getName(), initialContext, null); + return new InitialContext(); } catch (NamingException ex) { Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-22 21:47:17 UTC (rev 91585) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-22 21:48:11 UTC (rev 91586) @@ -26,7 +26,8 @@ <key>org.osgi.framework.system.packages.extra</key> <value> <!-- system --> - org.apache.xerces.dom, + javax.xml.bind.annotation;version=2.1, + org.apache.xerces.dom;version=2.9, <!-- jboss-osgi --> org.jboss.osgi.jmx;version=1.0, @@ -49,11 +50,14 @@ org.jboss.dependency.spi;version=2.0, org.jboss.kernel.spi.dependency;version=2.0, org.jboss.logging, + org.jboss.reflect.spi;version=2.0, + org.jboss.util.xml;version=2.2, org.jboss.virtual, org.jboss.virtual.plugins.registry, org.jboss.virtual.plugins.context.jar, org.jboss.virtual.plugins.vfs.helpers, org.jboss.virtual.protocol, + org.jboss.xb.annotations;version=2.0, org.jboss.xb.binding;version=2.0, org.jboss.xb.binding.sunday.unmarshalling;version=2.0, </value>