Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-02-09 05:45:22 -0500
committerChristopher Frost2011-02-09 05:45:22 -0500
commite2f1ebe4444291548c3c6f39d8c684c31138ed64 (patch)
treee44334c0e26ed25935e04897be70fc9aa05a38fb /org.eclipse.virgo.kernel.test/src
parent517a5b8b81f20b0ddd74674301eb51f1fe69c69a (diff)
downloadorg.eclipse.virgo.kernel-e2f1ebe4444291548c3c6f39d8c684c31138ed64.tar.gz
org.eclipse.virgo.kernel-e2f1ebe4444291548c3c6f39d8c684c31138ed64.tar.xz
org.eclipse.virgo.kernel-e2f1ebe4444291548c3c6f39d8c684c31138ed64.zip
333071 Upgrading to equinox 3.7M5
Diffstat (limited to 'org.eclipse.virgo.kernel.test/src')
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF34
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties8
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties6
3 files changed, 17 insertions, 31 deletions
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 55bfbe27..ba591543 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
@@ -1,14 +1,12 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.virgo.kernel.concurrent.test;version="2.2.
- 0";uses:="org.eclipse.virgo.kernel.core,org.eclipse.virgo.kernel.test
- ,org.junit",org.eclipse.virgo.kernel.dm.test;version="2.2.0";uses:="o
- rg.eclipse.virgo.kernel.test,org.junit",org.eclipse.virgo.kernel.ffdc
- .test;version="2.2.0";uses:="org.eclipse.virgo.kernel.test,org.junit"
- ,org.eclipse.virgo.kernel.osgi.test;version="2.2.0";uses:="org.eclips
- e.virgo.kernel.test,org.junit",org.eclipse.virgo.kernel.osgicommand.h
- elper.test;version="2.2.0";uses:="org.eclipse.virgo.kernel.test,org.j
- unit,org.junit.runner",org.eclipse.virgo.kernel.test;version="2.2.0";
- uses:="org.eclipse.virgo.kernel.core,org.junit,org.junit.runner"
+Export-Package: org.eclipse.virgo.kernel.concurrent.test;version="3.0.
+ 0";uses:="org.eclipse.virgo.kernel.test",org.eclipse.virgo.kernel.dm.
+ test;version="3.0.0";uses:="org.eclipse.virgo.kernel.test",org.eclips
+ e.virgo.kernel.ffdc.test;version="3.0.0";uses:="org.eclipse.virgo.ker
+ nel.test",org.eclipse.virgo.kernel.osgi.test;version="3.0.0";uses:="o
+ rg.eclipse.virgo.kernel.test",org.eclipse.virgo.kernel.osgicommand.he
+ lper.test;version="3.0.0";uses:="org.eclipse.virgo.kernel.test",org.e
+ clipse.virgo.kernel.test;version="3.0.0"
Bundle-ClassPath: .,quasi/simpleexporter.jar,quasi/simpleimporter.jar,
QuickConsumer.jar,SlowService.jar,quasi/simpleexporter.jar,quasi/simp
leimporter.jar,QuickConsumer.jar,SlowService.jar
@@ -17,18 +15,6 @@ Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Virgo Kernel Test
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.kernel.test
-Import-Package: javax.management;version="0",org.eclipse.virgo.kernel.
- core;version="[3.0.0,4)",org.eclipse.virgo.kernel.deployer.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.virgo.kernel.osgi.region;version="[3.0.0,4)",org.eclipse.virgo.k
- ernel.osgicommand.helper;version="[3.0.0,4)",org.eclipse.virgo.util.i
- o;version="[2.2.0,3.3)",org.eclipse.virgo.util.osgi.manifest;version=
- "[2.2.0,3.3)",org.junit;version="[4.7.0,5)",org.junit.runner;version=
- "[4.7.0,5)",org.osgi.framework;version="0",org.osgi.service.framework
- ;version="0",org.osgi.service.packageadmin;version="0",org.springfram
- ework.context;version="[2.5.6,3.1)",org.springframework.jmx.export;ve
- rsion="[2.5.6,3.1)",org.springframework.osgi.context.support;version=
- "[1.2.1,2)",org.springframework.osgi.service.importer.support;version
- ="[1.2.1,2)"
+Import-Package: org.eclipse.virgo.kernel.osgi.framework;version="[3.0.
+ 0,4)",org.springframework.jmx.export;version="[2.5.6,3.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 f32a2bb9..32e45f48 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
@@ -4,10 +4,10 @@ launcher.bundles =\
file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
- file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.core-${org.eclipse.virgo.medic}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar@start,\
- file:../ivy-cache/repository/org.eclipse/equinox-event/${org.eclipse.equinox.event}/equinox-event-${org.eclipse.equinox.event}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/${org.eclipse.virgo.util}/org.eclipse.virgo.util.common-${org.eclipse.virgo.util}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/${org.eclipse.virgo.util}/org.eclipse.virgo.util.io-${org.eclipse.virgo.util}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
@@ -28,8 +28,8 @@ launcher.bundles =\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar,\
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/equinox-ds/1.2.100.v20101206/equinox-ds-1.2.100.v20101206.jar@start,\
- file:../ivy-cache/repository/org.eclipse/equinox-util/1.0.200.v20100503/equinox-util-1.0.200.v20100503.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.ds/1.2.100.v20101206/org.eclipse.equinox.ds-1.2.100.v20101206.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.util/1.0.200.v20100503/org.eclipse.equinox.util-1.0.200.v20100503.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.osgi/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 6728105f..3941b68e 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
@@ -9,9 +9,9 @@ baseBundles =\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar,\
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/equinox-ds/1.2.100.v20101206/equinox-ds-1.2.100.v20101206.jar@start,\
- file:../ivy-cache/repository/org.eclipse/equinox-util/1.0.200.v20100503/equinox-util-1.0.200.v20100503.jar@start,\
- file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.ds/1.2.100.v20101206/org.eclipse.equinox.ds-1.2.100.v20101206.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.util/1.0.200.v20100503/org.eclipse.equinox.util-1.0.200.v20100503.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-3.3.0.v20110110.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.dmfragment/target/classes,\

Back to the top