diff --git a/build.versions b/build.versions
index 07333f1..0d9e944 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
 # Compile
 org.eclipse.virgo.nano=3.6.0.D-20121028233243
-org.eclipse.virgo.kernel=3.6.0.D-20121116162634
+org.eclipse.virgo.kernel=3.6.0.D-20121120164201
 org.eclipse.virgo.repository=3.6.0.D-20121028233711
 org.eclipse.virgo.util=3.6.0.D-20121028232155
 org.eclipse.virgo.medic=3.6.0.D-20121028233011
-org.apache.felix.gogo.runtime=0.8.0.v201108120515
+org.apache.felix.gogo.runtime=0.10.0.v201209301036
 javax.servlet=3.0.0.v201112011016
 org.eclipse.osgi=3.8.1.v20120830-144521
 org.eclipse.equinox.event=1.2.100.v20111010-1614
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 07846fe..9bfec29 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -32,8 +32,8 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121028232155/org.eclipse.virgo.util.io-3.6.0.D-20121028232155.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121028232155/org.eclipse.virgo.util.io-sources-3.6.0.D-20121028232155.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.6.0.D-20121028232155/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121028232155.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121116162634.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121120164201.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121028232155/org.eclipse.virgo.util.common-3.6.0.D-20121028232155.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.2.0.RC1/org.springframework.core-3.2.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.2.0.RC1/org.springframework.core-sources-3.2.0.RC1.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,9 +49,9 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20121028232155/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20121028232155.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20121028232155/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20121028232155.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.jar" sourcepath="/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="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.stubs-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.stubs-sources-3.6.0.D-20121116162634.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.artifact-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20121116162634.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.stubs-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.stubs/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.stubs-sources-3.6.0.D-20121120164201.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.artifact-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20121120164201.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20121028233711/org.eclipse.virgo.repository-3.6.0.D-20121028233711.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.6.0.D-20121028233243/org.eclipse.virgo.nano.core-3.6.0.D-20121028233243.jar"/>
diff --git a/org.eclipse.virgo.web.dm/.classpath b/org.eclipse.virgo.web.dm/.classpath
index 1d4156d..27f1dba 100644
--- a/org.eclipse.virgo.web.dm/.classpath
+++ b/org.eclipse.virgo.web.dm/.classpath
@@ -35,8 +35,8 @@
 	<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.6.0.D-20121028233243/org.eclipse.virgo.nano.core-3.6.0.D-20121028233243.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121116162634.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121120164201.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.2.0.RC1/org.springframework.aop-3.2.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.2.0.RC1/org.springframework.aop-sources-3.2.0.RC1.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 3a9e5f2..0df6b54 100755
--- a/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/.classpath
@@ -14,9 +14,9 @@
 	<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.29.v201208221210/org.apache.catalina-7.0.29.v201208221210.jar" sourcepath="/IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-sources-7.0.26.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121028232155/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121028232155.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.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"/>
 	<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.web.tomcat/2.2.0.BUILD-20121031194216/org.eclipse.gemini.web.tomcat-2.2.0.BUILD-20121031194216.jar"/>
diff --git a/org.eclipse.virgo.web.test/.classpath b/org.eclipse.virgo.web.test/.classpath
index ceb6193..d3c1596 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -25,11 +25,11 @@
 	<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.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121028232155/org.eclipse.virgo.util.io-3.6.0.D-20121028232155.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121028232155/org.eclipse.virgo.util.io-sources-3.6.0.D-20121028232155.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.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121116162634.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20121120164201.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121028232755/org.eclipse.virgo.test.framework-3.6.0.D-20121028232755.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121028232755/org.eclipse.virgo.test.framework-sources-3.6.0.D-20121028232755.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121028232155/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121028232155.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.equinox.extensions-sources-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.29.v201208221210/org.apache.catalina-7.0.29.v201208221210.jar" sourcepath="/IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-sources-7.0.26.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.29.v201208230737/org.apache.coyote-7.0.29.v201208230737.jar" sourcepath="/IVY_CACHE/org.apache.coyote/com.springsource.org.apache.coyote/7.0.26/com.springsource.org.apache.coyote-sources-7.0.26.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,7 +39,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20121028232755/org.eclipse.virgo.test.launcher-3.6.0.D-20121028232755.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.launcher/3.6.0.D-20121028232755/org.eclipse.virgo.kernel.launcher-sources-3.6.0.D-20121028232755.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121028232155/org.eclipse.virgo.util.common-3.6.0.D-20121028232155.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.6.0.D-20121116162634/org.eclipse.virgo.kernel.model-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.model-sources-3.6.0.D-20121116162634.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.model-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.model-sources-3.6.0.D-20121120164201.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.orm/3.2.0.RC1/org.springframework.orm-3.2.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.orm/3.2.0.RC1/org.springframework.orm-sources-3.2.0.RC1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121028233243/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20121028233243.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.transaction/1.1.1.v201105210645/javax.transaction-1.1.1.v201105210645.jar"/>
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 b43b444..19c8a75 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
@@ -8,10 +8,10 @@
  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.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.6.0.D-20121116162634/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121116162634.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121116162634.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121116162634.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121116162634.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121120164201.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121120164201.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121120164201.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121120164201.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 b43b444..19c8a75 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
@@ -8,10 +8,10 @@
  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.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.6.0.D-20121116162634/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121116162634.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121116162634.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121116162634.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121116162634.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20121120164201.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20121120164201.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20121120164201.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.userregion-3.6.0.D-20121120164201.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 93dc0e5..df87439 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.6.0.D-20121028232155/org.eclipse.virgo.util.math-3.6.0.D-20121028232155.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121116162634.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121116162634/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121116162634.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121120164201.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121120164201/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20121120164201.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>