Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed to use XWork ValueStack interface and factory

Browse Source 
WW-1459


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@451544 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-09-30 05:38:02 +00:00
parent 97a97832c7
commit 6bde06ae55
266 changed files with 696 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
+2 -2
View File
@@ -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);
core/pom.xml
+6
View File
@@ -84,6 +84,12 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>2.6.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
core/src/main/java/org/apache/struts2/ServletActionContext.java
+4 -4
View File
@@ -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);
}
/**
core/src/main/java/org/apache/struts2/components/ActionComponent.java
+5 -4
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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();
core/src/main/java/org/apache/struts2/components/ActionError.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/ActionMessage.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Anchor.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/AppendIterator.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Bean.java
+5 -4
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
core/src/main/java/org/apache/struts2/components/Checkbox.java
+3 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
* 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.
* <!-- END SNIPPET: javadoc -->
*
* <p/> <b>Examples</b>
@@ -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);
}
core/src/main/java/org/apache/struts2/components/CheckboxList.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/ComboBox.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Component.java
+6 -5
View File
@@ -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 <tt>null</tt>.
*/
protected String determineNamespace(String namespace, OgnlValueStack stack, HttpServletRequest req) {
protected String determineNamespace(String namespace, ValueStack stack, HttpServletRequest req) {
String result;
if (namespace == null) {
core/src/main/java/org/apache/struts2/components/Date.java
+4 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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 {
core/src/main/java/org/apache/struts2/components/DatePicker.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Debug.java
+4 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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()) {
core/src/main/java/org/apache/struts2/components/Div.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/DoubleSelect.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Else.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/ElseIf.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/FieldError.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/File.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Form.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/FormButton.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/GenericUIBean.java
+3 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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.<p/>
*
* <b>Remember:</b> the value params will always be resolved against the OgnlValueStack so if you mean to pass a
* <b>Remember:</b> 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)<p/>
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Head.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Hidden.java
+3 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
* 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.
* <!-- END SNIPPET: javadoc -->
*
* <p/> <b>Examples</b>
@@ -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);
}
core/src/main/java/org/apache/struts2/components/I18n.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/If.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -74,7 +74,7 @@ public class If extends Component {
this.test = test;
}
public If(OgnlValueStack stack) {
public If(ValueStack stack) {
super(stack);
}
core/src/main/java/org/apache/struts2/components/Include.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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;
core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+5 -4
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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();
}
core/src/main/java/org/apache/struts2/components/Label.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/ListUIBean.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/MergeIterator.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/OptGroup.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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;
core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Panel.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Param.java
+3 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -66,7 +66,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack;
* <p/>
* <!-- START SNIPPET: exampledescription -->
* where the key will be the identifier and the value the result of an OGNL expression run against the current
* OgnlValueStack.
* ValueStack.
* <!-- END SNIPPET: exampledescription -->
* <p/>
* 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);
}
core/src/main/java/org/apache/struts2/components/Password.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Property.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Push.java
+5 -4
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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();
core/src/main/java/org/apache/struts2/components/Radio.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Reset.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Select.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Set.java
+4 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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";
core/src/main/java/org/apache/struts2/components/Submit.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/TabbedPanel.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Text.java
+4 -3
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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();) {
core/src/main/java/org/apache/struts2/components/TextArea.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/TextField.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/TimePicker.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Token.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/Tree.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/TreeNode.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/UIBean.java
+2 -2
View File
@@ -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;
core/src/main/java/org/apache/struts2/components/URL.java
+2 -2
View File
@@ -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;
core/src/main/java/org/apache/struts2/components/UpDownSelect.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/components/table/WebTable.java
+2 -2
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
+2 -2
View File
@@ -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);
core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
+2 -2
View File
@@ -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);
core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
+4 -4
View File
@@ -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;
}
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+4 -3
View File
@@ -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<String, Object> 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 {
core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
+2 -2
View File
@@ -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();) {
core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
+2 -2
View File
@@ -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;
/**
* <!-- START SNIPPET: javadoc -->
@@ -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);
}
core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
+1 -1
View File
@@ -39,7 +39,7 @@ import com.opensymphony.xwork2.util.TextParseUtil;
* <ul>
* <li>location - the location to go to after execution (could be a jsp page or another action).
* It can be parsed as per the rules definied in the
* {@link TextParseUtil#translateVariables(java.lang.String, com.opensymphony.xwork2.util.OgnlValueStack) translateVariables}
* {@link TextParseUtil#translateVariables(java.lang.String, com.opensymphony.xwork2.util.ValueStack) translateVariables}
* method</li>
* <li>parse - true by default. If set to false, the location param will not be parsed for expressions</li>
* <li>encode - false by default. If set to false, the location param will not be url encoded. This only have effect when parse is true</li>
core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
+5 -4
View File
@@ -40,7 +40,8 @@ import org.apache.velocity.context.Context;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -96,7 +97,7 @@ public class VelocityResult extends StrutsResultSupport {
* the template or writing output to the servlet response stream.
*/
public void doExecute(String finalLocation, ActionInvocation invocation) throws Exception {
OgnlValueStack stack = ActionContext.getContext().getValueStack();
ValueStack stack = ActionContext.getContext().getValueStack();
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();
@@ -191,7 +192,7 @@ public class VelocityResult extends StrutsResultSupport {
* @return the template to render
* @throws Exception when the requested template could not be found
*/
protected Template getTemplate(OgnlValueStack stack, VelocityEngine velocity, ActionInvocation invocation, String location, String encoding) throws Exception {
protected Template getTemplate(ValueStack stack, VelocityEngine velocity, ActionInvocation invocation, String location, String encoding) throws Exception {
if (!location.startsWith("/")) {
location = invocation.getProxy().getNamespace() + "/" + location;
}
@@ -209,7 +210,7 @@ public class VelocityResult extends StrutsResultSupport {
* @param location the name of the template that is being used
* @return the a minted Velocity context.
*/
protected Context createContext(VelocityManager velocityManager, OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response, String location) {
protected Context createContext(VelocityManager velocityManager, ValueStack stack, HttpServletRequest request, HttpServletResponse response, String location) {
return velocityManager.createContext(stack, request, response);
}
}
core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
+4 -4
View File
@@ -6,13 +6,13 @@ import java.util.Iterator;
import org.apache.struts2.spi.ValueStack;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
public class ValueStackAdapter implements ValueStack {
final OgnlValueStack delegate;
final com.opensymphony.xwork2.util.ValueStack delegate;
public ValueStackAdapter(OgnlValueStack delegate) {
public ValueStackAdapter(com.opensymphony.xwork2.util.ValueStack delegate) {
this.delegate = delegate;
}
@@ -29,7 +29,7 @@ public class ValueStackAdapter implements ValueStack {
}
public ValueStack clone() {
return new ValueStackAdapter(new OgnlValueStack(delegate));
return new ValueStackAdapter(ValueStackFactory.getFactory().createValueStack(delegate));
}
public Object get(String expr) {
core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
+3 -3
View File
@@ -31,7 +31,7 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: description -->
@@ -269,7 +269,7 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
String key = getKey(invocation);
Map app = ActionContext.getContext().getApplication();
final OgnlValueStack stack = ActionContext.getContext().getValueStack();
final ValueStack stack = ActionContext.getContext().getValueStack();
if (LOG.isDebugEnabled()) {
LOG.debug("scope interceptor before");
@@ -325,7 +325,7 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
public void beforeResult(ActionInvocation invocation, String resultCode) {
String key = getKey(invocation);
Map app = ActionContext.getContext().getApplication();
final OgnlValueStack stack = ActionContext.getContext().getValueStack();
final ValueStack stack = ActionContext.getContext().getValueStack();
if (application != null)
for (int i = 0; i < application.length; i++) {
core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
+2 -2
View File
@@ -19,7 +19,7 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -71,7 +71,7 @@ public class StrutsConversionErrorInterceptor extends ConversionErrorInterceptor
private static final long serialVersionUID = 2759744840082921602L;
protected Object getOverrideExpr(ActionInvocation invocation, Object value) {
OgnlValueStack stack = invocation.getStack();
ValueStack stack = invocation.getStack();
try {
stack.push(value);
core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+3 -2
View File
@@ -28,7 +28,8 @@ import org.apache.struts2.util.TokenHelper;
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.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -119,7 +120,7 @@ public class TokenSessionStoreInterceptor extends TokenInterceptor {
if (savedInvocation != null) {
// set the valuestack to the request scope
OgnlValueStack stack = savedInvocation.getStack();
ValueStack stack = savedInvocation.getStack();
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
Result result = savedInvocation.getResult();
core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+3 -3
View File
@@ -43,7 +43,7 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* Provides several different debugging screens to provide insight into the
@@ -147,7 +147,7 @@ public class DebuggingInterceptor implements Interceptor {
}
});
} else if (COMMAND_MODE.equals(type)) {
OgnlValueStack stack = (OgnlValueStack) ctx.getSession().get(SESSION_KEY);
ValueStack stack = (ValueStack) ctx.getSession().get(SESSION_KEY);
String cmd = getParameter(EXPRESSION_PARAM);
HttpServletResponse res = ServletActionContext.getResponse();
@@ -243,7 +243,7 @@ public class DebuggingInterceptor implements Interceptor {
serializeIt(ctx.getSession(), "request", writer, new ArrayList<Object>());
serializeIt(ctx.getSession(), "session", writer, new ArrayList<Object>());
OgnlValueStack stack = (OgnlValueStack) ctx.get(ActionContext.VALUE_STACK);
ValueStack stack = (ValueStack) ctx.get(ActionContext.VALUE_STACK);
serializeIt(stack.getRoot(), "valueStack", writer, new ArrayList<Object>());
writer.endNode();
}
core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
+2 -2
View File
@@ -55,6 +55,7 @@ import org.apache.struts2.util.ObjectFactoryInitializable;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
@@ -62,7 +63,6 @@ import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* <!-- START SNIPPET: javadoc -->
@@ -437,7 +437,7 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
ActionProxy action = (ActionProxy) request.getPortletSession()
.getAttribute(EVENT_ACTION);
if (action != null) {
OgnlValueStack stack = proxy.getInvocation().getStack();
ValueStack stack = proxy.getInvocation().getStack();
Object top = stack.pop();
stack.push(action.getInvocation().getAction());
stack.push(top);
core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
+5 -4
View File
@@ -47,7 +47,8 @@ import org.apache.velocity.context.Context;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: description -->
@@ -137,7 +138,7 @@ public class PortletVelocityResult extends StrutsResultSupport {
public void executeRenderResult(String finalLocation,
ActionInvocation invocation) throws Exception {
prepareServletActionContext();
OgnlValueStack stack = ActionContext.getContext().getValueStack();
ValueStack stack = ActionContext.getContext().getValueStack();
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();
@@ -245,7 +246,7 @@ public class PortletVelocityResult extends StrutsResultSupport {
* @return the template to render
* @throws Exception when the requested template could not be found
*/
protected Template getTemplate(OgnlValueStack stack,
protected Template getTemplate(ValueStack stack,
VelocityEngine velocity, ActionInvocation invocation,
String location, String encoding) throws Exception {
if (!location.startsWith("/")) {
@@ -267,7 +268,7 @@ public class PortletVelocityResult extends StrutsResultSupport {
* @return the a minted Velocity context.
*/
protected Context createContext(VelocityManager velocityManager,
OgnlValueStack stack, HttpServletRequest request,
ValueStack stack, HttpServletRequest request,
HttpServletResponse response, String location) {
return velocityManager.createContext(stack, request, response);
}
core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
+3 -2
View File
@@ -23,7 +23,8 @@ import java.util.Map;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -55,7 +56,7 @@ public class InvocationSessionStore {
return null;
}
OgnlValueStack stack = invocationContext.invocation.getStack();
ValueStack stack = invocationContext.invocation.getStack();
ActionContext.getContext().setValueStack(stack);
return invocationContext.invocation;
core/src/main/java/org/apache/struts2/util/Sorter.java
+5 -3
View File
@@ -19,7 +19,9 @@ package org.apache.struts2.util;
import java.util.Comparator;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -47,7 +49,7 @@ public class Sorter {
public Comparator getAscending(final String anExpression) {
return new Comparator() {
private OgnlValueStack stack = new OgnlValueStack();
private ValueStack stack = ValueStackFactory.getFactory().createValueStack();
public int compare(Object o1, Object o2) {
// Get value for first object
@@ -109,7 +111,7 @@ public class Sorter {
public Comparator getDescending(final String anExpression) {
return new Comparator() {
private OgnlValueStack stack = new OgnlValueStack();
private ValueStack stack = ValueStackFactory.getFactory().createValueStack();
public int compare(Object o1, Object o2) {
// Get value for first object
core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+3 -3
View File
@@ -42,8 +42,8 @@ import org.apache.struts2.views.jsp.ui.OgnlTool;
import org.apache.struts2.views.util.UrlHelper;
import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
@@ -59,10 +59,10 @@ public class StrutsUtil {
protected HttpServletResponse response;
protected Map classes = new Hashtable();
protected OgnlTool ognl = OgnlTool.getInstance();
protected OgnlValueStack stack;
protected ValueStack stack;
public StrutsUtil(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) {
public StrutsUtil(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
this.stack = stack;
this.request = request;
this.response = response;
core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
+2 -2
View File
@@ -29,7 +29,7 @@ import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -40,7 +40,7 @@ public class VelocityStrutsUtil extends StrutsUtil {
private Context ctx;
public VelocityStrutsUtil(Context ctx, OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) {
public VelocityStrutsUtil(Context ctx, ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
this.ctx = ctx;
}
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+5 -4
View File
@@ -38,8 +38,9 @@ import org.apache.struts2.views.freemarker.tags.StrutsModels;
import org.apache.struts2.views.util.ContextUtil;
import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import freemarker.cache.FileTemplateLoader;
import freemarker.cache.MultiTemplateLoader;
@@ -162,7 +163,7 @@ public class FreemarkerManager {
return config;
}
protected ScopesHashModel buildScopesHashModel(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper, OgnlValueStack stack) {
protected ScopesHashModel buildScopesHashModel(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper, ValueStack stack) {
ScopesHashModel model = new ScopesHashModel(wrapper, servletContext, request, stack);
// Create hash model wrapper for servlet context (the application)
@@ -219,7 +220,7 @@ public class FreemarkerManager {
return model;
}
protected void populateContext(ScopesHashModel model, OgnlValueStack stack, Object action, HttpServletRequest request, HttpServletResponse response) {
protected void populateContext(ScopesHashModel model, ValueStack stack, Object action, HttpServletRequest request, HttpServletResponse response) {
// put the same objects into the context that the velocity result uses
Map standard = ContextUtil.getStandardContext(stack, request, response);
model.putAll(standard);
@@ -333,7 +334,7 @@ public class FreemarkerManager {
}
}
public SimpleHash buildTemplateModel(OgnlValueStack stack, Object action, ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper) {
public SimpleHash buildTemplateModel(ValueStack stack, Object action, ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper) {
ScopesHashModel model = buildScopesHashModel(servletContext, request, response, wrapper, stack);
populateContext(model, stack, action, request, response);
model.put("s", new StrutsModels(stack, request, response));
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+3 -2
View File
@@ -32,7 +32,8 @@ import org.apache.struts2.views.util.ResourceUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import freemarker.template.Configuration;
import freemarker.template.ObjectWrapper;
@@ -212,7 +213,7 @@ public class FreemarkerResult extends StrutsResultSupport {
ServletContext servletContext = ServletActionContext.getServletContext();
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();
OgnlValueStack stack = ServletActionContext.getContext().getValueStack();
ValueStack stack = ServletActionContext.getContext().getValueStack();
Object action = null;
if(invocation!= null ) action = invocation.getAction(); //Added for NullPointException
core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
+2 -2
View File
@@ -35,7 +35,7 @@ import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.views.util.ResourceUtil;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import freemarker.template.Configuration;
import freemarker.template.ObjectWrapper;
@@ -211,7 +211,7 @@ public class PortletFreemarkerResult extends StrutsResultSupport {
.getServletContext();
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();
OgnlValueStack stack = ServletActionContext.getContext()
ValueStack stack = ServletActionContext.getContext()
.getValueStack();
return FreemarkerManager.getInstance().buildTemplateModel(stack,
invocation.getAction(), servletContext, request, response,
core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+3 -3
View File
@@ -21,7 +21,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import freemarker.template.ObjectWrapper;
import freemarker.template.SimpleHash;
@@ -42,10 +42,10 @@ public class ScopesHashModel extends SimpleHash {
private HttpServletRequest request;
private ServletContext servletContext;
private OgnlValueStack stack;
private ValueStack stack;
public ScopesHashModel(ObjectWrapper objectWrapper, ServletContext context, HttpServletRequest request, OgnlValueStack stack) {
public ScopesHashModel(ObjectWrapper objectWrapper, ServletContext context, HttpServletRequest request, ValueStack stack) {
super(objectWrapper);
this.servletContext = context;
this.request = request;
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionError;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ActionError
*/
public class ActionErrorModel extends TagModel {
public ActionErrorModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ActionErrorModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionMessage;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ActionMessage
*/
public class ActionMessageModel extends TagModel {
public ActionMessageModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ActionMessageModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionComponent;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ActionComponent
*/
public class ActionModel extends TagModel {
public ActionModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ActionModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Anchor;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Anchor
*/
public class AnchorModel extends TagModel {
public AnchorModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public AnchorModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Bean;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Bean
*/
public class BeanModel extends TagModel {
public BeanModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public BeanModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
+3 -2
View File
@@ -23,13 +23,14 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see CheckboxList
*/
public class CheckboxListModel extends TagModel {
public CheckboxListModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public CheckboxListModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Checkbox;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Checkbox
*/
public class CheckboxModel extends TagModel {
public CheckboxModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public CheckboxModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ComboBox;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ComboBox
*/
public class ComboBoxModel extends TagModel {
public ComboBoxModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ComboBoxModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.GenericUIBean;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ComponentModel
*/
public class ComponentModel extends TagModel {
public ComponentModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ComponentModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
+2 -2
View File
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* <code>DateModel</code>
@@ -31,7 +31,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack;
*/
public class DateModel extends TagModel {
public DateModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public DateModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.DatePicker;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see DatePicker
*/
public class DatePickerModel extends TextFieldModel {
public DatePickerModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public DatePickerModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Div;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Div
*/
public class DivModel extends TagModel {
public DivModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public DivModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.DoubleSelect;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see DoubleSelect
*/
public class DoubleSelectModel extends TagModel {
public DoubleSelectModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public DoubleSelectModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
+2 -2
View File
@@ -23,14 +23,14 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.ElseIf;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @version $Date$ $Id$
*/
public class ElseIfModel extends TagModel {
public ElseIfModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ElseIfModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java
+2 -2
View File
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Else;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
*
@@ -31,7 +31,7 @@ import com.opensymphony.xwork2.util.OgnlValueStack;
*/
public class ElseModel extends TagModel {
public ElseModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public ElseModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
+2 -2
View File
@@ -23,13 +23,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
/**
* @see FieldError
*/
public class FieldErrorModel extends TagModel {
public FieldErrorModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
public FieldErrorModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}

Some files were not shown because too many files have changed in this diff Show More