Author: thomas.diesler(a)jboss.com Date: 2009-12-16 06:50:41 -0500 (Wed, 16 Dec 2009) New Revision: 97880 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/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/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Update to kernel & reflect 2.2.0-SNAPSHOT Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879) +++ projects/jboss-osgi/trunk/pom.xml 2009-12-16 11:50:41 UTC (rev 97880) @@ -54,15 +54,15 @@ <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.3</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> <version.jboss.osgi.jmx>1.0.2.SP1</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> - <version.jboss.osgi.microcontainer>2.0.9-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.reflect>2.0.2</version.jboss.osgi.reflect> + <version.jboss.osgi.microcontainer>2.2.0-SNAPSHOT</version.jboss.osgi.microcontainer> + <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect> <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5.1</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix> @@ -70,7 +70,7 @@ <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.webapp>0.7.2</version.jboss.osgi.webapp> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> - <version.jboss.osgi.xml.binding>2.0.2.Beta3</version.jboss.osgi.xml.binding> + <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> Modified: projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-12-16 11:22:19 UTC (rev 97879) +++ projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-12-16 11:50:41 UTC (rev 97880) @@ -12,19 +12,21 @@ <constructor> <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> <parameter><inject bean="MainDeployer" /></parameter> + <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - + <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath --> com.sun.xml.internal.bind.v2, - - <!-- log4j --> - org.apache.log4j;version=1.2, + <!-- loging --> + org.apache.log4j;version=1.2, + org.slf4j;version=1.5, + <!-- jboss --> org.jboss.beans.metadata.plugins;version=2.0, org.jboss.beans.metadata.plugins.builder;version=2.0, @@ -74,7 +76,6 @@ </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - <property name="synchronous">true</property> </bean> <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> @@ -121,6 +122,9 @@ <property name="deployers"><inject bean="Deployers" /></property> </bean> + <!-- The deployment registry --> + <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/> + <!-- The holder for deployers that determine structure --> <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> <property name="structureBuilder"> @@ -154,14 +158,19 @@ <constructor> <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> </constructor> + <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property> </bean> <!-- OSGI Deployment --> <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> - <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer"> + <bean name="OSGiBundleStateAddDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateAddDeployer"> <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="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> + <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" /> <!-- ******************************** 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-12-16 11:22:19 UTC (rev 97879) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-12-16 11:50:41 UTC (rev 97880) @@ -12,6 +12,7 @@ <constructor> <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> <parameter><inject bean="MainDeployer" /></parameter> + <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> @@ -75,7 +76,6 @@ </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - <property name="synchronous">true</property> </bean> <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> @@ -134,6 +134,9 @@ <property name="deployers"><inject bean="Deployers" /></property> </bean> + <!-- The deployment registry --> + <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/> + <!-- The holder for deployers that determine structure --> <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> <property name="structureBuilder"> @@ -167,14 +170,19 @@ <constructor> <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> </constructor> + <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property> </bean> <!-- OSGI Deployment --> <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> - <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer"> + <bean name="OSGiBundleStateAddDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateAddDeployer"> <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="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> + <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" /> <!-- ******************************** Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-12-16 11:22:19 UTC (rev 97879) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-12-16 11:50:41 UTC (rev 97880) @@ -38,7 +38,7 @@ <properties> <version.javax.ejb>3.0</version.javax.ejb> <version.jboss.ejb3>1.0.0</version.jboss.ejb3> - <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer> + <version.jboss.aop.mc.int>2.2.0.M2</version.jboss.aop.mc.int> </properties> <!-- Dependencies --> @@ -46,7 +46,13 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-aop-mc-int</artifactId> - <version>${version.jboss.microcontainer}</version> + <version>${version.jboss.aop.mc.int}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ejb</groupId> 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-12-16 11:22:19 UTC (rev 97879) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-12-16 11:50:41 UTC (rev 97880) @@ -12,6 +12,7 @@ <constructor> <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> <parameter><inject bean="MainDeployer" /></parameter> + <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> @@ -120,6 +121,9 @@ <property name="deployers"><inject bean="Deployers" /></property> </bean> + <!-- The deployment registry --> + <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/> + <!-- The holder for deployers that determine structure --> <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> <property name="structureBuilder"> @@ -153,14 +157,19 @@ <constructor> <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> </constructor> + <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property> </bean> <!-- OSGI Deployment --> <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> - <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer"> + <bean name="OSGiBundleStateAddDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateAddDeployer"> <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="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> + <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" /> <!-- ********************************