diff --git a/build.versions b/build.versions
index 24cb9c1..143fe78 100644
--- a/build.versions
+++ b/build.versions
@@ -1,9 +1,9 @@
 # Compile
-org.eclipse.virgo.nano=3.6.0.D-20121126075801
-org.eclipse.virgo.kernel=3.6.0.D-20121126080325
-org.eclipse.virgo.repository=3.6.0.D-20121126080208
-org.eclipse.virgo.util=3.6.0.D-20121126074956
-org.eclipse.virgo.medic=3.6.0.D-20121126075533
+org.eclipse.virgo.nano=3.6.0.M04
+org.eclipse.virgo.kernel=3.6.0.M04
+org.eclipse.virgo.repository=3.6.0.M04
+org.eclipse.virgo.util=3.6.0.M04
+org.eclipse.virgo.medic=3.6.0.M04
 org.apache.felix.gogo.runtime=0.10.0.v201209301036
 javax.servlet=3.0.0.v201112011016
 org.eclipse.osgi=3.8.1.v20120830-144521
@@ -42,7 +42,7 @@
 ch.qos.logback.core=1.0.3.v20120828-0612
 ch.qos.logback.slf4j=1.0.0.v201208311022
 com.dumbster=1.6.0
-org.eclipse.virgo.test=3.6.0.D-20121126075325
+org.eclipse.virgo.test=3.6.0.M04
 javax.activation=1.1.0.v201108011116
 javax.jms=1.1.0.v201205091237
 javax.mail=1.4.0.v201005080615
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index ebb332f..ede6595 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -28,34 +28,34 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20121126074956/org.eclipse.virgo.util.math-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20121126074956/org.eclipse.virgo.util.math-sources-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-sources-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.M04/org.eclipse.virgo.util.math-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.M04/org.eclipse.virgo.util.math-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-sources-3.6.0.M04.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.dm"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121126074956/org.eclipse.virgo.util.common-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.M04/org.eclipse.virgo.util.osgi.manifest-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.M04/org.eclipse.virgo.kernel.deployer-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.M04/org.eclipse.virgo.kernel.deployer-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.M04/org.eclipse.virgo.kernel.osgi-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.M04/org.eclipse.virgo.kernel.osgi-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.M04/org.eclipse.virgo.util.common-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20121126075325/org.eclipse.virgo.test.stubs-3.6.0.D-20121126075325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.M04/org.eclipse.virgo.test.stubs-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.1.0.RELEASE/org.springframework.test-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121126075533/org.eclipse.virgo.medic-3.6.0.D-20121126075533.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.M04/org.eclipse.virgo.medic-3.6.0.M04.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.M04/org.eclipse.virgo.util.parser.manifest-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.M04/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.stubs-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.stubs-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.artifact-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20121126080208/org.eclipse.virgo.repository-3.6.0.D-20121126080208.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.M04/org.eclipse.virgo.kernel.stubs-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.M04/org.eclipse.virgo.kernel.stubs-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.M04/org.eclipse.virgo.kernel.artifact-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.M04/org.eclipse.virgo.kernel.artifact-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.M04/org.eclipse.virgo.repository-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-3.6.0.D-20121126075801.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121126075801/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20121126075801.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121126075801/org.eclipse.virgo.nano.deployer.api-sources-3.6.0.D-20121126075801.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.M04/org.eclipse.virgo.nano.deployer.api-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.M04/org.eclipse.virgo.nano.deployer.api-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.0.M02/org.eclipse.gemini.web.core-2.2.0.M02.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 a716c2d..6ef2676 100644
--- a/org.eclipse.virgo.web.dm/.classpath
+++ b/org.eclipse.virgo.web.dm/.classpath
@@ -34,13 +34,13 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-3.6.0.D-20121126075801.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121126080325.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.M04/org.eclipse.virgo.kernel.deployer-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.M04/org.eclipse.virgo.kernel.deployer.dm-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.1.0.RELEASE/org.springframework.aop-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.1.0.RELEASE/org.springframework.aop-sources-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121126075533/org.eclipse.virgo.medic-3.6.0.D-20121126075533.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.M04/org.eclipse.virgo.medic-3.6.0.M04.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
diff --git a/org.eclipse.virgo.web.enterprise.appdeployer/.classpath b/org.eclipse.virgo.web.enterprise.appdeployer/.classpath
index 558156e..7b6bc38 100755
--- a/org.eclipse.virgo.web.enterprise.appdeployer/.classpath
+++ b/org.eclipse.virgo.web.enterprise.appdeployer/.classpath
@@ -10,7 +10,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.openejb.loader/4.0.0.beta-2_v201205041336/org.apache.openejb.loader-4.0.0.beta-2_v201205041336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.ejb/3.1.1.v201204261316/javax.ejb-3.1.1.v201204261316.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina-7.0.32.v201211201336.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina.source-7.0.32.v201211201336.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121126075533/org.eclipse.virgo.medic-3.6.0.D-20121126075533.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.M04/org.eclipse.virgo.medic-3.6.0.M04.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.openejb.jee/4.0.0.beta-2_v201205041336/org.apache.openejb.jee-4.0.0.beta-2_v201205041336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.validation/1.0.0.GA_v201205091237/javax.validation-1.0.0.GA_v201205091237.jar"/>
diff --git a/org.eclipse.virgo.web.enterprise.services.accessor/.classpath b/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
index d7d9c0b..508c195 100755
--- a/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
@@ -14,8 +14,8 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.openejb.loader/4.0.0.beta-2_v201205041336/org.apache.openejb.loader-4.0.0.beta-2_v201205041336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina-7.0.32.v201211201336.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina.source-7.0.32.v201211201336.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.M04/org.eclipse.virgo.util.osgi.manifest-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.10.0.v201209301036/org.apache.felix.gogo.runtime-0.10.0.v201209301036.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
diff --git a/org.eclipse.virgo.web.test/.classpath b/org.eclipse.virgo.web.test/.classpath
index 4bbc449..82df95c 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -23,25 +23,25 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/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="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-sources-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121126080325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121126075325/org.eclipse.virgo.test.framework-3.6.0.D-20121126075325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121126075325/org.eclipse.virgo.test.framework-sources-3.6.0.D-20121126075325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121126080325.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.M04/org.eclipse.virgo.kernel.deployer-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.M04/org.eclipse.virgo.kernel.deployer-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.M04/org.eclipse.virgo.kernel.osgi-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.M04/org.eclipse.virgo.test.framework-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.M04/org.eclipse.virgo.test.framework-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.M04/org.eclipse.virgo.util.osgi.manifest-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.M04/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina-7.0.32.v201211201336.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.32.v201211201336/org.apache.catalina.source-7.0.32.v201211201336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.32.v201211201952/org.apache.coyote-7.0.32.v201211201952.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.32.v201211201952/org.apache.coyote.source-7.0.32.v201211201952.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet.jsp/2.2.0.v201103241009/javax.servlet.jsp-sources-2.2.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.32.v201211201952/org.apache.jasper-7.0.32.v201211201952.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.32.v201211201952/org.apache.jasper.source-7.0.32.v201211201952.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.0.M02/org.eclipse.gemini.web.core-2.2.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.0.M02/org.eclipse.gemini.web.core-sources-2.2.0.M02.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20121126075325/org.eclipse.virgo.test.launcher-3.6.0.D-20121126075325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.launcher/3.6.0.D-20121126075325/org.eclipse.virgo.kernel.launcher-sources-3.6.0.D-20121126075325.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121126074956/org.eclipse.virgo.util.common-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.M04/org.eclipse.virgo.test.launcher-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.launcher/3.6.0.M04/org.eclipse.virgo.kernel.launcher-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.M04/org.eclipse.virgo.util.common-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.model-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.model-sources-3.6.0.D-20121126080325.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.M04/org.eclipse.virgo.kernel.model-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.M04/org.eclipse.virgo.kernel.model-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.orm/3.1.0.RELEASE/org.springframework.orm-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.orm/3.1.0.RELEASE/org.springframework.orm-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121126075801/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20121126075801.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.M04/org.eclipse.virgo.nano.deployer.api-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.transaction/1.1.1.v201105210645/javax.transaction-1.1.1.v201105210645.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 08dcb54..61332cd 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.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.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.6.0.D-20121126080325/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121126080325.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121126080325.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121126080325.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121126080325.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.M04/org.eclipse.virgo.kernel.agent.dm-3.6.0.M04.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.M04/org.eclipse.virgo.kernel.deployer.dm-3.6.0.M04.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.M04/org.eclipse.virgo.kernel.dmfragment-3.6.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.M04/org.eclipse.virgo.kernel.userregion-3.6.0.M04.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar,\
diff --git a/org.eclipse.virgo.web.test/src/test/resources/config/strict/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.web.test/src/test/resources/config/strict/org.eclipse.virgo.kernel.userregion.properties
index 08dcb54..61332cd 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/config/strict/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/config/strict/org.eclipse.virgo.kernel.userregion.properties
@@ -9,10 +9,10 @@
  file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.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.6.0.D-20121126080325/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121126080325.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121126080325.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121126080325.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121126080325.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.M04/org.eclipse.virgo.kernel.agent.dm-3.6.0.M04.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.M04/org.eclipse.virgo.kernel.deployer.dm-3.6.0.M04.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.M04/org.eclipse.virgo.kernel.dmfragment-3.6.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.M04/org.eclipse.virgo.kernel.userregion-3.6.0.M04.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar,\
