diff --git a/build.versions b/build.versions
index 720e7a2..fb04cfd 100644
--- a/build.versions
+++ b/build.versions
@@ -1,15 +1,15 @@
 # Compile
-org.eclipse.virgo.kernel=3.5.0.D-20120424013254
-org.eclipse.virgo.repository=3.5.0.D-20120424010511
-org.eclipse.virgo.util=3.5.0.D-20120424005002
-org.eclipse.virgo.medic=3.5.0.D-20120424005802
+org.eclipse.virgo.kernel=3.5.0.M04
+org.eclipse.virgo.repository=3.5.0.M04
+org.eclipse.virgo.util=3.5.0.M04
+org.eclipse.virgo.medic=3.5.0.M04
 javax.servlet=3.0.0.v201103241009
 org.eclipse.osgi=3.7.1.R37x_v20110808-1106
 org.eclipse.equinox.event=1.2.100.v20110110
 org.springframework=3.0.5.RELEASE
 org.eclipse.gemini.blueprint=1.0.0.RELEASE
 org.eclipse.gemini.web=2.1.0.M03
-org.eclipse.virgo.nano=3.5.0.D-20120424011058
+org.eclipse.virgo.nano=3.5.0.M04
 org.aspectj=1.6.12.RELEASE
 org.slf4j=1.6.1
 org.slf4j.spi=1.6.1
@@ -17,9 +17,9 @@
 # Test
 ch.qos.logback=0.9.28
 com.dumbster=1.6.0
-org.eclipse.virgo.osgi=3.5.0.D-20120424004624
-org.eclipse.virgo.teststubs=3.5.0.D-20120424004248
-org.eclipse.virgo.test=3.5.0.D-20120424005534
+org.eclipse.virgo.osgi=3.5.0.M04
+org.eclipse.virgo.teststubs=3.5.0.M04
+org.eclipse.virgo.test=3.5.0.M04
 javax.activation=1.1.1
 javax.jms=1.1.0
 javax.mail=1.4.0
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 2551985..fb33f24 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -28,34 +28,34 @@
 	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120424005002/org.eclipse.virgo.util.math-3.5.0.D-20120424005002.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120424005002/org.eclipse.virgo.util.math-sources-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-3.5.0.D-20120424005002.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-sources-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_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" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-sources-3.5.0.M04.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.dm"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120424005002/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer-sources-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.osgi-sources-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120424005002/org.eclipse.virgo.util.common-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_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"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.M04/org.eclipse.virgo.kernel.deployer-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.M04/org.eclipse.virgo.kernel.deployer-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.M04/org.eclipse.virgo.kernel.osgi-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.M04/org.eclipse.virgo.kernel.osgi-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_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="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.core-2.1.0.BUILD-20120320082844.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.core-sources-2.1.0.BUILD-20120320082844.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120424004248/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120424004248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120424005534/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.D-20120424005534.jar"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.test/3.0.5.RELEASE/org.springframework.test-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120424005802/org.eclipse.virgo.medic-3.5.0.D-20120424005802.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-sources-3.1.0.M01.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-sources-3.1.0.M01.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120424005002/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120424005002.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120424005002/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.6.1/com.springsource.slf4j.org.apache.commons.logging-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.6.1/com.springsource.slf4j.org.apache.commons.logging-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.stubs-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.stubs-sources-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.artifact-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.artifact-sources-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120424004624.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.extensions.equinox-sources-3.5.0.D-20120424004624.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120424010511/org.eclipse.virgo.repository-3.5.0.D-20120424010511.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.5.0.M04/org.eclipse.virgo.kernel.stubs-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.5.0.M04/org.eclipse.virgo.kernel.stubs-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.M04/org.eclipse.virgo.kernel.artifact-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.5.0.M04/org.eclipse.virgo.kernel.artifact-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M04/org.eclipse.virgo.repository-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120424011058/org.eclipse.virgo.kernel.core-3.5.0.D-20120424011058.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120424011058/org.eclipse.virgo.deployer.api-3.5.0.D-20120424011058.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.M04/org.eclipse.virgo.kernel.core-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.M04/org.eclipse.virgo.deployer.api-3.5.0.M04.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.web.dm/.classpath b/org.eclipse.virgo.web.dm/.classpath
