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 [4/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/velocity/components/ActionErrorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.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;
/**
* @see ActionError
@@ -33,7 +33,7 @@
return "actionerror";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/ActionMessageDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.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;
/**
* @see ActionMessage
@@ -33,7 +33,7 @@
return "actionmessage";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.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
@@ -33,7 +33,7 @@
return "a";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/BeanDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,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;
/**
* @see Bean
@@ -33,7 +33,7 @@
return "bean";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Bean(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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 CheckBoxDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/CheckBoxListDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see CheckboxList
*/
public class CheckBoxListDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/ComboBoxDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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 ComboBoxDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/ComponentDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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
*/
public class ComponentDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/DateDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.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;
/**
* <code>DateDirective</code>
@@ -34,7 +34,7 @@
return "date";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Date(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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 DatePickerDirective extends TextFieldDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.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;
/**
* @see Div
@@ -33,7 +33,7 @@
return "div";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/DoubleSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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 DoubleSelectDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/FieldErrorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.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;
/**
* @see FieldError
@@ -33,7 +33,7 @@
return "fielderror";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/FileDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see File
*/
public class FileDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/FormDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Form
*/
public class FormDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/HeadDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
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
*/
public class HeadDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/HiddenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java Fri Sep 29 22:38:02 2006
@@ -23,13 +23,13 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* @see Hidden
*/
public class HiddenDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/I18nDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.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;
/**
* @see I18n
@@ -33,7 +33,7 @@
return "i18n";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new I18n(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.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;
/**
* @see Include
@@ -33,7 +33,7 @@
return "include";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/LabelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.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;
/**
* @see Label
@@ -33,7 +33,7 @@
return "label";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/OptGroupDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -31,7 +31,7 @@
*/
public class OptGroupDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/OptionTransferSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.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;
/**
* @see OptionTransferSelect
@@ -34,7 +34,7 @@
return "optiontransferselect";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/PanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.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
@@ -33,7 +33,7 @@
return "panel";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/ParamDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.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
@@ -33,7 +33,7 @@
return "param";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Param(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.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;
/**
* @see Password
@@ -33,7 +33,7 @@
return "password";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/PropertyDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.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;
/**
*/
@@ -32,7 +32,7 @@
return "property";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Property(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.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;
/**
* @see Push
@@ -33,7 +33,7 @@
return "push";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Push(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.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;
/**
* @see Radio
@@ -33,7 +33,7 @@
return "radio";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/ResetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.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
@@ -33,7 +33,7 @@
return "reset";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/SelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.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;
/**
* @see Select
@@ -33,7 +33,7 @@
return "select";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/SetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.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;
/**
* @see Set
@@ -33,7 +33,7 @@
return "set";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Set(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.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
@@ -33,7 +33,7 @@
return "submit";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TabbedPanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -33,7 +33,7 @@
return "tabbedpanel";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TextAreaDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.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;
/**
* @see TextArea
@@ -33,7 +33,7 @@
return "textarea";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TextDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.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;
/**
* @see Text
@@ -33,7 +33,7 @@
return "text";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Text(stack);
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.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 TextFieldDirective extends AbstractDirective {
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TokenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.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;
/**
* @see Token
@@ -33,7 +33,7 @@
return "token";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TreeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.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;
/**
* <code>TreeDirective</code>
@@ -34,7 +34,7 @@
return "tree";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/TreeNodeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.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;
/**
* <code>TreeNodeDirective</code>
@@ -34,7 +34,7 @@
return "treenode";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/URLDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.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;
/**
* @see URL
@@ -33,7 +33,7 @@
return "url";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/UpDownSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.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
@@ -35,7 +35,7 @@
return "updownselect";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/velocity/components/WebTableDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java Fri Sep 29 22:38:02 2006
@@ -23,7 +23,7 @@
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
@@ -33,7 +33,7 @@
return "table";
}
- protected Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+ protected 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/xslt/XSLTResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java Fri Sep 29 22:38:02 2006
@@ -44,8 +44,8 @@
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;
/**
@@ -234,7 +234,7 @@
String location = getStylesheetLocation();
if (parse) {
- OgnlValueStack stack = ActionContext.getContext().getValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
location = TextParseUtil.translateVariables(location, stack);
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java Fri Sep 29 22:38:02 2006
@@ -28,7 +28,7 @@
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;
/**
@@ -76,7 +76,7 @@
if ((expectedValues != null) && (expectedValues.size() > 0) && (propertyNames != null) && (propertyNames.size() > 0))
{
- OgnlValueStack stack = ActionContext.getContext().getValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
for (int i = 0; i < propertyNames.size(); i++) {
String propertyName = (String) propertyNames.get(i);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java Fri Sep 29 22:38:02 2006
@@ -21,7 +21,8 @@
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*
@@ -32,7 +33,7 @@
public void testPopulateComponentHtmlId1() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Form form = new Form(stack, req, res);
form.getParameters().put("id", "formId");
@@ -48,7 +49,7 @@
public void testPopulateComponentHtmlId2() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Form form = new Form(stack, req, res);
form.getParameters().put("id", "formId");
@@ -64,7 +65,7 @@
public void testPopulateComponentHtmlId3() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Form form = new Form(stack, req, res);
form.getParameters().put("id", "formId");
@@ -81,7 +82,7 @@
public void testPopulateComponentHtmlId4() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Submit submit = new Submit(stack, req, res);
submit.setId("submitId");
@@ -94,7 +95,7 @@
public void testPopulateComponentHtmlId5() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Submit submit = new Submit(stack, req, res);
submit.setName("submitName");
@@ -107,7 +108,7 @@
public void testPopulateComponentHtmlId6() throws Exception {
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Submit submit = new Submit(stack, req, res);
submit.setAction("submitAction");
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java Fri Sep 29 22:38:02 2006
@@ -25,7 +25,8 @@
import org.apache.struts2.util.StrutsTypeConverter;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.XWorkConverter;
/**
@@ -33,7 +34,7 @@
*/
public class PropertyTest extends TestCase {
public void testNormalBehaviour() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new FooBar("foo-value", "bar-value"));
final Property property = new Property(stack);
property.setDefault("default");
@@ -42,7 +43,7 @@
}
public void testDefaultShouldBeOutputIfBeanNotAvailable() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
final Property property = new Property(stack);
property.setDefault("default");
property.setValue("foo");
@@ -50,7 +51,7 @@
}
public void testDefaultShouldBeOutputIfPropertyIsNull() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new FooBar(null, "bar-value"));
final Property property = new Property(stack);
property.setDefault("default");
@@ -59,7 +60,7 @@
}
public void testTopValueShouldReturnTopOfValueStack() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new FooBar("foo-value", "bar-value"));
final Property property = new Property(stack);
property.setDefault("default");
@@ -68,7 +69,7 @@
}
public void testTypeConverterShouldBeUsed() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Ognl.setTypeConverter(stack.getContext(), new TestDefaultConverter());
stack.push(new FooBar("foo-value", "bar-value"));
@@ -79,7 +80,7 @@
}
public void testTypeConverterReturningNullShouldLeadToDisplayOfDefaultValue() {
- final OgnlValueStack stack = new OgnlValueStack();
+ final ValueStack stack = ValueStackFactory.getFactory().createValueStack();
Ognl.setTypeConverter(stack.getContext(), new TestDefaultConverter());
stack.push(new FooBar("foo-value", null));
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIBeanTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIBeanTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIBeanTest.java Fri Sep 29 22:38:02 2006
@@ -21,7 +21,8 @@
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*
@@ -30,7 +31,7 @@
public class UIBeanTest extends StrutsTestCase {
public void testPopulateComponentHtmlId1() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
@@ -46,7 +47,7 @@
}
public void testPopulateComponentHtmlId2() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
MockHttpServletRequest req = new MockHttpServletRequest();
MockHttpServletResponse res = new MockHttpServletResponse();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java Fri Sep 29 22:38:02 2006
@@ -29,9 +29,10 @@
import org.apache.struts2.views.jsp.StrutsMockServletContext;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* Test case for PlainTextResult.
@@ -39,7 +40,7 @@
*/
public class PlainTextResultTest extends TestCase {
- OgnlValueStack stack;
+ ValueStack stack;
MockActionInvocation invocation;
ActionContext context;
StrutsMockHttpServletResponse response;
@@ -129,7 +130,7 @@
response = new StrutsMockHttpServletResponse();
response.setWriter(writer);
servletContext = new StrutsMockServletContext();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
context = new ActionContext(stack.getContext());
context.put(StrutsStatics.HTTP_RESPONSE, response);
context.put(StrutsStatics.SERVLET_CONTEXT, servletContext);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java Fri Sep 29 22:38:02 2006
@@ -32,7 +32,8 @@
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -57,7 +58,7 @@
ActionContext context = ActionContext.getContext();
- OgnlValueStack stack = context.getValueStack();
+ ValueStack stack = context.getValueStack();
context.getContextMap().put("value1", "value 1");
context.getContextMap().put("value2", "value 2");
context.getContextMap().put("value3", "value 3");
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java Fri Sep 29 22:38:02 2006
@@ -37,7 +37,8 @@
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -119,6 +120,6 @@
MockActionInvocation ai = new MockActionInvocation();
ai.setInvocationContext(ac);
this.ai = ai;
- ai.setStack(new OgnlValueStack());
+ ai.setStack(ValueStackFactory.getFactory().createValueStack());
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java Fri Sep 29 22:38:02 2006
@@ -29,10 +29,11 @@
import org.springframework.mock.web.MockHttpServletResponse;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* Unit test for {@link StreamResult}.
@@ -44,7 +45,7 @@
private MockHttpServletResponse response;
private MockActionInvocation mai;
- private OgnlValueStack stack;
+ private ValueStack stack;
private int contentLength = 0;
public void testStreamResultNoInputName() throws Exception {
@@ -165,7 +166,7 @@
response = new MockHttpServletResponse();
result = new StreamResult();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
ActionContext.getContext().setValueStack(stack);
MyImageAction action = new MyImageAction();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java Fri Sep 29 22:38:02 2006
@@ -22,7 +22,9 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
* Test case for StrutsResultSupport.
@@ -31,7 +33,7 @@
public void testParse() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new ActionSupport() {
public String getMyLocation() {
return "ThisIsMyLocation";
@@ -56,7 +58,7 @@
}
public void testParseAndEncode() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new ActionSupport() {
public String getMyLocation() {
return "/myPage?param=value¶m1=value1";
@@ -82,7 +84,7 @@
public void testNoParseAndEncode() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.push(new ActionSupport() {
public String getMyLocation() {
return "myLocation.jsp";
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java Fri Sep 29 22:38:02 2006
@@ -28,7 +28,9 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -38,7 +40,7 @@
ActionInvocation actionInvocation;
Mock mockActionProxy;
- OgnlValueStack stack;
+ ValueStack stack;
String namespace;
TestVelocityEngine velocity;
VelocityResult result;
@@ -51,7 +53,7 @@
Bean bean = new Bean();
bean.setLocation(location);
- OgnlValueStack stack = ActionContext.getContext().getValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.push(bean);
assertEquals(location, stack.findValue("location"));
@@ -89,7 +91,7 @@
protected void setUp() throws Exception {
namespace = "/html";
result = new VelocityResult();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
ActionContext.getContext().setValueStack(stack);
velocity = new TestVelocityEngine();
mockActionProxy = new Mock(ActionProxy.class);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java Fri Sep 29 22:38:02 2006
@@ -28,7 +28,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -41,7 +42,7 @@
protected ActionInvocation invocation;
protected Map conversionErrors;
protected Mock mockInvocation;
- protected OgnlValueStack stack;
+ protected ValueStack stack;
protected StrutsConversionErrorInterceptor interceptor;
@@ -82,7 +83,7 @@
interceptor = new StrutsConversionErrorInterceptor();
mockInvocation = new Mock(ActionInvocation.class);
invocation = (ActionInvocation) mockInvocation.proxy();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
context = new ActionContext(stack.getContext());
conversionErrors = new HashMap();
context.setConversionErrors(conversionErrors);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java Fri Sep 29 22:38:02 2006
@@ -34,7 +34,9 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -118,7 +120,7 @@
request.setParameterMap(params);
extraContext.put(ServletActionContext.HTTP_REQUEST, request);
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().putAll(extraContext);
oldContext = new ActionContext(stack.getContext());
ActionContext.setContext(oldContext);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Fri Sep 29 22:38:02 2006
@@ -49,7 +49,8 @@
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;
/**
* Jsr168DispatcherTest. Insert description.
@@ -89,7 +90,7 @@
}));
}
- private void setupActionFactory(String namespace, String actionName, String result, OgnlValueStack stack) {
+ private void setupActionFactory(String namespace, String actionName, String result, ValueStack stack) {
if(mockActionFactory == null) {
mockActionFactory = mock(ActionProxyFactory.class);
}
@@ -128,7 +129,7 @@
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), sessionMap, new HashMap(), PortletMode.VIEW, WindowState.NORMAL, false, null);
- setupActionFactory("/view", "testAction", "success", new OgnlValueStack());
+ setupActionFactory("/view", "testAction", "success", ValueStackFactory.getFactory().createValueStack());
mockInvocation.expects(once()).method("getStack").will(
returnValue(null));
@@ -159,7 +160,7 @@
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), new HashMap(), new HashMap(), PortletMode.VIEW, WindowState.NORMAL, true, null);
- setupActionFactory("/view", "testAction", "success", new OgnlValueStack());
+ setupActionFactory("/view", "testAction", "success", ValueStackFactory.getFactory().createValueStack());
Constraint[] paramConstraints = new Constraint[] {
eq(PortletActionConstants.EVENT_ACTION), same(mockActionProxy.proxy()) };
@@ -270,7 +271,7 @@
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), sessionMap, new HashMap(), mode, WindowState.NORMAL, false, null);
- setupActionFactory("/edit", "default", "success", new OgnlValueStack());
+ setupActionFactory("/edit", "default", "success", ValueStackFactory.getFactory().createValueStack());
mockInvocation.expects(once()).method("getStack").will(
returnValue(null));
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java Fri Sep 29 22:38:02 2006
@@ -32,7 +32,9 @@
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
* Test case for StrutsUtil.
@@ -40,7 +42,7 @@
*/
public class StrutsUtilTest extends StrutsTestCase {
- protected OgnlValueStack stack = null;
+ protected ValueStack stack = null;
protected InternalMockHttpServletRequest request = null;
protected MockHttpServletResponse response = null;
protected StrutsUtil strutsUtil = null;
@@ -191,7 +193,7 @@
protected void setUp() throws Exception {
super.setUp();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
request = new InternalMockHttpServletRequest();
response = new MockHttpServletResponse();
strutsUtil = new StrutsUtil(stack, request, response);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java Fri Sep 29 22:38:02 2006
@@ -26,7 +26,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -42,7 +43,7 @@
private ActionInvocation invocation;
private Map session;
private Mock invocationMock;
- private OgnlValueStack stack;
+ private ValueStack stack;
public void testStore() {
@@ -63,7 +64,7 @@
}
protected void setUp() throws Exception {
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
ActionContext actionContext = new ActionContext(stack.getContext());
ActionContext.setContext(actionContext);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java Fri Sep 29 22:38:02 2006
@@ -25,7 +25,9 @@
import org.apache.struts2.util.StrutsUtil;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import freemarker.ext.beans.CollectionModel;
import freemarker.template.ObjectWrapper;
@@ -75,7 +77,7 @@
protected void setUp() throws Exception {
super.setUp();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
ActionContext.setContext(new ActionContext(stack.getContext()));
testAction = new TestAction();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java Fri Sep 29 22:38:02 2006
@@ -35,7 +35,8 @@
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -46,7 +47,7 @@
protected Action action;
protected Map context;
protected Map session;
- protected OgnlValueStack stack;
+ protected ValueStack stack;
/**
* contains the buffer that our unit test will write to. we can later verify this buffer for correctness.
@@ -61,7 +62,7 @@
* Constructs the action that we're going to test against. For most UI tests, this default action should be enough.
* However, simply override getAction to return a custom Action if you need something more sophisticated.
*
- * @return the Action to be added to the OgnlValueStack as part of the unit test
+ * @return the Action to be added to the ValueStack as part of the unit test
*/
public Action getAction() {
return new TestAction();
@@ -74,7 +75,7 @@
* create our standard mock objects
*/
action = this.getAction();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
context = stack.getContext();
stack.push(action);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Fri Sep 29 22:38:02 2006
@@ -31,7 +31,9 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -249,7 +251,7 @@
protected void tearDown() throws Exception {
configurationManager.destroyConfiguration();
- OgnlValueStack stack = new OgnlValueStack();
+ ValueStack stack = ValueStackFactory.getFactory().createValueStack();
ActionContext.setContext(new ActionContext(stack.getContext()));
super.tearDown();
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java Fri Sep 29 22:38:02 2006
@@ -26,7 +26,9 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*
@@ -35,7 +37,7 @@
protected MockPageContext pageContext;
protected MockJspWriter jspWriter;
- protected OgnlValueStack stack;
+ protected ValueStack stack;
public void testIfIsFalseElseIfIsTrue() throws Exception {
@@ -92,7 +94,7 @@
protected void setUp() throws Exception {
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
jspWriter = new MockJspWriter();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java Fri Sep 29 22:38:02 2006
@@ -26,7 +26,9 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -35,7 +37,7 @@
ElseTag elseTag;
MockPageContext pageContext;
- OgnlValueStack stack;
+ ValueStack stack;
public void testTestFalse() {
@@ -88,7 +90,7 @@
protected void setUp() throws Exception {
// create the needed objects
elseTag = new ElseTag();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
// create the mock http servlet request
StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java Fri Sep 29 22:38:02 2006
@@ -27,7 +27,8 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
@@ -36,7 +37,7 @@
IfTag tag;
MockPageContext pageContext;
- OgnlValueStack stack;
+ ValueStack stack;
public void testNonBooleanTest() {
@@ -318,7 +319,7 @@
protected void setUp() throws Exception {
// create the needed objects
tag = new IfTag();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
// create the mock http servlet request
StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?view=diff&rev=451544&r1=451543&r2=451544
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Fri Sep 29 22:38:02 2006
@@ -46,7 +46,8 @@
import com.mockobjects.servlet.MockJspWriter;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*/
@@ -68,7 +69,7 @@
MockJspWriter mockJspWriter = null;
- OgnlValueStack stack = null;
+ ValueStack stack = null;
public static void main(String[] args) {
TestRunner.run(PortletUrlTagTest.class);
@@ -82,7 +83,7 @@
mockPortletApiAvailable();
- stack = new OgnlValueStack();
+ stack = ValueStackFactory.getFactory().createValueStack();
mockHttpReq = mock(HttpServletRequest.class);