Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:20:58 -0500 (Thu, 25 Feb 2010) New Revision: 101463 Removed: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 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/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: Remove references to spi.management Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.testing;version=1.0 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.testing;version=1.0 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-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -445,9 +445,6 @@ override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset> <!-- Equinox Integration --> @@ -466,9 +463,6 @@ <include name="org.eclipse.osgi.util.jar" /> <include name="pax-web-extender-war.jar" /> </fileset> - <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset> <!-- JBossMC Integration --> 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 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -51,7 +51,6 @@ 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.testing;version=1.0, 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 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -51,7 +51,6 @@ 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.testing;version=1.0, 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-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -40,7 +40,6 @@ 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.testing;version=1.0 Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - $Id$ ---> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - A bean that registers - - org.jboss.osgi.microcontainer.MicrocontainerService - - as OSGi services. Please see the JBoss OSGi userguide for details. - --> - <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.integration.jbossas.MicrocontainerServiceBean"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> - </bean> - - <!-- Microcontainer Deployer Service --> - <bean name="jboss.osgi:service=MicrocontainerDeployer" class="org.jboss.osgi.integration.jbossas.MicrocontainerDeployerServiceBean"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> - -</deployment> 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-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -38,7 +38,6 @@ 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.testing;version=1.0 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-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.testing;version=1.0 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-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.testing;version=1.0