diff --git a/build-web-container/copyJavaxToOsgi.sh b/build-web-container/copyJavaxToOsgi.sh
index 730ab92..f5c50c6 100755
--- a/build-web-container/copyJavaxToOsgi.sh
+++ b/build-web-container/copyJavaxToOsgi.sh
@@ -12,3 +12,4 @@
 cp $SRC/javax.transaction-1.1.0.v201205091237.jar $REPO/javax.transaction/javax.transaction-1.1.0.v201205091237.jar
 cp $SRC/javax.xml.rpc-1.1.0.v201005080400.jar $REPO/javax.xml.rpc/javax.xml.rpc-1.1.0.v201005080400.jar
 cp $SRC/javax.xml.soap-1.3.0.v201105210645.jar $REPO/javax.xml.soap/javax.xml.soap-1.3.0.v201105210645.jar
+cp $SRC/javax.websocket_1.0.0.v201312030745.jar $REPO/javax.websocket/javax.websocket_1.0.0.v201312030745.jar
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index 7b67048..6525ec0 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -7,15 +7,16 @@
 cp $SRC/org.eclipse.virgo.util.io-3.6.0.*.jar $REPO/org.eclipse.virgo.util.io/org.eclipse.virgo.util.io-3.6.0.jar
 cp $SRC/org.eclipse.virgo.util.math-3.6.0.*.jar $REPO/org.eclipse.virgo.util.math/org.eclipse.virgo.util.math-3.6.0.jar
 cp $SRC/org.eclipse.virgo.util.parser.manifest-3.6.0.*.jar $REPO/org.eclipse.virgo.util.parser.manifest/org.eclipse.virgo.util.parser.manifest-3.6.0.jar
-cp $SRC/org.apache.catalina.ha-7.0.35.*.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-7.0.35.jar
-cp $SRC/org.apache.catalina-7.0.35.*.jar $REPO/org.apache.catalina/org.apache.catalina-7.0.35.jar
-cp $SRC/org.apache.catalina.tribes-7.0.35.*.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-7.0.35.jar
-cp $SRC/org.apache.coyote-7.0.35.*.jar $REPO/org.apache.coyote/org.apache.coyote-7.0.35.jar
-cp $SRC/org.apache.el-7.0.35.*.jar $REPO/org.apache.el/org.apache.el-7.0.35.jar
-cp $SRC/org.apache.jasper-7.0.35.*.jar $REPO/org.apache.jasper/org.apache.jasper-7.0.35.jar
-cp $SRC/org.apache.juli.extras-7.0.35.*.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-7.0.35.jar
-cp $SRC/org.apache.tomcat.api-7.0.35.*.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-7.0.35.jar
-cp $SRC/org.apache.tomcat.util-7.0.35.*.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-7.0.35.jar
+cp $SRC/org.apache.catalina.ha-7.0.53.*.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-7.0.53.jar
+cp $SRC/org.apache.catalina-7.0.53.*.jar $REPO/org.apache.catalina/org.apache.catalina-7.0.53.jar
+cp $SRC/org.apache.catalina.tribes-7.0.53.*.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-7.0.53.jar
+cp $SRC/org.apache.coyote-7.0.53.*.jar $REPO/org.apache.coyote/org.apache.coyote-7.0.53.jar
+cp $SRC/org.apache.el-7.0.53.*.jar $REPO/org.apache.el/org.apache.el-7.0.53.jar
+cp $SRC/org.apache.jasper-7.0.53.*.jar $REPO/org.apache.jasper/org.apache.jasper-7.0.53.jar
+cp $SRC/org.apache.juli.extras-7.0.53.*.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-7.0.53.jar
+cp $SRC/org.apache.tomcat.api-7.0.53.*.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-7.0.53.jar
+cp $SRC/org.apache.tomcat.util-7.0.53.*.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-7.0.53.jar
+cp $SRC/org.apache.tomcat.websocket-7.0.53.*.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.websocket-7.0.53.jar
 cp $SRC/org.eclipse.gemini.web.core-2.2.1.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.2.1.jar
 cp $SRC/org.eclipse.gemini.web.extender-2.2.1.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.2.1.jar
 cp $SRC/org.eclipse.gemini.web.tomcat-2.2.1.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.2.1.jar
