diff --git a/build.versions b/build.versions
index 57675f4..654773c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,7 +1,7 @@
 # Compile
-org.eclipse.virgo.nano=3.7.0.D-20130226164727
-org.eclipse.virgo.kernel=3.7.0.D-20130226165455
-org.eclipse.virgo.repository=3.7.0.D-20130226165218
+org.eclipse.virgo.nano=3.7.0.D-20130322123645
+org.eclipse.virgo.kernel=3.7.0.D-20130322124857
+org.eclipse.virgo.repository=3.7.0.D-20130322124656
 org.eclipse.virgo.util=3.7.0.D-20130226163512
 org.eclipse.virgo.medic=3.7.0.D-20130226164418
 org.apache.felix.gogo.runtime=0.10.0.v201209301036
@@ -9,7 +9,7 @@
 org.eclipse.osgi=3.8.1.v20120830-144521
 org.eclipse.equinox.event=1.2.100.v20111010-1614
 org.springframework=3.1.0.RELEASE
-org.eclipse.gemini.blueprint=1.0.2.RELEASE
+org.eclipse.gemini.blueprint=2.0.0.M02
 org.eclipse.gemini.web=2.2.1.RELEASE
 org.aspectj=1.6.12.RELEASE
 org.slf4j.nop=1.7.2.v201212060727
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 1322e87..ad5221f 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -25,15 +25,15 @@
 	<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.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.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"/>
-	<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.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-sources-2.0.0.M02.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-sources-2.0.0.M02.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-sources-2.0.0.M02.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.7.0.D-20130226163512/org.eclipse.virgo.util.math-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.7.0.D-20130226163512/org.eclipse.virgo.util.math-sources-3.7.0.D-20130226163512.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-sources-3.7.0.D-20130226163512.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.7.0.D-20130226163512/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130226163512.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer-sources-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.osgi-sources-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer-sources-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.osgi-sources-3.7.0.D-20130322124857.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130226163512/org.eclipse.virgo.util.common-3.7.0.D-20130226163512.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"/>
@@ -49,13 +49,13 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop-1.7.2.v201212060727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop.source-1.7.2.v201212060727.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.7.0.D-20130226163512/org.eclipse.virgo.util.parser.manifest-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.7.0.D-20130226163512/org.eclipse.virgo.util.parser.manifest-sources-3.7.0.D-20130226163512.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.7.2.v20121108-1250/org.slf4j.jcl-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.7.2.v20121108-1250/org.slf4j.jcl.source-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.stubs-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.stubs-sources-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.artifact-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.artifact-sources-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130226165218/org.eclipse.virgo.repository-3.7.0.D-20130226165218.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.stubs-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.stubs-sources-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.artifact-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.artifact-sources-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130322124656/org.eclipse.virgo.repository-3.7.0.D-20130322124656.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.7.0.D-20130226164727/org.eclipse.virgo.nano.core-3.7.0.D-20130226164727.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130226164727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer.api-sources-3.7.0.D-20130226164727.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-3.7.0.D-20130322123645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130322123645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer.api-sources-3.7.0.D-20130322123645.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.1.RELEASE/org.eclipse.gemini.web.core-2.2.1.RELEASE.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 6afc821..e0dede2 100644
--- a/org.eclipse.virgo.web.dm/.classpath
+++ b/org.eclipse.virgo.web.dm/.classpath
@@ -29,14 +29,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-sources-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-sources-3.1.0.RELEASE.jar"/>
-	<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.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-sources-2.0.0.M02.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-sources-2.0.0.M02.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-sources-2.0.0.M02.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.7.0.D-20130226164727/org.eclipse.virgo.nano.core-3.7.0.D-20130226164727.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-3.7.0.D-20130322123645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130322124857.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api.source-1.7.2.v20121108-1250.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"/>
diff --git a/org.eclipse.virgo.web.enterprise.services.accessor/.classpath b/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
index bbb19c1..f854afa 100755
--- a/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
@@ -14,7 +14,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/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.35.v201302131125/org.apache.catalina-7.0.35.v201302131125.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina.source-7.0.35.v201302131125.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130322124857.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130226163512/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130226163512.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"/>
diff --git a/org.eclipse.virgo.web.test/.classpath b/org.eclipse.virgo.web.test/.classpath
index 04c3ad1..1f72187 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -22,14 +22,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-sources-3.1.0.jar"/>
 	<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.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-sources-2.0.0.M02.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-sources-3.7.0.D-20130226163512.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.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer-sources-3.7.0.D-20130226165455.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer-sources-3.7.0.D-20130322124857.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130322124857.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130226164155/org.eclipse.virgo.test.framework-3.7.0.D-20130226164155.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130226164155/org.eclipse.virgo.test.framework-sources-3.7.0.D-20130226164155.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130226163512/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130226163512.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.equinox.extensions-sources-3.7.0.D-20130322124857.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina-7.0.35.v201302131125.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina.source-7.0.35.v201302131125.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote.source-7.0.35.v201302140645.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"/>
@@ -39,9 +39,9 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.7.0.D-20130226164155/org.eclipse.virgo.test.launcher-3.7.0.D-20130226164155.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.launcher/3.7.0.D-20130226164155/org.eclipse.virgo.kernel.launcher-sources-3.7.0.D-20130226164155.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130226163512/org.eclipse.virgo.util.common-3.7.0.D-20130226163512.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.7.0.D-20130226165455/org.eclipse.virgo.kernel.model-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.model-sources-3.7.0.D-20130226165455.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.model-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.model-sources-3.7.0.D-20130322124857.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.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130226164727.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130322123645.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/META-INF/test.config.properties b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
index 0bf7177..71bdd96 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
@@ -38,9 +38,9 @@
  file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
  file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.management/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.management-${org.eclipse.virgo.nano}.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.agent.dm-${org.eclipse.virgo.kernel}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.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.artifact/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.artifact-${org.eclipse.virgo.kernel}.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.services-${org.eclipse.virgo.kernel}.jar@start,\
