diff --git a/build.versions b/build.versions
index c546f7f..5e444b1 100644
--- a/build.versions
+++ b/build.versions
@@ -1,11 +1,11 @@
 # Compile
-org.eclipse.virgo.kernel=2.1.0.D-20100702114401
-org.eclipse.virgo.medic=2.1.0.D-20100702113432
-org.eclipse.virgo.osgi=2.1.0.D-20100702112601
-org.eclipse.virgo.repository=2.1.0.D-20100702113952
-org.eclipse.virgo.util=2.1.0.D-20100702112810
-org.eclipse.virgo.web=2.1.0.D-20100702121333
-org.eclipse.gemini.web=1.0.0.CI-17
+org.eclipse.virgo.kernel=2.1.0.M02-incubation
+org.eclipse.virgo.medic=2.1.0.M02-incubation
+org.eclipse.virgo.osgi=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.web=2.1.0.M02-incubation
+org.eclipse.gemini.web=1.1.0.M02-incubation
 javax.jms=1.1.0
 javax.annotation=1.0.0
 javax.servlet.jsp=2.1.0
@@ -29,9 +29,9 @@
 org.springframework=3.0.0.RELEASE
 
 # Test
-org.eclipse.virgo.teststubs=2.1.0.D-20100702112350
+org.eclipse.virgo.teststubs=2.1.0.M02-incubation
 org.junit=4.7.0
 org.easymock=2.3.0
-org.eclipse.virgo.test=2.1.0.D-20100702113232
+org.eclipse.virgo.test=2.1.0.M02-incubation
 
 
diff --git a/org.eclipse.virgo.apps.admin.core/.classpath b/org.eclipse.virgo.apps.admin.core/.classpath
index a2761ed..bf57921 100644
--- a/org.eclipse.virgo.apps.admin.core/.classpath
+++ b/org.eclipse.virgo.apps.admin.core/.classpath
@@ -22,25 +22,25 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.services-2.1.0.D-20100702114401.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.0.0.D-164/org.eclipse.virgo.kernel.core-sources-2.0.0.D-164.jar"/>
+	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.M02-incubation/org.eclipse.virgo.kernel.services-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.0.0.D-164/org.eclipse.virgo.kernel.core-sources-2.0.0.D-164.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/APPS_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="APPS_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="/APPS_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="APPS_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="APPS_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="/APPS_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="APPS_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="APPS_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/APPS_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.shell-2.1.0.D-20100702114401.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.shell-sources-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.M02-incubation/org.eclipse.virgo.kernel.shell-2.1.0.M02-incubation.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.M02-incubation/org.eclipse.virgo.kernel.shell-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/2.0.0.D-20091006155952/org.eclipse.virgo.kernel.model-sources-2.0.0.D-20091006155952.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/2.0.0.D-20091006155952/org.eclipse.virgo.kernel.model-sources-2.0.0.D-20091006155952.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar"/>
-	<classpathentry kind="var" path="APPS_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"/>
-	<classpathentry kind="var" path="APPS_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="APPS_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"/>
+	<classpathentry kind="var" path="APPS_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="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.apps.admin.web/.classpath b/org.eclipse.virgo.apps.admin.web/.classpath
index 21b6932..61ffcc1 100644
--- a/org.eclipse.virgo.apps.admin.web/.classpath
+++ b/org.eclipse.virgo.apps.admin.web/.classpath
@@ -35,13 +35,13 @@
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/APPS_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="APPS_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/APPS_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.shell-2.1.0.D-20100702114401.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.shell-sources-2.1.0.D-20100702114401.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.M02-incubation/org.eclipse.virgo.kernel.shell-2.1.0.M02-incubation.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.shell/2.1.0.M02-incubation/org.eclipse.virgo.kernel.shell-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.admin.core"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.apps.repository.core/.classpath b/org.eclipse.virgo.apps.repository.core/.classpath
index 5a27fc3..a3cb813 100644
--- a/org.eclipse.virgo.apps.repository.core/.classpath
+++ b/org.eclipse.virgo.apps.repository.core/.classpath
@@ -23,20 +23,20 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="APPS_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" sourcepath="/APPS_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="APPS_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="APPS_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" sourcepath="/APPS_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="APPS_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="APPS_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/APPS_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="APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100702114401/org.eclipse.virgo.kernel.services-2.1.0.D-20100702114401.jar" sourcepath="/APPS_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="APPS_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="/APPS_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="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.M02-incubation/org.eclipse.virgo.kernel.services-2.1.0.M02-incubation.jar" sourcepath="/APPS_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="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar"/>
-	<classpathentry kind="var" path="APPS_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="APPS_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="APPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/APPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.0.0.CI-17/org.eclipse.gemini.web.core-1.0.0.CI-17.jar"/>
-	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.D-20100702113432/org.eclipse.virgo.medic.test-2.1.0.D-20100702113432.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
+	<classpathentry kind="var" path="APPS_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"/>
+	<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.M02-incubation/org.eclipse.virgo.medic.test-2.1.0.M02-incubation.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
+	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
diff --git a/org.eclipse.virgo.apps.repository.test/.classpath b/org.eclipse.virgo.apps.repository.test/.classpath
index 5ff4c93..e8f48a4 100644
--- a/org.eclipse.virgo.apps.repository.test/.classpath
+++ b/org.eclipse.virgo.apps.repository.test/.classpath
@@ -8,17 +8,17 @@
 	<classpathentry kind="var" path="APPS_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="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/APPS_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="APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="APPS_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"/>
-	<classpathentry kind="var" path="APPS_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="APPS_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" sourcepath="/APPS_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="APPS_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="/APPS_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="APPS_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"/>
+	<classpathentry kind="var" path="APPS_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="APPS_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" sourcepath="/APPS_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="APPS_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="/APPS_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="APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_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" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100702112810/org.eclipse.virgo.util.common-sources-2.1.0.D-20100702112810.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_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="/APPS_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="APPS_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" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="var" path="APPS_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar"/>
-	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.CI-B50/org.eclipse.virgo.osgi.launcher-sources-2.0.0.CI-B50.jar"/>
+	<classpathentry kind="var" path="APPS_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="/APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.CI-B50/org.eclipse.virgo.osgi.launcher-sources-2.0.0.CI-B50.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.repository.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>