[jboss-cvs] JBossAS SVN: r93483 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: jbossas and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-14 10:57:49 -0400 (Mon, 14 Sep 2009)
New Revision: 93483

Modified:
   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
Log:
Fix felix/equinox AS integration config

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	2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-14 14:57:49 UTC (rev 93483)
@@ -333,10 +333,7 @@
         <include name="jboss-osgi-apache-xerces.jar" />
         <include name="jboss-osgi-blueprint.jar" />
         <include name="jboss-osgi-common.jar" />
-        <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jaxb.jar" />
-        <include name="jboss-osgi-jmx.jar" />
-        <include name="jboss-osgi-jndi.jar" />
         <include name="jboss-osgi-webconsole.jar" />
         <include name="jboss-osgi-xml-binding.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
@@ -399,6 +396,9 @@
       </fileset>
       <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.osgi.compendium.jar" />
+        <include name="jboss-osgi-common-core.jar" />
+        <include name="jboss-osgi-jmx.jar" />
+        <include name="jboss-osgi-jndi.jar" />
       </fileset>
       
     </pack>

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	2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2009-09-14 14:57:49 UTC (rev 93483)
@@ -15,7 +15,7 @@
   -->
 
   <!-- The OSGiFramework -->
-  <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+  <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.EquinoxIntegration">
     <property name="properties">
       <map keyClass="java.lang.String" valueClass="java.lang.String">
         <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
@@ -66,8 +66,10 @@
 
   <!-- The Framework Management -->
   <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
-   <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
-   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+    <constructor>
+      <parameter><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></parameter>
+      <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+    </constructor>
   </bean>
 
   <!-- 
@@ -80,7 +82,7 @@
 
   <!-- Microcontainer Service -->
   <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
-   <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+   <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>

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	2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-09-14 14:57:49 UTC (rev 93483)
@@ -15,7 +15,7 @@
   -->
 
   <!-- The OSGiFramework -->
-  <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+  <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.FelixIntegration">
     <property name="properties">
       <map keyClass="java.lang.String" valueClass="java.lang.String">
         <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
@@ -89,8 +89,10 @@
 
   <!-- The Framework Management -->
   <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
-   <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
-   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+    <constructor>
+      <parameter><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></parameter>
+      <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+    </constructor>
   </bean>
 
   <!-- 
@@ -103,7 +105,7 @@
 
   <!-- Microcontainer Service -->
   <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
-   <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+   <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>