diff --git a/build-web-container/dependencies-ivy.xml b/build-web-container/dependencies-ivy.xml
index 493d27b..da7728a 100644
--- a/build-web-container/dependencies-ivy.xml
+++ b/build-web-container/dependencies-ivy.xml
@@ -27,6 +27,7 @@
 		<dependency org="org.eclipse.virgo.mirrored" name="org.apache.juli.extras" rev="${org.apache.juli.extras}" conf="dep->runtime"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.api" rev="${org.apache.tomcat.api}" conf="dep->runtime"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.util" rev="${org.apache.tomcat.util}" conf="dep->runtime"/>
+		<dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.websocket" rev="${org.apache.tomcat.websocket}" conf="dep->runtime"/>
 		
 		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt}" conf="dep->runtime"/>
 		
@@ -41,6 +42,7 @@
 		<dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="dep->runtime"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="javax.xml.rpc" rev="${javax.xml.rpc}" conf="dep->runtime"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="javax.xml.soap" rev="${javax.xml.soap}" conf="dep->runtime"/>
+		<dependency org="org.eclipse.virgo.mirrored" name="javax.websocket" rev="${javax.websocket}" conf="dep->runtime"/>
 		
 		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="dep->runtime"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.nop" rev="${org.slf4j.nop}" conf="dep->runtime"/>
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 799194f..2635a37 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -42,7 +42,7 @@
 		This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
 		<ul>
 			<li>
-				Apache Tomcat 7.0.35 - binary and source is available from the
+				Apache Tomcat 7.0.53 - binary and source is available from the
 				<a href="http://tomcat.apache.org/">Apache Tomcat project</a>
 			</li>
 		</ul>
diff --git a/build.versions b/build.versions
index 6081266..77da862 100644
--- a/build.versions
+++ b/build.versions
@@ -19,19 +19,21 @@
 javax.transaction=1.1.0.v201205091237
 javax.xml.rpc=1.1.0.v201005080400
 javax.xml.soap=1.3.0.v201105210645
+javax.websocket=1.0.0.v201312030745
 org.apache.taglibs=1.1.2.v20110517
 org.eclipse.osgi=3.8.1.v20120830-144521
 org.eclipse.osgi.services=3.3.0.v20120307-2102
 org.eclipse.equinox.event=1.2.100.v20111010-1614
