[jboss-osgi-commits] JBoss-OSGI SVN: r95403 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/jbossas and 51 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-22 09:39:47 -0400 (Thu, 22 Oct 2009) New Revision: 95403 Added: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiBundle.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiServiceReference.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTest.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/package.html Removed: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiServiceReference.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/package.html projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BlueprintContainerParserTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/RootElementParserTestCase.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties projects/jboss-osgi/trunk/reactor/framework/src/etc/osgitck/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloading/BundleClassPathTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedServiceReference.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFramework.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFrameworkException.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteServiceReference.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 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/simple/SimpleHuskyTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 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/jbosgi112/OSGI112TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGI92TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java 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/performance/blueprint/BlueprintStressTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties Log: Finalize separation of testing from spi Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -36,7 +36,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0, <!-- jboss --> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -44,7 +44,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0, <!-- jboss --> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -49,7 +49,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0 </value></entry> <!-- Husky socket connector properties --> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -42,7 +42,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0 </value></entry> <!-- Hot Deployment --> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -62,7 +62,7 @@ <version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi> <version.jboss.osgi.microcontainer>1.0.3-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.runtime.deployers>1.0.2</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.runtime.deployers>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -40,9 +40,9 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.container.bundle.BeanA; import org.jboss.test.osgi.blueprint.container.bundle.BeanB; import org.jboss.test.osgi.blueprint.container.bundle.ServiceA; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -40,7 +40,7 @@ import org.jboss.osgi.blueprint.parser.xb.TService; import org.jboss.osgi.blueprint.parser.xb.TServiceReference; import org.jboss.osgi.blueprint.parser.xb.TTypeConverters; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.MockBlueprintContext; import org.junit.BeforeClass; import org.junit.Test; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -33,7 +33,7 @@ import org.jboss.osgi.blueprint.parser.xb.TBean; import org.jboss.osgi.blueprint.parser.xb.TBlueprint; import org.jboss.osgi.blueprint.parser.xb.TComponent; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.MockBlueprintContext; import org.jboss.test.osgi.blueprint.parser.common.BeanA; import org.jboss.test.osgi.blueprint.parser.common.BeanB; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -34,8 +34,8 @@ import org.jboss.osgi.blueprint.parser.xb.TBlueprint; import org.jboss.osgi.blueprint.parser.xb.TComponent; import org.jboss.osgi.blueprint.parser.xb.TService; -import org.jboss.osgi.spi.testing.OSGiTest; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.MockBlueprintContext; import org.jboss.test.osgi.blueprint.parser.common.BeanA; import org.jboss.test.osgi.blueprint.parser.common.ServiceA; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BlueprintContainerParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BlueprintContainerParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BlueprintContainerParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -37,7 +37,7 @@ import org.jboss.osgi.blueprint.parser.xb.TProperty; import org.jboss.osgi.blueprint.parser.xb.TReference; import org.jboss.osgi.blueprint.parser.xb.TService; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.MockBlueprintContext; import org.jboss.test.osgi.blueprint.container.bundle.BeanA; import org.jboss.test.osgi.blueprint.container.bundle.BeanB; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/RootElementParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/RootElementParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/RootElementParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -32,7 +32,7 @@ import org.jboss.osgi.blueprint.parser.xb.TActivation; import org.jboss.osgi.blueprint.parser.xb.TAvailability; import org.jboss.osgi.blueprint.parser.xb.TBlueprint; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.blueprint.MockBlueprintContext; import org.junit.Test; Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -38,11 +38,10 @@ org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.framework;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.util;version=1.0 + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing, </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-10-22 13:39:47 UTC (rev 95403) @@ -12,7 +12,7 @@ org.jboss.osgi.husky, \ org.jboss.osgi.husky.annotation, \ org.jboss.osgi.spi.capability, \ - org.jboss.osgi.spi.testing, \ + org.jboss.osgi.testing, \ org.junit, \ org.osgi.framework, \ org.osgi.service.blueprint.* Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:39:47 UTC (rev 95403) @@ -23,11 +23,11 @@ org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.logging;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ - org.jboss.osgi.spi.testing;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing, \ org.jboss.virtual, \ org.jboss.virtual.plugins.registry, \ org.jboss.virtual.plugins.context.jar, \ Modified: projects/jboss-osgi/trunk/reactor/framework/src/etc/osgitck/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,7 +26,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.osgi.framework, Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,7 +26,7 @@ import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntime; /** * Adds the Microcontainer capability to the {@link OSGiRuntime} Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -38,7 +38,7 @@ import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy; import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; import org.junit.Before; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloading/BundleClassPathTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloading/BundleClassPathTest.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloading/BundleClassPathTest.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,7 +26,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,10 +26,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.util.ServiceLoader; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.integration.simple.bundleA.SimpleService; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -29,8 +29,8 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.util.ServiceLoader; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -31,8 +31,8 @@ import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.resolver.BundleResolver; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.util.ServiceLoader; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -23,7 +23,7 @@ org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.osgi.framework, Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,113 +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.osgi.spi.testing; - -import java.util.Dictionary; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; -import org.osgi.framework.Version; - -/** - * An abstraction of an OSGi {@link Bundle}. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public abstract class OSGiBundle -{ - /** - * Returns this bundle's unique identifier. - */ - public abstract long getBundleId(); - - /** - * Returns the symbolic name of this bundle as specified by its Bundle-SymbolicName manifest header. - */ - public abstract String getSymbolicName(); - - /** - * Returns the version of this bundle. - */ - public abstract Version getVersion(); - - /** - * Returns this bundle's Manifest headers and values. - */ - public abstract Dictionary<String, String> getHeaders(); - - /** - * Returns this bundle's current state. - */ - public abstract int getState(); - - /** - * Returns the value of the specified property. - */ - public abstract String getProperty(String key); - - /** - * Starts this bundle. - */ - public abstract void start() throws BundleException; - - /** - * Stops this bundle. - */ - public abstract void stop() throws BundleException; - - /** - * Uninstalls this bundle. - */ - public abstract void uninstall() throws BundleException; - - /** - * Return true if symbolic name and version are equal - */ - public boolean equals(Object obj) - { - if ((obj instanceof OSGiBundle) == false) - return false; - - OSGiBundle other = (OSGiBundle)obj; - - boolean isEqual = getSymbolicName().equals(other.getSymbolicName()); - isEqual = isEqual && getVersion().equals(other.getVersion()); - return isEqual; - } - - /** - * Returns the hash code for this bundle. - */ - public int hashCode() - { - return toString().hashCode(); - } - - /** - * Returns the string representation of this bundle - */ - public String toString() - { - return "[" + getSymbolicName() + "," + getVersion() + "]"; - } -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,45 +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.osgi.spi.testing; - -//$Id$ - -import org.osgi.service.packageadmin.PackageAdmin; - -/** - * An abstraction of the OSGi {@link PackageAdmin} service. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public interface OSGiPackageAdmin -{ - /** - * Forces the update (replacement) or removal of packages exported by the specified bundles. - * - * @see {@link PackageAdmin#refreshPackages(org.osgi.framework.Bundle[])} - * - * @param bundles The bundles whose exported packages are to be updated or removed, - * or null for all bundles updated or uninstalled since the last call to this method. - */ - void refreshPackages(OSGiBundle[] bundles); -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,128 +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.osgi.spi.testing; - -import javax.management.MBeanServerConnection; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.osgi.spi.capability.Capability; -import org.osgi.framework.BundleException; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.Version; -import org.osgi.service.packageadmin.PackageAdmin; - -/** - * An abstraction of an OSGi Runtime. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public interface OSGiRuntime -{ - /** - * Add a {@link Capability} to the runtime. - * - * Adding a capability recursively adds the orderded set of dependent capabilities - * before it installs and starts the orderded set bundles. - */ - void addCapability(Capability capability) throws BundleException, InvalidSyntaxException; - - /** - * Remove a {@link Capability} from the runtime. - * - * Removing a capability does the reverse of {@link #addCapability(Capability)}. - */ - void removeCapability(Capability capability); - - /** - * Install an {@link OSGiBundle} from the given location. - */ - OSGiBundle installBundle(String location) throws BundleException; - - /** - * Get the array of installed {@link OSGiBundle}s - */ - OSGiBundle[] getBundles(); - - /** - * Get the {@link OSGiBundle} for a given symbolic name and version - * - * In case the version is left unspecified, it returns the first bundle that - * matches the symbolic name. - * - * @param version may be null - * @return The bundle or null if there is none - */ - OSGiBundle getBundle(String symbolicName, Version version); - - /** - * Get the {@link OSGiBundle} for a given bundle id. - * - * @return The bundle or null if there is none - */ - OSGiBundle getBundle(long bundleId); - - /** - * Get an abstraction of the {@link PackageAdmin}. - */ - OSGiPackageAdmin getPackageAdmin(); - - /** - * Returns a ServiceReference object for a service that implements and was registered - * under the specified class. - * - * @return A ServiceReference object, or null if no services are registered which implement the named class. - */ - OSGiServiceReference getServiceReference(String clazz); - - /** - * Returns an array of ServiceReference objects. - * The returned array of ServiceReference objects contains services that were registered under the specified - * class and match the specified filter criteria. - */ - OSGiServiceReference[] getServiceReferences(String clazz, String filter); - - /** - * Get the initial naming context for this {@link OSGiRuntime} - */ - InitialContext getInitialContext() throws NamingException; - - /** - * Get the MBeanServerConnection for this {@link OSGiRuntime} - */ - MBeanServerConnection getMBeanServer(); - - /** - * Get the host name that this {@link OSGiRuntime} is running on. - * - * This is the value of the 'jboss.bind.address' system property. - */ - String getServerHost(); - - /** - * Shutdown the {@link OSGiRuntime}. - * - * This will remove all installed {@link OSGiBundle}s and added {@link Capability}. - */ - void shutdown(); -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiServiceReference.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiServiceReference.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiServiceReference.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,47 +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.osgi.spi.testing; - -import org.osgi.framework.ServiceReference; - - -/** - * An abstraction of the OSGi {@link ServiceReference} - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public interface OSGiServiceReference -{ - /** - * Returns the property value to which the specified property key is mapped - * in the properties Dictionary object of the service referenced by this - * ServiceReference object. - */ - Object getProperty(String key); - - /** - * Returns an array of the keys in the properties Dictionary - * object of the service referenced by this ServiceReference object. - */ - String[] getPropertyKeys(); -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,235 +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.osgi.spi.testing; - -import java.io.File; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.virtual.VFS; -import org.junit.After; -import org.junit.Before; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * An abstract OSGi Test. - * - * {@link OSGiTest} is a convenience wrapper for the functionality provided - * by {@link OSGiTestHelper}. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public abstract class OSGiTest -{ - // Provide logging - final Logger log = LoggerFactory.getLogger(OSGiTest.class); - - private OSGiTestHelper helper; - - protected OSGiTest() - { - // Prevent unknown protocol: vfsfile - VFS.init(); - } - - /** - * Get the test helper used by this test - * - * Overwrite if you need to supply another helper - * i.e. one that you have statically setup - */ - protected OSGiTestHelper getTestHelper() - { - if (helper == null) - helper = new OSGiTestHelper(); - - return helper; - } - - /** - * Writes a a debug start messge - */ - @Before - public void setUp() throws Exception - { - log.debug("### START " + getLongName()); - } - - /** - * Writes a a debug stop messge - */ - @After - public void tearDown() throws Exception - { - log.debug("### END " + getLongName()); - } - - /** - * Get the last token in the FQN of this test class. - */ - protected String getShortName() - { - String shortName = getClass().getName(); - shortName = shortName.substring(shortName.lastIndexOf(".") + 1); - return shortName; - } - - /** - * Get the the FQN of this test class. - */ - protected String getLongName() - { - return getClass().getName(); - } - - /** - * Delegates to {@link OSGiTestHelper#getDefaultRuntime()} - */ - protected OSGiRuntime getDefaultRuntime() - { - return getTestHelper().getDefaultRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getEmbeddedRuntime()} - */ - protected OSGiRuntime getEmbeddedRuntime() - { - return getTestHelper().getEmbeddedRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getRemoteRuntime()} - */ - public OSGiRuntime getRemoteRuntime() - { - return getTestHelper().getRemoteRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getResourceURL(String)} - */ - protected URL getResourceURL(String resource) - { - return getTestHelper().getResourceURL(resource); - } - - /** - * Delegates to {@link OSGiTestHelper#getResourceFile(String)} - */ - protected File getResourceFile(String resource) - { - return getTestHelper().getResourceFile(resource); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchiveURL(String)} - */ - protected URL getTestArchiveURL(String archive) - { - return getTestHelper().getTestArchiveURL(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchivePath(String)} - */ - protected String getTestArchivePath(String archive) - { - return getTestHelper().getTestArchivePath(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchiveFile(String)} - */ - protected File getTestArchiveFile(String archive) - { - return getTestHelper().getTestArchiveFile(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getInitialContext()} - */ - public InitialContext getInitialContext() throws NamingException - { - return getTestHelper().getInitialContext(); - } - - /** - * Delegates to {@link OSGiTestHelper#getJndiPort()} - */ - public Integer getJndiPort() - { - return getTestHelper().getJndiPort(); - } - - /** - * Delegates to {@link OSGiTestHelper#getServerHost()} - */ - public String getServerHost() - { - return getTestHelper().getServerHost(); - } - - /** - * Delegates to {@link OSGiTestHelper#getTargetContainer()} - */ - public String getTargetContainer() - { - return getTestHelper().getTargetContainer(); - } - - /** - * Delegates to {@link OSGiTestHelper#getFramework()} - */ - public String getFramework() - { - return getTestHelper().getFramework(); - } - - /** - * Delegates to {@link OSGiTestHelper#isFrameworkEquinox()} - */ - public boolean isFrameworkEquinox() - { - return getTestHelper().isFrameworkEquinox(); - } - - /** - * Delegates to {@link OSGiTestHelper#isFrameworkFelix()} - */ - public boolean isFrameworkFelix() - { - return getTestHelper().isFrameworkFelix(); - } - - /** - * Delegates to {@link OSGiTestHelper#isFrameworkJBossMC()} - */ - public boolean isFrameworkJBossMC() - { - return getTestHelper().isFrameworkJBossMC(); - } -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,220 +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.osgi.spi.testing; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Hashtable; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.internal.EmbeddedRuntime; -import org.jboss.osgi.spi.testing.internal.RemoteRuntime; - -/** - * An OSGi Test Helper - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public class OSGiTestHelper -{ - private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; - private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; - - // The OSGiBootstrapProvider is a lazy property of the helper - private OSGiBootstrapProvider bootProvider; - private boolean skipCreateBootstrapProvider; - - private static String testResourcesDir; - private static String testArchiveDir; - - public OSGiTestHelper() - { - testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes"); - testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs"); - } - - public OSGiBootstrapProvider getBootstrapProvider() - { - if (bootProvider == null && skipCreateBootstrapProvider == false) - { - try - { - bootProvider = OSGiBootstrap.getBootstrapProvider(); - } - catch (RuntimeException rte) - { - skipCreateBootstrapProvider = true; - throw rte; - } - } - return bootProvider; - } - - public void ungetBootstrapProvider() - { - bootProvider = null; - } - - public OSGiRuntime getDefaultRuntime() - { - OSGiRuntime runtime; - - String target = System.getProperty("target.container"); - if (target == null) - { - runtime = getEmbeddedRuntime(); - } - else - { - runtime = getRemoteRuntime(); - } - return runtime; - } - - public OSGiRuntime getEmbeddedRuntime() - { - return new EmbeddedRuntime(this); - } - - public OSGiRuntime getRemoteRuntime() - { - return new RemoteRuntime(this); - } - - /** Try to discover the URL for the test resource */ - public URL getResourceURL(String resource) - { - URL resURL = null; - try - { - File resourceFile = getResourceFile(resource); - resURL = resourceFile.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - return resURL; - } - - /** Try to discover the File for the test resource */ - public File getResourceFile(String resource) - { - File file = new File(resource); - if (file.exists()) - return file; - - file = new File(testResourcesDir + "/" + resource); - if (file.exists()) - return file; - - throw new IllegalArgumentException("Cannot obtain '" + testResourcesDir + "/" + resource + "'"); - } - - /** Try to discover the URL for the deployment archive */ - public URL getTestArchiveURL(String archive) - { - try - { - return getTestArchiveFile(archive).toURL(); - } - catch (MalformedURLException ex) - { - throw new IllegalStateException(ex); - } - } - - /** Try to discover the absolute path for the deployment archive */ - public String getTestArchivePath(String archive) - { - return getTestArchiveFile(archive).getAbsolutePath(); - } - - /** Try to discover the File for the deployment archive */ - public File getTestArchiveFile(String archive) - { - File file = new File(archive); - if (file.exists()) - return file; - - file = new File(testArchiveDir + "/" + archive); - if (file.exists()) - return file; - - throw new IllegalArgumentException("Cannot obtain '" + testArchiveDir + "/" + archive + "'."); - } - - @SuppressWarnings("unchecked") - public InitialContext getInitialContext() throws NamingException - { - Hashtable env = new Hashtable(); - env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); - env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); - env.put("java.naming.provider.url", "jnp://" + getServerHost() + ":" + getJndiPort()); - return new InitialContext(env); - } - - public Integer getJndiPort() - { - String port = System.getProperty("jndi.server.port", "1099"); - return new Integer(port); - } - - public String getServerHost() - { - String bindAddress = System.getProperty("jboss.bind.address", "localhost"); - return bindAddress; - } - - public String getTargetContainer() - { - String targetContainer = System.getProperty("target.container"); - return targetContainer; - } - - public String getFramework() - { - String framework = System.getProperty("framework", "jbossmc"); - return framework; - } - - public boolean isFrameworkEquinox() - { - return "equinox".equals(getFramework()); - } - - public boolean isFrameworkFelix() - { - return "felix".equals(getFramework()); - } - - public boolean isFrameworkJBossMC() - { - return "jbossmc".equals(getFramework()); - } -} Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/package.html =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/package.html 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/package.html 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,5 +0,0 @@ -<html> -<body> -OSGi test support classes and interfaces. -</body> -</html> Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiBundle.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiBundle.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiBundle.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,113 @@ +/* + * 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.testing; + +import java.util.Dictionary; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.Version; + +/** + * An abstraction of an OSGi {@link Bundle}. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiBundle +{ + /** + * Returns this bundle's unique identifier. + */ + public abstract long getBundleId(); + + /** + * Returns the symbolic name of this bundle as specified by its Bundle-SymbolicName manifest header. + */ + public abstract String getSymbolicName(); + + /** + * Returns the version of this bundle. + */ + public abstract Version getVersion(); + + /** + * Returns this bundle's Manifest headers and values. + */ + public abstract Dictionary<String, String> getHeaders(); + + /** + * Returns this bundle's current state. + */ + public abstract int getState(); + + /** + * Returns the value of the specified property. + */ + public abstract String getProperty(String key); + + /** + * Starts this bundle. + */ + public abstract void start() throws BundleException; + + /** + * Stops this bundle. + */ + public abstract void stop() throws BundleException; + + /** + * Uninstalls this bundle. + */ + public abstract void uninstall() throws BundleException; + + /** + * Return true if symbolic name and version are equal + */ + public boolean equals(Object obj) + { + if ((obj instanceof OSGiBundle) == false) + return false; + + OSGiBundle other = (OSGiBundle)obj; + + boolean isEqual = getSymbolicName().equals(other.getSymbolicName()); + isEqual = isEqual && getVersion().equals(other.getVersion()); + return isEqual; + } + + /** + * Returns the hash code for this bundle. + */ + public int hashCode() + { + return toString().hashCode(); + } + + /** + * Returns the string representation of this bundle + */ + public String toString() + { + return "[" + getSymbolicName() + "," + getVersion() + "]"; + } +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -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.testing; + +//$Id$ + +import org.osgi.service.packageadmin.PackageAdmin; + +/** + * An abstraction of the OSGi {@link PackageAdmin} service. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public interface OSGiPackageAdmin +{ + /** + * Forces the update (replacement) or removal of packages exported by the specified bundles. + * + * @see {@link PackageAdmin#refreshPackages(org.osgi.framework.Bundle[])} + * + * @param bundles The bundles whose exported packages are to be updated or removed, + * or null for all bundles updated or uninstalled since the last call to this method. + */ + void refreshPackages(OSGiBundle[] bundles); +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,128 @@ +/* + * 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.testing; + +import javax.management.MBeanServerConnection; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.osgi.spi.capability.Capability; +import org.osgi.framework.BundleException; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.Version; +import org.osgi.service.packageadmin.PackageAdmin; + +/** + * An abstraction of an OSGi Runtime. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public interface OSGiRuntime +{ + /** + * Add a {@link Capability} to the runtime. + * + * Adding a capability recursively adds the orderded set of dependent capabilities + * before it installs and starts the orderded set bundles. + */ + void addCapability(Capability capability) throws BundleException, InvalidSyntaxException; + + /** + * Remove a {@link Capability} from the runtime. + * + * Removing a capability does the reverse of {@link #addCapability(Capability)}. + */ + void removeCapability(Capability capability); + + /** + * Install an {@link OSGiBundle} from the given location. + */ + OSGiBundle installBundle(String location) throws BundleException; + + /** + * Get the array of installed {@link OSGiBundle}s + */ + OSGiBundle[] getBundles(); + + /** + * Get the {@link OSGiBundle} for a given symbolic name and version + * + * In case the version is left unspecified, it returns the first bundle that + * matches the symbolic name. + * + * @param version may be null + * @return The bundle or null if there is none + */ + OSGiBundle getBundle(String symbolicName, Version version); + + /** + * Get the {@link OSGiBundle} for a given bundle id. + * + * @return The bundle or null if there is none + */ + OSGiBundle getBundle(long bundleId); + + /** + * Get an abstraction of the {@link PackageAdmin}. + */ + OSGiPackageAdmin getPackageAdmin(); + + /** + * Returns a ServiceReference object for a service that implements and was registered + * under the specified class. + * + * @return A ServiceReference object, or null if no services are registered which implement the named class. + */ + OSGiServiceReference getServiceReference(String clazz); + + /** + * Returns an array of ServiceReference objects. + * The returned array of ServiceReference objects contains services that were registered under the specified + * class and match the specified filter criteria. + */ + OSGiServiceReference[] getServiceReferences(String clazz, String filter); + + /** + * Get the initial naming context for this {@link OSGiRuntime} + */ + InitialContext getInitialContext() throws NamingException; + + /** + * Get the MBeanServerConnection for this {@link OSGiRuntime} + */ + MBeanServerConnection getMBeanServer(); + + /** + * Get the host name that this {@link OSGiRuntime} is running on. + * + * This is the value of the 'jboss.bind.address' system property. + */ + String getServerHost(); + + /** + * Shutdown the {@link OSGiRuntime}. + * + * This will remove all installed {@link OSGiBundle}s and added {@link Capability}. + */ + void shutdown(); +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiServiceReference.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiServiceReference.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiServiceReference.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiServiceReference.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,47 @@ +/* + * 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.testing; + +import org.osgi.framework.ServiceReference; + + +/** + * An abstraction of the OSGi {@link ServiceReference} + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public interface OSGiServiceReference +{ + /** + * Returns the property value to which the specified property key is mapped + * in the properties Dictionary object of the service referenced by this + * ServiceReference object. + */ + Object getProperty(String key); + + /** + * Returns an array of the keys in the properties Dictionary + * object of the service referenced by this ServiceReference object. + */ + String[] getPropertyKeys(); +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTest.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTest.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,235 @@ +/* + * 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.testing; + +import java.io.File; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.virtual.VFS; +import org.junit.After; +import org.junit.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * An abstract OSGi Test. + * + * {@link OSGiTest} is a convenience wrapper for the functionality provided + * by {@link OSGiTestHelper}. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiTest +{ + // Provide logging + final Logger log = LoggerFactory.getLogger(OSGiTest.class); + + private OSGiTestHelper helper; + + protected OSGiTest() + { + // Prevent unknown protocol: vfsfile + VFS.init(); + } + + /** + * Get the test helper used by this test + * + * Overwrite if you need to supply another helper + * i.e. one that you have statically setup + */ + protected OSGiTestHelper getTestHelper() + { + if (helper == null) + helper = new OSGiTestHelper(); + + return helper; + } + + /** + * Writes a a debug start messge + */ + @Before + public void setUp() throws Exception + { + log.debug("### START " + getLongName()); + } + + /** + * Writes a a debug stop messge + */ + @After + public void tearDown() throws Exception + { + log.debug("### END " + getLongName()); + } + + /** + * Get the last token in the FQN of this test class. + */ + protected String getShortName() + { + String shortName = getClass().getName(); + shortName = shortName.substring(shortName.lastIndexOf(".") + 1); + return shortName; + } + + /** + * Get the the FQN of this test class. + */ + protected String getLongName() + { + return getClass().getName(); + } + + /** + * Delegates to {@link OSGiTestHelper#getDefaultRuntime()} + */ + protected OSGiRuntime getDefaultRuntime() + { + return getTestHelper().getDefaultRuntime(); + } + + /** + * Delegates to {@link OSGiTestHelper#getEmbeddedRuntime()} + */ + protected OSGiRuntime getEmbeddedRuntime() + { + return getTestHelper().getEmbeddedRuntime(); + } + + /** + * Delegates to {@link OSGiTestHelper#getRemoteRuntime()} + */ + public OSGiRuntime getRemoteRuntime() + { + return getTestHelper().getRemoteRuntime(); + } + + /** + * Delegates to {@link OSGiTestHelper#getResourceURL(String)} + */ + protected URL getResourceURL(String resource) + { + return getTestHelper().getResourceURL(resource); + } + + /** + * Delegates to {@link OSGiTestHelper#getResourceFile(String)} + */ + protected File getResourceFile(String resource) + { + return getTestHelper().getResourceFile(resource); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchiveURL(String)} + */ + protected URL getTestArchiveURL(String archive) + { + return getTestHelper().getTestArchiveURL(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchivePath(String)} + */ + protected String getTestArchivePath(String archive) + { + return getTestHelper().getTestArchivePath(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchiveFile(String)} + */ + protected File getTestArchiveFile(String archive) + { + return getTestHelper().getTestArchiveFile(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getInitialContext()} + */ + public InitialContext getInitialContext() throws NamingException + { + return getTestHelper().getInitialContext(); + } + + /** + * Delegates to {@link OSGiTestHelper#getJndiPort()} + */ + public Integer getJndiPort() + { + return getTestHelper().getJndiPort(); + } + + /** + * Delegates to {@link OSGiTestHelper#getServerHost()} + */ + public String getServerHost() + { + return getTestHelper().getServerHost(); + } + + /** + * Delegates to {@link OSGiTestHelper#getTargetContainer()} + */ + public String getTargetContainer() + { + return getTestHelper().getTargetContainer(); + } + + /** + * Delegates to {@link OSGiTestHelper#getFramework()} + */ + public String getFramework() + { + return getTestHelper().getFramework(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkEquinox()} + */ + public boolean isFrameworkEquinox() + { + return getTestHelper().isFrameworkEquinox(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkFelix()} + */ + public boolean isFrameworkFelix() + { + return getTestHelper().isFrameworkFelix(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkJBossMC()} + */ + public boolean isFrameworkJBossMC() + { + return getTestHelper().isFrameworkJBossMC(); + } +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,220 @@ +/* + * 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.testing; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.testing.internal.EmbeddedRuntime; +import org.jboss.osgi.testing.internal.RemoteRuntime; + +/** + * An OSGi Test Helper + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public class OSGiTestHelper +{ + private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; + private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; + + // The OSGiBootstrapProvider is a lazy property of the helper + private OSGiBootstrapProvider bootProvider; + private boolean skipCreateBootstrapProvider; + + private static String testResourcesDir; + private static String testArchiveDir; + + public OSGiTestHelper() + { + testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes"); + testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs"); + } + + public OSGiBootstrapProvider getBootstrapProvider() + { + if (bootProvider == null && skipCreateBootstrapProvider == false) + { + try + { + bootProvider = OSGiBootstrap.getBootstrapProvider(); + } + catch (RuntimeException rte) + { + skipCreateBootstrapProvider = true; + throw rte; + } + } + return bootProvider; + } + + public void ungetBootstrapProvider() + { + bootProvider = null; + } + + public OSGiRuntime getDefaultRuntime() + { + OSGiRuntime runtime; + + String target = System.getProperty("target.container"); + if (target == null) + { + runtime = getEmbeddedRuntime(); + } + else + { + runtime = getRemoteRuntime(); + } + return runtime; + } + + public OSGiRuntime getEmbeddedRuntime() + { + return new EmbeddedRuntime(this); + } + + public OSGiRuntime getRemoteRuntime() + { + return new RemoteRuntime(this); + } + + /** Try to discover the URL for the test resource */ + public URL getResourceURL(String resource) + { + URL resURL = null; + try + { + File resourceFile = getResourceFile(resource); + resURL = resourceFile.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + return resURL; + } + + /** Try to discover the File for the test resource */ + public File getResourceFile(String resource) + { + File file = new File(resource); + if (file.exists()) + return file; + + file = new File(testResourcesDir + "/" + resource); + if (file.exists()) + return file; + + throw new IllegalArgumentException("Cannot obtain '" + testResourcesDir + "/" + resource + "'"); + } + + /** Try to discover the URL for the deployment archive */ + public URL getTestArchiveURL(String archive) + { + try + { + return getTestArchiveFile(archive).toURL(); + } + catch (MalformedURLException ex) + { + throw new IllegalStateException(ex); + } + } + + /** Try to discover the absolute path for the deployment archive */ + public String getTestArchivePath(String archive) + { + return getTestArchiveFile(archive).getAbsolutePath(); + } + + /** Try to discover the File for the deployment archive */ + public File getTestArchiveFile(String archive) + { + File file = new File(archive); + if (file.exists()) + return file; + + file = new File(testArchiveDir + "/" + archive); + if (file.exists()) + return file; + + throw new IllegalArgumentException("Cannot obtain '" + testArchiveDir + "/" + archive + "'."); + } + + @SuppressWarnings("unchecked") + public InitialContext getInitialContext() throws NamingException + { + Hashtable env = new Hashtable(); + env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); + env.put("java.naming.provider.url", "jnp://" + getServerHost() + ":" + getJndiPort()); + return new InitialContext(env); + } + + public Integer getJndiPort() + { + String port = System.getProperty("jndi.server.port", "1099"); + return new Integer(port); + } + + public String getServerHost() + { + String bindAddress = System.getProperty("jboss.bind.address", "localhost"); + return bindAddress; + } + + public String getTargetContainer() + { + String targetContainer = System.getProperty("target.container"); + return targetContainer; + } + + public String getFramework() + { + String framework = System.getProperty("framework", "jbossmc"); + return framework; + } + + public boolean isFrameworkEquinox() + { + return "equinox".equals(getFramework()); + } + + public boolean isFrameworkFelix() + { + return "felix".equals(getFramework()); + } + + public boolean isFrameworkJBossMC() + { + return "jbossmc".equals(getFramework()); + } +} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal) Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,12 +19,12 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; import java.util.Dictionary; -import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.util.ExportedPackageHelper; +import org.jboss.osgi.testing.OSGiBundle; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Version; Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,10 +19,10 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; import org.osgi.framework.Bundle; import org.osgi.service.packageadmin.PackageAdmin; Deleted: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -1,200 +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.osgi.spi.testing.internal; - -// $Id$ - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.management.MBeanServer; -import javax.management.MBeanServerConnection; -import javax.management.MBeanServerFactory; - -import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.launch.Framework; -import org.osgi.service.packageadmin.PackageAdmin; - -/** - * An embedded implementation of the {@link OSGiRuntime} - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public class EmbeddedRuntime extends OSGiRuntimeImpl -{ - public EmbeddedRuntime(OSGiTestHelper helper) - { - super(helper); - } - - public OSGiBundle installBundle(String location) throws BundleException - { - URL url = getTestHelper().getTestArchiveURL(location); - - BundleContext context = getBundleContext(); - Bundle auxBundle = context.installBundle(url.toExternalForm()); - OSGiBundle bundle = new EmbeddedBundle(this, auxBundle); - - return registerBundle(location, bundle); - } - - public OSGiBundle[] getBundles() - { - List<OSGiBundle> absBundles = new ArrayList<OSGiBundle>(); - for (Bundle bundle : getBundleContext().getBundles()) - { - absBundles.add(new EmbeddedBundle(this, bundle)); - } - OSGiBundle[] bundleArr = new OSGiBundle[absBundles.size()]; - absBundles.toArray(bundleArr); - return bundleArr; - } - - public OSGiBundle getBundle(long bundleId) - { - Bundle bundle = getBundleContext().getBundle(bundleId); - return bundle != null ? new EmbeddedBundle(this, bundle) : null; - } - - public OSGiServiceReference getServiceReference(String clazz) - { - ServiceReference sref = getBundleContext().getServiceReference(clazz); - return (sref != null ? new EmbeddedServiceReference(sref) : null); - } - - public OSGiServiceReference[] getServiceReferences(String clazz, String filter) - { - OSGiServiceReference[] retRefs = null; - - ServiceReference[] srefs; - try - { - srefs = getBundleContext().getServiceReferences(clazz, filter); - } - catch (InvalidSyntaxException e) - { - throw new IllegalArgumentException("Invalid filter syntax: " + filter); - } - - if (srefs != null) - { - retRefs = new OSGiServiceReference[srefs.length]; - for(int i=0; i < srefs.length; i++) - retRefs[i] = new EmbeddedServiceReference(srefs[i]); - } - return retRefs; - } - - @Override - public void addCapability(Capability capability) throws BundleException - { - // Copy the properties to the System props - Map<String, String> props = capability.getSystemProperties(); - for (Entry<String, String> entry : props.entrySet()) - { - String value = System.getProperty(entry.getKey()); - if (value == null) - System.setProperty(entry.getKey(), entry.getValue()); - } - - super.addCapability(capability); - } - - @Override - public void shutdown() - { - OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider(); - if (bootProvider != null) - { - super.shutdown(); - try - { - Framework framework = bootProvider.getFramework(); - framework.stop(); - framework.waitForStop(5000); - } - catch (Exception ex) - { - log.error("Cannot stop the framework", ex); - } - getTestHelper().ungetBootstrapProvider(); - } - } - - public BundleContext getBundleContext() - { - OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider(); - Framework framework = bootProvider.getFramework(); - if (framework.getState() != Bundle.ACTIVE) - { - try - { - framework.start(); - } - catch (BundleException ex) - { - throw new IllegalStateException("Cannot start framework", ex); - } - } - return framework.getBundleContext(); - } - - @SuppressWarnings("unchecked") - public MBeanServerConnection getMBeanServer() - { - ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); - if (serverArr.size() > 1) - throw new IllegalStateException("Multiple MBeanServer instances not supported"); - - MBeanServer server = null; - if (serverArr.size() == 1) - server = serverArr.get(0); - - if (server == null) - server = MBeanServerFactory.createMBeanServer(); - - return server; - } - - public OSGiPackageAdmin getPackageAdmin() - { - BundleContext context = getBundleContext(); - ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); - PackageAdmin packAdmin = (PackageAdmin)context.getService(sref); - return new EmbeddedPackageAdmin(packAdmin); - } -} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java (from rev 95394, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,217 @@ +/* + * 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.testing.internal; + +// $Id$ + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerFactory; + +import org.jboss.osgi.deployment.deployer.DeployerService; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.util.BundleInfo; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; +import org.osgi.framework.launch.Framework; +import org.osgi.service.packageadmin.PackageAdmin; + +/** + * An embedded implementation of the {@link OSGiRuntime} + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public class EmbeddedRuntime extends OSGiRuntimeImpl +{ + public EmbeddedRuntime(OSGiTestHelper helper) + { + super(helper); + } + + public OSGiBundle installBundle(String location) throws BundleException + { + URL url = getTestHelper().getTestArchiveURL(location); + BundleInfo info = BundleInfo.createBundleInfo(url); + String symbolicName = info.getSymbolicName(); + Version version = info.getVersion(); + + OSGiBundle bundle; + + BundleContext context = getBundleContext(); + ServiceReference sref = context.getServiceReference(DeployerService.class.getName()); + if (sref != null) + { + DeployerService service = (DeployerService)context.getService(sref); + service.deploy(url); + bundle = getBundle(symbolicName, version, true); + } + else + { + Bundle auxBundle = context.installBundle(url.toExternalForm()); + bundle = new EmbeddedBundle(this, auxBundle); + } + return registerBundle(location, bundle); + } + + public OSGiBundle[] getBundles() + { + List<OSGiBundle> absBundles = new ArrayList<OSGiBundle>(); + for (Bundle bundle : getBundleContext().getBundles()) + { + absBundles.add(new EmbeddedBundle(this, bundle)); + } + OSGiBundle[] bundleArr = new OSGiBundle[absBundles.size()]; + absBundles.toArray(bundleArr); + return bundleArr; + } + + public OSGiBundle getBundle(long bundleId) + { + Bundle bundle = getBundleContext().getBundle(bundleId); + return bundle != null ? new EmbeddedBundle(this, bundle) : null; + } + + public OSGiServiceReference getServiceReference(String clazz) + { + ServiceReference sref = getBundleContext().getServiceReference(clazz); + return (sref != null ? new EmbeddedServiceReference(sref) : null); + } + + public OSGiServiceReference[] getServiceReferences(String clazz, String filter) + { + OSGiServiceReference[] retRefs = null; + + ServiceReference[] srefs; + try + { + srefs = getBundleContext().getServiceReferences(clazz, filter); + } + catch (InvalidSyntaxException e) + { + throw new IllegalArgumentException("Invalid filter syntax: " + filter); + } + + if (srefs != null) + { + retRefs = new OSGiServiceReference[srefs.length]; + for(int i=0; i < srefs.length; i++) + retRefs[i] = new EmbeddedServiceReference(srefs[i]); + } + return retRefs; + } + + @Override + public void addCapability(Capability capability) throws BundleException + { + // Copy the properties to the System props + Map<String, String> props = capability.getSystemProperties(); + for (Entry<String, String> entry : props.entrySet()) + { + String value = System.getProperty(entry.getKey()); + if (value == null) + System.setProperty(entry.getKey(), entry.getValue()); + } + + super.addCapability(capability); + } + + @Override + public void shutdown() + { + OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider(); + if (bootProvider != null) + { + super.shutdown(); + try + { + Framework framework = bootProvider.getFramework(); + framework.stop(); + framework.waitForStop(5000); + } + catch (Exception ex) + { + log.error("Cannot stop the framework", ex); + } + getTestHelper().ungetBootstrapProvider(); + } + } + + public BundleContext getBundleContext() + { + OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider(); + Framework framework = bootProvider.getFramework(); + if (framework.getState() != Bundle.ACTIVE) + { + try + { + framework.start(); + } + catch (BundleException ex) + { + throw new IllegalStateException("Cannot start framework", ex); + } + } + return framework.getBundleContext(); + } + + @SuppressWarnings("unchecked") + public MBeanServerConnection getMBeanServer() + { + ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); + if (serverArr.size() > 1) + throw new IllegalStateException("Multiple MBeanServer instances not supported"); + + MBeanServer server = null; + if (serverArr.size() == 1) + server = serverArr.get(0); + + if (server == null) + server = MBeanServerFactory.createMBeanServer(); + + return server; + } + + public OSGiPackageAdmin getPackageAdmin() + { + BundleContext context = getBundleContext(); + ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); + PackageAdmin packAdmin = (PackageAdmin)context.getService(sref); + return new EmbeddedPackageAdmin(packAdmin); + } +} Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedServiceReference.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedServiceReference.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/EmbeddedServiceReference.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,11 +19,11 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; // $Id$ -import org.jboss.osgi.spi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiServiceReference; import org.osgi.framework.ServiceReference; /** Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,7 +19,7 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; import java.io.File; import java.io.IOException; @@ -41,10 +41,10 @@ import javax.naming.NamingException; import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,14 +19,14 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; // $Id$ import java.util.Dictionary; import org.jboss.osgi.spi.management.ManagedBundleMBean; -import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiBundle; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFramework.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFramework.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFramework.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,7 +19,7 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; //$Id$ Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFrameworkException.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFrameworkException.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteFrameworkException.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,7 +19,7 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; // $Id$ Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,13 +19,13 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.spi.management.ManagedFrameworkMBean; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; /** * A remote implementation of the {@link OSGiPackageAdmin} Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,7 +19,7 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; // $Id$ @@ -39,12 +39,12 @@ import org.jboss.osgi.spi.management.ManagedBundleMBean; import org.jboss.osgi.spi.management.ManagedFrameworkMBean; import org.jboss.osgi.spi.management.ManagedServiceReference; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.util.BundleInfo; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; import org.osgi.framework.BundleException; /** Modified: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteServiceReference.java =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteServiceReference.java 2009-10-22 11:39:22 UTC (rev 95391) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemoteServiceReference.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -19,10 +19,10 @@ * 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.testing.internal; +package org.jboss.osgi.testing.internal; import org.jboss.osgi.spi.management.ManagedServiceReference; -import org.jboss.osgi.spi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiServiceReference; /** * A remote implementation of the {@link OSGiServiceReference} Copied: projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/package.html (from rev 95391, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/spi/testing/package.html) =================================================================== --- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/package.html (rev 0) +++ projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/package.html 2009-10-22 13:39:47 UTC (rev 95403) @@ -0,0 +1,5 @@ +<html> +<body> +OSGi test support classes and interfaces. +</body> +</html> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -33,9 +33,9 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.blueprint.bundle.BeanA; import org.jboss.test.osgi.example.blueprint.bundle.ServiceA; import org.jboss.test.osgi.example.blueprint.bundle.ServiceB; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -31,10 +31,10 @@ import java.net.URL; import org.jboss.osgi.spi.capability.HttpServiceCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -29,9 +29,9 @@ import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.jmx.bundle.FooMBean; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -30,9 +30,9 @@ import javax.naming.NameNotFoundException; import org.jboss.osgi.jndi.JNDICapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; 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-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -31,9 +31,9 @@ import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.microcontainer.bundleA.SomeBeanMBean; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -30,9 +30,9 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.simple.bundle.SimpleService; import org.junit.After; import org.junit.Before; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -25,9 +25,9 @@ import static org.junit.Assert.assertEquals; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -30,10 +30,10 @@ import java.io.InputStreamReader; import java.net.URL; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.osgi.webapp.WebAppCapability; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -39,9 +39,9 @@ import org.jboss.osgi.husky.annotation.ProvideContext; import org.jboss.osgi.jaxb.JAXBCapability; import org.jboss.osgi.jaxb.JAXBService; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -36,9 +36,9 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.After; import org.junit.Before; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -35,9 +35,9 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.After; import org.junit.Before; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -39,11 +39,10 @@ org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.framework;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.util;version=1.0 + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing, </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-10-22 13:39:47 UTC (rev 95403) @@ -9,8 +9,8 @@ org.jboss.osgi.blueprint, \ org.jboss.osgi.husky, \ org.jboss.osgi.husky.annotation, \ - org.jboss.osgi.spi.capability, \ - org.jboss.osgi.spi.testing, \ + org.jboss.osgi.spi*, \ + org.jboss.osgi.testing, \ org.junit, \ org.osgi.framework, \ org.osgi.service.blueprint.* Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-22 13:39:47 UTC (rev 95403) @@ -22,11 +22,10 @@ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ - org.jboss.osgi.spi.logging;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ - org.jboss.osgi.spi.testing;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing, \ org.jboss.virtual, \ org.jboss.virtual.plugins.registry, \ org.jboss.virtual.plugins.context.jar, \ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,11 +26,10 @@ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ - org.jboss.osgi.spi.logging;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ - org.jboss.osgi.spi.testing;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing, \ org.jboss.virtual, \ org.jboss.virtual.plugins.registry, \ org.jboss.virtual.plugins.context.jar, \ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-10-22 13:39:47 UTC (rev 95403) @@ -3,6 +3,6 @@ Bundle-SymbolicName: example-mcservice-bundleA Bundle-Activator: org.jboss.test.osgi.example.microcontainer.bundleA.SomeServiceActivator Export-Package: org.jboss.test.osgi.example.microcontainer.bundleA -Import-Package: org.jboss.osgi.spi.service, org.osgi.framework, javax.management, org.jboss.osgi.spi.management +Import-Package: org.jboss.osgi.spi.management, org.jboss.osgi.spi.service, org.jboss.osgi.testing, org.osgi.framework, javax.management Include-Resource: META-INF/mcservice-jboss-beans.xml=META-INF/mcservice-jboss-beans.xml -removeheaders: Include-Resource Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd 2009-10-22 13:39:47 UTC (rev 95403) @@ -6,7 +6,7 @@ Export-Package: org.jboss.test.osgi.example.xml.jaxb Import-Package: com.sun.xml.bind.v2, javax.xml.bind*, javax.xml.datatype, javax.xml.namespace, \ - org.jboss.osgi.husky*, org.jboss.osgi.jaxb, org.jboss.osgi.spi*, \ + org.jboss.osgi.husky*, org.jboss.osgi.jaxb, org.jboss.osgi.spi*, org.jboss.osgi.testing, \ org.junit, org.osgi.framework Include-Resource: booking.xml, booking.xsd Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -29,7 +29,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.launch.Framework; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -40,10 +40,10 @@ import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.spi.capability.LogServiceCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTest; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.Test; 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 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -29,10 +29,10 @@ import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.jbosgi108.bundleA.SomeBeanMBean; import org.junit.AfterClass; import org.junit.Before; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGI112TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGI112TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGI112TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -25,9 +25,9 @@ import static org.junit.Assert.assertEquals; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -28,7 +28,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.jbosgi142.bundleA.BeanA; import org.jboss.test.osgi.jbosgi142.bundleB.BeanB; import org.jboss.test.osgi.jbosgi142.bundleX.BeanX; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -28,7 +28,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.jbosgi143.bundleA.BeanA; import org.jboss.test.osgi.jbosgi143.bundleX.BeanX; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -25,7 +25,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.jbosgi151.bundleA.BeanA; import org.jboss.test.osgi.jbosgi151.bundleB.BeanB; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,9 +26,9 @@ import static org.junit.Assert.assertEquals; import org.jboss.osgi.spi.capability.LogServiceCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -29,9 +29,9 @@ import java.util.List; import org.jboss.osgi.spi.capability.CompendiumCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -28,9 +28,9 @@ import static org.junit.Assert.fail; import org.jboss.osgi.spi.capability.CompendiumCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -27,10 +27,10 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiPackageAdmin; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiPackageAdmin; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -32,9 +32,9 @@ import java.io.FileReader; import org.jboss.osgi.spi.capability.ConfigAdminCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGI92TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGI92TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGI92TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -28,10 +28,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,9 +26,9 @@ import static org.junit.Assert.assertEquals; import org.jboss.osgi.spi.capability.LogServiceCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.Test; import org.osgi.framework.Bundle; 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-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -31,9 +31,9 @@ import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; -import org.jboss.osgi.spi.testing.OSGiTest; -import org.jboss.osgi.spi.testing.OSGiTestHelper; -import org.jboss.osgi.spi.testing.internal.RemoteRuntime; +import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.internal.RemoteRuntime; import org.jboss.test.osgi.jbossas.jbosgi36.mbean.FooMBean; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,10 +26,10 @@ import static org.junit.Assert.assertNotNull; import org.jboss.osgi.blueprint.BlueprintCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiServiceReference; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.performance.blueprint.bundle.ServiceA; import org.jboss.test.osgi.performance.blueprint.bundle.ServiceB; import org.junit.Ignore; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -45,9 +45,9 @@ import org.jboss.osgi.spi.management.ManagedFrameworkMBean; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; -import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.service.microcontainer.bundleB.SomeBeanMBean; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-10-22 13:39:47 UTC (rev 95403) @@ -26,9 +26,9 @@ import static org.junit.Assert.assertEquals; import org.jboss.osgi.spi.capability.CompendiumCapability; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; import org.junit.Test; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-22 13:39:47 UTC (rev 95403) @@ -39,11 +39,10 @@ org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.framework;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.util;version=1.0 + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing, </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-22 13:39:47 UTC (rev 95403) @@ -22,10 +22,11 @@ org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.logging;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing, \ org.jboss.virtual, \ org.jboss.virtual.plugins.registry, \ org.jboss.virtual.plugins.context.jar, \ Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:35:32 UTC (rev 95402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-22 13:39:47 UTC (rev 95403) @@ -21,10 +21,11 @@ org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.logging;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing, \ org.jboss.util, \ org.jboss.util.id, \ org.jboss.util.threadpool, \