[jboss-osgi-commits] JBoss-OSGI SVN: r97986 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf.
Author: thomas.diesler(a)jboss.com
Date: 2009-12-18 05:53:19 -0500 (Fri, 18 Dec 2009)
New Revision: 97986
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
Log:
Fix framework setup in Runtime
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-12-18
10:52:24 UTC (rev 97985)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-12-18
10:53:19 UTC (rev 97986)
@@ -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">
@@ -150,6 +151,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">
@@ -169,6 +173,9 @@
<uncallback method="removeDeployer" />
</bean>
+ <!-- Bundle Structure -->
+ <bean name="BundleStructure"
class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
<!-- JAR & File Structure (needed for negative testing) -->
<bean name="JARStructure"
class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" />
<bean name="FileStructure"
class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" />
@@ -180,15 +187,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="OSGiBundleStructure"
class="org.jboss.osgi.deployer.BundleStructureDeployer" />
<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" />
<!--
********************************
@@ -230,4 +241,4 @@
<property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>