Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-11-30 00:27:30 -0500
committerGreg Wilkins2011-11-30 00:27:30 -0500
commitde005c68fdd010c22d0cab95729a07f8dc51c9e3 (patch)
treeefc1ab1296c73d5b0730a34b3bf4dd12639af462 /jetty-deploy/src/main
parent9e72457941e98eb2ee1adf64f2bc53160b01e34d (diff)
downloadorg.eclipse.jetty.project-de005c68fdd010c22d0cab95729a07f8dc51c9e3.tar.gz
org.eclipse.jetty.project-de005c68fdd010c22d0cab95729a07f8dc51c9e3.tar.xz
org.eclipse.jetty.project-de005c68fdd010c22d0cab95729a07f8dc51c9e3.zip
Revert "Merge branch 'release-8'"
Diffstat (limited to 'jetty-deploy/src/main')
-rw-r--r--jetty-deploy/src/main/config/etc/jetty-deploy.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 1b3fd66dcd..dd25f7ff34 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -22,7 +22,7 @@
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
+ <Arg>.*/.*jsp-api-[^/]*\.jar$|.*/.*jsp-[^/]*\.jar$|.*/.*taglibs[^/]*\.jar$</Arg>
</Call>

Back to the top