Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-05-04 10:12:11 -0400
committerGlyn Normington2011-05-04 10:12:11 -0400
commit11b24eaf2a4020872caaa27b7dc2a7d82abbf060 (patch)
tree85e416e5747fc773bfe189a4a79d65f045ccdcec
parente1ea56776279d95fde8ee09d38357ea0317f2c12 (diff)
downloadorg.eclipse.virgo.kernel-11b24eaf2a4020872caaa27b7dc2a7d82abbf060.tar.gz
org.eclipse.virgo.kernel-11b24eaf2a4020872caaa27b7dc2a7d82abbf060.tar.xz
org.eclipse.virgo.kernel-11b24eaf2a4020872caaa27b7dc2a7d82abbf060.zip
Revert "bug 342719: re-order base bundles in kernel integration tests so resolution failures are dumped"
This reverts commit e1ea56776279d95fde8ee09d38357ea0317f2c12. The change of order seemed to make the resolution error move to the user region bundle, which is the one which contributes the relevant dump contributor.
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties5
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/unresolvable.jarbin403 -> 0 bytes
3 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index dd512d56..127b5625 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,5 +1,4 @@
baseBundles =\
- file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../ivy-cache/repository/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.asm/3.0.0.RELEASE/org.springframework.asm-3.0.0.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.expression/3.0.0.RELEASE/org.springframework.expression-3.0.0.RELEASE.jar,\
@@ -16,6 +15,7 @@ baseBundles =\
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,\
+ file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../ivy-cache/repository/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.orm/3.0.0.RELEASE/org.springframework.orm-3.0.0.RELEASE.jar@start,\
file:../ivy-cache/repository/org.springframework/org.springframework.transaction/3.0.0.RELEASE/org.springframework.transaction-3.0.0.RELEASE.jar@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 d87ef245..67849102 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
@@ -1,5 +1,4 @@
baseBundles =\
- file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../ivy-cache/repository/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.asm/3.0.0.RELEASE/org.springframework.asm-3.0.0.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.expression/3.0.0.RELEASE/org.springframework.expression-3.0.0.RELEASE.jar,\
@@ -16,8 +15,9 @@ baseBundles =\
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,\
+ file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgicommand/target/classes@start
-
+
bundleImports = org.eclipse.osgi;bundle-version="0"
packageImports =\
@@ -87,4 +87,3 @@ serviceExports =\
org.osgi.service.cm.ManagedService,\
org.osgi.service.cm.ManagedServiceFactory,\
org.osgi.framework.BundleContext
-
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/unresolvable.jar b/org.eclipse.virgo.kernel.test/src/test/resources/unresolvable.jar
deleted file mode 100644
index cc4a2630..00000000
--- a/org.eclipse.virgo.kernel.test/src/test/resources/unresolvable.jar
+++ /dev/null
Binary files differ

Back to the top