diff --git a/build.versions b/build.versions
index 442b589..22d5e9c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,15 +1,15 @@
 # Compile
-org.eclipse.virgo.kernel=3.6.0.D-20120711101519
-org.eclipse.virgo.repository=3.6.0.D-20120711094540
-org.eclipse.virgo.util=3.6.0.D-20120711093140
-org.eclipse.virgo.medic=3.6.0.D-20120711093918
+org.eclipse.virgo.kernel=3.6.0.D-20120717095103
+org.eclipse.virgo.repository=3.6.0.D-20120716143152
+org.eclipse.virgo.util=3.6.0.D-20120716141547
+org.eclipse.virgo.medic=3.6.0.D-20120716142423
 javax.servlet=3.0.0.v201112011016
 org.eclipse.osgi=3.8.0.v20120508-2119
 org.eclipse.equinox.event=1.2.100.v20111010-1614
 org.springframework=3.0.5.RELEASE
 org.eclipse.gemini.blueprint=1.0.0.RELEASE
 org.eclipse.gemini.web=2.1.0.RELEASE
-org.eclipse.virgo.nano=3.6.0.D-20120711095111
+org.eclipse.virgo.nano=3.6.0.D-20120716143722
 org.aspectj=1.6.12.RELEASE
 org.slf4j=1.6.1
 org.slf4j.api=1.6.4.v20120130-2120
@@ -23,9 +23,9 @@
 ch.qos.logback.core=1.0.0.v20111214-2030
 ch.qos.logback.slf4j=1.0.0.v20120123-1500
 com.dumbster=1.6.0
-org.eclipse.virgo.osgi=3.6.0.D-20120711092707
-org.eclipse.virgo.teststubs=3.6.0.D-20120711092322
-org.eclipse.virgo.test=3.6.0.D-20120711093701
+org.eclipse.virgo.osgi=3.6.0.D-20120716141204
+org.eclipse.virgo.teststubs=3.6.0.D-20120716140824
+org.eclipse.virgo.test=3.6.0.D-20120716142203
 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 b04662e..57aca6f 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.6.0.D-20120711093140/org.eclipse.virgo.util.math-3.6.0.D-20120711093140.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120711093140/org.eclipse.virgo.util.math-sources-3.6.0.D-20120711093140.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-sources-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120716141547/org.eclipse.virgo.util.math-3.6.0.D-20120716141547.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120716141547/org.eclipse.virgo.util.math-sources-3.6.0.D-20120716141547.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-3.6.0.D-20120716141547.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-sources-3.6.0.D-20120716141547.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.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120711093140.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120716141547/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120716141547.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120716141547/org.eclipse.virgo.util.common-3.6.0.D-20120716141547.jar"/>
 	<classpathentry kind="var" path="WEB_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="/WEB_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="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.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120716140824/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120716140824.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120716140824/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120716140824.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.6.0.D-20120711093918/org.eclipse.virgo.medic-3.6.0.D-20120711093918.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.6.0.D-20120716142423/org.eclipse.virgo.medic-3.6.0.D-20120716142423.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.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.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.6.0.D-20120711093140/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120711093140.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120716141547/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120716141547.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120716141547/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20120716141547.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.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.6.0.D-20120711101519/org.eclipse.virgo.kernel.stubs-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.stubs-sources-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.artifact-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120711092707.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120711092707.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120711094540/org.eclipse.virgo.repository-3.6.0.D-20120711094540.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.stubs-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.stubs-sources-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.artifact-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120716141204.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120716141204.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120716143152/org.eclipse.virgo.repository-3.6.0.D-20120716143152.jar"/>
 	<classpathentry kind="var" path="WEB_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="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-3.6.0.D-20120711095111.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120711095111/org.eclipse.virgo.deployer.api-3.6.0.D-20120711095111.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120716143722/org.eclipse.virgo.kernel.core-3.6.0.D-20120716143722.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120716143722/org.eclipse.virgo.deployer.api-3.6.0.D-20120716143722.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 002b3d2..159e168 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.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-3.6.0.D-20120711095111.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120711101519.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120716143722/org.eclipse.virgo.kernel.core-3.6.0.D-20120716143722.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120717095103.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.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.6.0.D-20120711093918/org.eclipse.virgo.medic-3.6.0.D-20120711093918.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120716142423/org.eclipse.virgo.medic-3.6.0.D-20120716142423.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 5c30066..bbb8ab0 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.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-sources-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-3.6.0.D-20120716141547.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-sources-3.6.0.D-20120716141547.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.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.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120711101519.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120711093701/org.eclipse.virgo.test.framework-3.6.0.D-20120711093701.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120711093701/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120711093701.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120711093140.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120711092707.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120711092707.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120717095103.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120716142203/org.eclipse.virgo.test.framework-3.6.0.D-20120716142203.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120716142203/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120716142203.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120716141547/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120716141547.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120716141204.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120716141204.jar"/>
 	<classpathentry kind="var" path="WEB_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="/WEB_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="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/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar" sourcepath="/WEB_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="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.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120716141204.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120716141204/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120716141204.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120716141547/org.eclipse.virgo.util.common-3.6.0.D-20120716141547.jar"/>
 	<classpathentry kind="var" path="WEB_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="/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.6.0.D-20120711101519/org.eclipse.virgo.kernel.model-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.model-sources-3.6.0.D-20120711101519.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.model-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.model-sources-3.6.0.D-20120717095103.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.6.0.D-20120711095111/org.eclipse.virgo.deployer.api-3.6.0.D-20120711095111.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120716143722/org.eclipse.virgo.deployer.api-3.6.0.D-20120716143722.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 d9d15bc..077d69d 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.6.0.D-20120711101519/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20120711101519.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120711101519.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20120711101519.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.userregion-3.6.0.D-20120711101519.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20120717095103.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120717095103.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20120717095103.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.userregion-3.6.0.D-20120717095103.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 458c204..214b939 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.6.0.D-20120711093140/org.eclipse.virgo.util.math-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120716141547/org.eclipse.virgo.util.math-3.6.0.D-20120716141547.jar"/>
 	<classpathentry kind="var" path="WEB_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="/WEB_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="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120711101519.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120711101519.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120717095103.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120717095103/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120717095103.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.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-sources-3.6.0.D-20120711093140.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120711093918/org.eclipse.virgo.medic-3.6.0.D-20120711093918.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.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-3.6.0.D-20120711095111.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120711095111.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-3.6.0.D-20120716141547.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120716141547/org.eclipse.virgo.util.io-sources-3.6.0.D-20120716141547.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120716142423/org.eclipse.virgo.medic-3.6.0.D-20120716142423.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.6.0.D-20120716143722/org.eclipse.virgo.kernel.core-3.6.0.D-20120716143722.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120716143722/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120716143722.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>