Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2012-08-31 12:55:38 +0000
committerLazar Kirchev2012-08-31 12:58:04 +0000
commit85af33ac915a0ead2edc85e403a2de98ea98f9a1 (patch)
treea33fc31fc8766a80a925552795d954988ae686db /org.eclipse.virgo.kernel.test/src/test
parent61a3d2ae5fdc20db6d8117d1484ad360ceff8724 (diff)
downloadorg.eclipse.virgo.kernel-85af33ac915a0ead2edc85e403a2de98ea98f9a1.tar.gz
org.eclipse.virgo.kernel-85af33ac915a0ead2edc85e403a2de98ea98f9a1.tar.xz
org.eclipse.virgo.kernel-85af33ac915a0ead2edc85e403a2de98ea98f9a1.zip
Bug 388518 - Merge shell-related bundles in Virgo
Diffstat (limited to 'org.eclipse.virgo.kernel.test/src/test')
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgicommand/helper/test/ClassLoadingHelperIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties3
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties7
3 files changed, 7 insertions, 5 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 a0435584..b9a58f0c 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
@@ -19,7 +19,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import org.eclipse.virgo.kernel.osgicommand.helper.ClassLoadingHelper;
+import org.eclipse.virgo.shell.osgicommand.helper.ClassLoadingHelper;
import org.eclipse.virgo.kernel.test.AbstractKernelIntegrationTest;
import org.eclipse.virgo.test.framework.dmkernel.DmKernelTestRunner;
import org.junit.Before;
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 41b8a67c..d20bcf62 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
@@ -41,12 +41,13 @@ launcher.bundles =\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/${org.eclipse.equinox.ds}/org.eclipse.equinox.ds-${org.eclipse.equinox.ds}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/${org.eclipse.equinox.util}/org.eclipse.equinox.util-${org.eclipse.equinox.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${org.apache.felix.gogo.runtime}/org.apache.felix.gogo.runtime-${org.apache.felix.gogo.runtime}.jar@start,\
file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
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.kernel.shell/target/classes@start,\
+ 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 84e2fd12..fe8045bc 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
@@ -17,7 +17,7 @@ baseBundles =\
file:../org.eclipse.virgo.kernel.deployer.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.dmfragment/target/classes,\
file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
- file:../org.eclipse.virgo.kernel.osgicommand/target/classes@start,\
+ file:../org.eclipse.virgo.shell.command/target/classes@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.mina.core/2.0.2.v201108120515/org.apache.mina.core-2.0.2.v201108120515.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/0.8.0.v201108120515/org.apache.felix.gogo.command-0.8.0.v201108120515.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar@start,\
@@ -41,7 +41,6 @@ packageImports =\
org.eclipse.virgo.nano.serviceability;version="0",\
org.eclipse.virgo.nano.serviceability.*;version="0",\
org.eclipse.virgo.kernel.services.work;version="0",\
- org.eclipse.virgo.kernel.shell;version="0",\
org.eclipse.virgo.nano.shim.*;version="0",\
org.eclipse.virgo.medic.*;version="0",\
org.eclipse.virgo.repository;version="0",\
@@ -60,7 +59,8 @@ packageImports =\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
org.junit;version="[4.7.0,5.0.0)",\
- org.junit.runner;version="[4.7.0,5.0.0)"
+ org.junit.runner;version="[4.7.0,5.0.0)",\
+ org.springframework.util;version="[2.5.6,4)"
serviceImports =\
org.eclipse.equinox.region.Region,\
@@ -84,6 +84,7 @@ serviceImports =\
org.eclipse.virgo.medic.dump.DumpGenerator,\
org.eclipse.virgo.nano.shim.scope.ScopeFactory,\
org.eclipse.virgo.nano.shim.serviceability.TracingService,\
+ org.eclipse.virgo.kernel.model.management.RuntimeArtifactModelObjectNameCreator,\
org.eclipse.osgi.service.resolver.PlatformAdmin,\
org.osgi.service.packageadmin.PackageAdmin,\
org.eclipse.virgo.nano.core.ConfigurationExporter

Back to the top