[jboss-osgi-commits] JBoss-OSGI SVN: r102493 - in projects/jboss-osgi: projects/bundles/blueprint/trunk and 37 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-16 19:51:30 -0400 (Tue, 16 Mar 2010) New Revision: 102493 Added: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java Removed: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.project projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/projects/bundles/common/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/refresh/UnmarshallerServiceRefreshTestCase.java projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/simple/BasicXMLBindingTestCase.java projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/ServiceLoaderCapability.java projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.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/interceptor/InterceptorTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/CourseBooking.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/jbosgi112/OSGi112TestCase.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/localization/LocalizationTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Prepare for Capability/Runtime integration Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.project =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.project 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.project 2010-03-16 23:51:30 UTC (rev 102493) @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -19,5 +24,6 @@ <natures> <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -30,17 +30,10 @@ <version>1.0.5-SNAPSHOT</version> </parent> - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - <!-- Properties --> <properties> <version.apache.xerces>2.9.1</version.apache.xerces> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser> <version.xml.resolver>1.2</version.xml.resolver> @@ -110,7 +103,7 @@ org.jboss.osgi.xml.internal </Privat-Package> <Export-Package> - org.jboss.osgi.xml;version=2.9.1 + org.jboss.osgi.xml;version=${version} </Export-Package> <Import-Package> javax.xml.datatype, @@ -122,9 +115,9 @@ org.xml.sax*, <!-- import --> - org.jboss.logging;version="[2.1,2.2)", - org.jboss.osgi.common.log;version="[1.0,1.1)", - org.jboss.osgi.spi.capability;version="[1.0,1.1)", + org.jboss.logging;version="[2.1,3.0)", + org.jboss.osgi.common.log;version="[1.0,2.0)", + org.jboss.osgi.spi*;version="[1.0,2.0)", org.osgi.framework, org.osgi.service.log, org.osgi.util.xml, @@ -146,4 +139,12 @@ </plugin> </plugins> </build> + + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + </scm> + </project> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -37,23 +37,18 @@ <version>1.0.5-SNAPSHOT</version> </parent> - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - <!-- Properties --> <properties> <version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint> + <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx> <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util> + <version.apache.felix.log>1.0.0</version.apache.felix.log> <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing> + <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs> <version.osgi>4.2.0</version.osgi> <surefire.jpda.args /> @@ -87,6 +82,12 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.aries.jmx</groupId> + <artifactId>org.apache.aries.jmx</artifactId> + <version>${version.apache.aries.jmx}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> <version>${version.apache.aries.util}</version> @@ -99,6 +100,22 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${version.apache.felix.log}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> <version>${version.jboss.osgi.common}</version> @@ -116,12 +133,6 @@ <version>${version.jboss.osgi.jmx}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-framework</artifactId> - <version>${version.jboss.osgi.framework}</version> - <scope>provided</scope> - </dependency> <!-- OSGi Dependencies --> <dependency> @@ -139,9 +150,9 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <version>${version.jboss.osgi.framework}</version> <scope>test</scope> </dependency> <dependency> @@ -273,7 +284,7 @@ <systemProperties> <property> <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + <value>org.jboss.net.protocol|org.jboss.vfs.protocol</value> </property> <property> <name>log4j.output.dir</name> @@ -295,58 +306,17 @@ </plugins> </build> + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + </scm> + <!-- Profiles --> <profiles> <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-felix - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>framework</name> - <value>felix</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jpda Descr: Enable JPDA remote debuging --> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -15,11 +15,11 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jmx:jar</include> - <include>*:jboss-osgi-jndi:jar</include> + <include>*:org.apache.aries.jmx:jar</include> <include>*:org.apache.aries.util:jar</include> + <include>*:org.apache.felix.log:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.testing.OSGiRuntime; /** * Adds the Blueprint capability to the {@link OSGiRuntime} Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -41,9 +41,10 @@ import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.RuntimeContext; import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.spi.capability.LogServiceCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; 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; @@ -79,13 +80,14 @@ { if (context == null) { - runtime = new OSGiTestHelper().getEmbeddedRuntime(); + runtime = new OSGiRuntimeHelper().getEmbeddedRuntime(); runtime.addCapability(new HuskyCapability()); + runtime.addCapability(new LogServiceCapability()); runtime.addCapability(new JMXCapability()); runtime.addCapability(new BlueprintCapability()); - + huskyBridge = BridgeFactory.getBridge(); - + OSGiBundle bundle = runtime.installBundle("container-basic.jar"); bundle.start(); } @@ -103,9 +105,9 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + Bundle bundle = context.getBundle(); assertEquals("container-basic", bundle.getSymbolicName()); } @@ -115,9 +117,9 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); assertNotNull("BlueprintContainer available", bpContainer); } @@ -127,9 +129,9 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); BeanA beanA = (BeanA)bpContainer.getComponentInstance("beanA"); assertNotNull("ComponentInstance available", beanA); @@ -140,25 +142,25 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + ServiceReference srefA = context.getServiceReference(ServiceA.class.getName()); assertNotNull("ServiceReference available", srefA); - + ServiceA serviceA = (ServiceA)context.getService(srefA); assertNotNull("Service available", serviceA); - + ServiceReference srefB = context.getServiceReference(ServiceB.class.getName()); assertNotNull("ServiceReference available", srefB); - + ServiceB serviceB = (ServiceB)context.getService(srefB); assertNotNull("Service available", serviceB); - + BeanB beanB = (BeanB)serviceB; BeanA beanA = beanB.getBeanA(); assertNotNull("BeanA available", beanA); - + MBeanServer mbeanServer = beanA.getMbeanServer(); assertNotNull("MBeanServer available", mbeanServer); } @@ -168,12 +170,12 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); ComponentMetadata compMetadata = bpContainer.getComponentMetadata("beanA"); - + assertNotNull("ComponentMetadata not null", compMetadata); assertEquals("beanA", compMetadata.getId()); } @@ -183,9 +185,9 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); Set<String> compNames = bpContainer.getComponentIds(); @@ -202,15 +204,15 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); Collection<BeanMetadata> bcMetadata = bpContainer.getMetadata(BeanMetadata.class); - + assertNotNull("BeanComponentsMetadata not null", bcMetadata); assertEquals("BeanComponentsMetadata size", 2, bcMetadata.size()); - + BeanMetadata bmd = bcMetadata.iterator().next(); assertEquals("beanA", bmd.getId()); assertEquals(BeanA.class.getName(), bmd.getClassName()); @@ -221,27 +223,27 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); Collection<ServiceMetadata> servicesMetadata = bpContainer.getMetadata(ServiceMetadata.class); assertNotNull("ServiceMetadata not null", servicesMetadata); assertEquals("ServiceMetadata size", 2, servicesMetadata.size()); - + Iterator<ServiceMetadata> itServices = servicesMetadata.iterator(); ServiceMetadata serviceA = itServices.next(); assertEquals("serviceA", serviceA.getId()); - + List<String> interfaceNamesA = serviceA.getInterfaces(); assertNotNull("InterfaceNames not null", interfaceNamesA); assertEquals("InterfaceNames size", 1, interfaceNamesA.size()); assertEquals("InterfaceName", ServiceA.class.getName(), interfaceNamesA.get(0)); - + ServiceMetadata serviceB = itServices.next(); assertEquals("serviceB", serviceB.getId()); - + List<String> interfaceNamesB = serviceB.getInterfaces(); assertNotNull("InterfaceNames not null", interfaceNamesB); assertEquals("InterfaceNames size", 1, interfaceNamesB.size()); @@ -253,18 +255,18 @@ { if (context == null) huskyBridge.run(); - + assumeNotNull(context); - + BlueprintContainer bpContainer = getBlueprintContainer(); Collection<ReferenceMetadata> srefsMetadata = bpContainer.getMetadata(ReferenceMetadata.class); assertNotNull("ReferenceMetadata not null", srefsMetadata); assertEquals("ReferenceMetadata size", 1, srefsMetadata.size()); - + ReferenceMetadata srefMetadata = srefsMetadata.iterator().next(); assertEquals("mbeanService", srefMetadata.getId()); - + String interfaceName = srefMetadata.getInterface(); assertNotNull("InterfaceName not null", interfaceName); assertEquals("InterfaceName", MBeanServer.class.getName(), interfaceName); @@ -274,7 +276,7 @@ { // 10sec for processing of STARTING event int timeout = 50; - + ServiceReference sref = null; while (sref == null && 0 < timeout--) { @@ -282,7 +284,7 @@ Thread.sleep(200); } assertNotNull("BlueprintContainer not null", sref); - + BlueprintContainer bpContainer = (BlueprintContainer)context.getService(sref); return bpContainer; } Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -35,9 +35,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.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.util;version=1.0 + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing;version=1.0, + org.jboss.osgi.vfs;version=1.0 </value></entry> </map> </property> @@ -184,12 +185,11 @@ <!-- OSGI Deployment --> <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> - <bean name="OSGiBundleStateAddDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateAddDeployer"> + <bean name="OSGiBundleStateCreateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateCreateDeployer"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiBundleStateRemoveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateRemoveDeployer"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> + <bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/> + <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/> <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" /> <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" /> Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -30,13 +30,6 @@ <version>1.0.5-SNAPSHOT</version> </parent> - <!-- SCM --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - <!-- Properties --> <properties> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> @@ -98,8 +91,7 @@ <Import-Package> javax.management, org.apache.log4j;version=1.2;resolution:=optional, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.spi*;version="[1.0,2.0)", org.osgi.framework;version=1.4, org.osgi.service.log;version=1.3, org.osgi.util.tracker @@ -141,4 +133,12 @@ </plugin> </plugins> </build> + + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + </scm> + </project> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -46,7 +46,6 @@ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix> <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing> <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs> <version.osgi>4.2.0</version.osgi> </properties> @@ -135,12 +134,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.osgi.vfs</groupId> <artifactId>jboss-osgi-vfs21</artifactId> <version>${version.jboss.osgi.vfs}</version> Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -30,16 +30,9 @@ <version>1.0.4</version> </parent> - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - <!-- Properties --> <properties> - <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.apache.xerces>2.9.1.SP4-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.xml.bind>2.1.10</version.xml.bind> <version.osgi>4.2.0</version.osgi> </properties> @@ -85,7 +78,7 @@ org.jboss.osgi.jaxb.internal </Private-Package> <Export-Package> - org.jboss.osgi.jaxb;version=2.1.10 + org.jboss.osgi.jaxb;version=${version} </Export-Package> <Import-Package> <!-- system --> @@ -99,9 +92,8 @@ org.xml.sax*, <!-- import --> - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.xml, + org.jboss.osgi.spi*;version="[1.0,2.0)", + org.jboss.osgi.xml;version="[2.9,3.0)", org.osgi.framework, org.osgi.service.log, @@ -128,4 +120,11 @@ </plugins> </build> + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + </scm> + </project> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -30,23 +30,20 @@ <version>1.0.5-SNAPSHOT</version> </parent> - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - <!-- Properties --> <properties> - <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx> + <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util> <version.jboss.xb>2.0.2.Beta4</version.jboss.xb> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> + <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix> <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> + <version.jboss.osgi.jaxb>2.1.10.SP4-SNAPSHOT</version.jboss.osgi.jaxb> + <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs> <version.osgi>4.2.0</version.osgi> </properties> @@ -75,6 +72,24 @@ <!-- Provided Dependencies --> <dependency> + <groupId>org.apache.aries.jmx</groupId> + <artifactId>org.apache.aries.jmx</artifactId> + <version>${version.apache.aries.jmx}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${version.apache.aries.util}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> <version>${version.jboss.osgi.common}</version> @@ -99,6 +114,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-reflect</artifactId> <version>${version.jboss.osgi.reflect}</version> @@ -121,11 +142,17 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> + <groupId>org.jboss.osgi.felix</groupId> + <artifactId>jboss-osgi-felix</artifactId> + <version>${version.jboss.osgi.felix}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.vfs</groupId> + <artifactId>jboss-osgi-vfs30</artifactId> + <version>${version.jboss.osgi.vfs}</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -261,6 +288,13 @@ </plugins> </build> + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + </scm> + <!-- Profiles --> <profiles> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -20,7 +20,10 @@ <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> + <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-reflect:jar</include> + <include>*:org.apache.aries.jmx:jar</include> + <include>*:org.apache.aries.util:jar</include> <include>*:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/refresh/UnmarshallerServiceRefreshTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/refresh/UnmarshallerServiceRefreshTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/refresh/UnmarshallerServiceRefreshTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -24,11 +24,12 @@ //$Id: BasicXMLBindingTestCase.java 97031 2009-11-26 14:54:08Z thomas.diesler(a)jboss.com $ import org.jboss.osgi.jbossxb.XMLBindingCapability; +import org.jboss.osgi.jmx.JMXCapability; 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.jboss.osgi.testing.OSGiRuntimeTest; import org.junit.Test; +import org.osgi.jmx.framework.FrameworkMBean; /** * Test XMLBindingService @@ -36,7 +37,7 @@ * @author thomas.diesler(a)jboss.com * @since 26-Nov-2009 */ -public class UnmarshallerServiceRefreshTestCase extends OSGiTest +public class UnmarshallerServiceRefreshTestCase extends OSGiRuntimeTest { @Test public void testUnmarshaller() throws Exception @@ -44,6 +45,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { + runtime.addCapability(new JMXCapability()); runtime.addCapability(new XMLBindingCapability()); OSGiBundle serviceBundle = runtime.getBundle("jboss-osgi-xml-binding", null); @@ -55,8 +57,8 @@ serviceBundle.uninstall(); - OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin(); - packageAdmin.refreshPackages(null); + FrameworkMBean frameworkMBean = runtime.getFrameworkMBean(); + frameworkMBean.refreshBundles(null); serviceBundle = runtime.installBundle("bundles/jboss-osgi-xml-binding.jar"); serviceBundle.start(); Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/simple/BasicXMLBindingTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/simple/BasicXMLBindingTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/simple/BasicXMLBindingTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -35,7 +35,7 @@ import org.jboss.osgi.jbossxb.XMLBindingCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.test.osgi.jbossxb.simple.bundle.CourseBooking; import org.junit.After; import org.junit.Before; @@ -51,7 +51,7 @@ * @author thomas.diesler(a)jboss.com * @since 26-Nov-2009 */ -public class BasicXMLBindingTestCase extends OSGiTest +public class BasicXMLBindingTestCase extends OSGiRuntimeTest { @RuntimeContext public BundleContext context; Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties 2010-03-16 23:51:30 UTC (rev 102493) @@ -24,6 +24,7 @@ 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;version=1.0, \ org.jboss.logging;version=2.1, \ org.jboss.virtual;version=2.1, \ org.osgi.framework;version=1.5 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -31,10 +31,6 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - </dependency> - <dependency> <groupId>org.apache.aries.jmx</groupId> <artifactId>org.apache.aries.jmx.api</artifactId> </dependency> @@ -45,16 +41,6 @@ <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> - </dependency> </dependencies> - - <build> - <plugins> - </plugins> - </build> </project> Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -1,64 +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.jmx; - -//$Id$ - -import javax.management.MBeanServer; - -import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.capability.CompendiumCapability; - -/** - * Adds the JMX capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MBeanServer} is already registered. - * - * Installed bundles: jboss-osgi-jmx.jar - * - * Default properties set by this capability - * - * <table> - * <tr><th>Property</th><th>Value</th></tr> - * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> - * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> - * </table> - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class JMXCapability extends Capability -{ - public JMXCapability() - { - super(MBeanServer.class.getName()); - - addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); - addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198"); - - addDependency(new CompendiumCapability()); - - addBundle("bundles/jboss-osgi-jmx.jar"); - addBundle("bundles/org.apache.aries.jmx.jar"); - } -} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -36,8 +36,8 @@ <version>${version}</version> </dependency> <dependency> - <groupId>org.apache.aries.jmx</groupId> - <artifactId>org.apache.aries.jmx.api</artifactId> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> </dependency> <!-- Provided Dependencies --> @@ -122,8 +122,8 @@ org.jboss.logging;version="[2.1,3.0)", <!-- jboss-osgi --> + org.jboss.osgi.jmx;version="[1.0,2.0)", org.jboss.osgi.spi*;version="[1.0,2.0)", - org.jboss.osgi.jmx;version="[1.0,2.0)", <!-- osgi --> org.osgi.framework;version="[1.5,2.0)", Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java (from rev 101598, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -0,0 +1,65 @@ +/* + * 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.jmx; + +//$Id$ + +import javax.management.MBeanServer; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.capability.CompendiumCapability; +import org.jboss.osgi.testing.OSGiRuntime; + +/** + * Adds the JMX capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link MBeanServer} is already registered. + * + * Installed bundles: jboss-osgi-jmx.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> + * </table> + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JMXCapability extends Capability +{ + public JMXCapability() + { + super(MBeanServer.class.getName()); + + addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); + addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198"); + + addDependency(new CompendiumCapability()); + + addBundle("bundles/jboss-osgi-jmx.jar"); + addBundle("bundles/org.apache.aries.jmx.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/ServiceLoaderCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/ServiceLoaderCapability.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/ServiceLoaderCapability.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.testing.OSGiRuntime; /** * Adds the Blueprint capability to the {@link OSGiRuntime} Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -25,6 +25,7 @@ import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.capability.HttpServiceCapability; +import org.jboss.osgi.testing.OSGiRuntime; /** * Adds the WebApp (WAR) capability to the {@link OSGiRuntime} Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -167,11 +167,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework-vfs30</artifactId> <version>${version}</version> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -62,7 +62,6 @@ <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing> <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs> <version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding> <version.jboss.test>1.1.4.GA</version.jboss.test> @@ -236,11 +235,6 @@ <version>${version.jboss.test}</version> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi.vfs</groupId> <artifactId>jboss-osgi-vfs21</artifactId> <version>${version.jboss.osgi.vfs}</version> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -152,7 +152,6 @@ <include name="jboss-osgi-felix-sources.jar" /> <include name="jboss-osgi-jbossas-sources.jar" /> <include name="jboss-osgi-spi-sources.jar" /> - <include name="jboss-osgi-testing-sources.jar" /> <include name="jboss-osgi-webapp-sources.jar" /> <include name="jboss-osgi-webconsole-sources.jar" /> <include name="jboss-osgi-xml-binding-sources.jar" /> @@ -189,7 +188,6 @@ <include name="jboss-logging-log4j.jar" /> <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-spi.jar" /> - <include name="jboss-osgi-testing.jar" /> <include name="jboss-osgi-vfs.jar" /> <include name="jboss-osgi-vfs30.jar" /> <include name="jboss-vfs.jar" /> @@ -407,7 +405,6 @@ <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-jbossas.jar" /> <include name="jboss-osgi-spi.jar" /> - <include name="jboss-osgi-testing.jar" /> <include name="jboss-osgi-vfs.jar" /> </fileset> <fileset condition="!isJBoss601" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -23,7 +23,6 @@ <include>*:jboss-osgi-jndi-api:jar:sources</include> <include>*:jboss-osgi-jta:jar:sources</include> <include>*:jboss-osgi-spi:jar:sources</include> - <include>*:jboss-osgi-testing:jar:sources</include> <include>*:jboss-osgi-vfs:jar:sources</include> <include>*:jboss-osgi-webapp:jar:sources</include> <include>*:jboss-osgi-xml-binding:jar:sources</include> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -72,22 +72,6 @@ <classifier>javadoc</classifier> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> <groupId>org.jboss.osgi.deployers</groupId> <artifactId>jboss-osgi-deployers-vfs30</artifactId> </dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -66,7 +66,7 @@ <version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.5-SNAPSHOT</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> + <version.jboss.osgi.jaxb>2.1.10.SP4-SNAPSHOT</version.jboss.osgi.jaxb> <version.jboss.osgi.jbossas>1.0.3-SNAPSHOT</version.jboss.osgi.jbossas> <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi> @@ -74,7 +74,6 @@ <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> <version.jboss.osgi.serviceloader>1.0.1-SNAPSHOT</version.jboss.osgi.serviceloader> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing> <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs> <version.jboss.osgi.webapp>0.7.2.SP2-SNAPSHOT</version.jboss.osgi.webapp> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> @@ -127,11 +126,6 @@ <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - <version>${version.jboss.osgi.testing}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi.deployers</groupId> <artifactId>jboss-osgi-deployers-vfs21</artifactId> <version>${version.jboss.osgi.deployers}</version> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -34,8 +34,8 @@ import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -32,8 +32,8 @@ import org.jboss.osgi.spi.capability.HttpServiceCapability; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/interceptor/InterceptorTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -32,8 +32,8 @@ import org.jboss.osgi.spi.capability.HttpServiceCapability; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/serviceloader/ServiceLoaderTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -32,8 +32,8 @@ import org.jboss.osgi.spi.util.ServiceLoader; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.test.osgi.example.serviceloader.service.AccountService; import org.jboss.test.osgi.example.serviceloader.service.internal.AccountServiceImpl; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/CourseBooking.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/CourseBooking.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/CourseBooking.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -11,6 +11,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; 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 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -43,8 +43,8 @@ import org.jboss.osgi.spi.capability.LogServiceCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.Test; 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 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGi112TestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -25,8 +25,8 @@ import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/jbosgi92/OSGi92TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -31,9 +31,9 @@ import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/jbosgi99/OSGi99TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -35,8 +35,8 @@ import org.jboss.osgi.spi.util.ConstantsHelper; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/jbossas/jbosgi36/OSGi36TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -28,8 +28,8 @@ import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.internal.RemoteRuntime; import org.jboss.test.osgi.jbossas.jbosgi36.mbean.FooMBean; import org.junit.AfterClass; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -23,15 +23,15 @@ //$Id$ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Dictionary; import java.util.Locale; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.jboss.osgi.testing.OSGiRuntimeHelper; 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/performance/blueprint/BlueprintStressTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2010-03-16 23:51:30 UTC (rev 102493) @@ -28,8 +28,8 @@ import org.jboss.osgi.blueprint.BlueprintCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.test.osgi.performance.blueprint.bundle.ServiceA; import org.jboss.test.osgi.performance.blueprint.bundle.ServiceB; import org.junit.Test; Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-16 23:49:00 UTC (rev 102492) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-16 23:51:30 UTC (rev 102493) @@ -49,10 +49,6 @@ <artifactId>jboss-osgi-spi</artifactId> </dependency> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testing</artifactId> - </dependency> - <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> </dependency>