[jboss-osgi-commits] JBoss-OSGI SVN: r102361 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-12 12:34:19 -0500 (Fri, 12 Mar 2010) New Revision: 102361 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix native/jboss600 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -167,11 +167,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-mdr</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testing</artifactId> <scope>test</scope> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -37,6 +37,10 @@ <artifactId>jboss-osgi-framework-metadata</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + </dependency> <!-- JBoss OSGi Dependencies --> <dependency> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -35,6 +35,14 @@ <dependencies> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> </dependency> <dependency> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -84,11 +84,26 @@ <dependencies> <dependency> <groupId>org.jboss.cl</groupId> + <artifactId>jboss-classloading</artifactId> + <version>${version.jboss.classloading}</version> + </dependency> + <dependency> + <groupId>org.jboss.cl</groupId> <artifactId>jboss-classloading-vfs</artifactId> <version>${version.jboss.classloading}</version> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> <version>${version.jboss.deployers}</version> </dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/trunk/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -290,12 +290,32 @@ <version>${version.apache.felix.core}</version> </dependency> - <!-- JBossMC Dependencies --> + <!-- Native Framework Dependencies --> <dependency> <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework</artifactId> <version>${version.jboss.osgi.framework}</version> </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-core</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-metadata</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs21</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> <!-- OPS4J --> <dependency> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-12 17:34:19 UTC (rev 102361) @@ -30,6 +30,7 @@ import java.net.URL; +import org.jboss.osgi.jmx.BundleStateMBeanExt; import org.jboss.osgi.jmx.FrameworkMBeanExt; import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.capability.LogServiceCapability; @@ -107,10 +108,14 @@ OSGiBundle fragA = runtime.installBundle("fragments-simple-fragA.jar"); assertBundleState(Bundle.INSTALLED, fragA.getState()); - URL entryURL = fragA.getEntry("resources/resource.txt"); + // Use the BundleStateMBeanExt.getEntry() instead of OSGiBundle.getEntry() + // to normalize the differences in VFS protocols when running against a VFS21 target container. + BundleStateMBeanExt bundleState = (BundleStateMBeanExt)runtime.getBundleStateMBean(); + + String entryURL = bundleState.getEntry(fragA.getBundleId(), "resources/resource.txt"); assertNotNull("Entry URL not null", entryURL); - URL resourceURL = fragA.getResource("resources/resource.txt"); + String resourceURL = bundleState.getResource(fragA.getBundleId(), "resources/resource.txt"); assertNull("Resource URL null", resourceURL); try @@ -146,10 +151,14 @@ assertBundleState(Bundle.ACTIVE, hostA.getState()); assertBundleState(Bundle.RESOLVED, fragA.getState()); - URL entryURL = hostA.getEntry("resources/resource.txt"); + // Use the BundleStateMBeanExt.getEntry() instead of OSGiBundle.getEntry() + // to normalize the differences in VFS protocols when running against a VFS21 target container. + BundleStateMBeanExt bundleState = (BundleStateMBeanExt)runtime.getBundleStateMBean(); + + String entryURL = bundleState.getEntry(hostA.getBundleId(), "resources/resource.txt"); assertNull("Entry URL null", entryURL); - URL resourceURL = hostA.getResource("resources/resource.txt"); + String resourceURL = bundleState.getResource(hostA.getBundleId(), "resources/resource.txt"); assertNotNull("Resource URL not null", resourceURL); OSGiBundle fragBeanProvider = hostA.loadClass(FragBeanA.class.getName()); Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 17:27:23 UTC (rev 102360) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 17:34:19 UTC (rev 102361) @@ -333,15 +333,19 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs30</artifactId> - <version>${version.jboss.osgi.framework}</version> + <artifactId>jboss-osgi-framework-core</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework</artifactId> + <artifactId>jboss-osgi-framework-metadata</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </profile> <profile> @@ -354,15 +358,19 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs30</artifactId> - <version>${version.jboss.osgi.framework}</version> + <artifactId>jboss-osgi-framework-core</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework</artifactId> + <artifactId>jboss-osgi-framework-metadata</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </profile>