Author: thomas.diesler(a)jboss.com Date: 2010-01-08 07:23:08 -0500 (Fri, 08 Jan 2010) New Revision: 99156 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 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/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Fragments resolve a part of the host bundle. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-01-08 12:23:08 UTC (rev 99156) @@ -59,7 +59,7 @@ { // Return if this is not a real bundle (i.e. a fragment) AbstractBundleState absBundleState = unit.getAttachment(AbstractBundleState.class); - if (absBundleState.isFragment()) + if (absBundleState == null || absBundleState.isFragment()) return; OSGiBundleState bundleState = (OSGiBundleState)absBundleState; 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 2010-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-01-08 12:23:08 UTC (rev 99156) @@ -200,5 +200,9 @@ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> </bean> + <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> </deployment> \ No newline at end of file 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 2010-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-01-08 12:23:08 UTC (rev 99156) @@ -222,6 +222,10 @@ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> </bean> + <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> 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 2010-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-01-08 12:23:08 UTC (rev 99156) @@ -205,6 +205,10 @@ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> </bean> + <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> 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-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-01-08 12:23:08 UTC (rev 99156) @@ -23,7 +23,7 @@ //$Id$ -import static org.junit.Assert.*; +import static org.junit.Assert.fail; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; @@ -103,11 +103,11 @@ host.start(); assertBundleState(Bundle.ACTIVE, host.getState()); - //assertBundleState(Bundle.RESOLVED, fragment.getState()); + assertBundleState(Bundle.RESOLVED, fragment.getState()); host.uninstall(); assertBundleState(Bundle.UNINSTALLED, host.getState()); - //assertBundleState(Bundle.RESOLVED, fragment.getState()); + assertBundleState(Bundle.RESOLVED, fragment.getState()); fragment.uninstall(); assertBundleState(Bundle.UNINSTALLED, fragment.getState()); 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 2010-01-08 11:55:23 UTC (rev 99155) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-01-08 12:23:08 UTC (rev 99156) @@ -192,6 +192,10 @@ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> </bean> + <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" />