Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-02-01 17:14:39 -0500
committerGlyn Normington2011-02-01 17:14:39 -0500
commit41173c4d0a1fcffe4bb10180e78a202161138fe5 (patch)
treed24d5c2d19ae6ffa94f1bf1c54b7849a00997060 /org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
parent08e329f6cb2ea607f4990cb6e5468a3b4e614f00 (diff)
parent3304adff3025d3cd8a130b9ecb79d2153b444271 (diff)
downloadorg.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.tar.gz
org.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.tar.xz
org.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.zip
Merge branch 'master' into bug330776-framework-hooks
Conflicts: org.eclipse.virgo.kernel.agent.dm/.classpath org.eclipse.virgo.kernel.deployer.test/.classpath org.eclipse.virgo.kernel.shell/.classpath org.eclipse.virgo.kernel.test/.classpath org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
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.properties3
1 files changed, 3 insertions, 0 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 4886ea5f..126a02b7 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
@@ -41,6 +41,9 @@ packageImports =\
org.eclipse.osgi.*;version="0",\
javax.management;version="0",\
javax.management.*;version="0",\
+ org.osgi.service.cm;version="0",\
+ org.osgi.service.log;version="0",\
+ org.osgi.service.event;version="0",\
org.slf4j;version="[1.6.1,2)",\
org.slf4j.spi;version="[1.6.1,2)"

Back to the top