diff options
| author | Greg Wilkins | 2014-11-20 05:34:30 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-11-20 05:34:30 +0000 |
| commit | ab2e9c357ff85cc078d23ce0ea5a5f6da6b48f83 (patch) | |
| tree | 09860bee7dacbe6860b3a0442611433e7465ab88 /jetty-osgi/jetty-osgi-boot-jsp | |
| parent | 466fce4b80dc6ebd0403b5ec42bc7e0e333e5f2d (diff) | |
| parent | 1915e592b587dd13e2c2083c4702ad77bba9f0e1 (diff) | |
| download | org.eclipse.jetty.project-ab2e9c357ff85cc078d23ce0ea5a5f6da6b48f83.tar.gz org.eclipse.jetty.project-ab2e9c357ff85cc078d23ce0ea5a5f6da6b48f83.tar.xz org.eclipse.jetty.project-ab2e9c357ff85cc078d23ce0ea5a5f6da6b48f83.zip | |
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot-jsp')
| -rw-r--r-- | jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java index 7979d7bd47..305dabfa94 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java +++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java @@ -79,7 +79,7 @@ public class ContainerTldBundleDiscoverer implements TldBundleDiscoverer * we locate the corresponding bundle and register it as a bundle that * contains tld files. */ - private static String DEFAULT_JSTL_BUNDLE_CLASS = "org.apache.taglibs.standard.tag.el.core.WhenTag"; + private static String DEFAULT_JSTL_BUNDLE_CLASS = "org.apache.taglibs.standard.tag.rt.core.WhenTag"; private Bundle jstlBundle = null; |