[jboss-cvs] JBossAS SVN: r88331 - in projects/jboss-osgi/trunk/runtime: felix/src/main/resources and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-07 02:03:39 -0400 (Thu, 07 May 2009)
New Revision: 88331

Modified:
   projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
Log:
Fix reference to bundleContext

Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 05:59:02 UTC (rev 88330)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 06:03:39 UTC (rev 88331)
@@ -41,7 +41,7 @@
 
   <!-- A Service that gives access to the Microcontainer Kernel -->
   <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+    <property name="systemContext"><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>
@@ -51,18 +51,18 @@
   
   <!-- The OSGi Bundle Deployer -->
   <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
     <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
   </bean>
 
   <!-- The Bundle ClassLoader Deployer -->
   <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Start/Stop Deployer -->
   <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Management Deployer -->

Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 05:59:02 UTC (rev 88330)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 06:03:39 UTC (rev 88331)
@@ -64,7 +64,7 @@
 
   <!-- A Service that gives access to the Microcontainer Kernel -->
   <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
-   <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+   <property name="systemContext"><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>
@@ -77,18 +77,18 @@
   
   <!-- The OSGi Bundle Deployer -->
   <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
     <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
   </bean>
 
   <!-- The Bundle ClassLoader Deployer -->
   <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Start/Stop Deployer -->
   <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Management Deployer -->

Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 05:59:02 UTC (rev 88330)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-07 06:03:39 UTC (rev 88331)
@@ -40,7 +40,7 @@
 
   <!-- A Service that gives access to the Microcontainer Kernel -->
   <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+    <property name="systemContext"><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>
@@ -53,18 +53,18 @@
   
   <!-- The OSGi Bundle Deployer -->
   <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
     <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
   </bean>
 
   <!-- The Bundle ClassLoader Deployer -->
   <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Start/Stop Deployer -->
   <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
-    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
+    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
   </bean>
 
   <!-- The Bundle Management Deployer -->