index cfd8571..f26fcd6 100644
--- a/org.eclipse.virgo.web.dm/.classpath
+++ b/org.eclipse.virgo.web.dm/.classpath
@@ -34,13 +34,13 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/WEB_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120424011058/org.eclipse.virgo.kernel.core-3.5.0.D-20120424011058.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer.dm-3.5.0.D-20120424013254.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.M04/org.eclipse.virgo.kernel.core-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.M04/org.eclipse.virgo.kernel.deployer-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.M04/org.eclipse.virgo.kernel.deployer.dm-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-sources-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120424005802/org.eclipse.virgo.medic-3.5.0.D-20120424005802.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-3.5.0.M04.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
diff --git a/org.eclipse.virgo.web.test/.classpath b/org.eclipse.virgo.web.test/.classpath
index d8eb586..10f56c7 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -24,13 +24,13 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/WEB_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/WEB_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-3.5.0.D-20120424005002.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-sources-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_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" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer-sources-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120424013254.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120424005534/org.eclipse.virgo.test.framework-3.5.0.D-20120424005534.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120424005534/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120424005534.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120424005002/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120424004624.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.extensions.equinox-sources-3.5.0.D-20120424004624.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.M04/org.eclipse.virgo.kernel.deployer-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.M04/org.eclipse.virgo.kernel.deployer-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.M04/org.eclipse.virgo.kernel.osgi-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_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"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.tomcat-2.1.0.BUILD-20120320082844.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.tomcat-sources-2.1.0.BUILD-20120320082844.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-7.0.26.jar" sourcepath="/WEB_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="WEB_IVY_CACHE/org.apache.coyote/com.springsource.org.apache.coyote/7.0.26/com.springsource.org.apache.coyote-7.0.26.jar" sourcepath="/WEB_IVY_CACHE/org.apache.coyote/com.springsource.org.apache.coyote/7.0.26/com.springsource.org.apache.coyote-sources-7.0.26.jar"/>
@@ -38,11 +38,11 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.jasper/com.springsource.org.apache.jasper/7.0.26/com.springsource.org.apache.jasper-7.0.26.jar" sourcepath="/WEB_IVY_CACHE/org.apache.jasper/com.springsource.org.apache.jasper/7.0.26/com.springsource.org.apache.jasper-sources-7.0.26.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.core-2.1.0.BUILD-20120320082844.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.core-sources-2.1.0.BUILD-20120320082844.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120424004624.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120424004624/org.eclipse.virgo.osgi.launcher-sources-3.5.0.D-20120424004624.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120424005002/org.eclipse.virgo.util.common-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_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="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.model-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.model-sources-3.5.0.D-20120424013254.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.5.0.M04/org.eclipse.virgo.kernel.model-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.5.0.M04/org.eclipse.virgo.kernel.model-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120424011058/org.eclipse.virgo.deployer.api-3.5.0.D-20120424011058.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.M04/org.eclipse.virgo.deployer.api-3.5.0.M04.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 7d26d58..7b52ba9 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -9,10 +9,10 @@
  file:../ivy-cache/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
  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.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.agent.dm-3.5.0.D-20120424013254.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.deployer.dm-3.5.0.D-20120424013254.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.dmfragment-3.5.0.D-20120424013254.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.userregion-3.5.0.D-20120424013254.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.5.0.M04/org.eclipse.virgo.kernel.agent.dm-3.5.0.M04.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.5.0.M04/org.eclipse.virgo.kernel.deployer.dm-3.5.0.M04.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.5.0.M04/org.eclipse.virgo.kernel.dmfragment-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.5.0.M04/org.eclipse.virgo.kernel.userregion-3.5.0.M04.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,\
diff --git a/org.eclipse.virgo.web.tomcat.support/.classpath b/org.eclipse.virgo.web.tomcat.support/.classpath
index e683820..5a4bacc 100644
--- a/org.eclipse.virgo.web.tomcat.support/.classpath
+++ b/org.eclipse.virgo.web.tomcat.support/.classpath
@@ -25,16 +25,16 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/WEB_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="WEB_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="/WEB_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 combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.core"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120424005002/org.eclipse.virgo.util.math-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.BUILD-20120114220114/org.eclipse.gemini.web.tomcat-2.1.0.BUILD-20120114220114.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.1.0.M01/org.eclipse.gemini.web.tomcat-sources-2.1.0.M01.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120424013254.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120424013254/org.eclipse.virgo.kernel.osgi-sources-3.5.0.D-20120424013254.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.M04/org.eclipse.virgo.kernel.osgi-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.M04/org.eclipse.virgo.kernel.osgi-sources-3.5.0.M04.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-3.5.0.D-20120424005002.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-sources-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120424005802/org.eclipse.virgo.medic-3.5.0.D-20120424005802.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-sources-3.1.0.M01.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120424011058/org.eclipse.virgo.kernel.core-3.5.0.D-20120424011058.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.D-20120424011058/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120424011058.jar"/>
+	<classpathentry kind="var" path="WEB_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" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-sources-3.1.0.M01.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.M04/org.eclipse.virgo.kernel.core-3.5.0.M04.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.5.0.M04/org.eclipse.virgo.kernel.core-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>