diff --git a/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.strict.properties b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.strict.properties
index 48f0696..fa0816b 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.strict.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.strict.properties
@@ -38,9 +38,9 @@
  file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
  file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.management/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.management-${org.eclipse.virgo.nano}.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.agent.dm-${org.eclipse.virgo.kernel}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.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.artifact/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.artifact-${org.eclipse.virgo.kernel}.jar@start,\
  file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.services-${org.eclipse.virgo.kernel}.jar@start,\
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 3715c4e..b02c736 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
@@ -5,14 +5,14 @@
  file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar,\
  file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar,\
  file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.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.7.0.D-20130226165455/org.eclipse.virgo.kernel.agent.dm-3.7.0.D-20130226165455.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130226165455.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.dmfragment-3.7.0.D-20130226165455.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.userregion-3.7.0.D-20130226165455.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.agent.dm-3.7.0.D-20130322124857.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130322124857.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.dmfragment-3.7.0.D-20130322124857.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.userregion-3.7.0.D-20130322124857.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 3715c4e..b02c736 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
@@ -5,14 +5,14 @@
  file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar,\
  file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar,\
  file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.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.7.0.D-20130226165455/org.eclipse.virgo.kernel.agent.dm-3.7.0.D-20130226165455.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130226165455.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.dmfragment-3.7.0.D-20130226165455.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.userregion-3.7.0.D-20130226165455.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.agent.dm-3.7.0.D-20130322124857.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.deployer.dm-3.7.0.D-20130322124857.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.dmfragment-3.7.0.D-20130322124857.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.userregion-3.7.0.D-20130322124857.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 7d6dbb4..c494983 100644
--- a/org.eclipse.virgo.web.tomcat.support/.classpath
+++ b/org.eclipse.virgo.web.tomcat.support/.classpath
@@ -26,7 +26,7 @@
 	<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.7.0.D-20130226163512/org.eclipse.virgo.util.math-3.7.0.D-20130226163512.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.osgi-sources-3.7.0.D-20130226165455.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.osgi-sources-3.7.0.D-20130322124857.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
@@ -34,7 +34,7 @@
 	<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.7.0.D-20130226163512/org.eclipse.virgo.util.io-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-sources-3.7.0.D-20130226163512.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.7.0.D-20130226164418/org.eclipse.virgo.medic-3.7.0.D-20130226164418.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.7.0.D-20130226164727/org.eclipse.virgo.nano.core-3.7.0.D-20130226164727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.7.0.D-20130226164727/org.eclipse.virgo.nano.core-sources-3.7.0.D-20130226164727.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-3.7.0.D-20130322123645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-sources-3.7.0.D-20130322123645.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.1.RELEASE/org.eclipse.gemini.web.tomcat-2.2.1.RELEASE.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 30bc4f2..30f6790 100644
--- a/org.eclipse.virgo.web.war.deployer/.classpath
+++ b/org.eclipse.virgo.web.war.deployer/.classpath
@@ -21,7 +21,7 @@
 		</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.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130226164727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer.api-sources-3.7.0.D-20130226164727.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130322123645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer.api-sources-3.7.0.D-20130322123645.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.7.0.D-20130226164418/org.eclipse.virgo.medic.core-3.7.0.D-20130226164418.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.7.0.D-20130226164418/org.eclipse.virgo.medic-3.7.0.D-20130226164418.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"/>
@@ -31,8 +31,8 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api.source-1.7.2.v20121108-1250.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-3.7.0.D-20130226163512.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130226163512/org.eclipse.virgo.util.io-sources-3.7.0.D-20130226163512.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130226163512/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130226163512.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer/3.7.0.D-20130226164727/org.eclipse.virgo.nano.deployer-3.7.0.D-20130226164727.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.7.0.D-20130226164727/org.eclipse.virgo.nano.core-3.7.0.D-20130226164727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.7.0.D-20130226164727/org.eclipse.virgo.nano.core-sources-3.7.0.D-20130226164727.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer/3.7.0.D-20130322123645/org.eclipse.virgo.nano.deployer-3.7.0.D-20130322123645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-3.7.0.D-20130322123645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.nano.core/3.7.0.D-20130322123645/org.eclipse.virgo.nano.core-sources-3.7.0.D-20130322123645.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.1.RELEASE/org.eclipse.gemini.web.core-2.2.1.RELEASE.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="output" path="target/classes"/>
diff --git a/test-apps/spring-capability-tests/.classpath b/test-apps/spring-capability-tests/.classpath
index c672b0b..5e2617d 100644
--- a/test-apps/spring-capability-tests/.classpath
+++ b/test-apps/spring-capability-tests/.classpath
@@ -9,6 +9,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-sources-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-sources-3.1.0.RELEASE.jar"/>
 	<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.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.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-sources-2.0.0.M02.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/web-module-resource-loading/web_module_resource_loading.web/.classpath b/test-apps/web-module-resource-loading/web_module_resource_loading.web/.classpath
index 661b9d7..30df057 100644
--- a/test-apps/web-module-resource-loading/web_module_resource_loading.web/.classpath
+++ b/test-apps/web-module-resource-loading/web_module_resource_loading.web/.classpath
@@ -11,6 +11,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar"/>
-	<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.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-sources-2.0.0.M02.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>