-org.apache.catalina=7.0.35.v201302131125
-org.apache.catalina.ha=7.0.35.v201302131607
-org.apache.catalina.tribes=7.0.35.v201302140645
-org.apache.coyote=7.0.35.v201302140645
-org.apache.el=7.0.35.v201302120746
-org.apache.jasper=7.0.35.v201302161127
-org.apache.juli.extras=7.0.35.v201302120746
-org.apache.tomcat.api=7.0.35.v201302120746
-org.apache.tomcat.util=7.0.35.v201302140645
+org.apache.catalina=7.0.53.v201406061610
+org.apache.catalina.ha=7.0.53.v201406070630
+org.apache.catalina.tribes=7.0.53.v201406070630
+org.apache.coyote=7.0.53.v201406070630
+org.apache.el=7.0.53.v201406060720
+org.apache.jasper=7.0.53.v201406070630
+org.apache.juli.extras=7.0.53.v201406060720
+org.apache.tomcat.api=7.0.53.v201406060720
+org.apache.tomcat.util=7.0.53.v201406070630
+org.apache.tomcat.websocket=7.0.53.v201406070630
 org.eclipse.jdt=3.8.0.I20120518-2145
 org.slf4j.api=1.7.2.v20121108-1250
 org.slf4j.nop=1.7.2.v201212060727
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index cfbcb9c..333a75c 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.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.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina-7.0.35.v201302131125.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina.source-7.0.35.v201302131125.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras-7.0.35.v201302120746.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras.source-7.0.35.v201302120746.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper-7.0.35.v201302161127.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper.source-7.0.35.v201302161127.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha-7.0.35.v201302131607.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha.source-7.0.35.v201302131607.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes.source-7.0.35.v201302140645.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote.source-7.0.35.v201302140645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina-7.0.53.v201406061610.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina.source-7.0.53.v201406061610.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras-7.0.53.v201406060720.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras.source-7.0.53.v201406060720.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote.source-7.0.53.v201406070630.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-sources-1.2.100.v20111010-1614.jar.jar"/>
diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 5dcd8e3..cf09627 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -12,12 +12,12 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.RELEASE/org.eclipse.virgo.util.io-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/3.6.0.RELEASE/org.eclipse.virgo.util.io-sources-3.6.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-sources-3.6.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina-7.0.35.v201302131125.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina.source-7.0.35.v201302131125.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras-7.0.35.v201302120746.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras.source-7.0.35.v201302120746.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper-7.0.35.v201302161127.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper.source-7.0.35.v201302161127.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha-7.0.35.v201302131607.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha.source-7.0.35.v201302131607.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes.source-7.0.35.v201302140645.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote.source-7.0.35.v201302140645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina-7.0.53.v201406061610.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina.source-7.0.53.v201406061610.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras-7.0.53.v201406060720.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras.source-7.0.53.v201406060720.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote.source-7.0.53.v201406070630.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.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 combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.tomcat"/>
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index 41c9bbf..6ad9300 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -27,14 +27,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.RELEASE/org.eclipse.virgo.util.io-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.RELEASE/org.eclipse.virgo.util.io-sources-3.6.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-sources-3.6.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina-7.0.35.v201302131125.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.35.v201302131125/org.apache.catalina.source-7.0.35.v201302131125.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras-7.0.35.v201302120746.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.35.v201302120746/org.apache.juli.extras.source-7.0.35.v201302120746.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper-7.0.35.v201302161127.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.35.v201302161127/org.apache.jasper.source-7.0.35.v201302161127.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha-7.0.35.v201302131607.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.35.v201302131607/org.apache.catalina.ha.source-7.0.35.v201302131607.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.35.v201302140645/org.apache.catalina.tribes.source-7.0.35.v201302140645.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.35.v201302140645/org.apache.coyote.source-7.0.35.v201302140645.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.35.v201302120746/org.apache.tomcat.api-7.0.35.v201302120746.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.35.v201302120746/org.apache.tomcat.api.source-7.0.35.v201302120746.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/7.0.35.v201302140645/org.apache.tomcat.util-7.0.35.v201302140645.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/7.0.35.v201302140645/org.apache.tomcat.util.source-7.0.35.v201302140645.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina-7.0.53.v201406061610.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.53.v201406061610/org.apache.catalina.source-7.0.53.v201406061610.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras-7.0.53.v201406060720.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.53.v201406060720/org.apache.juli.extras.source-7.0.53.v201406060720.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/7.0.53.v201406070630/org.apache.jasper.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/7.0.53.v201406070630/org.apache.catalina.ha.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/7.0.53.v201406070630/org.apache.catalina.tribes.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.53.v201406070630/org.apache.coyote.source-7.0.53.v201406070630.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.53.v201406060720/org.apache.tomcat.api-7.0.53.v201406060720.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.53.v201406060720/org.apache.tomcat.api.source-7.0.53.v201406060720.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/7.0.53.v201406070630/org.apache.tomcat.util-7.0.53.v201406070630.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/7.0.53.v201406070630/org.apache.tomcat.util.source-7.0.53.v201406070630.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.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 combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
diff --git a/test-bundles/customizer-bundle/.classpath b/test-bundles/customizer-bundle/.classpath
index ec9d5aa..4efc940 100755
--- a/test-bundles/customizer-bundle/.classpath
+++ b/test-bundles/customizer-bundle/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.35.v201302120746/org.apache.tomcat.api-7.0.35.v201302120746.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.35.v201302120746/org.apache.tomcat.api.source-7.0.35.v201302120746.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.53.v201406060720/org.apache.tomcat.api-7.0.53.v201406060720.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.53.v201406060720/org.apache.tomcat.api.source-7.0.53.v201406060720.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.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-sources-3.8.1.v20120830-144521.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-2.2.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-sources-2.2.0.M02.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>