diff --git a/org.eclipse.virgo.web.tomcat.support/.classpath b/org.eclipse.virgo.web.tomcat.support/.classpath
index 47dff19..e8a133e 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="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="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="/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="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20121126074956/org.eclipse.virgo.util.math-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121126080325.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121126080325/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121126080325.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.M04/org.eclipse.virgo.util.math-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.M04/org.eclipse.virgo.kernel.osgi-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.M04/org.eclipse.virgo.kernel.osgi-sources-3.6.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="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-sources-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121126075533/org.eclipse.virgo.medic-3.6.0.D-20121126075533.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-3.6.0.D-20121126075801.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-sources-3.6.0.D-20121126075801.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.M04/org.eclipse.virgo.medic-3.6.0.M04.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-2.2.0.M02.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.web.war.deployer/.classpath b/org.eclipse.virgo.web.war.deployer/.classpath
index 38ab13d..5fe8488 100644
--- a/org.eclipse.virgo.web.war.deployer/.classpath
+++ b/org.eclipse.virgo.web.war.deployer/.classpath
@@ -21,18 +21,18 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121126075801/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20121126075801.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121126075801/org.eclipse.virgo.nano.deployer.api-sources-3.6.0.D-20121126075801.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20121126075533/org.eclipse.virgo.medic.core-3.6.0.D-20121126075533.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121126075533/org.eclipse.virgo.medic-3.6.0.D-20121126075533.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.M04/org.eclipse.virgo.nano.deployer.api-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.M04/org.eclipse.virgo.nano.deployer.api-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.M04/org.eclipse.virgo.medic.core-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.M04/org.eclipse.virgo.medic-3.6.0.M04.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator.manipulator/2.0.0.v20110808-1657/org.eclipse.equinox.simpleconfigurator.manipulator-2.0.0.v20110808-1657.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator/1.0.300.v20110815-1744/org.eclipse.equinox.simpleconfigurator-1.0.300.v20110815-1744.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-3.6.0.D-20121126074956.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121126074956/org.eclipse.virgo.util.io-sources-3.6.0.D-20121126074956.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121126074956/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121126074956.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.M04/org.eclipse.virgo.util.io-sources-3.6.0.M04.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.M04/org.eclipse.virgo.util.osgi.manifest-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer/3.6.0.BUILD-20121009125557/org.eclipse.virgo.nano.deployer-3.6.0.BUILD-20121009125557.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-3.6.0.D-20121126075801.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.6.0.D-20121126075801/org.eclipse.virgo.nano.core-sources-3.6.0.D-20121126075801.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-3.6.0.M04.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.6.0.M04/org.eclipse.virgo.nano.core-sources-3.6.0.M04.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.0.M02/org.eclipse.gemini.web.core-2.2.0.M02.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>