[jboss-osgi-commits] JBoss-OSGI SVN: r93213 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-04 12:49:40 -0400 (Fri, 04 Sep 2009)
New Revision: 93213

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
Log:
[JBOSGI-148] Autostart bundles when deployed in JBossAS
Use DeployersWrapper

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-04 16:44:06 UTC (rev 93212)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-09-04 16:49:40 UTC (rev 93213)
@@ -49,6 +49,13 @@
         <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
         <!-- Config Admin Service -->
         <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry>
+        <!-- JMX bundle properties -->
+        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+        <!-- JNDI bundle properties -->
+        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
       </map>
     </property>
     <incallback method="addPlugin" />
@@ -98,10 +105,14 @@
   ********************************
   -->
   
-  <!-- Bundle Structure -->
-  <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
-  
-  <!-- OSGI Deployment -->
+  <bean name="OSGiDeployersWrapper" class="org.jboss.osgi.plugins.deployers.bundle.OSGiDeployersWrapper" >
+    <constructor>
+      <parameter><inject bean="MainDeployer"/></parameter>
+      <parameter><inject bean="OSGiBundleManager"/></parameter>
+    </constructor>
+  </bean>
+
+  <bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
   <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
   <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
     <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
@@ -120,8 +131,9 @@
   -->
   
   <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
-    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter><parameter>OSGiDomain</parameter></constructor>
+    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
     <property name="classLoaderSystem"><inject bean="ClassLoaderSystem"/></property>
+    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
   </bean>
 
   <!--