diff --git a/build.versions b/build.versions
index 1376c88..dbb945c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,8 +1,8 @@
 # Compile
-org.eclipse.virgo.kernel=2.1.0.D-20100702114401
-org.eclipse.virgo.repository=2.1.0.D-20100702113952
-org.eclipse.virgo.util=2.1.0.D-20100702112810
-org.eclipse.virgo.medic=2.1.0.D-20100702113432
+org.eclipse.virgo.kernel=2.1.0.M02-incubation
+org.eclipse.virgo.repository=2.1.0.M02-incubation
+org.eclipse.virgo.util=2.1.0.M02-incubation
+org.eclipse.virgo.medic=2.1.0.M02-incubation
 javax.servlet=2.5.0
 org.eclipse.osgi=3.5.1.R35x_v20091005
 org.springframework=3.0.0.RELEASE
@@ -15,9 +15,9 @@
 
 # Test
 com.dumbster=1.6.0
-org.eclipse.virgo.osgi=2.1.0.D-20100702112601
-org.eclipse.virgo.teststubs=2.1.0.D-20100702112350
-org.eclipse.virgo.test=2.1.0.D-20100702113232
+org.eclipse.virgo.osgi=2.1.0.M02-incubation
+org.eclipse.virgo.teststubs=2.1.0.M02-incubation
+org.eclipse.virgo.test=2.1.0.M02-incubation
 javax.activation=1.1.0
 javax.jms=1.1.0
 javax.mail=1.4.1
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index d2fa358..b738e2a 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -28,32 +28,32 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.D-20100702112810/org.eclipse.virgo.util.math-2.1.0.D-20100702112810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.D-20100702112810/org.eclipse.virgo.util.math-sources-2.1.0.D-20100702112810.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-2.1.0.D-20100702112810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-sources-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.M02-incubation/org.eclipse.virgo.util.math-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.M02-incubation/org.eclipse.virgo.util.math-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-sources-2.1.0.M02-incubation.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/2.1.0.D-20100702112810/org.eclipse.virgo.util.osgi-2.1.0.D-20100702112810.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.osgi-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.core-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.core-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100702112810/org.eclipse.virgo.util.common-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-1.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-sources-1.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.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/2.1.0.D-20100702112350/org.eclipse.virgo.teststubs.osgi-2.1.0.D-20100702112350.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.D-20100702112350/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.D-20100702112350.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.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/2.1.0.D-20100702113432/org.eclipse.virgo.medic-2.1.0.D-20100702113432.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100702113432/org.eclipse.virgo.medic-sources-2.1.0.D-20100702113432.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-sources-2.1.0.M02-incubation.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.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-sources-1.5.10.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.D-20100702112810/org.eclipse.virgo.util.parser.manifest-2.1.0.D-20100702112810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.D-20100702112810/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.5.10/com.springsource.slf4j.org.apache.commons.logging-1.5.10.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.5.10/com.springsource.slf4j.org.apache.commons.logging-sources-1.5.10.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.stubs-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.stubs-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.artifact-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.artifact-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.D-20100702112601.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.D-20100702112601.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100702113952/org.eclipse.virgo.repository-2.1.0.D-20100702113952.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/2.1.0.M02-incubation/org.eclipse.virgo.kernel.stubs-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/2.1.0.M02-incubation/org.eclipse.virgo.kernel.stubs-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.M02-incubation/org.eclipse.virgo.repository-2.1.0.M02-incubation.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 a1cb89c..6ea2620 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.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.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.kernel/org.eclipse.virgo.kernel.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.core-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer.dm-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-sources-3.0.0.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/2.1.0.D-20100702113432/org.eclipse.virgo.medic-2.1.0.D-20100702113432.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-2.1.0.M02-incubation.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 44f1a6c..1de4a39 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -29,13 +29,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.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-2.1.0.D-20100702112810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-sources-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.osgi-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100702113232/org.eclipse.virgo.test.framework-2.1.0.D-20100702113232.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100702113232/org.eclipse.virgo.test.framework-sources-2.1.0.D-20100702113232.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.D-20100702112810/org.eclipse.virgo.util.osgi-2.1.0.D-20100702112810.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.D-20100702112601.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.D-20100702112601.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-1.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-sources-1.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-sources-6.0.20.S2-r5956.jar"/>
@@ -43,10 +43,10 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-sources-6.0.20.S2-r5956.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-1.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-sources-1.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.launcher-2.1.0.D-20100702112601.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100702112601/org.eclipse.virgo.osgi.launcher-sources-2.1.0.D-20100702112601.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100702112810/org.eclipse.virgo.util.common-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.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/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.model-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.model-sources-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/2.1.0.M02-incubation/org.eclipse.virgo.kernel.model-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/2.1.0.M02-incubation/org.eclipse.virgo.kernel.model-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.0.RELEASE/org.springframework.orm-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.0.RELEASE/org.springframework.orm-sources-3.0.0.RELEASE.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 6a158d8..59e38a6 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.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.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/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.agent.dm-2.1.0.D-20100702114401.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer.dm-2.1.0.D-20100702114401.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.dmfragment-2.1.0.D-20100702114401.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.userregion-2.1.0.D-20100702114401.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.agent.dm-2.1.0.M02-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M02-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.M02-incubation/org.eclipse.virgo.kernel.dmfragment-2.1.0.M02-incubation.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.M02-incubation/org.eclipse.virgo.kernel.userregion-2.1.0.M02-incubation.jar@start,\
  file:../ivy-cache/repository/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.orm/3.0.0.RELEASE/org.springframework.orm-3.0.0.RELEASE.jar@start,\
  file:../ivy-cache/repository/org.springframework/org.springframework.transaction/3.0.0.RELEASE/org.springframework.transaction-3.0.0.RELEASE.jar@start,\
diff --git a/org.eclipse.virgo.web.tomcat/.classpath b/org.eclipse.virgo.web.tomcat/.classpath
index 1fc8da7..41dab77 100644
--- a/org.eclipse.virgo.web.tomcat/.classpath
+++ b/org.eclipse.virgo.web.tomcat/.classpath
@@ -25,16 +25,16 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/WEB_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.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/2.1.0.D-20100702112810/org.eclipse.virgo.util.math-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.1.0.M02-incubation/org.eclipse.virgo.util.math-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-1.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-sources-1.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.osgi-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100702114401.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M02-incubation.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/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-2.1.0.D-20100702112810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100702112810/org.eclipse.virgo.util.io-sources-2.1.0.D-20100702112810.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100702113432/org.eclipse.virgo.medic-2.1.0.D-20100702113432.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.D-20100702113432/org.eclipse.virgo.medic-sources-2.1.0.D-20100702113432.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.core-2.1.0.D-20100702114401.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.core-sources-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>