Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.snaps into 369907-rework-dag-interface
diff --git a/build.versions b/build.versions
index 38c9ffb..23bd397 100644
--- a/build.versions
+++ b/build.versions
@@ -6,15 +6,15 @@
javax.servlet=3.0.0.v201103241009
javax.servlet.jsp=2.2.0.v201103241009
org.springframework=3.0.5.RELEASE
-org.eclipse.virgo.kernel=3.5.0.D-20120530104427
-org.eclipse.virgo.util=3.5.0.M04
-org.eclipse.gemini.web=2.1.0.BUILD-20120525195844
-org.eclipse.virgo.test=3.5.0.M04
-org.eclipse.virgo.web=3.5.0.D-20120530112011
-org.eclipse.virgo.osgi=3.5.0.M04
+org.eclipse.virgo.kernel=3.5.0.D-20120615074116
+org.eclipse.virgo.util=3.5.0.D-20120615065828
+org.eclipse.gemini.web=2.1.0.RELEASE
+org.eclipse.virgo.test=3.5.0.D-20120615070343
+org.eclipse.virgo.web=3.5.0.D-20120615111727
+org.eclipse.virgo.osgi=3.5.0.D-20120615065435
org.eclipse.virgo.snaps.samples=1.1.0
org.apache.catalina=7.0.26
-org.eclipse.virgo.nano=3.5.0.BUILD-20120510145727
+org.eclipse.virgo.nano=3.5.0.D-20120615071853
# Test/Sample
ch.qos.logback=0.9.28
@@ -32,7 +32,7 @@
org.junit=4.7.0
org.easymock=2.3.0
net.sourceforge.jwebunit=2.1.0
-org.eclipse.virgo.teststubs=3.5.0.M04
-org.eclipse.virgo.medic=3.5.0.M04
-org.eclipse.virgo.repository=3.5.0.M04
+org.eclipse.virgo.teststubs=3.5.0.D-20120615065132
+org.eclipse.virgo.medic=3.5.0.D-20120615070622
+org.eclipse.virgo.repository=3.5.0.D-20120615071313
org.eclipse.gemini.blueprint=1.0.0.RELEASE
diff --git a/org.eclipse.virgo.snaps.api/.classpath b/org.eclipse.virgo.snaps.api/.classpath
index 7fcc61d..c6ed273 100644
--- a/org.eclipse.virgo.snaps.api/.classpath
+++ b/org.eclipse.virgo.snaps.api/.classpath
@@ -24,12 +24,12 @@
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/javax.servlet.jsp/2.2.0.v201103241009/javax.servlet.jsp-2.2.0.v201103241009.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/javax.servlet.jsp/2.2.0.v201103241009/javax.servlet.jsp-sources-2.2.0.v201103241009.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.core-2.1.0.BUILD-20120525195844.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.core-sources-2.1.0.BUILD-20120525195844.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-sources-2.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.test/3.0.5.RELEASE/org.springframework.test-3.0.5.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.test/3.0.5.RELEASE/org.springframework.test-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120615065132/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120615065132.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120615065132/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.D-20120615065132.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.snaps.api/ivy.xml b/org.eclipse.virgo.snaps.api/ivy.xml
index 7ca0345..540aacf 100644
--- a/org.eclipse.virgo.snaps.api/ivy.xml
+++ b/org.eclipse.virgo.snaps.api/ivy.xml
@@ -16,7 +16,7 @@
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
<dependency org="javax.servlet" name="javax.servlet" rev="${javax.servlet}" conf="compile->runtime"/>
<dependency org="javax.servlet" name="javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="compile->compile"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="compile->compile" />
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="compile->compile" />
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="test->runtime"/>
diff --git a/org.eclipse.virgo.snaps.core/.classpath b/org.eclipse.virgo.snaps.core/.classpath
index a7d3984..055244f 100644
--- a/org.eclipse.virgo.snaps.core/.classpath
+++ b/org.eclipse.virgo.snaps.core/.classpath
@@ -26,26 +26,26 @@
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120530104427.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.deployer-sources-3.5.0.D-20120530104427.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M04/org.eclipse.virgo.util.osgi.manifest-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M04/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120530104427.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.osgi-sources-3.5.0.D-20120530104427.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.core-2.1.0.BUILD-20120525195844.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.core-sources-2.1.0.BUILD-20120525195844.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120615074116.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.deployer-sources-3.5.0.D-20120615074116.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-3.5.0.D-20120615065828.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120615065828.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120615074116.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.osgi-sources-3.5.0.D-20120615074116.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-sources-2.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.tomcat-2.1.0.BUILD-20120525195844.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.tomcat-sources-2.1.0.BUILD-20120525195844.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.1.0.RELEASE/org.eclipse.gemini.web.tomcat-2.1.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.1.0.RELEASE/org.eclipse.gemini.web.tomcat-sources-2.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-7.0.26.jar" sourcepath="/SNAPS_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-sources-7.0.26.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120615065132/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120615065132.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120615065132/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.D-20120615065132.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120615065828.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.M04/org.eclipse.virgo.medic.core-3.5.0.M04.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M04/org.eclipse.virgo.medic.test-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.0.CI-B20/org.eclipse.virgo.medic.test-sources-1.0.0.CI-B20.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.artifact-3.5.0.D-20120530104427.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.artifact-sources-3.5.0.D-20120530104427.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120510145727/org.eclipse.virgo.kernel.core-3.5.0.BUILD-20120510145727.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120510145727/org.eclipse.virgo.kernel.core-sources-3.5.0.BUILD-20120510145727.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120615070622/org.eclipse.virgo.medic.core-3.5.0.D-20120615070622.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-3.5.0.D-20120615070622.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.0.CI-B20/org.eclipse.virgo.medic.test-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120615070622/org.eclipse.virgo.medic-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.artifact-3.5.0.D-20120615074116.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.artifact-sources-3.5.0.D-20120615074116.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-3.5.0.D-20120615071853.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120615071853.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/SNAPS_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="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.snaps.core/ivy.xml b/org.eclipse.virgo.snaps.core/ivy.xml
index 1feaf06..2cb56a8 100644
--- a/org.eclipse.virgo.snaps.core/ivy.xml
+++ b/org.eclipse.virgo.snaps.core/ivy.xml
@@ -18,8 +18,8 @@
<dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.api" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.api" rev="${org.eclipse.virgo.nano}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="${org.eclipse.virgo.kernel}" conf="compile->compile"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.tomcat" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.common" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->compile"/>
diff --git a/org.eclipse.virgo.snaps.test/.classpath b/org.eclipse.virgo.snaps.test/.classpath
index 1234611..c7177a6 100644
--- a/org.eclipse.virgo.snaps.test/.classpath
+++ b/org.eclipse.virgo.snaps.test/.classpath
@@ -5,17 +5,17 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.M04/org.eclipse.virgo.test.framework-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.M04/org.eclipse.virgo.test.framework-sources-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120615070343/org.eclipse.virgo.test.framework-3.5.0.D-20120615070343.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120615070343/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120615070343.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M04/org.eclipse.virgo.util.osgi.manifest-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M04/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120510145727/org.eclipse.virgo.kernel.core-3.5.0.BUILD-20120510145727.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120510145727/org.eclipse.virgo.kernel.core-sources-3.5.0.BUILD-20120510145727.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120530104427.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.deployer.core-sources-3.5.0.D-20120530104427.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-3.5.0.D-20120615065828.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120615065828.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-3.5.0.D-20120615071853.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120615071853.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120615074116.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.deployer.core-sources-3.5.0.D-20120615074116.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.M04/org.eclipse.virgo.osgi.launcher-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.M04/org.eclipse.virgo.osgi.launcher-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.M04/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.M04.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.M04/org.eclipse.virgo.osgi.extensions.equinox-sources-3.5.0.M04.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120615065435.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.launcher-sources-3.5.0.D-20120615065435.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120615065435.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.extensions.equinox-sources-3.5.0.D-20120615065435.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.snaps.test/ivy.xml b/org.eclipse.virgo.snaps.test/ivy.xml
index 42ce97e..248a9dd 100644
--- a/org.eclipse.virgo.snaps.test/ivy.xml
+++ b/org.eclipse.virgo.snaps.test/ivy.xml
@@ -58,7 +58,8 @@
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
<override org="org.eclipse.virgo.repository" rev="${org.eclipse.virgo.repository}"/>
<override org="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}"/>
- <override org="org.eclipse.gemini.web" rev="${org.eclipse.gemini.web}"/>
+ <override org="org.eclipse.gemini" module="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}"/>
+ <override org="org.eclipse.gemini" module="org.eclipse.gemini.web.tomcat" rev="${org.eclipse.gemini.web}"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 84c0d5d..527f642 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -10,10 +10,10 @@
file:../ivy-cache/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.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.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.agent.dm-3.5.0.D-20120530104427.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.deployer.dm-3.5.0.D-20120530104427.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.dmfragment-3.5.0.D-20120530104427.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.5.0.D-20120530104427/org.eclipse.virgo.kernel.userregion-3.5.0.D-20120530104427.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.agent.dm-3.5.0.D-20120615074116.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.deployer.dm-3.5.0.D-20120615074116.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.dmfragment-3.5.0.D-20120615074116.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.5.0.D-20120615074116/org.eclipse.virgo.kernel.userregion-3.5.0.D-20120615074116.jar@start,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.ds/1.3.0.v20110124-0830/org.eclipse.equinox.ds-1.3.0.v20110124-0830.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.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar,\
