[jboss-cvs] JBossAS SVN: r96993 - in projects/jboss-osgi/projects/bundles/microcontainer/trunk: src/main/java/org/jboss/osgi/microcontainer and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-11-25 15:10:01 -0500 (Wed, 25 Nov 2009)
New Revision: 96993

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
Log:
Fix MicrocontainerCapability to include XB and JMX 

Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-11-25 20:06:05 UTC (rev 96992)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-11-25 20:10:01 UTC (rev 96993)
@@ -21,7 +21,7 @@
   <artifactId>jboss-osgi-microcontainer</artifactId>
   <packaging>bundle</packaging>
 
-  <version>2.0-SNAPSHOT</version>
+  <version>2.0.9-SNAPSHOT</version>
   
   <!-- Parent -->
   <parent>
@@ -43,6 +43,7 @@
     <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
     <version.jboss.osgi.runtime.deployers>1.0.2</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.osgi>4.2.0</version.osgi>
@@ -57,6 +58,11 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jmx</artifactId>
+      <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>

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-25 20:06:05 UTC (rev 96992)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java	2009-11-25 20:10:01 UTC (rev 96993)
@@ -23,8 +23,9 @@
 
 //$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.capability.CompendiumCapability;
 import org.jboss.osgi.spi.service.MicrocontainerService;
 
 /**
@@ -44,7 +45,8 @@
    {
       super(MicrocontainerService.class.getName());
       
-      addDependency(new CompendiumCapability());
+      addDependency(new XMLBindingCapability());
+      addDependency(new JMXCapability());
       
       addBundle("bundles/jboss-osgi-microcontainer.jar");
    }