Author: thomas.diesler(a)jboss.com Date: 2009-09-10 04:55:40 -0400 (Thu, 10 Sep 2009) New Revision: 93345 Modified: 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/resources/META-INF/jboss-osgi-bootstrap.xml Log: [JBOSGI-151] Cannot resolve circular dependencies Move ClassLoaderPolicy modification to new OSGiClassLoaderPolicyDeployer 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-09-10 08:51:06 UTC (rev 93344) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-10 08:55:40 UTC (rev 93345) @@ -135,9 +135,6 @@ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> - <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> - </bean> <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> <!-- @@ -153,6 +150,10 @@ <property name="classLoaderSystem"><inject bean="ClassLoaderSystem"/></property> <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <!-- ******************************** 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-09-10 08:51:06 UTC (rev 93344) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-09-10 08:55:40 UTC (rev 93345) @@ -160,9 +160,6 @@ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> - <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> - </bean> <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> <!-- @@ -179,6 +176,10 @@ <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property> <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <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 2009-09-10 08:51:06 UTC (rev 93344) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-10 08:55:40 UTC (rev 93345) @@ -148,9 +148,6 @@ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> - <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> - </bean> <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> <!-- @@ -167,6 +164,10 @@ <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property> <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> 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-09-10 08:51:06 UTC (rev 93344) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-10 08:55:40 UTC (rev 93345) @@ -134,9 +134,6 @@ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> - <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> - </bean> <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> <!-- @@ -153,6 +150,10 @@ <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property> <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + </bean> + <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" />