diff --git a/build.versions b/build.versions
index a9e6e4a..c97ce7e 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
 # Compile
-org.eclipse.virgo.kernel=3.7.0.D-20130226165455
-org.eclipse.virgo.nano=3.7.0.D-20130226164727
+org.eclipse.virgo.kernel=3.7.0.D-20130322124857
+org.eclipse.virgo.nano=3.7.0.D-20130322123645
 org.eclipse.virgo.medic=3.7.0.D-20130226164418
-org.eclipse.virgo.repository=3.7.0.D-20130226165218
+org.eclipse.virgo.repository=3.7.0.D-20130322124656
 org.eclipse.virgo.util=3.7.0.D-20130226163512
-org.eclipse.virgo.web=3.7.0.D-20130226172929
+org.eclipse.virgo.web=3.7.0.D-20130322133509
 org.eclipse.gemini.web=2.2.1.RELEASE
 javax.jms=1.1.0.v201205091237
 javax.servlet.jsp.jstl=1.2.0.v20110728
@@ -20,7 +20,7 @@
 org.slf4j.api=1.7.2.v20121108-1250
 org.slf4j.jul=1.7.2.v20121108-1250
 org.slf4j.jcl=1.7.2.v20121108-1250
-org.eclipse.gemini.blueprint=1.0.2.RELEASE
+org.eclipse.gemini.blueprint=2.0.0.M02
 org.springframework=3.1.0.RELEASE
 org.eclipse.osgi.services=3.3.0.v20120307-2102
 org.eclipse.equinox.cm=1.0.400.v20120319-2029
diff --git a/org.eclipse.virgo.apps.repository.core/.classpath b/org.eclipse.virgo.apps.repository.core/.classpath
index 26fba75..0672742 100644
--- a/org.eclipse.virgo.apps.repository.core/.classpath
+++ b/org.eclipse.virgo.apps.repository.core/.classpath
@@ -23,12 +23,12 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.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.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-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"/>
 	<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.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/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.7.0.D-20130226165455/org.eclipse.virgo.kernel.services-3.7.0.D-20130226165455.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.7.0.D-20130322124857/org.eclipse.virgo.kernel.services-3.7.0.D-20130322124857.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.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"/>
 	<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"/>
 	<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"/>
diff --git a/org.eclipse.virgo.apps.repository.test/.classpath b/org.eclipse.virgo.apps.repository.test/.classpath
index 6296855..8e39806 100644
--- a/org.eclipse.virgo.apps.repository.test/.classpath
+++ b/org.eclipse.virgo.apps.repository.test/.classpath
@@ -7,14 +7,14 @@
 	<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.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.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.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.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20120711092707/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20120711092707.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.repository/org.eclipse.virgo.repository/3.7.0.D-20130226165218/org.eclipse.virgo.repository-3.7.0.D-20130226165218.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.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/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
 	<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.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/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.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/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.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/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.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/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130226163512/org.eclipse.virgo.util.common-sources-3.7.0.D-20130226163512.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.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"/>
diff --git a/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
index 94f9aa8..1d41395 100644
--- a/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
@@ -28,9 +28,9 @@
  file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
  file:${integration.repo.dir}/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.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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.services-${org.eclipse.virgo.kernel}.jar@start,\