Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-04-03 18:44:43 -0400
committerGlyn Normington2011-04-03 18:44:43 -0400
commitad79f64737a46f3da13392611fc069a0c7f622f3 (patch)
tree041e51a9ab5852bec63c1aacd14bf1ae355abef2
parent54e31a7cb4d808eefe5d16466a41078c2335baf0 (diff)
downloadorg.eclipse.virgo.kernel-ram-upgrade-for-regions.tar.gz
org.eclipse.virgo.kernel-ram-upgrade-for-regions.tar.xz
org.eclipse.virgo.kernel-ram-upgrade-for-regions.zip
remove dead parameterram-upgrade-for-regions
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializer.java6
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml1
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml2
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java15
4 files changed, 8 insertions, 16 deletions
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializer.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializer.java
index ca8a0929..8a526236 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializer.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializer.java
@@ -25,13 +25,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * An intializer responsible for registering a {@link ModelBundleListener} and enumerating any existing {@link Bundle}
+ * An initializer responsible for registering a {@link ModelBundleListener} and enumerating any existing {@link Bundle}
* objects from the OSGi Framework.
* <p />
*
* <strong>Concurrent Semantics</strong><br />
*
- * Threadsafe
+ * Thread safe
*
* @see ModelBundleListener
*/
@@ -50,7 +50,7 @@ public final class ModelBundleListenerInitializer {
private final RegionDigraph regionDigraph;
public ModelBundleListenerInitializer(@NonNull RuntimeArtifactRepository artifactRepository, @NonNull PackageAdminUtil packageAdminUtil,
- @NonNull BundleContext kernelBundleContext, @NonNull BundleContext userRegionBundleContext, @NonNull RegionDigraph regionDigraph) {
+ @NonNull BundleContext kernelBundleContext, @NonNull RegionDigraph regionDigraph) {
this.artifactRepository = artifactRepository;
this.packageAdminUtil = packageAdminUtil;
this.kernelBundleContext = kernelBundleContext;
diff --git a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
index 52d5dcdc..99442c5e 100644
--- a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
+++ b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/module-context.xml
@@ -9,7 +9,6 @@
<constructor-arg ref="artifactRepository"/>
<constructor-arg ref="packageAdminUtil"/>
<constructor-arg ref="bundleContext"/>
- <constructor-arg ref="userBundleContext"/>
<constructor-arg ref="regionDigraph"/>
</bean>
diff --git a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
index b9c99de4..df23f813 100644
--- a/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/org.eclipse.virgo.kernel.model/src/main/resources/META-INF/spring/osgi-context.xml
@@ -39,8 +39,6 @@
<reference id="runtimeArtifactModel" interface="org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel"/>
- <reference id="userBundleContext" interface="org.osgi.framework.BundleContext" filter="(org.eclipse.virgo.kernel.regionContext=true)"/>
-
<reference id="applicationDeployer" interface="org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer"/>
<reference id="regionDigraph" interface="org.eclipse.virgo.kernel.osgi.region.RegionDigraph" />
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
index bae26f85..59bb20db 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
@@ -52,31 +52,26 @@ public class ModelBundleListenerInitializerTests {
}
private final ModelBundleListenerInitializer initializer = new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil,
- bundleContext, bundleContext, regionDigraph);
+ bundleContext, regionDigraph);
@Test(expected = FatalAssertionException.class)
public void nullArtifactRepository() {
- new ModelBundleListenerInitializer(null, packageAdminUtil, bundleContext, bundleContext, regionDigraph);
+ new ModelBundleListenerInitializer(null, packageAdminUtil, bundleContext, regionDigraph);
}
@Test(expected = FatalAssertionException.class)
public void nullPackageAdminUtil() {
- new ModelBundleListenerInitializer(artifactRepository, null, bundleContext, bundleContext, regionDigraph);
+ new ModelBundleListenerInitializer(artifactRepository, null, bundleContext, regionDigraph);
}
@Test(expected = FatalAssertionException.class)
public void nullKernelBundleContext() {
- new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil, null, bundleContext, regionDigraph);
+ new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil, null, regionDigraph);
}
@Test(expected = FatalAssertionException.class)
- public void nullUserRegionBundleContext() {
- new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil, bundleContext, null, regionDigraph);
- }
-
- @Test(expected = FatalAssertionException.class)
public void nullRegionDigraph() {
- new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil, bundleContext, bundleContext, null);
+ new ModelBundleListenerInitializer(artifactRepository, packageAdminUtil, bundleContext, null);
}
@Test

Back to the top