diff --git a/build.versions b/build.versions
index c440b45..907299c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,23 +1,23 @@
 # Compile
-org.eclipse.virgo.kernel=3.0.0.D-20110802154133
-org.eclipse.virgo.repository=3.0.0.D-20110801095215
-org.eclipse.virgo.util=3.0.0.D-20110801094248
-org.eclipse.virgo.medic=3.0.0.D-20110801094811
+org.eclipse.virgo.kernel=3.0.0.RC2
+org.eclipse.virgo.repository=3.0.0.RC2
+org.eclipse.virgo.util=3.0.0.RC2
+org.eclipse.virgo.medic=3.0.0.RC2
 javax.servlet=3.0.0.v201103241009
 org.eclipse.osgi=3.7.0.v20110613
 org.eclipse.equinox.event=1.2.100.v20110110
 org.springframework=3.0.5.RELEASE
 org.springframework.osgi=1.2.1
-org.eclipse.gemini.web=2.0.0.BUILD-20110728103513
+org.eclipse.gemini.web=2.0.0.RC2
 org.aspectj=1.6.6.RELEASE
 org.slf4j=1.6.1
 org.slf4j.spi=1.6.1
 
 # Test
 com.dumbster=1.6.0
-org.eclipse.virgo.osgi=3.0.0.D-20110801094018
-org.eclipse.virgo.teststubs=3.0.0.D-20110801093810
-org.eclipse.virgo.test=3.0.0.D-20110801094638
+org.eclipse.virgo.osgi=3.0.0.RC2
+org.eclipse.virgo.teststubs=3.0.0.RC2
+org.eclipse.virgo.test=3.0.0.RC2
 javax.activation=1.1.1
 javax.jms=1.1.0
 javax.mail=1.4.0
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 2acfd75..2fcaad0 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -28,33 +28,33 @@
 	<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/3.0.0.D-20110801094248/org.eclipse.virgo.util.math-3.0.0.D-20110801094248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.D-20110801094248/org.eclipse.virgo.util.math-sources-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-3.0.0.D-20110801094248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-sources-3.0.0.D-20110801094248.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.RC2/org.eclipse.virgo.util.math-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.RC2/org.eclipse.virgo.util.math-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.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/3.0.0.D-20110801094248/org.eclipse.virgo.util.osgi-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.osgi-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.osgi-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.core-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.core-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110801094248/org.eclipse.virgo.util.common-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.core-2.0.0.BUILD-20110728103513.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.M01/org.eclipse.gemini.web.core-sources-2.0.0.M01.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.RC2/org.eclipse.virgo.kernel.deployer-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.RC2/org.eclipse.virgo.kernel.deployer-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.RC2/org.eclipse.virgo.kernel.osgi-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.RC2/org.eclipse.virgo.kernel.osgi-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.RC2/org.eclipse.virgo.kernel.core-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.RC2/org.eclipse.virgo.kernel.core-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.RC2/org.eclipse.gemini.web.core-2.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.M01/org.eclipse.gemini.web.core-sources-2.0.0.M01.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110801093810/org.eclipse.virgo.teststubs.osgi-3.0.0.D-20110801093810.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110801093810/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.D-20110801093810.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.test/3.0.5.RELEASE/org.springframework.test-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110801094811/org.eclipse.virgo.medic-3.0.0.D-20110801094811.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110801094811/org.eclipse.virgo.medic-sources-3.0.0.D-20110801094811.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.RC2/org.eclipse.virgo.medic-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.RC2/org.eclipse.virgo.medic-sources-3.0.0.RC2.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.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.D-20110801094248/org.eclipse.virgo.util.parser.manifest-3.0.0.D-20110801094248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.D-20110801094248/org.eclipse.virgo.util.parser.manifest-sources-3.0.0.D-20110801094248.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.RC2/org.eclipse.virgo.util.parser.manifest-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.RC2/org.eclipse.virgo.util.parser.manifest-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.6.1/com.springsource.slf4j.org.apache.commons.logging-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/1.6.1/com.springsource.slf4j.org.apache.commons.logging-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.stubs-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.stubs-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.artifact-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.artifact-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.D-20110801094018.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.D-20110801094018.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.0.0.D-20110801095215/org.eclipse.virgo.repository-3.0.0.D-20110801095215.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.0.0.RC2/org.eclipse.virgo.kernel.stubs-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.0.0.RC2/org.eclipse.virgo.kernel.stubs-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.0.0.RC2/org.eclipse.virgo.kernel.artifact-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.0.0.RC2/org.eclipse.virgo.kernel.artifact-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.RC2/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.RC2/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.0.0.RC2/org.eclipse.virgo.repository-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-3.3.0.v20110110.jar"/>
 	<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110512073827/org.eclipse.virgo.medic-3.0.0.D-20110512073827.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar">
 		<attributes>
