[jboss-cvs] JBossAS SVN: r101390 - in projects/jboss-osgi: trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108 and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-24 07:25:12 -0500 (Wed, 24 Feb 2010)
New Revision: 101390

Modified:
   projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
Log:
Aries JMX dependes on Compendium

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java	2010-02-24 12:13:48 UTC (rev 101389)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java	2010-02-24 12:25:12 UTC (rev 101390)
@@ -26,6 +26,7 @@
 import javax.management.MBeanServer;
 
 import org.jboss.osgi.spi.capability.Capability;
+import org.jboss.osgi.spi.capability.CompendiumCapability;
 
 /**
  * Adds the JMX capability to the {@link OSGiRuntime}
@@ -55,6 +56,8 @@
       addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost"));
       addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198");
       
+      addDependency(new CompendiumCapability());
+      
       addBundle("bundles/jboss-osgi-jmx.jar");
       addBundle("bundles/org.apache.aries.jmx.jar");
    }

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java	2010-02-24 12:13:48 UTC (rev 101389)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java	2010-02-24 12:25:12 UTC (rev 101390)
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import org.jboss.osgi.jmx.JMXCapability;
+import org.jboss.osgi.spi.capability.LogServiceCapability;
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.testing.OSGiBundle;
 import org.jboss.osgi.testing.OSGiPackageAdmin;
@@ -56,6 +57,7 @@
    public static void beforeClass() throws Exception
    {
       runtime = new OSGiTestHelper().getDefaultRuntime();
+      runtime.addCapability(new LogServiceCapability());
       runtime.addCapability(new JMXCapability());
    }