From a0d8579cc699bb029df122869bb14d8091952b19 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 23 Mar 2009 07:36:38 +0000 Subject: [PATCH] Remove the Catalina dependency from Jasper. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@757335 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/el/ELContextImpl.java | 4 ++-- java/org/apache/jasper/el/ELResolverImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/apache/jasper/el/ELContextImpl.java b/java/org/apache/jasper/el/ELContextImpl.java index 1421c7a49..f79955a8b 100644 --- a/java/org/apache/jasper/el/ELContextImpl.java +++ b/java/org/apache/jasper/el/ELContextImpl.java @@ -26,7 +26,7 @@ import javax.el.FunctionMapper; import javax.el.ValueExpression; import javax.el.VariableMapper; -import org.apache.catalina.Globals; +import org.apache.jasper.Constants; /** * Implementation of ELContext @@ -69,7 +69,7 @@ public final class ELContextImpl extends ELContext { public ELContextImpl() { this(ELResolverImpl.getDefaultResolver()); - if (Globals.IS_SECURITY_ENABLED) { + if (Constants.IS_SECURITY_ENABLED) { functionMapper = new FunctionMapper() { public Method resolveFunction(String prefix, String localName) { return null; diff --git a/java/org/apache/jasper/el/ELResolverImpl.java b/java/org/apache/jasper/el/ELResolverImpl.java index ba35e27ad..e1b24bfe2 100644 --- a/java/org/apache/jasper/el/ELResolverImpl.java +++ b/java/org/apache/jasper/el/ELResolverImpl.java @@ -32,7 +32,7 @@ import javax.el.PropertyNotWritableException; import javax.el.ResourceBundleELResolver; import javax.servlet.jsp.el.VariableResolver; -import org.apache.catalina.Globals; +import org.apache.jasper.Constants; public final class ELResolverImpl extends ELResolver { /** @deprecated - Use getDefaultResolver(). Needs to be made private */ @@ -146,7 +146,7 @@ public final class ELResolverImpl extends ELResolver { } public static ELResolver getDefaultResolver() { - if (Globals.IS_SECURITY_ENABLED) { + if (Constants.IS_SECURITY_ENABLED) { ELResolver defaultResolver = new CompositeELResolver(); ((CompositeELResolver) defaultResolver).add(new MapELResolver()); ((CompositeELResolver) defaultResolver).add(new ResourceBundleELResolver()); -- 2.11.0