Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java?view=diff&rev=451544&r1=451543&r2=451544 ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.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; /** @@ -37,7 +38,7 @@ public class PropertyTagTest extends StrutsTestCase { StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest(); - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); public void testDefaultValue() {
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?view=diff&rev=451544&r1=451543&r2=451544 ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Fri Sep 29 22:38:02 2006 @@ -36,7 +36,9 @@ import com.mockobjects.servlet.MockJspWriter; 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.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; /** @@ -168,7 +170,7 @@ assertEquals(value1, writer.toString()); final StringBuffer buffer = writer.getBuffer(); buffer.delete(0, buffer.length()); - OgnlValueStack newStack = new OgnlValueStack(); + ValueStack newStack = ValueStackFactory.getFactory().createValueStack(); newStack.getContext().put(ActionContext.LOCALE, foreignLocale); newStack.push(new TestAction1()); request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack); @@ -199,7 +201,7 @@ buffer.delete(0, buffer.length()); String value_int = getLocalizedMessage(foreignLocale); assertFalse(value_default.equals(value_int)); - OgnlValueStack newStack = new OgnlValueStack(stack); + ValueStack newStack = ValueStackFactory.getFactory().createValueStack(stack); newStack.getContext().put(ActionContext.LOCALE, foreignLocale); assertNotSame(newStack.getContext().get(ActionContext.LOCALE), ActionContext.getContext().getLocale()); request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack); @@ -271,7 +273,7 @@ } protected void tearDown() throws Exception { - OgnlValueStack valueStack = new OgnlValueStack(); + ValueStack valueStack = ValueStackFactory.getFactory().createValueStack(); ActionContext.setContext(new ActionContext(valueStack.getContext())); } } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?view=diff&rev=451544&r1=451543&r2=451544 ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Fri Sep 29 22:38:02 2006 @@ -22,7 +22,9 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.Settings; -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 ContextUtil @@ -31,7 +33,7 @@ public class ContextUtilTest extends TestCase { public void testAltSyntaxMethod1() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", "true"); Settings.reset(); @@ -42,7 +44,7 @@ } public void testAltSyntaxMethod2() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", "false"); Settings.reset(); @@ -53,7 +55,7 @@ } public void testAltSyntaxMethod3() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", "true"); Settings.reset(); @@ -64,7 +66,7 @@ } public void testAltSyntaxMethod4() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", "false"); Settings.reset(); @@ -77,7 +79,7 @@ //======================================================== public void testAltSyntaxMethod5() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", Boolean.TRUE); Settings.reset(); @@ -87,7 +89,7 @@ assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod6() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", Boolean.FALSE); Settings.reset(); @@ -97,7 +99,7 @@ assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod7() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", Boolean.TRUE); Settings.reset(); @@ -107,7 +109,7 @@ assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod8() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", Boolean.FALSE); Settings.reset(); @@ -119,7 +121,7 @@ // ========================================== public void testAltSyntaxMethod9() throws Exception { - OgnlValueStack stack = new OgnlValueStack(); + ValueStack stack = ValueStackFactory.getFactory().createValueStack(); stack.getContext().put("useAltSyntax", null); Settings.reset(); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?view=diff&rev=451544&r1=451543&r2=451544 ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java Fri Sep 29 22:38:02 2006 @@ -32,7 +32,8 @@ 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; +import com.opensymphony.xwork2.util.ValueStackFactory; /** * Unit test for [EMAIL PROTECTED] XSLTResult}. @@ -45,7 +46,7 @@ private MockHttpServletRequest request; private MockServletContext servletContext; private MockActionInvocation mai; - private OgnlValueStack stack; + private ValueStack stack; public void testNoLocation() throws Exception { try { @@ -119,7 +120,7 @@ servletContext = new MockServletContext(new DefaultResourceLoader()); result = new XSLTResult(); - stack = new OgnlValueStack(); + stack = ValueStackFactory.getFactory().createValueStack(); ActionContext.getContext().setValueStack(stack); MyAction action = new MyAction(); Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?view=diff&rev=451544&r1=451543&r2=451544 ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java (original) +++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Fri Sep 29 22:38:02 2006 @@ -45,7 +45,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.StrutsResultSupport; import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; /** * <!-- START SNIPPET: description --> @@ -64,11 +64,11 @@ * <li><b>location (default)</b> - the location where the compiled jasper report * definition is (foo.jasper), relative from current URL.</li> * - * <li><b>dataSource (required)</b> - the Ognl expression used to retrieve the + * <li><b>dataSource (required)</b> - the EL expression used to retrieve the * datasource from the value stack (usually a List).</li> * * <li><b>parse</b> - true by default. If set to false, the location param will - * not be parsed for Ognl expressions.</li> + * not be parsed for EL expressions.</li> * * <li><b>format</b> - the format in which the report should be generated. Valid * values can be found in [EMAIL PROTECTED] JasperReportConstants}. If no format is @@ -176,8 +176,8 @@ HttpServletResponse response = (HttpServletResponse) invocation.getInvocationContext().get(ServletActionContext.HTTP_RESPONSE); //construct the data source for the report - OgnlValueStack stack = invocation.getStack(); - OgnlValueStackDataSource stackDataSource = new OgnlValueStackDataSource(stack, dataSource); + ValueStack stack = invocation.getStack(); + ValueStackDataSource stackDataSource = new ValueStackDataSource(stack, dataSource); format = conditionalParse(format, invocation); dataSource = conditionalParse(dataSource, invocation); @@ -201,7 +201,7 @@ // ServletContext servletContext = ((ServletConfig) invocation.getInvocationContext().get(ServletActionContext.SERVLET_CONFIG)).getServletContext(); ServletContext servletContext = (ServletContext) invocation.getInvocationContext().get(ServletActionContext.SERVLET_CONTEXT); String systemId = servletContext.getRealPath(finalLocation); - Map parameters = new OgnlValueStackShadowMap(stack); + Map parameters = new ValueStackShadowMap(stack); File directory = new File(systemId.substring(0, systemId.lastIndexOf(File.separator))); parameters.put("reportDirectory", directory); parameters.put(JRParameter.REPORT_LOCALE, invocation.getInvocationContext().getLocale()); Copied: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java (from r451541, struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java?view=diff&rev=451544&p1=struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java&r1=451541&p2=struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java&r2=451544 ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java (original) +++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java Fri Sep 29 22:38:02 2006 @@ -18,7 +18,7 @@ package org.apache.struts2.views.jasperreports; import org.apache.struts2.util.MakeIterator; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRField; @@ -31,16 +31,16 @@ * Ported to Struts. * */ -public class OgnlValueStackDataSource implements JRDataSource { +public class ValueStackDataSource implements JRDataSource { /** * Logger for this class */ - private static Log log = LogFactory.getLog(OgnlValueStackDataSource.class); + private static Log log = LogFactory.getLog(ValueStackDataSource.class); Iterator iterator; - OgnlValueStack valueStack; + ValueStack valueStack; boolean firstTimeThrough = true; @@ -50,7 +50,7 @@ * @param valueStack The value stack to base the data source on * @param dataSource The property to iterate over for the report */ - public OgnlValueStackDataSource(OgnlValueStack valueStack, String dataSource) { + public ValueStackDataSource(ValueStack valueStack, String dataSource) { this.valueStack = valueStack; Object dataSourceValue = valueStack.findValue(dataSource); @@ -76,12 +76,12 @@ * of the field is either taken from the description property or from the name of the field * if the description is <code>null</code>. * @return an <code>Object</code> containing the field value or a new - * <code>OgnlValueStackDataSource</code> object if the field value evaluates to + * <code>ValueStackDataSource</code> object if the field value evaluates to * an object that can be iterated over. * @throws JRException if there is a problem obtaining the value */ public Object getFieldValue(JRField field) throws JRException { - //TODO: move the code to return a OgnlValueStackDataSource to a seperate + //TODO: move the code to return a ValueStackDataSource to a seperate // method when and if the JRDataSource interface is updated to support // this. String expression = field.getDescription(); @@ -98,8 +98,8 @@ } if (MakeIterator.isIterable(value)) { - // return new OgnlValueStackDataSource(this.valueStack, field.getName()); - return new OgnlValueStackDataSource(this.valueStack, expression); + // return new ValueStackDataSource(this.valueStack, field.getName()); + return new ValueStackDataSource(this.valueStack, expression); } else { return value; } Copied: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java (from r451541, struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java?view=diff&rev=451544&p1=struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java&r1=451541&p2=struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java&r2=451544 ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java (original) +++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java Fri Sep 29 22:38:02 2006 @@ -17,7 +17,7 @@ */ package org.apache.struts2.views.jasperreports; -import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import java.util.HashMap; import java.util.Set; @@ -27,14 +27,14 @@ * Ported to Struts: * */ -public class OgnlValueStackShadowMap extends HashMap { +public class ValueStackShadowMap extends HashMap { private static final long serialVersionUID = -167109778490907240L; /** * valueStack reference */ - OgnlValueStack valueStack; + ValueStack valueStack; /** * entries reference @@ -43,11 +43,11 @@ /** - * Constructs an instance of OgnlValueStackShadowMap. + * Constructs an instance of ValueStackShadowMap. * * @param valueStack - the underlying valuestack */ - public OgnlValueStackShadowMap(OgnlValueStack valueStack) { + public ValueStackShadowMap(ValueStack valueStack) { this.valueStack = valueStack; }
