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

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

Author: thomas.diesler at jboss.com
Date: 2009-11-25 15:20:02 -0500 (Wed, 25 Nov 2009)
New Revision: 96995

Modified:
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java
Log:
Used fixed MicrocontainerCapability 

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java	2009-11-25 20:14:14 UTC (rev 96994)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java	2009-11-25 20:20:02 UTC (rev 96995)
@@ -26,9 +26,6 @@
 import static org.jboss.test.osgi.example.microcontainer.bundleA.SomeBeanMBean.MBEAN_NAME;
 import static org.junit.Assert.assertEquals;
 
-import org.jboss.osgi.jbossxb.XMLBindingCapability;
-import org.jboss.osgi.jmx.JMXCapability;
-import org.jboss.osgi.jndi.JNDICapability;
 import org.jboss.osgi.microcontainer.MicrocontainerCapability;
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.testing.OSGiBundle;
@@ -53,9 +50,6 @@
    public static void setUpClass() throws Exception
    {
       runtime = new OSGiTestHelper().getDefaultRuntime();
-      runtime.addCapability(new JNDICapability());
-      runtime.addCapability(new JMXCapability());
-      runtime.addCapability(new XMLBindingCapability());
       runtime.addCapability(new MicrocontainerCapability());
 
       OSGiBundle bundleA = runtime.installBundle("example-mcservice-bundleA.jar");

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java	2009-11-25 20:14:14 UTC (rev 96994)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java	2009-11-25 20:20:02 UTC (rev 96995)
@@ -26,8 +26,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import org.jboss.osgi.jmx.JMXCapability;
-import org.jboss.osgi.jndi.JNDICapability;
 import org.jboss.osgi.microcontainer.MicrocontainerCapability;
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.spi.management.MBeanProxyException;
@@ -55,8 +53,6 @@
    public static void setUpClass() throws Exception
    {
       runtime = (RemoteRuntime)new OSGiTestHelper().getRemoteRuntime();
-      runtime.addCapability(new JNDICapability());
-      runtime.addCapability(new JMXCapability());
       runtime.addCapability(new MicrocontainerCapability());
 
       runtime.installBundle("jbosgi36-bundle.jar");