[jbossweb-commits] JBossWeb SVN: r968 - in trunk: java/org/apache/jasper/el and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2009-03-23 06:48:50 -0400 (Mon, 23 Mar 2009)
New Revision: 968
Modified:
trunk/PATCHES.txt
trunk/java/org/apache/jasper/el/ELContextImpl.java
trunk/java/org/apache/jasper/el/ELResolverImpl.java
Log:
- Dependency fix.
Modified: trunk/PATCHES.txt
===================================================================
--- trunk/PATCHES.txt 2009-03-22 01:32:22 UTC (rev 967)
+++ trunk/PATCHES.txt 2009-03-23 10:48:50 UTC (rev 968)
@@ -56,3 +56,5 @@
752651, 752936
XmlBase configuration
+757223
+AJP hack to pass remote port (the protocol does not do it, well, too bad)
Modified: trunk/java/org/apache/jasper/el/ELContextImpl.java
===================================================================
--- trunk/java/org/apache/jasper/el/ELContextImpl.java 2009-03-22 01:32:22 UTC (rev 967)
+++ trunk/java/org/apache/jasper/el/ELContextImpl.java 2009-03-23 10:48:50 UTC (rev 968)
@@ -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: trunk/java/org/apache/jasper/el/ELResolverImpl.java
===================================================================
--- trunk/java/org/apache/jasper/el/ELResolverImpl.java 2009-03-22 01:32:22 UTC (rev 967)
+++ trunk/java/org/apache/jasper/el/ELResolverImpl.java 2009-03-23 10:48:50 UTC (rev 968)
@@ -32,8 +32,9 @@
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 */
public final static ELResolver DefaultResolver = new CompositeELResolver();
@@ -146,7 +147,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());