svn commit: r757335 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextImpl.java ELResolverImpl.java

[markt]

Author: markt
Date: Mon Mar 23 07:36:38 2009
New Revision: 757335

URL: http://svn.apache.org/viewvc?rev=757335&view=rev
Log:
Remove the Catalina dependency from Jasper.

Modified:
    tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java

Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=757335&r1=757334&r2=757335&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Mon Mar 23 
07:36:38 2009
@@ -26,7 +26,7 @@
 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 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;

Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=757335&r1=757334&r2=757335&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Mon Mar 23 
07:36:38 2009
@@ -32,7 +32,7 @@
 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 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());



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org