Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-05-12 10:26:49 -0400
committerChristopher Frost2011-05-12 10:26:49 -0400
commit79235ace8c503e4a8d3d62572563d166a8ad97aa (patch)
tree0f5d6073cce0b93d8c262296fe2fa06333d2054a /org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
parent9d41ff7df0fb48d5d48a2060621bb5293623480c (diff)
parent6ca93baa8b1458f713456113c6474ac6091335a8 (diff)
downloadorg.eclipse.virgo.kernel-79235ace8c503e4a8d3d62572563d166a8ad97aa.tar.gz
org.eclipse.virgo.kernel-79235ace8c503e4a8d3d62572563d166a8ad97aa.tar.xz
org.eclipse.virgo.kernel-79235ace8c503e4a8d3d62572563d166a8ad97aa.zip
344672 Merging in master and fixing conflictsglobalRegion
Diffstat (limited to 'org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties')
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties7
1 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 67849102..12e388be 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -44,12 +44,13 @@ packageImports =\
org.junit.runner;version="[4.7.0,5.0.0)",\
org.osgi.service.cm;version="0",\
org.osgi.service.event;version="0",\
+ org.eclipse.equinox.region;version="1",\
org.slf4j;version="[1.6.1,2)",\
org.slf4j.spi;version="[1.6.1,2)"
serviceImports =\
- org.eclipse.virgo.kernel.osgi.region.Region,\
- org.eclipse.virgo.kernel.osgi.region.RegionDigraph,\
+ org.eclipse.equinox.region.Region,\
+ org.eclipse.equinox.region.RegionDigraph,\
org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer,\
org.eclipse.virgo.kernel.deployer.core.DeployUriNormaliser,\
org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository,\
@@ -81,7 +82,7 @@ serviceExports =\
org.eclipse.virgo.kernel.osgi.framework.OsgiFramework,\
org.eclipse.virgo.kernel.osgi.framework.ImportExpander,\
org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil,\
- org.eclipse.virgo.kernel.osgi.region.Region,\
+ org.eclipse.equinox.region.Region,\
org.osgi.service.event.EventHandler,\
org.osgi.service.cm.ConfigurationListener,\
org.osgi.service.cm.ManagedService,\

Back to the top