You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/09/30 07:38:10 UTC
svn commit: r451544 [3/5] - in /struts/struts2/trunk:
apps/showcase/src/main/java/org/apache/struts2/showcase/ core/
core/src/main/java/org/apache/struts2/
core/src/main/java/org/apache/struts2/components/
core/src/main/java/org/apache/struts2/componen...
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Set
*/
public class SetModel extends TagModel {
- public SetModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public SetModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java Fri Sep 29 22:38:02 2006
@@ -20,14 +20,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* Provides @s.tag access for various tags.
*
*/
public class StrutsModels {
- protected OgnlValueStack stack;
+ protected ValueStack stack;
protected HttpServletRequest req;
protected HttpServletResponse res;
@@ -80,7 +81,7 @@
protected TimePickerModel timePickerModel;
- public StrutsModels(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public StrutsModels(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
this.stack = stack;
this.req = req;
this.res = res;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Submit
*/
public class SubmitModel extends TagModel {
- public SubmitModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public SubmitModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TabbedPanel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TabbedPanel
*/
public class TabbedPanelModel extends TagModel {
- public TabbedPanelModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TabbedPanelModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java Fri Sep 29 22:38:02 2006
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
import freemarker.template.SimpleNumber;
import freemarker.template.SimpleSequence;
@@ -40,11 +40,11 @@
public abstract class TagModel implements TemplateTransformModel {
private static final Log LOG = LogFactory.getLog(TagModel.class);
- protected OgnlValueStack stack;
+ protected ValueStack stack;
protected HttpServletRequest req;
protected HttpServletResponse res;
- public TagModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TagModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
this.stack = stack;
this.req = req;
this.res = res;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TextArea
*/
public class TextAreaModel extends TagModel {
- public TextAreaModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TextAreaModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TextField
*/
public class TextFieldModel extends TagModel {
- public TextFieldModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TextFieldModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Text
*/
public class TextModel extends TagModel {
- public TextModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TextModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TimePickerModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TimePickerModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TimePickerModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TimePickerModel.java Fri Sep 29 22:38:02 2006
@@ -6,11 +6,11 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TimePicker;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
public class TimePickerModel extends TagModel {
- public TimePickerModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TimePickerModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Token
*/
public class TokenModel extends TagModel {
- public TokenModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TokenModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Tree;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* TreeModel
@@ -31,7 +31,7 @@
*
*/
public class TreeModel extends TagModel {
- public TreeModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TreeModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java Fri Sep 29 22:38:02 2006
@@ -23,14 +23,14 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TreeNode;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* TreeNodeModel
* @see TreeNode
*/
public class TreeNodeModel extends TagModel {
- public TreeNodeModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public TreeNodeModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see URL
*/
public class URLModel extends TagModel {
- public URLModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public URLModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see UpDownSelect
@@ -31,7 +31,7 @@
*/
public class UpDownSelectModel extends TagModel {
- public UpDownSelectModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public UpDownSelectModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.table.WebTable;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see WebTable
*/
public class WebTableModel extends TagModel {
- public WebTableModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public WebTableModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
super(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -37,7 +37,7 @@
protected boolean executeResult;
protected boolean ignoreContextParams;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ActionComponent(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java Fri Sep 29 22:38:02 2006
@@ -25,7 +25,7 @@
import org.apache.struts2.components.Bean;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -39,7 +39,7 @@
protected String name;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Bean(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java Fri Sep 29 22:38:02 2006
@@ -23,14 +23,14 @@
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
*/
public abstract class ComponentTagSupport extends StrutsBodyTagSupport {
protected Component component;
- public abstract Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res);
+ public abstract Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res);
public int doEndTag() throws JspException {
component.end(pageContext.getOut(), getBody());
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Date
@@ -36,7 +36,7 @@
protected String format;
protected boolean nice;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Date(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.ElseIf;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see ElseIf
@@ -34,7 +34,7 @@
protected String test;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ElseIf(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Else;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 8166807953193406785L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Else(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String name;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new I18n(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.If;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
String test;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new If(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String value;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Include(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.IteratorComponent;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see IteratorComponent
@@ -36,7 +36,7 @@
protected String statusAttr;
protected String value;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new IteratorComponent(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Param
@@ -35,7 +35,7 @@
protected String name;
protected String value;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Param(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -37,7 +37,7 @@
private String value;
private boolean escape = true;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Property(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String value;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Push(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -37,7 +37,7 @@
protected String scope;
protected String value;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Set(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,8 @@
import org.apache.struts2.util.FastByteArrayOutputStream;
import org.apache.struts2.views.util.ContextUtil;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -47,7 +48,7 @@
return ContextUtil.isUseAltSyntax(getStack().getContext());
}
- protected OgnlValueStack getStack() {
+ protected ValueStack getStack() {
return TagUtils.getStack(pageContext);
}
@@ -98,7 +99,7 @@
}
}
- public static String translateVariables(String expression, OgnlValueStack stack) {
+ public static String translateVariables(String expression, ValueStack stack) {
while (true) {
int x = expression.indexOf("%{");
int y = expression.indexOf("}", x);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java Fri Sep 29 22:38:02 2006
@@ -36,19 +36,21 @@
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;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*/
public class TagUtils {
- public static OgnlValueStack getStack(PageContext pageContext) {
+ public static ValueStack getStack(PageContext pageContext) {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
- OgnlValueStack stack = (OgnlValueStack) req.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
+ ValueStack stack = (ValueStack) req.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
if (stack == null) {
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
HttpServletResponse res = (HttpServletResponse) pageContext.getResponse();
Dispatcher du = Dispatcher.getInstance();
@@ -77,7 +79,7 @@
return stack;
}
- public static String buildNamespace(OgnlValueStack stack, HttpServletRequest request) {
+ public static String buildNamespace(ValueStack stack, HttpServletRequest request) {
ActionContext context = new ActionContext(stack.getContext());
ActionInvocation invocation = context.getActionInvocation();
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String name;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Text(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -46,7 +46,7 @@
protected String portletUrlType;
protected String anchor;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new URL(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -37,7 +37,7 @@
private static final long serialVersionUID = -6017337859763283691L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new AppendIterator(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,7 @@
import org.apache.struts2.components.MergeIterator;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 4999729472466011218L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new MergeIterator(stack);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.ActionError;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* ActionError Tag.
@@ -33,7 +33,7 @@
private static final long serialVersionUID = -3710234378022378639L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ActionError(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.ActionMessage;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* ActionMessage Tag.
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 243396927554182506L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ActionMessage(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -39,7 +39,7 @@
protected String afterLoading;
protected String preInvokeJS;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Anchor(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 4023034029558150010L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new CheckboxList(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Checkbox;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String fieldValue;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Checkbox(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -59,7 +59,7 @@
this.listValue = listValue;
}
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ComboBox(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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 GenericUIBean
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 5448365363044104731L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new GenericUIBean(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -38,7 +38,7 @@
protected String templateCssPath;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new DatePicker(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java Fri Sep 29 22:38:02 2006
@@ -6,13 +6,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Debug;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
public class DebugTag extends AbstractUITag {
private static final long serialVersionUID = 3487684841317160628L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Debug(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
public class DivTag extends AbstractClosingTag {
@@ -38,7 +38,7 @@
protected String listenTopics;
protected String afterLoading;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Div(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 7426011596359509386L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new DoubleSelect(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* FieldError Tag.
@@ -32,7 +32,7 @@
private static final long serialVersionUID = -182532967507726323L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new FieldError(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -36,7 +36,7 @@
protected String accept;
protected String size;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new File(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -44,7 +44,7 @@
protected String windowState;
protected String acceptcharset;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Form(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Head
@@ -35,7 +35,7 @@
private String calendarcss;
private String debug;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Head(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = -1124367972048371675L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Hidden(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String forAttr;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Label(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,7 @@
import org.apache.struts2.components.OptGroup;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
*
@@ -39,7 +39,7 @@
protected String listKey;
protected String listValue;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new OptGroup(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* OptionTransferSelect jsp tag.
@@ -57,7 +57,7 @@
protected String rightDownLabel;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new OptionTransferSelect(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Panel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Panel
@@ -36,7 +36,7 @@
protected String subscribeTopicName;
protected String remote;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Panel(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -35,7 +35,7 @@
protected String showPassword;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Password(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = -6497403399521333624L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Radio(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see org.apache.struts2.components.Reset
@@ -37,7 +37,7 @@
protected String align;
protected String type;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Reset(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -39,7 +39,7 @@
protected String multiple;
protected String size;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Select(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Submit
@@ -43,7 +43,7 @@
protected String type;
protected String src;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Submit(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java Fri Sep 29 22:38:02 2006
@@ -26,7 +26,7 @@
import org.apache.struts2.components.Panel;
import org.apache.struts2.components.TabbedPanel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TabbedPanel
@@ -35,7 +35,7 @@
private static final long serialVersionUID = -4719930205515386252L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new TabbedPanel(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TextField
@@ -36,7 +36,7 @@
protected String readonly;
protected String size;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new TextField(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -38,7 +38,7 @@
protected String rows;
protected String wrap;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new TextArea(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TimePicker;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @version $Date$ $Id$
@@ -37,7 +37,7 @@
protected String templatePath;
protected String templateCssPath;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new TimePicker(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 722480798151703457L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Token(stack, req, res);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TreeNode;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see TreeNode
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 7340746943017900803L;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new TreeNode(stack,req,res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Tree;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Tree
@@ -58,7 +58,7 @@
private String templateCssPath;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Tree(stack,req,res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see UpDownSelect
@@ -41,7 +41,7 @@
protected String selectAllLabel;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new UpDownSelect(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java Fri Sep 29 22:38:02 2006
@@ -24,7 +24,7 @@
import org.apache.struts2.components.table.WebTable;
import org.apache.struts2.views.jsp.ui.ComponentTag;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -39,7 +39,7 @@
protected boolean sortable;
protected int sortColumn;
- public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new WebTable(stack, req, res);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java Fri Sep 29 22:38:02 2006
@@ -30,7 +30,8 @@
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;
/**
* Value Stack's Context related Utilities.
@@ -48,7 +49,7 @@
public static final String STRUTS = "struts";
public static final String ACTION = "action";
- public static Map getStandardContext(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public static Map getStandardContext(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
HashMap map = new HashMap();
map.put(REQUEST, req);
map.put(REQUEST2, req);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java Fri Sep 29 22:38:02 2006
@@ -35,8 +35,8 @@
import org.apache.struts2.config.Settings;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.XWorkContinuationConfig;
@@ -265,7 +265,7 @@
}
private static String translateVariable(String input) {
- OgnlValueStack valueStack = ServletActionContext.getContext().getValueStack();
+ ValueStack valueStack = ServletActionContext.getContext().getValueStack();
String output = TextParseUtil.translateVariables(input, valueStack);
return output;
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java Fri Sep 29 22:38:02 2006
@@ -19,7 +19,7 @@
import org.apache.velocity.VelocityContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -27,15 +27,15 @@
public class StrutsVelocityContext extends VelocityContext {
private static final long serialVersionUID = 8497212428904436963L;
- OgnlValueStack stack;
+ ValueStack stack;
VelocityContext[] chainedContexts;
- public StrutsVelocityContext(OgnlValueStack stack) {
+ public StrutsVelocityContext(ValueStack stack) {
this(null, stack);
}
- public StrutsVelocityContext(VelocityContext[] chainedContexts, OgnlValueStack stack) {
+ public StrutsVelocityContext(VelocityContext[] chainedContexts, ValueStack stack) {
this.chainedContexts = chainedContexts;
this.stack = stack;
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java Fri Sep 29 22:38:02 2006
@@ -92,7 +92,8 @@
import org.apache.velocity.tools.view.servlet.ServletToolboxManager;
import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -177,7 +178,7 @@
* <ul>
* <li><strong>request</strong> - the current HttpServletRequest</li>
* <li><strong>response</strong> - the current HttpServletResponse</li>
- * <li><strong>stack</strong> - the current {@link OgnlValueStack}</li>
+ * <li><strong>stack</strong> - the current {@link ValueStack}</li>
* <li><strong>ognl</strong> - an {@link OgnlTool}</li>
* <li><strong>struts</strong> - an instance of {@link org.apache.struts2.util.StrutsUtil}</li>
* <li><strong>action</strong> - the current Struts action</li>
@@ -185,7 +186,7 @@
*
* @return a new StrutsVelocityContext
*/
- public Context createContext(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ public Context createContext(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
VelocityContext[] chainedContexts = prepareChainedContexts(req, res, stack.getContext());
StrutsVelocityContext context = new StrutsVelocityContext(chainedContexts, stack);
Map standardMap = ContextUtil.getStandardContext(stack, req, res);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java Fri Sep 29 22:38:02 2006
@@ -34,7 +34,7 @@
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.node.Node;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
public abstract class AbstractDirective extends Directive {
public String getName() {
@@ -50,11 +50,11 @@
return LINE;
}
- protected abstract Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res);
+ protected abstract Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res);
public boolean render(InternalContextAdapter ctx, Writer writer, Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException {
// get the bean
- OgnlValueStack stack = (OgnlValueStack) ctx.get("stack");
+ ValueStack stack = (ValueStack) ctx.get("stack");
HttpServletRequest req = (HttpServletRequest) stack.getContext().get(ServletActionContext.HTTP_REQUEST);
HttpServletResponse res = (HttpServletResponse) stack.getContext().get(ServletActionContext.HTTP_RESPONSE);
Component bean = getBean(stack, req, res);
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -33,7 +33,7 @@
return "action";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new ActionComponent(stack, req, res);
}
}