Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-12-30 16:44:55 +0000
committerGlyn Normington2010-12-30 16:44:55 +0000
commit91e3c587480327912f0b0d6666a5c4f48ab80779 (patch)
tree0860560690aa486c1e4c26b6d1cbb303cb9c3f32
parent9f42a410b49bf0d8c954118a15082022ab7ece1a (diff)
downloadorg.eclipse.virgo.kernel-91e3c587480327912f0b0d6666a5c4f48ab80779.tar.gz
org.eclipse.virgo.kernel-91e3c587480327912f0b0d6666a5c4f48ab80779.tar.xz
org.eclipse.virgo.kernel-91e3c587480327912f0b0d6666a5c4f48ab80779.zip
bug 330776: delete RegionAwarePackageAdminAccessor as there is now only one PackageAdmin service
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/RegionAwarePackageAdminAccessor.java26
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml9
2 files changed, 1 insertions, 34 deletions
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/RegionAwarePackageAdminAccessor.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/RegionAwarePackageAdminAccessor.java
deleted file mode 100644
index 05adc0d7..00000000
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/RegionAwarePackageAdminAccessor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.kernel.deployer.core.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
-import org.eclipse.virgo.kernel.osgi.region.Region;
-
-@SuppressWarnings("deprecation")
-final class RegionAwarePackageAdminAccessor {
- public static PackageAdmin getPackageAdmin(Region region) {
- BundleContext bundleContext = region.getBundleContext();
- return OsgiFrameworkUtils.getService(bundleContext, PackageAdmin.class).getService();
- }
-}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
index 0a41f09b..a5da1843 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
+++ b/org.eclipse.virgo.kernel.deployer/src/main/resources/META-INF/spring/deployer-context.xml
@@ -156,14 +156,7 @@
<beans:bean id="plumber"
class="org.eclipse.virgo.kernel.deployer.core.internal.Plumber">
- <beans:constructor-arg>
- <beans:bean factory-method="getPackageAdmin"
- class="org.eclipse.virgo.kernel.deployer.core.internal.RegionAwarePackageAdminAccessor">
- <beans:constructor-arg>
- <reference interface="org.eclipse.virgo.kernel.osgi.region.Region" />
- </beans:constructor-arg>
- </beans:bean>
- </beans:constructor-arg>
+ <beans:constructor-arg ref="packageAdmin" />
<beans:constructor-arg ref="bundleContext" />
<beans:constructor-arg ref="pipelineFactory" />
<beans:constructor-arg ref="quasiFrameworkFactory" />

Back to the top