[jboss-osgi-commits] JBoss-OSGI SVN: r100858 - in projects/jboss-osgi/trunk: testsuite/example/src/test/resources/META-INF and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-11 03:00:27 -0500 (Thu, 11 Feb 2010)
New Revision: 100858

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/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/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
Fix references to DeploymentRegistry

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	2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml	2010-02-11 08:00:27 UTC (rev 100858)
@@ -93,7 +93,7 @@
   <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
     <constructor>
       <parameter><inject bean="OSGiBundleManager" /></parameter>
-      <parameter><inject bean="DeploymentRegistry" /></parameter>
+      <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
     </constructor>
   </bean>
   <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -160,7 +160,7 @@
   </bean>
 
   <!-- The deployment registry -->
-  <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+  <bean name="OSGiDeploymentRegistry" 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">
@@ -195,7 +195,7 @@
     <constructor>
       <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
     </constructor>
-    <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+    <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
   </bean>
 
   <!-- OSGI Deployment -->

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	2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-11 08:00:27 UTC (rev 100858)
@@ -78,7 +78,7 @@
   <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
     <constructor>
       <parameter><inject bean="OSGiBundleManager" /></parameter>
-      <parameter><inject bean="DeploymentRegistry" /></parameter>
+      <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
     </constructor>
   </bean>
   <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -148,7 +148,7 @@
   </bean>
 
   <!-- The deployment registry -->
-  <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+  <bean name="OSGiDeploymentRegistry" 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">
@@ -183,7 +183,7 @@
     <constructor>
       <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
     </constructor>
-    <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+    <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
   </bean>
 
   <!-- OSGI Deployment -->

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	2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-11 08:00:27 UTC (rev 100858)
@@ -63,7 +63,7 @@
   <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
     <constructor>
       <parameter><inject bean="OSGiBundleManager" /></parameter>
-      <parameter><inject bean="DeploymentRegistry" /></parameter>
+      <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
     </constructor>
   </bean>
   <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -121,7 +121,7 @@
   </bean>
 
   <!-- The deployment registry -->
-  <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+  <bean name="OSGiDeploymentRegistry" 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">
@@ -156,7 +156,7 @@
     <constructor>
       <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
     </constructor>
-    <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+    <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
   </bean>
 
   <!-- OSGI Deployment -->