Author: thomas.diesler(a)jboss.com Date: 2009-04-08 13:21:20 -0400 (Wed, 08 Apr 2009) New Revision: 86975 Added: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteBundle.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFramework.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFrameworkException.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38RemoteTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java Removed: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38DeployerTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38EmbeddedTestCase.java Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleMBean.java projects/jboss-osgi/trunk/testsuite/.classpath projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39DeployerTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41DeployerTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelDeployerTestCase.java Log: Add RemoteFramework, RemoteBundle Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-08 17:21:20 UTC (rev 86975) @@ -42,12 +42,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-deployer</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-deployer</artifactId> <classifier>sources</classifier> <version>${version}</version> </dependency> Added: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteBundle.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteBundle.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteBundle.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.spi.framework; + +//$Id$ + +import org.osgi.framework.BundleException; + +/** + * The supported functionality of a remote OSGi Bundle. + * + * @author thomas.diesler(a)jboss.com + * @since 04-Mar-2009 + */ +public interface RemoteBundle +{ + /** + * Returns this bundle's current state. + * A bundle can be in only one state at any time. + * + * @return An element of UNINSTALLED,INSTALLED, RESOLVED,STARTING, STOPPING,ACTIVE. + */ + int getState(); + + /** + * Returns this bundle's unique identifier. + */ + long getBundleId(); + + /** + * Returns the symbolic name of this bundle as specified by its Bundle-SymbolicName manifest header + */ + String getSymbolicName(); + + /** + * Returns the value of the specified property from the BundleContext. + */ + String getProperty(String key); + + /** + * Starts this bundle with no options + */ + void start() throws BundleException; + + /** + * Stops this bundle with no options. + */ + void stop() throws BundleException; +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteBundle.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFramework.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFramework.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFramework.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.spi.framework; + +//$Id$ + +import java.util.Set; + +/** + * The supported functionality of a remote OSGi Framework + * + * @author thomas.diesler(a)jboss.com + * @since 04-Mar-2009 + */ +public interface RemoteFramework +{ + /** + * Get the list of all installed bundles + */ + Set<RemoteBundle> getBundles(); + + /** + * Get the installed bundle + */ + RemoteBundle getBundle(String symbolicName); +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFramework.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFrameworkException.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFrameworkException.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFrameworkException.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.spi.framework; + +// $Id$ + +/** + * A remote OSGi Framework exception that should be thrown on unrecoverable errors. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jan-2009 + */ +@SuppressWarnings("serial") +public class RemoteFrameworkException extends RuntimeException +{ + public RemoteFrameworkException(String message) + { + super(message); + } + + public RemoteFrameworkException(String message, Throwable cause) + { + super(message, cause); + } + + public RemoteFrameworkException(Throwable cause) + { + super(cause); + } +} Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/RemoteFrameworkException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -27,9 +27,8 @@ import javax.management.MBeanServerConnection; -import org.jboss.osgi.spi.management.MBeanProxyException; -import org.jboss.osgi.spi.management.ManagedBundleMBean; -import org.jboss.osgi.spi.management.ManagedFrameworkMBean; +import org.jboss.osgi.spi.framework.RemoteBundle; +import org.jboss.osgi.spi.framework.RemoteFramework; /** * An integration test case @@ -70,7 +69,7 @@ getDelegate().deploy(archive); } - protected ManagedBundleMBean deployBundle(String bundleName) throws Exception + protected RemoteBundle deployBundle(String bundleName) throws Exception { return getDelegate().deployBundle(bundleName); } @@ -90,9 +89,9 @@ getDelegate().undeployBundle(bundleName); } - protected ManagedFrameworkMBean getManagedFramework() throws MBeanProxyException + protected RemoteFramework getRemoteFramework() throws Exception { - return getDelegate().getManagedFramework(); + return getDelegate().getRemoteFramework(); } protected MBeanServerConnection getServer() Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -22,7 +22,9 @@ package org.jboss.osgi.spi.junit; import java.net.URL; +import java.util.HashSet; import java.util.Hashtable; +import java.util.Set; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -31,6 +33,9 @@ import org.jboss.deployers.client.spi.DeployerClient; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.framework.RemoteBundle; +import org.jboss.osgi.spi.framework.RemoteFramework; +import org.jboss.osgi.spi.framework.RemoteFrameworkException; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.spi.management.ManagedBundleMBean; @@ -138,12 +143,10 @@ } } - public ManagedBundleMBean deployBundle(String bundleName) throws Exception + public RemoteBundle deployBundle(String bundleName) throws Exception { deploy(bundleName + ".jar"); - - ObjectName bundleOName = getManagedFramework().getBundle(bundleName); - return MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer()); + return getRemoteFramework().getBundle(bundleName); } public void undeployBundle(String bundleName) throws Exception @@ -151,12 +154,44 @@ undeploy(bundleName + ".jar"); } - public ManagedFrameworkMBean getManagedFramework() throws MBeanProxyException + public RemoteFramework getRemoteFramework() throws Exception { if (managedFramework == null) managedFramework = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.OBJECT_NAME, getServer()); - return managedFramework; + return new RemoteFramework() + { + public RemoteBundle getBundle(String symbolicName) + { + ObjectName bundleOName = managedFramework.getBundle(symbolicName); + try + { + return MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer()); + } + catch (MBeanProxyException ex) + { + throw new RemoteFrameworkException(ex); + } + } + + public Set<RemoteBundle> getBundles() + { + Set<RemoteBundle> remBundles = new HashSet<RemoteBundle>(); + for (ObjectName bundleOName : managedFramework.getBundles()) + { + try + { + RemoteBundle remBundle = MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer()); + remBundles.add(remBundle); + } + catch (MBeanProxyException ex) + { + throw new RemoteFrameworkException(ex); + } + } + return remBundles; + } + }; } public static boolean isRemoteIntegration() Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleMBean.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleMBean.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleMBean.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -21,13 +21,12 @@ */ package org.jboss.osgi.spi.management; -import javax.management.ObjectName; - -import org.osgi.framework.BundleException; - //$Id$ +import javax.management.ObjectName; +import org.jboss.osgi.spi.framework.RemoteBundle; + /** * The managed view of an OSGi Bundle. * @@ -38,43 +37,10 @@ * @author thomas.diesler(a)jboss.com * @since 04-Mar-2009 */ -public interface ManagedBundleMBean +public interface ManagedBundleMBean extends RemoteBundle { /** - * Returns this bundle's current state. - * A bundle can be in only one state at any time. - * - * @return An element of UNINSTALLED,INSTALLED, RESOLVED,STARTING, STOPPING,ACTIVE. - */ - int getState(); - - /** * Get the bundles object name. */ ObjectName getObjectName(); - - /** - * Returns this bundle's unique identifier. - */ - long getBundleId(); - - /** - * Returns the symbolic name of this bundle as specified by its Bundle-SymbolicName manifest header - */ - String getSymbolicName(); - - /** - * Returns the value of the specified property from the BundleContext. - */ - String getProperty(String key); - - /** - * Starts this bundle with no options - */ - void start() throws BundleException; - - /** - * Stops this bundle with no options. - */ - void stop() throws BundleException; } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/.classpath =================================================================== --- projects/jboss-osgi/trunk/testsuite/.classpath 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/.classpath 2009-04-08 17:21:20 UTC (rev 86975) @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry combineaccessrules="false" kind="src" path="/jboss-osgi-runtime-spi"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38DeployerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38DeployerTestCase.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38DeployerTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -1,140 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi38; - -//$Id$ - -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.junit.IntegrationTest; -import org.jboss.osgi.spi.management.ManagedBundleMBean; -import org.osgi.framework.Bundle; - -/** - * [JBOSGI-38] Investigate bundle install/start behaviour with random deployment order - * - * https://jira.jboss.org/jira/browse/JBOSGI-38 - * - * Bundle A depends on bundle B, both share bundle X. - * - * A ---> B - * A ---> X <--- B - * - * @author thomas.diesler(a)jboss.com - * @since 02-Mar-2009 - */ -public class OSGI38DeployerTestCase extends IntegrationTest -{ - @Override - protected OSGiBootstrapProvider getBootstrapProvider() - { - OSGiBootstrapProvider bootProvider = super.getBootstrapProvider(); - bootProvider.configure(); - return bootProvider; - } - - /* - * Install/Start the common bundle - */ - public void testInstallStartX() throws Exception - { - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - - undeployBundle("jbosgi38-bundleX"); - } - - /* - * Install X, B - */ - public void testInstallXBeforeB() throws Exception - { - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); - ManagedBundleMBean bundleB = deployBundle("jbosgi38-bundleB"); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - undeployBundle("jbosgi38-bundleB"); - undeployBundle("jbosgi38-bundleX"); - } - - /* - * Install X, B, A - */ - public void testInstallBBeforeA() throws Exception - { - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); - ManagedBundleMBean bundleB = deployBundle("jbosgi38-bundleB"); - ManagedBundleMBean bundleA = deployBundle("jbosgi38-bundleA"); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); - - undeployBundle("jbosgi38-bundleA"); - undeployBundle("jbosgi38-bundleB"); - undeployBundle("jbosgi38-bundleX"); - } - - /* - * Install B, X - */ - public void testInstallBBeforeX() throws Exception - { - ManagedBundleMBean bundleB = deployBundle("jbosgi38-bundleB"); - - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - undeployBundle("jbosgi38-bundleB"); - undeployBundle("jbosgi38-bundleX"); - } - - /* - * Install A, B, X - */ - public void testInstallABeforeB() throws Exception - { - ManagedBundleMBean bundleA = deployBundle("jbosgi38-bundleA"); - - assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - - ManagedBundleMBean bundleB = deployBundle("jbosgi38-bundleB"); - - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); - - undeployBundle("jbosgi38-bundleA"); - undeployBundle("jbosgi38-bundleB"); - undeployBundle("jbosgi38-bundleX"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38EmbeddedTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38EmbeddedTestCase.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38EmbeddedTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -1,228 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi38; - -//$Id$ - -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiFramework; -import org.jboss.osgi.spi.junit.IntegrationTest; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -/** - * [JBOSGI-38] Investigate bundle install/start behaviour with random deployment order - * - * https://jira.jboss.org/jira/browse/JBOSGI-38 - * - * Bundle A depends on bundle B, both share bundle X. - * - * A ---> B - * A ---> X <--- B - * - * @author thomas.diesler(a)jboss.com - * @since 02-Mar-2009 - */ -public class OSGI38EmbeddedTestCase extends IntegrationTest -{ - /* - * Install/Start the common bundle - */ - public void testInstallStartX() throws Exception - { - OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); - BundleContext sysContext = framework.getSystemBundleContext(); - - Bundle bundleX = null; - try - { - bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - - bundleX.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); - } - finally - { - uninstall(bundleX); - } - } - - /* - * Install X, B - */ - public void testInstallXBeforeB() throws Exception - { - OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); - BundleContext sysContext = framework.getSystemBundleContext(); - - Bundle bundleB = null; - Bundle bundleX = null; - try - { - bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - - bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - bundleB.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - } - finally - { - uninstall(bundleB); - uninstall(bundleX); - } - } - - /* - * Install X, B, A - */ - public void testInstallBBeforeA() throws Exception - { - OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); - BundleContext sysContext = framework.getSystemBundleContext(); - - Bundle bundleA = null; - Bundle bundleB = null; - Bundle bundleX = null; - try - { - bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - - bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleA.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - - bundleA.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); - } - finally - { - uninstall(bundleA); - uninstall(bundleB); - uninstall(bundleX); - } - } - - /* - * Install B, X - */ - public void testInstallBBeforeX() throws Exception - { - OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); - BundleContext sysContext = framework.getSystemBundleContext(); - - Bundle bundleB = null; - Bundle bundleX = null; - try - { - bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - try - { - bundleB.start(); - fail("Unresolved constraint expected"); - } - catch (BundleException ex) - { - // expected - } - - bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - - bundleB.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - } - finally - { - uninstall(bundleX); - uninstall(bundleB); - } - } - - /* - * Install A, B, X - */ - public void testInstallABeforeB() throws Exception - { - OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); - BundleContext sysContext = framework.getSystemBundleContext(); - - Bundle bundleA = null; - Bundle bundleB = null; - Bundle bundleX = null; - try - { - bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleA.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - - bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - try - { - bundleB.start(); - fail("Unresolved constraint expected"); - } - catch (BundleException ex) - { - // expected - } - - bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - - bundleB.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - bundleA.start(); - assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); - } - finally - { - uninstall(bundleA); - uninstall(bundleB); - uninstall(bundleX); - } - } - - private void uninstall(Bundle bnd) - { - try - { - if (bnd != null) - bnd.uninstall(); - } - catch (BundleException ex) - { - System.err.println(ex.toString()); - } - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38RemoteTestCase.java (from rev 86968, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38DeployerTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38RemoteTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38RemoteTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -0,0 +1,131 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi38; + +//$Id$ + +import org.jboss.osgi.spi.framework.RemoteBundle; +import org.jboss.osgi.spi.junit.IntegrationTest; +import org.osgi.framework.Bundle; + +/** + * [JBOSGI-38] Investigate bundle install/start behaviour with random deployment order + * + * https://jira.jboss.org/jira/browse/JBOSGI-38 + * + * Bundle A depends on bundle B, both share bundle X. + * + * A ---> B + * A ---> X <--- B + * + * @author thomas.diesler(a)jboss.com + * @since 02-Mar-2009 + */ +public class OSGI38RemoteTestCase extends IntegrationTest +{ + /* + * Install/Start the common bundle + */ + public void testInstallStartX() throws Exception + { + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + + undeployBundle("jbosgi38-bundleX"); + } + + /* + * Install X, B + */ + public void testInstallXBeforeB() throws Exception + { + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); + RemoteBundle bundleB = deployBundle("jbosgi38-bundleB"); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + undeployBundle("jbosgi38-bundleB"); + undeployBundle("jbosgi38-bundleX"); + } + + /* + * Install X, B, A + */ + public void testInstallBBeforeA() throws Exception + { + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); + RemoteBundle bundleB = deployBundle("jbosgi38-bundleB"); + RemoteBundle bundleA = deployBundle("jbosgi38-bundleA"); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); + + undeployBundle("jbosgi38-bundleA"); + undeployBundle("jbosgi38-bundleB"); + undeployBundle("jbosgi38-bundleX"); + } + + /* + * Install B, X + */ + public void testInstallBBeforeX() throws Exception + { + RemoteBundle bundleB = deployBundle("jbosgi38-bundleB"); + + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + undeployBundle("jbosgi38-bundleB"); + undeployBundle("jbosgi38-bundleX"); + } + + /* + * Install A, B, X + */ + public void testInstallABeforeB() throws Exception + { + RemoteBundle bundleA = deployBundle("jbosgi38-bundleA"); + + assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); + + RemoteBundle bundleB = deployBundle("jbosgi38-bundleB"); + + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); + + undeployBundle("jbosgi38-bundleA"); + undeployBundle("jbosgi38-bundleB"); + undeployBundle("jbosgi38-bundleX"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38RemoteTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java (from rev 86968, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38EmbeddedTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -0,0 +1,228 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi38; + +//$Id$ + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiFramework; +import org.jboss.osgi.spi.junit.IntegrationTest; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; + +/** + * [JBOSGI-38] Investigate bundle install/start behaviour with random deployment order + * + * https://jira.jboss.org/jira/browse/JBOSGI-38 + * + * Bundle A depends on bundle B, both share bundle X. + * + * A ---> B + * A ---> X <--- B + * + * @author thomas.diesler(a)jboss.com + * @since 02-Mar-2009 + */ +public class OSGI38TestCase extends IntegrationTest +{ + /* + * Install/Start the common bundle + */ + public void testInstallStartX() throws Exception + { + OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); + BundleContext sysContext = framework.getSystemBundleContext(); + + Bundle bundleX = null; + try + { + bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); + + bundleX.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); + } + finally + { + uninstall(bundleX); + } + } + + /* + * Install X, B + */ + public void testInstallXBeforeB() throws Exception + { + OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); + BundleContext sysContext = framework.getSystemBundleContext(); + + Bundle bundleB = null; + Bundle bundleX = null; + try + { + bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); + + bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + bundleB.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + } + finally + { + uninstall(bundleB); + uninstall(bundleX); + } + } + + /* + * Install X, B, A + */ + public void testInstallBBeforeA() throws Exception + { + OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); + BundleContext sysContext = framework.getSystemBundleContext(); + + Bundle bundleA = null; + Bundle bundleB = null; + Bundle bundleX = null; + try + { + bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); + + bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleA.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); + + bundleA.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); + } + finally + { + uninstall(bundleA); + uninstall(bundleB); + uninstall(bundleX); + } + } + + /* + * Install B, X + */ + public void testInstallBBeforeX() throws Exception + { + OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); + BundleContext sysContext = framework.getSystemBundleContext(); + + Bundle bundleB = null; + Bundle bundleX = null; + try + { + bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + try + { + bundleB.start(); + fail("Unresolved constraint expected"); + } + catch (BundleException ex) + { + // expected + } + + bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); + + bundleB.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + } + finally + { + uninstall(bundleX); + uninstall(bundleB); + } + } + + /* + * Install A, B, X + */ + public void testInstallABeforeB() throws Exception + { + OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework(); + BundleContext sysContext = framework.getSystemBundleContext(); + + Bundle bundleA = null; + Bundle bundleB = null; + Bundle bundleX = null; + try + { + bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleA.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); + + bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + try + { + bundleB.start(); + fail("Unresolved constraint expected"); + } + catch (BundleException ex) + { + // expected + } + + bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleX.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); + + bundleB.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + bundleA.start(); + assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); + } + finally + { + uninstall(bundleA); + uninstall(bundleB); + uninstall(bundleX); + } + } + + private void uninstall(Bundle bnd) + { + try + { + if (bnd != null) + bnd.uninstall(); + } + catch (BundleException ex) + { + System.err.println(ex.toString()); + } + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39DeployerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39DeployerTestCase.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39DeployerTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -23,8 +23,8 @@ //$Id$ +import org.jboss.osgi.spi.framework.RemoteBundle; import org.jboss.osgi.spi.junit.IntegrationTest; -import org.jboss.osgi.spi.management.ManagedBundleMBean; import org.osgi.framework.Bundle; /** @@ -53,11 +53,11 @@ private void installBBeforeX() throws Exception { - ManagedBundleMBean bundleB = deployBundle("jbosgi38-bundleB"); + RemoteBundle bundleB = deployBundle("jbosgi38-bundleB"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - ManagedBundleMBean bundleX = deployBundle("jbosgi38-bundleX"); + RemoteBundle bundleX = deployBundle("jbosgi38-bundleX"); assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState()); assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41DeployerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41DeployerTestCase.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41DeployerTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -27,8 +27,8 @@ import java.io.File; import java.io.FileReader; +import org.jboss.osgi.spi.framework.RemoteBundle; import org.jboss.osgi.spi.junit.IntegrationTest; -import org.jboss.osgi.spi.management.ManagedBundleMBean; import org.osgi.framework.Bundle; /** @@ -43,7 +43,7 @@ { public void testFirstRun() throws Exception { - ManagedBundleMBean bundleA = deployBundle("jbosgi41-bundleA"); + RemoteBundle bundleA = deployBundle("jbosgi41-bundleA"); assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); File dataFile = getBundleDataFile(bundleA, "config/jbosgi41.txt"); @@ -56,7 +56,7 @@ undeployBundle("jbosgi41-bundleA"); } - private File getBundleDataFile(ManagedBundleMBean bundleA, String filename) + private File getBundleDataFile(RemoteBundle bundleA, String filename) { String storageRoot = bundleA.getProperty("org.osgi.framework.storage"); assertNotNull("Storage dir not null", storageRoot); Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelDeployerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelDeployerTestCase.java 2009-04-08 17:12:11 UTC (rev 86974) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelDeployerTestCase.java 2009-04-08 17:21:20 UTC (rev 86975) @@ -23,8 +23,8 @@ //$Id$ +import org.jboss.osgi.spi.framework.RemoteBundle; import org.jboss.osgi.spi.junit.IntegrationTest; -import org.jboss.osgi.spi.management.ManagedBundleMBean; import org.osgi.framework.Bundle; /** @@ -37,7 +37,7 @@ { public void testStartLevel() throws Exception { - ManagedBundleMBean bundle = deployBundle("startlevel-service"); + RemoteBundle bundle = deployBundle("startlevel-service"); assertEquals("Bundle active", Bundle.ACTIVE, bundle.getState());