Author: thomas.diesler(a)jboss.com Date: 2010-03-19 00:18:40 -0400 (Fri, 19 Mar 2010) New Revision: 102603 Modified: projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Upgrade aries-jmx 0.1-incubating-SNAPSHOT Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-19 04:18:40 UTC (rev 102603) @@ -406,10 +406,6 @@ <artifactId>org.apache.aries.jmx</artifactId> </dependency> <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi</artifactId> - </dependency> - <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> </dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:18:40 UTC (rev 102603) @@ -45,9 +45,8 @@ <properties> <version.apache.ant>1.7.0</version.apache.ant> <version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint> - <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx> - <version.apache.aries.jndi>1.0.0-incubating-SNAPSHOT</version.apache.aries.jndi> - <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util> + <version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx> + <version.apache.aries.util>0.1-incubating-SNAPSHOT</version.apache.aries.util> <version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin> <version.apache.felix.core>1.4.0</version.apache.felix.core> <version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin> @@ -109,11 +108,6 @@ <version>${version.apache.aries.jmx}</version> </dependency> <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi</artifactId> - <version>${version.apache.aries.jndi}</version> - </dependency> - <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> <version>${version.apache.aries.util}</version> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2010-03-19 04:18:40 UTC (rev 102603) @@ -30,7 +30,6 @@ <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.aries.blueprint:jar</include> <include>*:org.apache.aries.jmx:jar</include> - <include>*:org.apache.aries.jndi:jar</include> <include>*:org.apache.aries.util:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.eventadmin:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-03-19 04:18:40 UTC (rev 102603) @@ -28,7 +28,6 @@ <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.aries.blueprint:jar</include> <include>*:org.apache.aries.jmx:jar</include> - <include>*:org.apache.aries.jndi:jar</include> <include>*:org.apache.aries.util:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.eventadmin:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-19 04:18:40 UTC (rev 102603) @@ -30,12 +30,15 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.jboss.logging.Logger; import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.capability.CompendiumCapability; +import org.jboss.osgi.spi.capability.LogServiceCapability; +import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiRuntimeTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.osgi.jmx.framework.BundleStateMBean; import org.osgi.jmx.framework.FrameworkMBean; @@ -51,19 +54,24 @@ */ public class OSGi298TestCase extends OSGiRuntimeTest { + // Provide logging + private static final Logger log = Logger.getLogger(OSGi298TestCase.class); + private OSGiRuntime runtime; @Before public void setUp() throws Exception { + super.setUp(); runtime = getEmbeddedRuntime(); - runtime.addCapability(new CompendiumCapability()); + runtime.addCapability(new LogServiceCapability()); } @After - public void tearDown() + public void tearDown() throws Exception { runtime.shutdown(); + super.tearDown(); } @Test @@ -78,14 +86,34 @@ runtime.removeCapability(capability); - assertFalse("FrameworkMBean registered", isRegistered(FrameworkMBean.OBJECTNAME)); - assertFalse("BundleStateMBean registered", isRegistered(BundleStateMBean.OBJECTNAME)); - assertFalse("ServiceStateMBean registered", isRegistered(ServiceStateMBean.OBJECTNAME)); + assertFalse("FrameworkMBean not registered", isRegistered(FrameworkMBean.OBJECTNAME)); + assertFalse("BundleStateMBean not registered", isRegistered(BundleStateMBean.OBJECTNAME)); + assertFalse("ServiceStateMBean not registered", isRegistered(ServiceStateMBean.OBJECTNAME)); } +/* + @Test + public void testJMXBundles() throws Exception + { + OSGiBundle jbossJMX = runtime.installBundle("bundles/jboss-osgi-jmx.jar"); + OSGiBundle ariesJMX = runtime.installBundle("bundles/org.apache.aries.jmx.jar"); + + jbossJMX.start(); + ariesJMX.start(); + + Thread.sleep(2000); + + ariesJMX.stop(); + + Thread.sleep(2000); + } +*/ + private boolean isRegistered(String oname) throws MalformedObjectNameException { MBeanServer server = (MBeanServer)runtime.getMBeanServer(); - return server.isRegistered(ObjectName.getInstance(oname)); + boolean registered = server.isRegistered(ObjectName.getInstance(oname)); + log.debug(oname + " registered: " + registered); + return registered; } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-19 04:00:53 UTC (rev 102602) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-19 04:18:40 UTC (rev 102603) @@ -70,11 +70,6 @@ <artifactId>org.apache.aries.jmx</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi</artifactId> - <scope>provided</scope> - </dependency> <!-- Bundle Dependencies --> <dependency>