Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2012-08-31 08:55:38 -0400
committerLazar Kirchev2012-08-31 08:58:04 -0400
commit85af33ac915a0ead2edc85e403a2de98ea98f9a1 (patch)
treea33fc31fc8766a80a925552795d954988ae686db /org.eclipse.virgo.kernel.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')
-rw-r--r--org.eclipse.virgo.kernel.test/.classpath54
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml4
-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
5 files changed, 36 insertions, 34 deletions
diff --git a/org.eclipse.virgo.kernel.test/.classpath b/org.eclipse.virgo.kernel.test/.classpath
index 79409c46..c569e288 100644
--- a/org.eclipse.virgo.kernel.test/.classpath
+++ b/org.eclipse.virgo.kernel.test/.classpath
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120830095553/org.eclipse.virgo.test.framework-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120830095553/org.eclipse.virgo.test.launcher-3.6.0.D-20120830095553.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgicommand"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120820125548/org.eclipse.virgo.test.framework-3.6.0.D-20120820125548.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120820124944/org.eclipse.virgo.util.io-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120820125548/org.eclipse.virgo.test.launcher-3.6.0.D-20120820125548.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120820124944/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120820125756/org.eclipse.virgo.medic-3.6.0.D-20120820125756.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120820130036/org.eclipse.virgo.nano.core-3.6.0.D-20120820130036.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120820130036/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120820130036.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.shell.command"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index e177f458..d7680799 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -38,8 +38,8 @@
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.core" rev="${org.eclipse.virgo.nano}" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.shell" rev="latest.integration" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.shell.command" rev="latest.integration" conf="test->runtime"/>
+ <!--dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="test->runtime"/-->
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackcorefragment" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
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