diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java index 345a8fab7..3a2729c83 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java @@ -20,7 +20,7 @@ package org.apache.struts2.showcase; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.Validateable; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import java.util.ArrayList; import java.util.Collections; @@ -123,7 +123,7 @@ public class UITagExample extends ActionSupport implements Validateable { } public List getVehicalSpecificList() { - OgnlValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest()); + ValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest()); Object vehicalType = stack.findValue("top"); if (vehicalType != null && vehicalType instanceof VehicalType) { List l = (List) vehicalSpecificMap.get(vehicalType); diff --git a/core/pom.xml b/core/pom.xml index f846c4970..b278edbd2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -84,6 +84,12 @@ provided + + ognl + ognl + 2.6.7 + + commons-logging commons-logging diff --git a/core/src/main/java/org/apache/struts2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java index ac2152e8c..cc6a5018d 100644 --- a/core/src/main/java/org/apache/struts2/ServletActionContext.java +++ b/core/src/main/java/org/apache/struts2/ServletActionContext.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** @@ -51,7 +51,7 @@ public class ServletActionContext extends ActionContext implements StrutsStatics * @return The current action context */ public static ActionContext getActionContext(HttpServletRequest req) { - OgnlValueStack vs = getValueStack(req); + ValueStack vs = getValueStack(req); if (vs != null) { return new ActionContext(vs.getContext()); } else { @@ -65,8 +65,8 @@ public class ServletActionContext extends ActionContext implements StrutsStatics * @param req The request * @return The value stack */ - public static OgnlValueStack getValueStack(HttpServletRequest req) { - return (OgnlValueStack) req.getAttribute(STRUTS_VALUESTACK_KEY); + public static ValueStack getValueStack(HttpServletRequest req) { + return (ValueStack) req.getAttribute(STRUTS_VALUESTACK_KEY); } /** diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index 9df4b5891..4adf5003f 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -39,7 +39,8 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; /** * @@ -121,7 +122,7 @@ public class ActionComponent extends Component { protected boolean executeResult; protected boolean ignoreContextParams; - public ActionComponent(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) { + public ActionComponent(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack); this.req = req; this.res = res; @@ -175,7 +176,7 @@ public class ActionComponent extends Component { res, servletContext); - OgnlValueStack newStack = new OgnlValueStack(stack); + ValueStack newStack = ValueStackFactory.getFactory().createValueStack(stack); extraContext.put(ActionContext.VALUE_STACK, newStack); // add page context, such that ServletDispatcherResult will do an include @@ -225,7 +226,7 @@ public class ActionComponent extends Component { } // get the old value stack from the request - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); // execute at this point, after params have been set try { Configuration config = Dispatcher.getInstance().getConfigurationManager().getConfiguration(); diff --git a/core/src/main/java/org/apache/struts2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java index 5753e09b5..a37fa4ea1 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionError.java +++ b/core/src/main/java/org/apache/struts2/components/ActionError.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -51,7 +51,7 @@ public class ActionError extends UIBean { public static final String TEMPLATE = "actionerror"; - public ActionError(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public ActionError(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java index 40350ad4f..c614d44f7 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java +++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -48,7 +48,7 @@ public class ActionMessage extends UIBean { private static final String TEMPLATE = "actionmessage"; - public ActionMessage(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public ActionMessage(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index 6063c6ce3..789aa3c95 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -89,7 +89,7 @@ public class Anchor extends RemoteCallUIBean { protected String notifyTopics; protected String preInvokeJS; - public Anchor(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Anchor(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java index e70fdaa41..3f04b7b9e 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -28,7 +28,7 @@ import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.AppendIteratorFilter; import org.apache.struts2.util.MakeIterator; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -119,7 +119,7 @@ public class AppendIterator extends Component implements UnnamedParametric { private AppendIteratorFilter appendIteratorFilter= null; private List _parameters; - public AppendIterator(OgnlValueStack stack) { + public AppendIterator(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index ab2012e0f..fcb7b585b 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -25,7 +25,8 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.util.OgnlUtil; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -96,14 +97,14 @@ public class Bean extends Component { protected Object bean; protected String name; - public Bean(OgnlValueStack stack) { + public Bean(ValueStack stack) { super(stack); } public boolean start(Writer writer) { boolean result = super.start(writer); - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); try { String beanName = findString(name, "name", "Bean name is required. Example: com.acme.FooBean"); @@ -126,7 +127,7 @@ public class Bean extends Component { } public boolean end(Writer writer, String body) { - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); stack.pop(); return super.end(writer, body); diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index 52816a8d0..5f080f379 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -20,11 +20,11 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * - * Renders an HTML input element of type checkbox, populated by the specified property from the OgnlValueStack. + * Renders an HTML input element of type checkbox, populated by the specified property from the ValueStack. * * *

Examples @@ -51,7 +51,7 @@ public class Checkbox extends UIBean { protected String fieldValue; - public Checkbox(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Checkbox(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java index ba12714fa..86101b58c 100644 --- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java +++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -43,7 +43,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public class CheckboxList extends ListUIBean { final public static String TEMPLATE = "checkboxlist"; - public CheckboxList(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public CheckboxList(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index a70fbea83..466a63a47 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * ClosingUIBean is the standard superclass for UI components such as div etc. @@ -33,7 +33,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public abstract class ClosingUIBean extends UIBean { private static final Log LOG = LogFactory.getLog(ClosingUIBean.class); - protected ClosingUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + protected ClosingUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java index d874b0abe..1b31cd43b 100644 --- a/core/src/main/java/org/apache/struts2/components/ComboBox.java +++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.util.MakeIterator; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -96,7 +96,7 @@ public class ComboBox extends TextField { protected String emptyOption; - public ComboBox(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public ComboBox(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index 90a4fd859..6e69ed0f3 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -37,8 +37,9 @@ import org.apache.struts2.views.jsp.TagUtils; import org.apache.struts2.views.util.ContextUtil; import org.apache.struts2.views.util.UrlHelper; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextParseUtil; +import com.opensymphony.xwork2.util.ValueStack; /** * Base class to extend for UI components. @@ -49,7 +50,7 @@ import com.opensymphony.xwork2.util.TextParseUtil; public class Component { public static final String COMPONENT_STACK = "__component_stack"; - protected OgnlValueStack stack; + protected ValueStack stack; protected Map parameters; protected String id; @@ -58,7 +59,7 @@ public class Component { * * @param stack OGNL value stack. */ - public Component(OgnlValueStack stack) { + public Component(ValueStack stack) { this.stack = stack; this.parameters = new HashMap(); getComponentStack().push(this); @@ -80,7 +81,7 @@ public class Component { * Get's the OGNL value stack assoicated with this component. * @return the OGNL value stack assoicated with this component. */ - public OgnlValueStack getStack() { + public ValueStack getStack() { return stack; } @@ -344,7 +345,7 @@ public class Component { * @param req HTTP request * @return the namepsace of the current page being rendered, is never null. */ - protected String determineNamespace(String namespace, OgnlValueStack stack, HttpServletRequest req) { + protected String determineNamespace(String namespace, ValueStack stack, HttpServletRequest req) { String result; if (namespace == null) { diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index f6ef74b2f..721f035f5 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -30,7 +30,8 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -188,7 +189,7 @@ public class Date extends Component { private boolean nice; - public Date(OgnlValueStack stack) { + public Date(ValueStack stack) { super(stack); } @@ -269,7 +270,7 @@ public class Date extends Component { public boolean end(Writer writer, String body) { String msg = null; - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); java.util.Date date = null; // find the name on the valueStack, and cast it to a date try { diff --git a/core/src/main/java/org/apache/struts2/components/DatePicker.java b/core/src/main/java/org/apache/struts2/components/DatePicker.java index 5f6bd639f..6e59b9329 100644 --- a/core/src/main/java/org/apache/struts2/components/DatePicker.java +++ b/core/src/main/java/org/apache/struts2/components/DatePicker.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -107,7 +107,7 @@ public class DatePicker extends TextField { protected String templateCssPath; protected String size; - public DatePicker(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public DatePicker(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java index c4027a9f1..7d6e5a174 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -12,7 +12,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.util.OgnlUtil; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -39,7 +40,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public class Debug extends UIBean { public static final String TEMPLATE = "debug"; - public Debug(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Debug(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } @@ -50,7 +51,7 @@ public class Debug extends UIBean { public boolean start(Writer writer) { boolean result = super.start(writer); - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); Iterator iter = stack.getRoot().iterator(); List stackValues = new ArrayList(stack.getRoot().size()); while (iter.hasNext()) { diff --git a/core/src/main/java/org/apache/struts2/components/Div.java b/core/src/main/java/org/apache/struts2/components/Div.java index 48e3f785e..8b54216c3 100644 --- a/core/src/main/java/org/apache/struts2/components/Div.java +++ b/core/src/main/java/org/apache/struts2/components/Div.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.util.UrlHelper; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -65,7 +65,7 @@ public class Div extends RemoteCallUIBean { protected String loadingText; protected String listenTopics; - public Div(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Div(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 1edf9c7b3..dde415b5c 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -22,7 +22,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * DoubleListUIBean is the standard superclass of all Struts double list handling components. @@ -82,7 +82,7 @@ public abstract class DoubleListUIBean extends ListUIBean { protected String doubleAccesskey; - public DoubleListUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public DoubleListUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java index 7fba5eb3f..d7d9eba3f 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -43,7 +43,7 @@ public class DoubleSelect extends DoubleListUIBean { final public static String TEMPLATE = "doubleselect"; - public DoubleSelect(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public DoubleSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java index 91589bfc5..128e22cfb 100644 --- a/core/src/main/java/org/apache/struts2/components/Else.java +++ b/core/src/main/java/org/apache/struts2/components/Else.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import java.io.Writer; import java.util.Map; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -54,7 +54,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; * @s.tag name="else" bodycontent="JSP" description="Else tag" tld-tag-class="org.apache.struts2.views.jsp.ElseTag" */ public class Else extends Component { - public Else(OgnlValueStack stack) { + public Else(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java index ac22c4df2..de4968619 100644 --- a/core/src/main/java/org/apache/struts2/components/ElseIf.java +++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java @@ -19,7 +19,7 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -58,7 +58,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; * @s.tag name="elseif" tld-body-content="JSP" description="Elseif tag" tld-tag-class="org.apache.struts2.views.jsp.ElseIfTag" */ public class ElseIf extends Component { - public ElseIf(OgnlValueStack stack) { + public ElseIf(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java index c7bce142e..72f8111b5 100644 --- a/core/src/main/java/org/apache/struts2/components/FieldError.java +++ b/core/src/main/java/org/apache/struts2/components/FieldError.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.Param.UnnamedParametric; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -84,7 +84,7 @@ public class FieldError extends UIBean implements UnnamedParametric { private List errorFieldNames = new ArrayList(); - public FieldError(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public FieldError(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 3f4537d42..a1e2e6af2 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -50,7 +50,7 @@ public class File extends UIBean { protected String accept; protected String size; - public File(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public File(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java index e80ad19b1..996aa5996 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -44,7 +44,7 @@ import com.opensymphony.xwork2.config.RuntimeConfiguration; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.config.entities.InterceptorMapping; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory; import com.opensymphony.xwork2.validator.FieldValidator; import com.opensymphony.xwork2.validator.ValidationInterceptor; @@ -108,7 +108,7 @@ public class Form extends ClosingUIBean { protected String windowState; protected String acceptcharset; - public Form(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Form(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java index 75e78ad74..c9cc084b9 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * FormButton. @@ -36,7 +36,7 @@ public abstract class FormButton extends UIBean { protected String align; protected String type; - public FormButton(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public FormButton(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java index 1fc37ae75..0221742c9 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.util.ContainUtil; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -50,7 +50,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; * Currently, your custom UI components can be written in Velocity, JSP, or Freemarker, and the correct rendering * engine will be found based on file extension.

* - * Remember: the value params will always be resolved against the OgnlValueStack so if you mean to pass a + * Remember: the value params will always be resolved against the ValueStack so if you mean to pass a * string literal to your component, make sure to wrap it in quotes i.e. value="'value1'" otherwise, the the value * stack will search for an Object on the stack with a method of getValue1(). (now that i've written this, i'm not * entirely sure this is the case. i should verify this manana)

@@ -111,7 +111,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public class GenericUIBean extends UIBean { private final static String TEMPLATE = "empty"; - public GenericUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public GenericUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java index 7d73a5888..1c29db8b1 100644 --- a/core/src/main/java/org/apache/struts2/components/Head.java +++ b/core/src/main/java/org/apache/struts2/components/Head.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.Settings; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -80,7 +80,7 @@ public class Head extends UIBean { private String calendarcss = "calendar-blue.css"; private boolean debug; - public Head(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Head(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java index 08b4b19d6..3d1f1c9da 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -20,11 +20,11 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * - * Renders an HTML input element of type hidden, populated by the specified property from the OgnlValueStack. + * Renders an HTML input element of type hidden, populated by the specified property from the ValueStack. * * *

Examples @@ -49,7 +49,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public class Hidden extends UIBean { final public static String TEMPLATE = "hidden"; - public Hidden(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Hidden(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java index ff6877243..832052148 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProviderSupport; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -80,7 +80,7 @@ public class I18n extends Component { protected boolean pushed; protected String name; - public I18n(OgnlValueStack stack) { + public I18n(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java index 1ee051b7f..32322283a 100644 --- a/core/src/main/java/org/apache/struts2/components/If.java +++ b/core/src/main/java/org/apache/struts2/components/If.java @@ -19,7 +19,7 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -74,7 +74,7 @@ public class If extends Component { this.test = test; } - public If(OgnlValueStack stack) { + public If(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index fb2b67b78..0d2099e47 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -44,7 +44,7 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.Settings; import org.apache.struts2.util.FastByteArrayOutputStream; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -101,7 +101,7 @@ public class Include extends Component { private HttpServletRequest req; private HttpServletResponse res; - public Include(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) { + public Include(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack); this.req = req; this.res = res; diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java index 109677060..de34d8d48 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -23,7 +23,8 @@ import java.util.Iterator; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.jsp.IteratorStatus; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -187,7 +188,7 @@ public class IteratorComponent extends Component { protected String statusAttr; protected String value; - public IteratorComponent(OgnlValueStack stack) { + public IteratorComponent(ValueStack stack) { super(stack); } @@ -198,7 +199,7 @@ public class IteratorComponent extends Component { status = new IteratorStatus(statusState); } - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); if (value == null) { value = "top"; @@ -233,7 +234,7 @@ public class IteratorComponent extends Component { } public boolean end(Writer writer, String body) { - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); if (iterator != null) { stack.pop(); } diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java index 06ec79d8b..f964e5127 100644 --- a/core/src/main/java/org/apache/struts2/components/Label.java +++ b/core/src/main/java/org/apache/struts2/components/Label.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -49,7 +49,7 @@ public class Label extends UIBean { protected String forAttr; - public Label(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Label(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index a088d56dd..9497a4e36 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.util.ContainUtil; import org.apache.struts2.util.MakeIterator; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * DoubleListUIBean is the standard superclass of all Struts list handling components. @@ -51,7 +51,7 @@ public abstract class ListUIBean extends UIBean { // indicate if an exception is to be thrown when value attribute is null protected boolean throwExceptionOnNullValueAttribute = false; - protected ListUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + protected ListUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java index 7eb799b88..1468bc21a 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -28,7 +28,7 @@ import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.util.MergeIteratorFilter; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -132,7 +132,7 @@ public class MergeIterator extends Component implements UnnamedParametric { private MergeIteratorFilter mergeIteratorFilter = null; private List _parameters; - public MergeIterator(OgnlValueStack stack) { + public MergeIterator(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index 191b10c9b..d16c6fe28 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -76,7 +76,7 @@ public class OptGroup extends Component { protected ListUIBean internalUiBean; - public OptGroup(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) { + public OptGroup(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack); this.req = req; this.res = res; diff --git a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index 7358e46fa..0cba4511e 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -120,7 +120,7 @@ public class OptionTransferSelect extends DoubleListUIBean { protected String rightDownLabel; - public OptionTransferSelect(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public OptionTransferSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Panel.java b/core/src/main/java/org/apache/struts2/components/Panel.java index 81f992e91..f32987738 100644 --- a/core/src/main/java/org/apache/struts2/components/Panel.java +++ b/core/src/main/java/org/apache/struts2/components/Panel.java @@ -22,7 +22,7 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -48,7 +48,7 @@ public class Panel extends Div { protected String subscribeTopicName; protected String remote; - public Panel(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Panel(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Param.java b/core/src/main/java/org/apache/struts2/components/Param.java index 679a89187..e48c8bf3b 100644 --- a/core/src/main/java/org/apache/struts2/components/Param.java +++ b/core/src/main/java/org/apache/struts2/components/Param.java @@ -21,7 +21,7 @@ import java.io.Writer; import org.apache.struts2.StrutsException; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -66,7 +66,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; *

* * where the key will be the identifier and the value the result of an OGNL expression run against the current - * OgnlValueStack. + * ValueStack. * *

* This second example demonstrates how the text tag can use parameters from this param tag. @@ -90,7 +90,7 @@ public class Param extends Component { protected String name; protected String value; - public Param(OgnlValueStack stack) { + public Param(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java index 34dc017fd..3b2b92a15 100644 --- a/core/src/main/java/org/apache/struts2/components/Password.java +++ b/core/src/main/java/org/apache/struts2/components/Password.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -47,7 +47,7 @@ public class Password extends TextField { protected String showPassword; - public Password(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Password(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java index 6ad1e7e80..56b413f51 100644 --- a/core/src/main/java/org/apache/struts2/components/Property.java +++ b/core/src/main/java/org/apache/struts2/components/Property.java @@ -23,7 +23,7 @@ import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextUtils; /** @@ -86,7 +86,7 @@ import com.opensymphony.xwork2.util.TextUtils; public class Property extends Component { private static final Log LOG = LogFactory.getLog(Property.class); - public Property(OgnlValueStack stack) { + public Property(ValueStack stack) { super(stack); } diff --git a/core/src/main/java/org/apache/struts2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java index 620846f05..d1b55469b 100644 --- a/core/src/main/java/org/apache/struts2/components/Push.java +++ b/core/src/main/java/org/apache/struts2/components/Push.java @@ -19,7 +19,8 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -109,14 +110,14 @@ public class Push extends Component { protected String value; protected boolean pushed; - public Push(OgnlValueStack stack) { + public Push(ValueStack stack) { super(stack); } public boolean start(Writer writer) { boolean result = super.start(writer); - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); if (stack != null) { stack.push(findValue(value, "value", "You must specify a value to push on the stack. Example: person")); @@ -129,7 +130,7 @@ public class Push extends Component { } public boolean end(Writer writer, String body) { - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); if (pushed && (stack != null)) { stack.pop(); diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java index b982402e7..f48e2527e 100644 --- a/core/src/main/java/org/apache/struts2/components/Radio.java +++ b/core/src/main/java/org/apache/struts2/components/Radio.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -49,7 +49,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack; public class Radio extends ListUIBean { final public static String TEMPLATE = "radiomap"; - public Radio(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Radio(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java b/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java index 25e5bf788..5d5f85875 100644 --- a/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * RemoteCallUIBean is superclass for all components dealing with remote calls. @@ -33,7 +33,7 @@ public abstract class RemoteCallUIBean extends ClosingUIBean { protected String showErrorTransportText; protected String afterLoading; - public RemoteCallUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public RemoteCallUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java index edd125a45..db96b85e9 100644 --- a/core/src/main/java/org/apache/struts2/components/Reset.java +++ b/core/src/main/java/org/apache/struts2/components/Reset.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -60,7 +60,7 @@ public class Reset extends FormButton { protected String align; protected String type; - public Reset(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Reset(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java index 1a058f145..0335b6ffb 100644 --- a/core/src/main/java/org/apache/struts2/components/Select.java +++ b/core/src/main/java/org/apache/struts2/components/Select.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -82,7 +82,7 @@ public class Select extends ListUIBean { protected String multiple; protected String size; - public Select(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Select(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 3f6c7e7df..9e4ea3dba 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -19,7 +19,8 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -76,12 +77,12 @@ public class Set extends Component { protected String scope; protected String value; - public Set(OgnlValueStack stack) { + public Set(ValueStack stack) { super(stack); } public boolean end(Writer writer, String body) { - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); if (value == null) { value = "top"; diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index da121e602..f173caf43 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -170,7 +170,7 @@ public class Submit extends FormButton { protected String preInvokeJS; protected String src; - public Submit(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Submit(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java index 3787a8fcb..750c3f599 100644 --- a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java +++ b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java @@ -23,7 +23,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -99,7 +99,7 @@ public class TabbedPanel extends ClosingUIBean { protected List tabs = new ArrayList(); - public TabbedPanel(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public TabbedPanel(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java index 421752cd3..a81f75938 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -28,8 +28,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.util.TextUtils; +import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -117,7 +118,7 @@ public class Text extends Component implements Param.UnnamedParametric { protected String actualName; protected String name; - public Text(OgnlValueStack stack) { + public Text(ValueStack stack) { super(stack); } @@ -146,7 +147,7 @@ public class Text extends Component implements Param.UnnamedParametric { defaultMessage = actualName; } String msg = null; - OgnlValueStack stack = getStack(); + ValueStack stack = getStack(); for (Iterator iterator = getStack().getRoot().iterator(); iterator.hasNext();) { diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java index 6e2840535..6d8e49446 100644 --- a/core/src/main/java/org/apache/struts2/components/TextArea.java +++ b/core/src/main/java/org/apache/struts2/components/TextArea.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -48,7 +48,7 @@ public class TextArea extends UIBean { protected String rows; protected String wrap; - public TextArea(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public TextArea(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java index 4e3248dbd..d724983b0 100644 --- a/core/src/main/java/org/apache/struts2/components/TextField.java +++ b/core/src/main/java/org/apache/struts2/components/TextField.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -53,7 +53,7 @@ public class TextField extends UIBean { protected String readonly; protected String size; - public TextField(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public TextField(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/TimePicker.java b/core/src/main/java/org/apache/struts2/components/TimePicker.java index 1c59d043d..edc995bfb 100644 --- a/core/src/main/java/org/apache/struts2/components/TimePicker.java +++ b/core/src/main/java/org/apache/struts2/components/TimePicker.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -82,7 +82,7 @@ public class TimePicker extends TextField { protected String timeIconPath; protected String size; - public TimePicker(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public TimePicker(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java index 50a921862..1b33f6ed9 100644 --- a/core/src/main/java/org/apache/struts2/components/Token.java +++ b/core/src/main/java/org/apache/struts2/components/Token.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.util.TokenHelper; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -53,7 +53,7 @@ public class Token extends UIBean { public static final String TEMPLATE = "token"; - public Token(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Token(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/Tree.java b/core/src/main/java/org/apache/struts2/components/Tree.java index 44353e69a..e76f16253 100644 --- a/core/src/main/java/org/apache/struts2/components/Tree.java +++ b/core/src/main/java/org/apache/struts2/components/Tree.java @@ -22,7 +22,7 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -94,7 +94,7 @@ public class Tree extends ClosingUIBean { private String toggleDuration; private String templateCssPath; - public Tree(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public Tree(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/TreeNode.java b/core/src/main/java/org/apache/struts2/components/TreeNode.java index b4109b64e..a4ad9bca7 100644 --- a/core/src/main/java/org/apache/struts2/components/TreeNode.java +++ b/core/src/main/java/org/apache/struts2/components/TreeNode.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -80,7 +80,7 @@ public class TreeNode extends ClosingUIBean { private static final String TEMPLATE = "treenode-close"; private static final String OPEN_TEMPLATE = "treenode"; - public TreeNode(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public TreeNode(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 56800b9dc..1e34ed3e7 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -37,7 +37,7 @@ import org.apache.struts2.config.Settings; import org.apache.struts2.views.util.ContextUtil; import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * UIBean is the standard superclass of all Struts UI componentns. @@ -393,7 +393,7 @@ public abstract class UIBean extends Component { protected HttpServletRequest request; protected HttpServletResponse response; - public UIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public UIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack); this.request = request; this.response = response; diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index 10b073788..7a2e67b47 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -38,7 +38,7 @@ import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.views.util.UrlHelper; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.XWorkContinuationConfig; /** @@ -138,7 +138,7 @@ public class URL extends Component { protected String portletUrlType; protected String anchor; - public URL(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) { + public URL(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack); this.req = req; this.res = res; diff --git a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java index 934ab50ef..8ece3cda9 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -92,7 +92,7 @@ public class UpDownSelect extends Select { return TEMPLATE; } - public UpDownSelect(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public UpDownSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/table/WebTable.java b/core/src/main/java/org/apache/struts2/components/table/WebTable.java index 4b8778e87..ea13cc01d 100644 --- a/core/src/main/java/org/apache/struts2/components/table/WebTable.java +++ b/core/src/main/java/org/apache/struts2/components/table/WebTable.java @@ -32,7 +32,7 @@ import org.apache.struts2.StrutsException; import org.apache.struts2.components.GenericUIBean; import org.apache.struts2.components.table.renderer.CellRenderer; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @s.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.table.WebTableTag" @@ -51,7 +51,7 @@ public class WebTable extends GenericUIBean { protected int sortColumn = -1; protected int curRow = 0; - public WebTable(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) { + public WebTable(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index c2433dc60..8e09ca6ab 100644 --- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java @@ -35,7 +35,7 @@ import org.apache.struts2.views.freemarker.FreemarkerManager; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import freemarker.template.Configuration; import freemarker.template.SimpleHash; @@ -62,7 +62,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine { public void renderTemplate(TemplateRenderingContext templateContext) throws Exception { // get the various items required from the stack - OgnlValueStack stack = templateContext.getStack(); + ValueStack stack = templateContext.getStack(); Map context = stack.getContext(); ServletContext servletContext = (ServletContext) context.get(ServletActionContext.SERVLET_CONTEXT); HttpServletRequest req = (HttpServletRequest) context.get(ServletActionContext.HTTP_REQUEST); diff --git a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java index 277bd0ed7..a0b21d039 100644 --- a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java @@ -29,7 +29,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.components.Include; import org.apache.struts2.components.UIBean; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * JSP based template engine. @@ -44,7 +44,7 @@ public class JspTemplateEngine extends BaseTemplateEngine { LOG.debug("Trying to render template " + template + ", repeating through parents until we succeed"); } UIBean tag = templateContext.getTag(); - OgnlValueStack stack = templateContext.getStack(); + ValueStack stack = templateContext.getStack(); stack.push(tag); PageContext pageContext = (PageContext) stack.getContext().get(ServletActionContext.PAGE_CONTEXT); List templates = template.getPossibleTemplates(this); diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java index 3a94404d7..df0809e73 100644 --- a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java +++ b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java @@ -22,14 +22,14 @@ import java.util.Map; import org.apache.struts2.components.UIBean; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * Context used when rendering templates. */ public class TemplateRenderingContext { Template template; - OgnlValueStack stack; + ValueStack stack; Map parameters; UIBean tag; Writer writer; @@ -43,7 +43,7 @@ public class TemplateRenderingContext { * @param params parameters to this template. * @param tag the tag UI component. */ - public TemplateRenderingContext(Template template, Writer writer, OgnlValueStack stack, Map params, UIBean tag) { + public TemplateRenderingContext(Template template, Writer writer, ValueStack stack, Map params, UIBean tag) { this.template = template; this.writer = writer; this.stack = stack; @@ -55,7 +55,7 @@ public class TemplateRenderingContext { return template; } - public OgnlValueStack getStack() { + public ValueStack getStack() { return stack; } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index 1b5a5ceef..7fca1e7eb 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -60,7 +60,8 @@ import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; import com.opensymphony.xwork2.util.LocalizedTextUtil; import com.opensymphony.xwork2.util.ObjectTypeDeterminer; import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.util.XWorkContinuationConfig; import com.opensymphony.xwork2.util.location.Location; import com.opensymphony.xwork2.util.location.LocationUtils; @@ -290,9 +291,9 @@ public class Dispatcher { Map extraContext = createContextMap(request, response, mapping, context); // If there was a previous value stack, then create a new copy and pass it in to be used by the new Action - OgnlValueStack stack = (OgnlValueStack) request.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY); + ValueStack stack = (ValueStack) request.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY); if (stack != null) { - extraContext.put(ActionContext.VALUE_STACK, new OgnlValueStack(stack)); + extraContext.put(ActionContext.VALUE_STACK, ValueStackFactory.getFactory().createValueStack(stack)); } try { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java index 2fd46744c..b77d878e5 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java @@ -28,8 +28,8 @@ import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.util.OgnlValueStack; import com.opensymphony.xwork2.util.TextParseUtil; +import com.opensymphony.xwork2.util.ValueStack; /** @@ -127,7 +127,7 @@ public class HttpHeaderResult implements Result { } if (headers != null) { - OgnlValueStack stack = ActionContext.getContext().getValueStack(); + ValueStack stack = ActionContext.getContext().getValueStack(); for (Iterator iterator = headers.entrySet().iterator(); iterator.hasNext();) { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java index 1d206631e..1f1a0359c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * @@ -71,7 +71,7 @@ public class StrutsRequestWrapper extends HttpServletRequestWrapper { try { // If not found, then try the ValueStack ActionContext.getContext().put("__requestWrapper.getAttribute", Boolean.TRUE); - OgnlValueStack stack = ActionContext.getContext().getValueStack(); + ValueStack stack = ActionContext.getContext().getValueStack(); if (stack != null) { attribute = stack.findValue(s); } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java index 89cc35647..79bcadf49 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java @@ -39,7 +39,7 @@ import com.opensymphony.xwork2.util.TextParseUtil; *