aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-09-02 10:38:40 (EDT)
committerSteve Powell2010-09-02 10:38:40 (EDT)
commit4c357ea17e68c7b722c584d4ee9980b1195fb105 (patch)
tree7d00083c8fa8130d3749fb26e39e768725d3e1d0
parent7af11539b09b636a5d19675115668cfe531a5ec6 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-4c357ea17e68c7b722c584d4ee9980b1195fb105.zip
org.eclipse.gemini.web.gemini-web-container-4c357ea17e68c7b722c584d4ee9980b1195fb105.tar.gz
org.eclipse.gemini.web.gemini-web-container-4c357ea17e68c7b722c584d4ee9980b1195fb105.tar.bz2
Modify tomcat version to 6.0.29.S2-r1559
-rwxr-xr-xbuild-web-container/copyToOsgi.sh15
-rw-r--r--build.versions2
-rw-r--r--org.eclipse.gemini.web.core/.classpath13
-rw-r--r--org.eclipse.gemini.web.test/.classpath17
-rw-r--r--org.eclipse.gemini.web.test/ivy.xml3
-rw-r--r--org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties15
-rw-r--r--org.eclipse.gemini.web.tomcat/.classpath13
-rw-r--r--org.eclipse.gemini.web.tomcat/ivy.xml2
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF54
-rw-r--r--org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/BundleDependenciesJarScannerTests.java4
-rw-r--r--org.eclipse.gemini.web.tomcat/template.mf12
11 files changed, 74 insertions, 76 deletions
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index 642dac7..7b9b1bb 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -12,14 +12,13 @@ cp $SRC/org.springframework.context-2.5.6.*.jar $REPO/org.springframework.contex
cp $SRC/org.springframework.core-2.5.6.*.jar $REPO/org.springframework.core/org.springframework.core-2.5.6.jar
cp $SRC/org.springframework.osgi.core-1.2.0.jar $REPO/org.springframework.osgi.core/org.springframework.osgi.core-1.2.0.jar
cp $SRC/org.springframework.osgi.io-1.2.0.jar $REPO/org.springframework.osgi.io/org.springframework.osgi.io-1.2.0.jar
-cp $SRC/com.springsource.org.apache.catalina.ha.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.catalina.ha.springsource/com.springsource.org.apache.catalina.ha.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.catalina.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.catalina.tribes.springsource/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.coyote.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.el.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.el.springsource/com.springsource.org.apache.el.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.jasper.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource-6.0.20.jar
-cp $SRC/com.springsource.org.apache.juli.extras.springsource-6.0.20.*.jar $REPO/com.springsource.org.apache.juli.extras.springsource/com.springsource.org.apache.juli.extras.springsource-6.0.20.jar
+cp $SRC/com.springsource.org.apache.catalina.ha.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.catalina.ha.springsource/com.springsource.org.apache.catalina.ha.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.catalina.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.catalina.tribes.springsource/com.springsource.org.apache.catalina.tribes.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.coyote.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.el.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.el.springsource/com.springsource.org.apache.el.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.jasper.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource-6.0.29.jar
+cp $SRC/com.springsource.org.apache.juli.extras.springsource-6.0.29.*.jar $REPO/com.springsource.org.apache.juli.extras.springsource/com.springsource.org.apache.juli.extras.springsource-6.0.29.jar
cp $SRC/com.springsource.org.apache.commons.logging-1.1.1.jar $REPO/com.springsource.org.apache.commons.logging/com.springsource.org.apache.commons.logging-1.1.1.jar
cp $SRC/org.eclipse.gemini.web.core-1.0.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-1.0.0.jar
cp $SRC/org.eclipse.gemini.web.extender-1.0.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-1.0.0.jar
diff --git a/build.versions b/build.versions
index 5734835..f1742dc 100644
--- a/build.versions
+++ b/build.versions
@@ -26,7 +26,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.20.S2-r5956
+org.apache.tomcat=6.0.29.S2-r1559
org.eclipse.jdt=3.3.0
org.eclipse.osgi=3.5.1.R35x_v20091005
org.slf4j=1.6.1
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 640412b..151b3f5 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath
@@ -27,13 +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.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.20.S2-r5956/com.springsource.org.apache.juli.extras.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.ha.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-6.0.20.S2-r5956.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/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 8d5082d..0e636f0 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -11,18 +11,17 @@
<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.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.20.S2-r5956/com.springsource.org.apache.juli.extras.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.ha.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-sources-6.0.20.S2-r5956.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/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"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M03-incubation/org.eclipse.virgo.test.framework-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M03-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M03-incubation.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M03-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M03-incubation.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.RELEASE/org.eclipse.virgo.osgi.launcher-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100823153727/org.eclipse.virgo.test.framework-2.1.0.D-20100823153727.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100823153727/org.eclipse.virgo.test.framework-sources-2.1.0.D-20100823153727.jar"/>
+ <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100823153033/org.eclipse.virgo.osgi.launcher-2.1.0.D-20100823153033.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.D-20100823153033/org.eclipse.virgo.osgi.launcher-sources-2.1.0.D-20100823153033.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.gemini.web.test/ivy.xml b/org.eclipse.gemini.web.test/ivy.xml
index cf90d95..52aa6bc 100644
--- a/org.eclipse.gemini.web.test/ivy.xml
+++ b/org.eclipse.gemini.web.test/ivy.xml
@@ -25,7 +25,8 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}"/>
+ <dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.extensions.equinox" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
<dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
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 c80738f..d0dce51 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
@@ -15,14 +15,13 @@ file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet/2.5.0/
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/javax.xml.ws/com.springsource.javax.xml.ws/2.1.1/com.springsource.javax.xml.ws-2.1.1.jar@start,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.ha.springsource-6.0.20.S2-r5956.jar@start,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.S2-r5956.jar@start,\
-file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar@start,\
-file:../ivy-cache/repository/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-6.0.20.S2-r5956.jar,\
-file:../ivy-cache/repository/org.apache.el.springsource/com.springsource.org.apache.el.springsource/6.0.20.S2-r5956/com.springsource.org.apache.el.springsource-6.0.20.S2-r5956.jar@start,\
-file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar@start,\
-file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-6.0.20.S2-r5956.jar,\
-file:../ivy-cache/repository/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.20.S2-r5956/com.springsource.org.apache.juli.extras.springsource-6.0.20.S2-r5956.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@start,\
+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@start,\
+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.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.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,\
file:../ivy-cache/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index b8c803c..0e3ac92 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -27,13 +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.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.20.S2-r5956/com.springsource.org.apache.juli.extras.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.springsource-sources-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.ha.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.ha.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.tribes.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.tribes.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-6.0.20.S2-r5956.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.20.S2-r5956/com.springsource.org.apache.coyote.springsource-sources-6.0.20.S2-r5956.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/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/ivy.xml b/org.eclipse.gemini.web.tomcat/ivy.xml
index d3cd515..9e00ad6 100644
--- a/org.eclipse.gemini.web.tomcat/ivy.xml
+++ b/org.eclipse.gemini.web.tomcat/ivy.xml
@@ -38,7 +38,7 @@
<dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="${javax.xml.stream}" />
<dependency org="org.apache.jasper.springsource" name="com.springsource.org.apache.jasper.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
<dependency org="org.apache.el.springsource" name="com.springsource.org.apache.el.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
- <dependency org="org.apache.jasper.springsource" name="com.springsource.org.apache.jasper.org.eclipse.jdt.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="${org.eclipse.jdt}" conf="compile->runtime"/>
<dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
<dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.ha.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
<dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.tribes.springsource" rev="${org.apache.tomcat}" conf="compile->runtime"/>
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
index f7ec24f..9822ebe 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
@@ -1,38 +1,36 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.gemini.web.tomcat.spi;version="1";uses:="o
rg.osgi.framework"
+Bundle-ClassPath: .,com.springsource.javax.xml.bind-2.1.7.jar,com.spri
+ ngsource.javax.xml.soap-1.3.0.jar,com.springsource.javax.xml.stream-1
+ .0.1.jar
Bundle-Version: 1
Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Tomcat Bootstrap (incubation)
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator
Bundle-SymbolicName: org.eclipse.gemini.web.tomcat
-Import-Package: javax.activation;version="0",javax.management;version=
- "0",javax.naming;version="0",javax.naming.directory;version="0",javax
- .servlet;version="2.5",javax.xml.datatype;version="0",javax.xml.parse
- rs;version="0",javax.xml.transform;version="0",javax.xml.transform.do
- m;version="0",javax.xml.transform.sax;version="0",javax.xml.transform
- .stream;version="0",javax.xml.validation;version="0",org.apache.catal
- ina;version="6.0.20.S2-r5956",org.apache.catalina.connector;version="
- 6.0.20.S2-r5956",org.apache.catalina.core;version="6.0.20.S2-r5956",o
- rg.apache.catalina.deploy;version="6.0.20.S2-r5956",org.apache.catali
- na.session;version="6.0.20.S2-r5956",org.apache.catalina.startup;vers
- ion="6.0.20.S2-r5956",org.apache.catalina.util;version="6.0.20.S2-r59
- 56",org.apache.juli.logging;version="6.0.20.S2-r5956",org.apache.nami
- ng;version="6.0.20.S2-r5956",org.apache.naming.resources;version="6.0
- .20.S2-r5956",org.apache.tomcat;version="6.0.20.S2-r5956",org.apache.
- tomcat.util;version="6.0.20.S2-r5956",org.apache.tomcat.util.digester
- ;version="6.0.20.S2-r5956",org.apache.tomcat.util.modeler;version="6.
- 0.20.S2-r5956",org.eclipse.gemini.web.core;version="1.0",org.eclipse.
- gemini.web.core.spi;version="1.0",org.eclipse.osgi.baseadaptor;versio
- n="0";resolution:="optional",org.eclipse.osgi.baseadaptor.bundlefile;
- version="0";resolution:="optional",org.eclipse.osgi.framework.adaptor
- ;version="0";resolution:="optional",org.eclipse.osgi.framework.intern
- al.core;version="0";resolution:="optional",org.eclipse.virgo.util.io;
- version="2.0",org.eclipse.virgo.util.osgi;version="2.0",org.osgi.fram
- ework;version="0",org.osgi.service.packageadmin;version="1.0",org.osg
- i.service.url;version="1.0",org.osgi.util.tracker;version="1.4.0",org
- .slf4j;version="1.6.1",org.springframework.osgi.util;version="1.2.0",
- org.w3c.dom;version="0",org.xml.sax;version="0",org.xml.sax.ext;versi
- on="0",org.xml.sax.helpers;version="0"
+Import-Package: javax.management;version="0",javax.naming;version="0",
+ javax.naming.directory;version="0",javax.servlet;version="2.5",org.ap
+ ache.catalina;version="6.0.29.S2-r1559",org.apache.catalina.connector
+ ;version="6.0.29.S2-r1559",org.apache.catalina.core;version="6.0.29.S
+ 2-r1559",org.apache.catalina.deploy;version="6.0.29.S2-r1559",org.apa
+ che.catalina.session;version="6.0.29.S2-r1559",org.apache.catalina.st
+ artup;version="6.0.29.S2-r1559",org.apache.catalina.util;version="6.0
+ .29.S2-r1559",org.apache.juli.logging;version="6.0.29.S2-r1559",org.a
+ pache.naming;version="6.0.29.S2-r1559",org.apache.naming.resources;ve
+ rsion="6.0.29.S2-r1559",org.apache.tomcat;version="6.0.29.S2-r1559",o
+ rg.apache.tomcat.util;version="6.0.29.S2-r1559",org.apache.tomcat.uti
+ l.digester;version="6.0.29.S2-r1559",org.apache.tomcat.util.modeler;v
+ ersion="6.0.29.S2-r1559",org.eclipse.gemini.web.core;version="1.0",or
+ g.eclipse.gemini.web.core.spi;version="1.0",org.eclipse.osgi.baseadap
+ tor;version="0";resolution:="optional",org.eclipse.osgi.baseadaptor.b
+ undlefile;version="0";resolution:="optional",org.eclipse.osgi.framewo
+ rk.adaptor;version="0";resolution:="optional",org.eclipse.osgi.framew
+ ork.internal.core;version="0";resolution:="optional",org.eclipse.virg
+ o.util.io;version="2.0",org.eclipse.virgo.util.osgi;version="2.0",org
+ .osgi.framework;version="0",org.osgi.service.packageadmin;version="1.
+ 0",org.osgi.service.url;version="1.0",org.osgi.util.tracker;version="
+ 1.4.0",org.slf4j;version="1.6.1",org.springframework.osgi.util;versio
+ n="1.2.0",org.xml.sax;version="0"
diff --git a/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/BundleDependenciesJarScannerTests.java b/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/BundleDependenciesJarScannerTests.java
index e478159..c49f748 100644
--- a/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/BundleDependenciesJarScannerTests.java
+++ b/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/BundleDependenciesJarScannerTests.java
@@ -60,6 +60,7 @@ public class BundleDependenciesJarScannerTests {
private final Bundle dependency = createMock(Bundle.class);
+ @SuppressWarnings("unchecked")
@Test
public void noDependencies() {
expect(bundle.getHeaders()).andReturn(new Hashtable());
@@ -74,6 +75,7 @@ public class BundleDependenciesJarScannerTests {
verify(dependencyDeterminer, bundleFileResolver, bundle, callback);
}
+ @SuppressWarnings("unchecked")
@Test
public void scanDirectory() throws IOException {
expect(bundle.getHeaders()).andReturn(new Hashtable());
@@ -92,6 +94,7 @@ public class BundleDependenciesJarScannerTests {
verify(dependencyDeterminer, bundleFileResolver, bundle, callback);
}
+ @SuppressWarnings("unchecked")
@Test
public void scanFile() throws IOException {
expect(bundle.getHeaders()).andReturn(new Hashtable());
@@ -110,6 +113,7 @@ public class BundleDependenciesJarScannerTests {
verify(dependencyDeterminer, bundleFileResolver, bundle, callback);
}
+ @SuppressWarnings("unchecked")
@Test
public void scanJarUrlConnection() throws IOException {
expect(bundle.getHeaders()).andReturn(new Hashtable());
diff --git a/org.eclipse.gemini.web.tomcat/template.mf b/org.eclipse.gemini.web.tomcat/template.mf
index 32c5319..2f3e2c1 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.20.S2-r5956",
- org.apache.juli.*;version="6.0.20.S2-r5956",
- org.apache.naming.*;version="6.0.20.S2-r5956",
- org.apache.tomcat.*;version="6.0.20.S2-r5956",
+ 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.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.20.S2-r5956",
- org.apache.catalina.session;version="6.0.20.S2-r5956"
+Import-Package: org.apache.catalina.deploy;version="6.0.29.S2-r1559",
+ org.apache.catalina.session;version="6.0.29.S2-r1559"
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator
Excluded-Exports: *.internal.*,javax.*