aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-04-14 10:43:05 (EDT)
committerGlyn Normington2011-04-14 10:43:05 (EDT)
commita27d17a6e8cc73cc11bb9aa2319d8da14e2f479a (patch)
tree028fa99760adb9a907eaf22944c41fc306915a70
parent1c983bbecffc2072894b7158b8f7d279aa00feeb (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-a27d17a6e8cc73cc11bb9aa2319d8da14e2f479a.zip
org.eclipse.gemini.web.gemini-web-container-a27d17a6e8cc73cc11bb9aa2319d8da14e2f479a.tar.gz
org.eclipse.gemini.web.gemini-web-container-a27d17a6e8cc73cc11bb9aa2319d8da14e2f479a.tar.bz2
Bug 342839: Upgrade to Tomcat 6.0.36.S2-r1673
-rw-r--r--build.versions2
-rw-r--r--org.eclipse.gemini.web.core/.classpath12
-rw-r--r--org.eclipse.gemini.web.test/.classpath12
-rw-r--r--org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties14
-rw-r--r--org.eclipse.gemini.web.tomcat/.classpath12
-rw-r--r--org.eclipse.gemini.web.tomcat/template.mf12
6 files changed, 32 insertions, 32 deletions
diff --git a/build.versions b/build.versions
index 6366a84..d79b806 100644
--- a/build.versions
+++ b/build.versions
@@ -25,7 +25,7 @@ org.aopalliance=1.0.0
org.apache.commons.logging=1.1.1
org.apache.felix.configadmin=1.0.10
org.apache.felix.eventadmin=1.0.0
-org.apache.tomcat=6.0.29.S2-r1559
+org.apache.tomcat=6.0.32.S2-r1673
org.eclipse.jdt=3.3.0
org.eclipse.osgi=3.6.1.R36x_v20100806
org.slf4j=1.6.1
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 79b60bb..295b456 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath
@@ -27,12 +27,12 @@
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M03-incubation/org.eclipse.virgo.util.io-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/2.0.0.RELEASE/org.eclipse.virgo.util.io-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M03-incubation/org.eclipse.virgo.util.common-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/2.0.0.RELEASE/org.eclipse.virgo.util.common-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_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_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-sources-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.ha.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-sources-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.32.S2-r1673/com.springsource.org.apache.juli.extras.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.32.S2-r1673/com.springsource.org.apache.jasper.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.ha.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.tribes.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-6.0.32.S2-r1673.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/WEB_CONTAINER_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_CONTAINER_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 20c3866..fc85aeb 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -11,12 +11,12 @@
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M03-incubation/org.eclipse.virgo.util.io-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/2.0.0.RELEASE/org.eclipse.virgo.util.io-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M03-incubation/org.eclipse.virgo.util.common-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/2.0.0.RELEASE/org.eclipse.virgo.util.common-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_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_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-sources-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.ha.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-sources-6.0.29.S2-r1559.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-sources-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.32.S2-r1673/com.springsource.org.apache.juli.extras.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.32.S2-r1673/com.springsource.org.apache.jasper.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.ha.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.tribes.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-sources-6.0.32.S2-r1673.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/WEB_CONTAINER_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.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index 23d5acb..27b5d1c 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
@@ -14,14 +14,14 @@ file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp/2.
file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar@start,\
file:../ivy-cache/repository/javax.xml.rpc/com.springsource.javax.xml.rpc/1.1.0/com.springsource.javax.xml.rpc-1.1.0.jar@start,\
file:../ivy-cache/repository/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar@start,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.ha.springsource-6.0.29.S2-r1559.jar,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.S2-r1559.jar,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar@start,\
-file:../ivy-cache/repository/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar,\
-file:../ivy-cache/repository/org.apache.el.springsource/com.springsource.org.apache.el.springsource/6.0.29.S2-r1559/com.springsource.org.apache.el.springsource-6.0.29.S2-r1559.jar@start,\
-file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar,\
+file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.ha.springsource-6.0.32.S2-r1673.jar,\
+file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.tribes.springsource-6.0.32.S2-r1673.jar,\
+file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-6.0.32.S2-r1673.jar@start,\
+file:../ivy-cache/repository/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-6.0.32.S2-r1673.jar,\
+file:../ivy-cache/repository/org.apache.el.springsource/com.springsource.org.apache.el.springsource/6.0.32.S2-r1673/com.springsource.org.apache.el.springsource-6.0.32.S2-r1673.jar@start,\
+file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.32.S2-r1673/com.springsource.org.apache.jasper.springsource-6.0.32.S2-r1673.jar,\
file:../ivy-cache/repository/org.eclipse.jdt/com.springsource.org.eclipse.jdt.core.compiler.batch/3.3.0/com.springsource.org.eclipse.jdt.core.compiler.batch-3.3.0.jar,\
-file:../ivy-cache/repository/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.jar@start,\
+file:../ivy-cache/repository/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.32.S2-r1673/com.springsource.org.apache.juli.extras.springsource-6.0.32.S2-r1673.jar@start,\
file:../ivy-cache/repository/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar@start,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar,\
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index 5a34bb4..ea09868 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -27,12 +27,12 @@
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M03-incubation/org.eclipse.virgo.util.io-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/2.0.0.RELEASE/org.eclipse.virgo.util.io-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M03-incubation/org.eclipse.virgo.util.common-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/2.0.0.RELEASE/org.eclipse.virgo.util.common-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_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_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-sources-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-sources-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.ha.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-sources-6.0.29.S2-r1559.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.springsource-sources-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.32.S2-r1673/com.springsource.org.apache.juli.extras.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.32.S2-r1673/com.springsource.org.apache.jasper.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.32.S2-r1673/com.springsource.org.apache.jasper.springsource-sources-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.ha.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.32.S2-r1673/com.springsource.org.apache.catalina.tribes.springsource-6.0.32.S2-r1673.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-6.0.32.S2-r1673.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.32.S2-r1673/com.springsource.org.apache.coyote.springsource-sources-6.0.32.S2-r1673.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/WEB_CONTAINER_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/org.eclipse.gemini.web.tomcat/template.mf b/org.eclipse.gemini.web.tomcat/template.mf
index 16d7fd7..43a4e2b 100644
--- a/org.eclipse.gemini.web.tomcat/template.mf
+++ b/org.eclipse.gemini.web.tomcat/template.mf
@@ -4,10 +4,10 @@ Bundle-SymbolicName: org.eclipse.gemini.web.tomcat
Bundle-Version: 1
Import-Template: org.eclipse.gemini.web.*;version="1.0",
org.eclipse.virgo.util.*;version="2.0",
- org.apache.catalina.*;version="6.0.29.S2-r1559",
- org.apache.juli.*;version="6.0.29.S2-r1559",
- org.apache.naming.*;version="6.0.29.S2-r1559",
- org.apache.tomcat.*;version="6.0.29.S2-r1559",
+ org.apache.catalina.*;version="6.0.32.S2-r1673",
+ org.apache.juli.*;version="6.0.32.S2-r1673",
+ org.apache.naming.*;version="6.0.32.S2-r1673",
+ org.apache.tomcat.*;version="6.0.32.S2-r1673",
org.springframework.osgi.*;version="1.2.0",
org.osgi.framework.*;version="0",
org.osgi.util.tracker.*;version="1.4.0",
@@ -26,7 +26,7 @@ Import-Template: org.eclipse.gemini.web.*;version="1.0",
javax.xml.transform.*;version="0",
javax.xml.validation.*;version="0",
org.w3c.dom.*;version="0"
-Import-Package: org.apache.catalina.deploy;version="6.0.29.S2-r1559",
- org.apache.catalina.session;version="6.0.29.S2-r1559"
+Import-Package: org.apache.catalina.deploy;version="6.0.32.S2-r1673",
+ org.apache.catalina.session;version="6.0.32.S2-r1673"
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator
Excluded-Exports: *.internal.*,javax.*