Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2012-09-10 03:49:50 -0400
committerLazar Kirchev2012-09-10 04:05:36 -0400
commitfc0b09e29de83ef7f298644d85b07b5635a849c3 (patch)
treee34521aae1330d2105628217118c9c2f0b61b28b /org.eclipse.virgo.kernel.test
parentadf989625b43d0a4d9f51eac06fe44d625b7ff44 (diff)
parente7afff18213d1ddd79aa022b78b3354d35b4fe59 (diff)
downloadorg.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.tar.gz
org.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.tar.xz
org.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.zip
Merge master with branch shell_bundles_merge_bug388518
Diffstat (limited to 'org.eclipse.virgo.kernel.test')
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java6
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF18
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties1
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties1
4 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java
index b9a58f0c..8072e3d3 100644
--- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java
@@ -29,12 +29,12 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
- * Class for integration testing {@link org.eclipse.virgo.kernel.osgicommand.helper.ClassLoadingHelper}
+ * Class for integration testing {@link org.eclipse.virgo.shell.osgicommand.helper.ClassLoadingHelper}
*/
@RunWith(DmKernelTestRunner.class)
public class ClassLoadingHelperIntegrationTests extends AbstractKernelIntegrationTest {
- private static final String SHELL_COMMANDS_BUNDLE_NAME = "org.eclipse.virgo.kernel.osgicommand";
- private static final String CLASSLOADING_PACKAGE = "org.eclipse.virgo.kernel.osgicommand.helper";
+ private static final String SHELL_COMMANDS_BUNDLE_NAME = "org.eclipse.virgo.shell.command";
+ private static final String CLASSLOADING_PACKAGE = "org.eclipse.virgo.shell.osgicommand.helper";
private static final String TEST_CLASS_NAME = ClassLoadingHelperIntegrationTests.class.getName();
private static final String TEST_CLASS_PACKAGE = ClassLoadingHelperIntegrationTests.class.getPackage().getName();
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
index c7bfdcd8..bca8d4a6 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
@@ -21,12 +21,12 @@ Import-Package: javax.management;version="0",org.eclipse.virgo.nano.co
re;version="[3.0.0,4)",org.eclipse.virgo.nano.deployer.api.core;versi
on="[3.0.0,4)",org.eclipse.virgo.kernel.osgi.framework;version="[3.0.
0,4)",org.eclipse.virgo.kernel.osgi.quasi;version="[3.0.0,4)",org.ecl
- ipse.equinox.region;version="1",org.eclipse.virgo.kernel.osgicommand.
- helper;version="[3.0.0,4)",org.eclipse.virgo.util.io;version="[3.0.0,
- 4)",org.eclipse.virgo.util.osgi.manifest;version="[3.0.0,4)",org.juni
- t;version="[4.7.0,5)",org.junit.runner;version="[4.7.0,5)",org.osgi.f
- ramework;version="0",org.springframework.context;version="[2.5.6,4.1)
- ",org.springframework.jmx.export;version="[2.5.6,4.1)",org.eclipse.ge
- mini.blueprint.context.support;version="[1.0.0.RELEASE,1.1)",org.ecli
- pse.gemini.blueprint.service.importer.support;version="[1.0.0.RELEASE
- ,1.1)"
+ ipse.equinox.region;version="1",org.eclipse.virgo.shell.osgicommand.h
+ elper;version="[3.0.0,4)",org.eclipse.virgo.util.io;version="[3.0.0,4
+ )",org.eclipse.virgo.util.osgi.manifest;version="[3.0.0,4)",org.junit
+ ;version="[4.7.0,5)",org.junit.runner;version="[4.7.0,5)",org.osgi.fr
+ amework;version="0",org.springframework.context;version="[2.5.6,4.1)"
+ ,org.springframework.jmx.export;version="[2.5.6,4.1)",org.eclipse.gem
+ ini.blueprint.context.support;version="[1.0.0.RELEASE,1.1)",org.eclip
+ se.gemini.blueprint.service.importer.support;version="[1.0.0.RELEASE,
+ 1.1)"
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index ee563e08..956f93ca 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -47,7 +47,6 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
file:../org.eclipse.virgo.kernel.model/target/classes@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes,\
- file:../org.eclipse.virgo.shell.command/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
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 8f57ef44..52177e7e 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
@@ -32,6 +32,7 @@ packageImports =\
org.eclipse.virgo.kernel.artifact.*;version="0",\
org.eclipse.virgo.nano.core;version="0",\
org.eclipse.virgo.nano.deployer.api.*;version="0",\
+ org.eclipse.virgo.nano.deployer.api;version="0",\
org.eclipse.virgo.kernel.deployer.core.event;version="0",\
org.eclipse.virgo.kernel.install.*;version="0",\
org.eclipse.virgo.kernel.osgi.*;version="0",\

Back to the top