Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-05-19 12:20:52 -0400
committerJan Bartel2014-05-19 12:20:52 -0400
commit1386f20cf56cf8092a3cf375e58312d015481024 (patch)
treebd5faf97c077d7fc7d59cbcb1fc988e71e50ad78 /jetty-osgi/jetty-osgi-boot/src
parentea990e445069974ce99a175b00d327db8474ee6a (diff)
downloadorg.eclipse.jetty.project-1386f20cf56cf8092a3cf375e58312d015481024.tar.gz
org.eclipse.jetty.project-1386f20cf56cf8092a3cf375e58312d015481024.tar.xz
org.eclipse.jetty.project-1386f20cf56cf8092a3cf375e58312d015481024.zip
435217 Remove deprecated TagLibConfiguration
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java2
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
index 6a2648291f..6d31ebd03c 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
@@ -330,8 +330,6 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
// the webapp first
applyMetaInfContextXml(rootResource);
- // pass the value of the require tld bundle so that the TagLibOSGiConfiguration
- // can pick it up.
_webApp.setAttribute(OSGiWebappConstants.REQUIRE_TLD_BUNDLE, requireTldBundles);
//Set up some attributes
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
index b4f67697c3..ce3c141ae5 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
@@ -63,7 +63,7 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration
* </ol>
*
* We also allow individual bundles to specify particular bundles that might include TLDs via the Require-Tlds
- * MANIFEST.MF header. This is processed in the TagLibOSGiConfiguration class.
+ * MANIFEST.MF header.
*
* @see org.eclipse.jetty.webapp.WebInfConfiguration#preConfigure(org.eclipse.jetty.webapp.WebAppContext)
*/

Back to the top