diff --git a/org.eclipse.virgo.web.dm/.classpath b/org.eclipse.virgo.web.dm/.classpath
index bd5fd98..a1e4012 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/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.core-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer.dm-3.0.0.D-20110802154133.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.RC2/org.eclipse.virgo.kernel.core-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.RC2/org.eclipse.virgo.kernel.deployer-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.0.0.RC2/org.eclipse.virgo.kernel.deployer.dm-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-sources-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110801094811/org.eclipse.virgo.medic-3.0.0.D-20110801094811.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.RC2/org.eclipse.virgo.medic-3.0.0.RC2.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 8156234..92384bc 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -29,24 +29,24 @@
 	<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/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-3.0.0.D-20110801094248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-sources-3.0.0.D-20110801094248.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer-sources-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.osgi-3.0.0.D-20110802154133.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.D-20110801094638/org.eclipse.virgo.test.framework-3.0.0.D-20110801094638.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.D-20110801094638/org.eclipse.virgo.test.framework-sources-3.0.0.D-20110801094638.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110801094248/org.eclipse.virgo.util.osgi-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.D-20110801094018.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.D-20110801094018.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.tomcat-2.0.0.BUILD-20110728103513.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.tomcat-sources-2.0.0.BUILD-20110728103513.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.RC2/org.eclipse.virgo.kernel.deployer-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.RC2/org.eclipse.virgo.kernel.deployer-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.RC2/org.eclipse.virgo.kernel.osgi-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.RC2/org.eclipse.virgo.test.framework-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.RC2/org.eclipse.virgo.test.framework-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.RC2/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.RC2/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.RC2/org.eclipse.gemini.web.tomcat-2.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.RC2/org.eclipse.gemini.web.tomcat-sources-2.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.12/com.springsource.org.apache.catalina-7.0.12.jar" sourcepath="/WEB_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.12/com.springsource.org.apache.catalina-sources-7.0.12.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.coyote/com.springsource.org.apache.coyote/7.0.12/com.springsource.org.apache.coyote-7.0.12.jar" sourcepath="/WEB_IVY_CACHE/org.apache.coyote/com.springsource.org.apache.coyote/7.0.12/com.springsource.org.apache.coyote-sources-7.0.12.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/javax.servlet/javax.servlet.jsp/2.2.0.v201103241009/javax.servlet.jsp-2.2.0.v201103241009.jar" sourcepath="/WEB_IVY_CACHE/javax.servlet/javax.servlet.jsp/2.2.0.v201103241009/javax.servlet.jsp-sources-2.2.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.jasper/com.springsource.org.apache.jasper/7.0.12/com.springsource.org.apache.jasper-7.0.12.jar" sourcepath="/WEB_IVY_CACHE/org.apache.jasper/com.springsource.org.apache.jasper/7.0.12/com.springsource.org.apache.jasper-sources-7.0.12.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.core-2.0.0.BUILD-20110728103513.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.core-sources-2.0.0.BUILD-20110728103513.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.RC2/org.eclipse.gemini.web.core-2.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.0.0.RC2/org.eclipse.gemini.web.core-sources-2.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.launcher-3.0.0.D-20110801094018.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.D-20110801094018/org.eclipse.virgo.osgi.launcher-sources-3.0.0.D-20110801094018.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110801094248/org.eclipse.virgo.util.common-3.0.0.D-20110801094248.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.RC2/org.eclipse.virgo.osgi.launcher-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.RC2/org.eclipse.virgo.osgi.launcher-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.model-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.model-sources-3.0.0.D-20110802154133.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.0.0.RC2/org.eclipse.virgo.kernel.model-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.0.0.RC2/org.eclipse.virgo.kernel.model-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-3.0.5.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-sources-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="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 da911a5..7c08a3f 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/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.agent.dm-3.0.0.D-20110802154133.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.deployer.dm-3.0.0.D-20110802154133.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.dmfragment-3.0.0.D-20110802154133.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.userregion-3.0.0.D-20110802154133.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.0.0.RC2/org.eclipse.virgo.kernel.agent.dm-3.0.0.RC2.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.0.0.RC2/org.eclipse.virgo.kernel.deployer.dm-3.0.0.RC2.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.0.0.RC2/org.eclipse.virgo.kernel.dmfragment-3.0.0.RC2.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.0.0.RC2/org.eclipse.virgo.kernel.userregion-3.0.0.RC2.jar@start,\
  file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.ds/1.3.0.v20110124-0830/org.eclipse.equinox.ds-1.3.0.v20110124-0830.jar@start,\
  file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.util/1.0.200.v20100503/org.eclipse.equinox.util-1.0.200.v20100503.jar@start,\
  file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-3.3.0.v20110110.jar,\
diff --git a/org.eclipse.virgo.web.tomcat.support/.classpath b/org.eclipse.virgo.web.tomcat.support/.classpath
index 3ec8cff..beafc69 100644
--- a/org.eclipse.virgo.web.tomcat.support/.classpath
+++ b/org.eclipse.virgo.web.tomcat.support/.classpath
@@ -25,16 +25,16 @@
 	<classpathentry kind="var" path="WEB_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/WEB_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.core"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.D-20110801094248/org.eclipse.virgo.util.math-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.tomcat-2.0.0.BUILD-20110728103513.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.BUILD-20110728103513/org.eclipse.gemini.web.tomcat-sources-2.0.0.BUILD-20110728103513.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.osgi-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.osgi-sources-3.0.0.D-20110802154133.jar">
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.RC2/org.eclipse.virgo.util.math-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.RC2/org.eclipse.gemini.web.tomcat-2.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/2.0.0.RC2/org.eclipse.gemini.web.tomcat-sources-2.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.RC2/org.eclipse.virgo.kernel.osgi-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.RC2/org.eclipse.virgo.kernel.osgi-sources-3.0.0.RC2.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-3.0.0.D-20110801094248.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110801094248/org.eclipse.virgo.util.io-sources-3.0.0.D-20110801094248.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110801094811/org.eclipse.virgo.medic-3.0.0.D-20110801094811.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.D-20110801094811/org.eclipse.virgo.medic-sources-3.0.0.D-20110801094811.jar"/>
-	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.core-3.0.0.D-20110802154133.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110802154133/org.eclipse.virgo.kernel.core-sources-3.0.0.D-20110802154133.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.RC2/org.eclipse.virgo.medic-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.0.0.RC2/org.eclipse.virgo.medic-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.RC2/org.eclipse.virgo.kernel.core-3.0.0.RC2.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.RC2/org.eclipse.virgo.kernel.core-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>