Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-01-28 11:21:23 -0500
committerGlyn Normington2011-01-28 11:21:23 -0500
commitca911ddd68ffeac684a689a9d4cf34f837d42c22 (patch)
treec882a084062323f8216fe51ea52d24fb41e31c90 /org.eclipse.virgo.kernel.shell
parent730f6d095f4d33e7155f691cd195e86b44815735 (diff)
downloadorg.eclipse.virgo.kernel-ca911ddd68ffeac684a689a9d4cf34f837d42c22.tar.gz
org.eclipse.virgo.kernel-ca911ddd68ffeac684a689a9d4cf34f837d42c22.tar.xz
org.eclipse.virgo.kernel-ca911ddd68ffeac684a689a9d4cf34f837d42c22.zip
bug 330776: relax restriction that a region and its inbound filters may not both contain a given bundle symbolic name and bundle version
Diffstat (limited to 'org.eclipse.virgo.kernel.shell')
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/state/internal/StandardStateService.java6
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/module-context.xml2
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/osgi-context.xml2
3 files changed, 6 insertions, 4 deletions
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/state/internal/StandardStateService.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/state/internal/StandardStateService.java
index c5ab86fc..3e020088 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/state/internal/StandardStateService.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/state/internal/StandardStateService.java
@@ -50,11 +50,11 @@ final public class StandardStateService implements StateService {
private final Region kernelRegion;
- public StandardStateService(QuasiFrameworkFactory quasiFrameworkFactory, BundleContext bundleContext, RegionDigraph regionMembership) {
+ public StandardStateService(QuasiFrameworkFactory quasiFrameworkFactory, BundleContext bundleContext, RegionDigraph regionDigraph) {
this.quasiFrameworkFactory = quasiFrameworkFactory;
this.bundleContext = bundleContext;
- this.regionDigraph = regionMembership;
- this.kernelRegion = getKernelRegion(regionMembership);
+ this.regionDigraph = regionDigraph;
+ this.kernelRegion = getKernelRegion(regionDigraph);
}
private Region getKernelRegion(RegionDigraph regionDigraph) {
diff --git a/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/module-context.xml b/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/module-context.xml
index 785db471..6835911e 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/module-context.xml
+++ b/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/module-context.xml
@@ -28,7 +28,7 @@
<bean id="stateService" class="org.eclipse.virgo.kernel.shell.state.internal.StandardStateService">
<constructor-arg ref="quasiFrameworkFactory" />
<constructor-arg ref="userRegionBundleContext" />
- <constructor-arg ref="regionMembership" />
+ <constructor-arg ref="regionDigraph" />
</bean>
<bean id="installCommand" class="org.eclipse.virgo.kernel.shell.internal.commands.InstallCommand"/>
diff --git a/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/osgi-context.xml b/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/osgi-context.xml
index 1d64cf2e..11c74046 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/org.eclipse.virgo.kernel.shell/src/main/resources/META-INF/spring/osgi-context.xml
@@ -29,6 +29,8 @@
<osgi:service ref="modelAccessorHelper" interface="org.eclipse.virgo.kernel.shell.model.helper.RamAccessorHelper" />
+ <osgi:reference id="regionDigraph" interface="org.eclipse.virgo.kernel.osgi.region.RegionDigraph" />
+
<!-- SERVICES FOR THE TYPE CONVERTERS -->
<osgi:service ref="longConverter" interface="org.eclipse.virgo.kernel.shell.Converter">

Back to the top