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 2007/09/20 14:51:45 UTC
svn commit: r577728 [2/2] - in /struts/struts2/trunk:
apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/
apps/showcase/src/main/resources/ core/src/main/java/org/apache/struts2/
core/src/main/java/org/apache/struts2/components/ core/sr...
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -27,6 +27,7 @@
import junit.framework.TestCase;
import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
@@ -41,7 +42,7 @@
* Test case for PlainTextResult.
*
*/
-public class PlainTextResultTest extends TestCase {
+public class PlainTextResultTest extends StrutsTestCase {
ValueStack stack;
MockActionInvocation invocation;
@@ -133,7 +134,7 @@
response = new StrutsMockHttpServletResponse();
response.setWriter(writer);
servletContext = new StrutsMockServletContext();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
context = new ActionContext(stack.getContext());
context.put(StrutsStatics.HTTP_RESPONSE, response);
context.put(StrutsStatics.SERVLET_CONTEXT, servletContext);
@@ -144,6 +145,7 @@
protected void tearDown() throws Exception {
+ super.tearDown();
stack = null;
invocation = null;
context = null;
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -132,6 +132,6 @@
MockActionInvocation ai = new MockActionInvocation();
ai.setInvocationContext(ac);
this.ai = ai;
- ai.setStack(ValueStackFactory.getFactory().createValueStack());
+ ai.setStack(ActionContext.getContext().getValueStack());
}
}
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
import org.springframework.mock.web.MockHttpServletResponse;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
@@ -42,7 +43,7 @@
* Unit test for {@link StreamResult}.
*
*/
-public class StreamResultTest extends TestCase {
+public class StreamResultTest extends StrutsTestCase {
private StreamResult result;
private MockHttpServletResponse response;
@@ -166,11 +167,11 @@
}
protected void setUp() throws Exception {
+ super.setUp();
response = new MockHttpServletResponse();
result = new StreamResult();
- stack = ValueStackFactory.getFactory().createValueStack();
- ActionContext.getContext().setValueStack(stack);
+ stack = ActionContext.getContext().getValueStack();
MyImageAction action = new MyImageAction();
contentLength = (int) action.getContentLength();
@@ -186,7 +187,8 @@
- protected void tearDown() {
+ protected void tearDown() throws Exception {
+ super.tearDown();
response = null;
result = null;
stack = null;
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -23,6 +23,7 @@
import org.apache.struts2.StrutsTestCase;
import org.easymock.EasyMock;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.ValueStack;
@@ -35,7 +36,7 @@
public void testParse() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.push(new ActionSupport() {
public String getMyLocation() {
return "ThisIsMyLocation";
@@ -60,7 +61,7 @@
}
public void testParseAndEncode() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.push(new ActionSupport() {
public String getMyLocation() {
return "/myPage?param=value¶m1=value1";
@@ -86,7 +87,7 @@
public void testNoParseAndEncode() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
+import org.apache.struts2.StrutsTestCase;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ParseErrorException;
@@ -38,7 +39,7 @@
/**
*
*/
-public class VelocityResultTest extends TestCase {
+public class VelocityResultTest extends StrutsTestCase {
ActionInvocation actionInvocation;
Mock mockActionProxy;
@@ -91,9 +92,10 @@
}
protected void setUp() throws Exception {
+ super.setUp();
namespace = "/html";
result = new VelocityResult();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -86,7 +86,7 @@
interceptor = new StrutsConversionErrorInterceptor();
mockInvocation = new Mock(ActionInvocation.class);
invocation = (ActionInvocation) mockInvocation.proxy();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -121,7 +121,7 @@
request.setParameterMap(params);
extraContext.put(ServletActionContext.HTTP_REQUEST, request);
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().putAll(extraContext);
oldContext = new ActionContext(stack.getContext());
ActionContext.setContext(oldContext);
@@ -132,7 +132,6 @@
}
protected void tearDown() throws Exception {
- configurationManager.destroyConfiguration();
- ActionContext.setContext(null);
+ super.tearDown();
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java Thu Sep 20 05:51:41 2007
@@ -38,6 +38,7 @@
super.setUp();
test = new TestAction();
interceptor = new AnnotationValidationInterceptor();
+ container.inject(interceptor);
mockActionInvocation = new Mock(ActionInvocation.class);
mockActionProxy = new Mock(ActionProxy.class);
mockActionInvocation.matchAndReturn("getProxy", (ActionProxy) mockActionProxy.proxy());
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java Thu Sep 20 05:51:41 2007
@@ -126,16 +126,15 @@
this.action = new TestAction();
this.interceptor = new JSONValidationInterceptor();
this.validationInterceptor = new AnnotationValidationInterceptor();
+ container.inject(validationInterceptor);
this.request = new StrutsMockHttpServletRequest();
stringWriter = new StringWriter();
PrintWriter writer = new PrintWriter(stringWriter);
this.response = new StrutsMockHttpServletResponse();
response.setWriter(writer);
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
- ActionContext context = new ActionContext(stack.getContext());
+ ActionContext context = ActionContext.getContext();
- ActionContext.setContext(context);
context.put(StrutsStatics.HTTP_REQUEST, request);
context.put(StrutsStatics.HTTP_RESPONSE, 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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -67,7 +67,8 @@
}
protected void setUp() throws Exception {
- stack = ValueStackFactory.getFactory().createValueStack();
+ super.setUp();
+ stack = ActionContext.getContext().getValueStack();
ActionContext actionContext = new ActionContext(stack.getContext());
ActionContext.setContext(actionContext);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java Thu Sep 20 05:51:41 2007
@@ -35,6 +35,7 @@
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -195,7 +196,7 @@
protected void setUp() throws Exception {
super.setUp();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
request = new InternalMockHttpServletRequest();
response = new MockHttpServletResponse();
strutsUtil = new StrutsUtil(stack, request, response);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java Thu Sep 20 05:51:41 2007
@@ -27,6 +27,7 @@
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -40,7 +41,7 @@
* Test case for FreeMarkerResult.
*
*/
-public class FreeMarkerResultTest extends TestCase {
+public class FreeMarkerResultTest extends StrutsTestCase {
ValueStack stack;
MockActionInvocation invocation;
@@ -89,7 +90,7 @@
response.setWriter(writer);
request = new MockHttpServletRequest();
servletContext = new StrutsMockServletContext();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
context = new ActionContext(stack.getContext());
context.put(StrutsStatics.HTTP_RESPONSE, response);
context.put(StrutsStatics.HTTP_REQUEST, request);
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
+import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.util.ListEntry;
import org.apache.struts2.util.StrutsUtil;
@@ -37,22 +38,13 @@
/**
*/
-public class FreemarkerTest extends TestCase {
+public class FreemarkerTest extends StrutsTestCase {
TestAction testAction = null;
- /**
- *
- */
- public FreemarkerTest(String name) {
- super(name);
- }
-
-
public void testSelectHelper() {
StrutsUtil wwUtil = new StrutsUtil(ActionContext.getContext().getValueStack(), null, null);
-
List selectList = null;
selectList = wwUtil.makeSelectList("ignored", "stringList", null, null);
@@ -78,9 +70,6 @@
protected void setUp() throws Exception {
super.setUp();
-
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
- ActionContext.setContext(new ActionContext(stack.getContext()));
testAction = new TestAction();
ActionContext.getContext().getValueStack().push(testAction);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java Thu Sep 20 05:51:41 2007
@@ -33,7 +33,8 @@
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
import freemarker.ext.util.WrapperTemplateModel;
import freemarker.template.AdapterTemplateModel;
@@ -56,7 +57,7 @@
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
- OgnlValueStack stack = new OgnlValueStack();
+ OgnlValueStack stack = (OgnlValueStack)ActionContext.getContext().getValueStack();
Map params = new LinkedHashMap();
@@ -184,8 +185,8 @@
public void testGetWriter() throws Exception {
- OgnlValueStack stack = new OgnlValueStack();
-
+ OgnlValueStack stack = (OgnlValueStack)ActionContext.getContext().getValueStack();
+
final InternalBean bean = new InternalBean(stack);
MockHttpServletRequest request = new MockHttpServletRequest();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -82,7 +82,7 @@
* create our standard mock objects
*/
action = this.getAction();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -251,10 +251,7 @@
}
protected void tearDown() throws Exception {
- configurationManager.destroyConfiguration();
- 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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -30,6 +30,8 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -98,7 +100,7 @@
protected void setUp() throws Exception {
super.setUp();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -29,6 +29,7 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -93,7 +94,7 @@
super.setUp();
// create the needed objects
elseTag = new ElseTag();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
// 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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -324,7 +324,7 @@
super.setUp();
// create the needed objects
tag = new IfTag();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
// create the mock http servlet request
StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -42,7 +42,7 @@
public class PropertyTagTest extends StrutsTestCase {
StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack;
public void testDefaultValue() {
@@ -279,7 +279,7 @@
protected void setUp() throws Exception {
super.setUp();
- ActionContext.getContext().setValueStack(stack);
+ stack = ActionContext.getContext().getValueStack();
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -172,8 +172,9 @@
assertEquals(value1, writer.toString());
final StringBuffer buffer = writer.getBuffer();
buffer.delete(0, buffer.length());
- ValueStack newStack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack newStack = container.getInstance(ValueStackFactory.class).createValueStack();
newStack.getContext().put(ActionContext.LOCALE, foreignLocale);
+ newStack.getContext().put(ActionContext.CONTAINER, container);
newStack.push(new TestAction1());
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack);
assertNotSame(ActionContext.getContext().getValueStack().peek(), newStack.peek());
@@ -203,8 +204,9 @@
buffer.delete(0, buffer.length());
String value_int = getLocalizedMessage(foreignLocale);
assertFalse(value_default.equals(value_int));
- ValueStack newStack = ValueStackFactory.getFactory().createValueStack(stack);
+ ValueStack newStack = container.getInstance(ValueStackFactory.class).createValueStack(stack);
newStack.getContext().put(ActionContext.LOCALE, foreignLocale);
+ newStack.getContext().put(ActionContext.CONTAINER, container);
assertNotSame(newStack.getContext().get(ActionContext.LOCALE), ActionContext.getContext().getLocale());
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack);
assertEquals(ActionContext.getContext().getValueStack().peek(), newStack.peek());
@@ -275,7 +277,6 @@
}
protected void tearDown() throws Exception {
- ValueStack valueStack = ValueStackFactory.getFactory().createValueStack();
- ActionContext.setContext(new ActionContext(valueStack.getContext()));
+ super.tearDown();
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Thu Sep 20 05:51:41 2007
@@ -184,17 +184,6 @@
}
});
- // used by form tag to get "actionClass" parameter
- ObjectFactory.setObjectFactory(new ObjectFactory() {
- public Class getClassInstance(String className) throws ClassNotFoundException {
- if (DefaultActionMapper.class.getName().equals(className)) {
- return DefaultActionMapper.class;
- }
- return ActionSupport.class;
- }
- });
-
-
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
@@ -221,7 +210,6 @@
}
finally {
configurationManager.setConfiguration(originalConfiguration);
- ObjectFactory.setObjectFactory(originalObjectFactory);
}
}
@@ -289,17 +277,6 @@
}
});
- // used by form tag to get "actionClass" parameter
- ObjectFactory.setObjectFactory(new ObjectFactory() {
- public Class getClassInstance(String className) throws ClassNotFoundException {
- if (DefaultActionMapper.class.getName().equals(className)) {
- return DefaultActionMapper.class;
- }
- return ActionSupport.class;
- }
- });
-
-
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
@@ -326,7 +303,6 @@
}
finally {
configurationManager.setConfiguration(originalConfiguration);
- ObjectFactory.setObjectFactory(originalObjectFactory);
}
}
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -23,7 +23,12 @@
import junit.framework.TestCase;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsTestCase;
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -31,77 +36,83 @@
* Test case for ContextUtil
*
*/
-public class ContextUtilTest extends TestCase {
+public class ContextUtilTest extends StrutsTestCase {
+ private void setAltSyntax(ValueStack stack, String val) {
+ Mock container = new Mock(Container.class);
+ container.expectAndReturn("getInstance", C.args(C.eq(String.class), C.eq(StrutsConstants.STRUTS_TAG_ALTSYNTAX)), val);
+ stack.getContext().put(ActionContext.CONTAINER, container.proxy());
+ }
+
public void testAltSyntaxMethod1() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", "true");
- ContextUtil.setAltSyntax("true");
+ setAltSyntax(stack, "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod2() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", "false");
- ContextUtil.setAltSyntax("true");
+ setAltSyntax(stack, "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod3() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", "true");
- ContextUtil.setAltSyntax("false");
+ setAltSyntax(stack, "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod4() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", "false");
- ContextUtil.setAltSyntax("false");
+ setAltSyntax(stack, "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
//========================================================
public void testAltSyntaxMethod5() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", Boolean.TRUE);
- ContextUtil.setAltSyntax("true");
+ setAltSyntax(stack, "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod6() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", Boolean.FALSE);
- ContextUtil.setAltSyntax("true");
+ setAltSyntax(stack, "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod7() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", Boolean.TRUE);
- ContextUtil.setAltSyntax("false");
+ setAltSyntax(stack, "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod8() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", Boolean.FALSE);
- ContextUtil.setAltSyntax("false");
+ setAltSyntax(stack, "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
// ==========================================
public void testAltSyntaxMethod9() throws Exception {
- ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+ ValueStack stack = ActionContext.getContext().getValueStack();
stack.getContext().put("useAltSyntax", null);
- ContextUtil.setAltSyntax("true");
+ setAltSyntax(stack, "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java Thu Sep 20 05:51:41 2007
@@ -20,16 +20,24 @@
*/
package org.apache.struts2.views.util;
+import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Scope.Strategy;
+import com.opensymphony.xwork2.util.ValueStack;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Set;
import java.util.TreeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
@@ -38,6 +46,8 @@
*
*/
public class UrlHelperTest extends StrutsTestCase {
+
+ private StubContainer stubContainer;
public void testForceAddSchemeHostAndPort() throws Exception {
String expectedUrl = "http://localhost/contextPath/path1/path2/myAction.action";
@@ -252,8 +262,8 @@
String expectedString = "https://www.mydomain.com:7002/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";
- UrlHelper.setHttpPort("7001");
- UrlHelper.setHttpsPort("7002");
+ setProp(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001");
+ setProp(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002");
Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com");
@@ -281,8 +291,8 @@
String expectedString = "http://www.mydomain.com:7001/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";
- UrlHelper.setHttpPort("7001");
- UrlHelper.setHttpsPort("7002");
+ setProp(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001");
+ setProp(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002");
Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com");
@@ -354,7 +364,7 @@
public void testTranslateAndEncode() throws Exception {
- UrlHelper.setCustomEncoding("UTF-8");
+ setProp(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
String result = UrlHelper.translateAndEncode("\u65b0\u805e");
String expectedResult = "%E6%96%B0%E8%81%9E";
@@ -362,10 +372,64 @@
}
public void testTranslateAndDecode() throws Exception {
- UrlHelper.setCustomEncoding("UTF-8");
+ setProp(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
String result = UrlHelper.translateAndDecode("%E6%96%B0%E8%81%9E");
String expectedResult = "\u65b0\u805e";
assertEquals(result, expectedResult);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ stubContainer = new StubContainer(container);
+ ActionContext.getContext().put(ActionContext.CONTAINER, stubContainer);
+ }
+
+ private void setProp(String key, String val) {
+ stubContainer.overrides.put(key, val);
+ }
+
+ class StubContainer implements Container {
+
+ Container parent;
+
+ public StubContainer(Container parent) {
+ super();
+ this.parent = parent;
+ }
+
+ public Map<String, Object> overrides = new HashMap<String,Object>();
+ public <T> T getInstance(Class<T> type, String name) {
+ if (String.class.isAssignableFrom(type) && overrides.containsKey(name)) {
+ return (T) overrides.get(name);
+ } else {
+ return parent.getInstance(type, name);
+ }
+ }
+
+ public <T> T getInstance(Class<T> type) {
+ return parent.getInstance(type);
+ }
+
+ public Set<String> getInstanceNames(Class<?> type) {
+ return parent.getInstanceNames(type);
+ }
+
+ public void inject(Object o) {
+ parent.inject(o);
+ }
+
+ public <T> T inject(Class<T> implementation) {
+ return parent.inject(implementation);
+ }
+
+ public void removeScopeStrategy() {
+ parent.removeScopeStrategy();
+
+ }
+
+ public void setScopeStrategy(Strategy scopeStrategy) {
+ parent.setScopeStrategy(scopeStrategy);
+ }
}
}
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?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- 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 Thu Sep 20 05:51:41 2007
@@ -142,13 +142,13 @@
}
protected void setUp() throws Exception {
+ super.setUp();
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
servletContext = new MockServletContext();
result = new XSLTResult();
- stack = ValueStackFactory.getFactory().createValueStack();
- ActionContext.getContext().setValueStack(stack);
+ stack = ActionContext.getContext().getValueStack();
MyAction action = new MyAction();
@@ -163,7 +163,8 @@
ActionContext.getContext().put(ServletActionContext.SERVLET_CONTEXT, servletContext);
}
- protected void tearDown() {
+ protected void tearDown() throws Exception {
+ super.tearDown();
request = null;
response = null;
servletContext = null;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java Thu Sep 20 05:51:41 2007
@@ -27,7 +27,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.validator.ActionValidatorManager;
/**
* ListValidatorsAction loads the validations for a given class and context
@@ -40,7 +41,14 @@
private String clazz;
private String context;
List validators = Collections.EMPTY_LIST;
+ private ActionValidatorManager actionValidatorManager;
+
+ @Inject
+ public void setActionValidatorManager(ActionValidatorManager mgr) {
+ this.actionValidatorManager = mgr;
+ }
+
public String getClazz() {
return clazz;
}
@@ -77,7 +85,7 @@
protected void loadValidators() {
Class value = getClassInstance();
if ( value != null ) {
- validators = ActionValidatorManagerFactory.getInstance().getValidators(value, context);
+ validators = actionValidatorManager.getValidators(value, context);
}
}
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java Thu Sep 20 05:51:41 2007
@@ -24,8 +24,6 @@
import java.util.Set;
import java.util.TreeSet;
-import ognl.OgnlRuntime;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,6 +31,7 @@
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
/**
* ShowConfigAction
@@ -53,6 +52,7 @@
private ConfigurationHelper configHelper;
private ObjectFactory objectFactory;
+ private ReflectionProvider reflectionProvider;
public String getDetailView() {
return detailView;
@@ -79,6 +79,11 @@
public void setObjectFactory(ObjectFactory fac) {
this.objectFactory = fac;
}
+
+ @Inject
+ public void setReflectionProvider(ReflectionProvider prov) {
+ this.reflectionProvider = prov;
+ }
public String stripPackage(Class clazz) {
return clazz.getName().substring(clazz.getName().lastIndexOf('.') + 1);
@@ -111,8 +116,7 @@
new TreeSet(configHelper.getActionNames(namespace));
try {
Class clazz = objectFactory.getClassInstance(getConfig().getClassName());
- java.util.Collection pds = OgnlRuntime.getPropertyDescriptors(clazz).values();
- properties = (PropertyDescriptor[]) pds.toArray(PDSAT);
+ properties = reflectionProvider.getPropertyDescriptors(clazz);
} catch (Exception e) {
log.error("Unable to get properties for action " + actionName, e);
addActionError("Unable to retrieve action properties: " + e.toString());
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java Thu Sep 20 05:51:41 2007
@@ -29,13 +29,13 @@
import java.util.Set;
import java.util.TreeSet;
-import ognl.Ognl;
-import ognl.OgnlException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
+import com.opensymphony.xwork2.util.reflection.ReflectionException;
+import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import com.opensymphony.xwork2.validator.Validator;
/**
@@ -49,7 +49,20 @@
Set properties = Collections.EMPTY_SET;
int selected = 0;
-
+
+ ReflectionProvider reflectionProvider;
+ ReflectionContextFactory reflectionContextFactory;
+
+ @Inject
+ public void setReflectionProvider(ReflectionProvider prov) {
+ this.reflectionProvider = prov;
+ }
+
+ @Inject
+ public void setReflectionContextFactory(ReflectionContextFactory fac) {
+ this.reflectionContextFactory = fac;
+ }
+
public int getSelected() {
return selected;
}
@@ -71,7 +84,7 @@
Validator validator = getSelectedValidator();
properties = new TreeSet();
try {
- Map context = Ognl.createDefaultContext(validator);
+ Map context = reflectionContextFactory.createDefaultContext(validator);
BeanInfo beanInfoFrom = null;
try {
beanInfoFrom = Introspector.getBeanInfo(validator.getClass(), Object.class);
@@ -91,10 +104,9 @@
value = "No read method for property";
} else {
try {
- Object expr = OgnlUtil.compile(name);
- value = Ognl.getValue(expr, context, validator);
- } catch (OgnlException e) {
- addActionError("Caught OGNL exception while getting property value for '" + name + "' on validator of type " + validator.getClass().getName());
+ value = reflectionProvider.getValue(name, context, validator);
+ } catch (ReflectionException e) {
+ addActionError("Caught exception while getting property value for '" + name + "' on validator of type " + validator.getClass().getName());
}
}
properties.add(new PropertyInfo(name, pd.getPropertyType(), value));
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java Thu Sep 20 05:51:41 2007
@@ -83,7 +83,7 @@
* create our standard mock objects
*/
action = this.getAction();
- stack = ValueStackFactory.getFactory().createValueStack();
+ stack = ActionContext.getContext().getValueStack();
context = stack.getContext();
stack.push(action);
context.put(Head.PARSE_CONTENT, false);
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java Thu Sep 20 05:51:41 2007
@@ -24,7 +24,7 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
import com.opensymphony.xwork2.ActionContext;
/**
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Thu Sep 20 05:51:41 2007
@@ -38,7 +38,6 @@
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.validator.Validator;
/**
@@ -144,7 +143,7 @@
Map extraContext = new HashMap();
extraContext.put(PLEXUS_COMPONENT_TYPE, Interceptor.class.getName());
Interceptor interceptor = (Interceptor) buildBean(interceptorClassName, extraContext);
- OgnlUtil.setProperties(params, interceptor);
+ reflectionProvider.setProperties(params, interceptor);
interceptor.init();
return interceptor;
@@ -195,7 +194,7 @@
Map context = new HashMap();
context.put(PLEXUS_COMPONENT_TYPE, Validator.class.getName());
Validator validator = (Validator) buildBean(className, context);
- OgnlUtil.setProperties(params, validator);
+ reflectionProvider.setProperties(params, validator);
return validator;
}
Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java (original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java Thu Sep 20 05:51:41 2007
@@ -43,7 +43,9 @@
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
* An abstract template page filter that sets up the proper contexts for
@@ -97,8 +99,8 @@
ServletContext servletContext = filterConfig.getServletContext();
ActionContext ctx = ServletActionContext.getActionContext(req);
if (ctx == null) {
- // ok, one isn't associated with the request, so let's get a ThreadLocal one (which will create one if needed)
- OgnlValueStack vs = new OgnlValueStack();
+ // ok, one isn't associated with the request, so let's create one using the current Dispatcher
+ ValueStack vs = Dispatcher.getInstance().getContainer().getInstance(ValueStackFactory.class).createValueStack();
vs.getContext().putAll(Dispatcher.getInstance().createContextMap(req, res, null, servletContext));
ctx = new ActionContext(vs.getContext());
if (ctx.getActionInvocation() == null) {
@@ -165,7 +167,7 @@
public void setResultCode(String resultCode) {
}
- public OgnlValueStack getStack() {
+ public ValueStack getStack() {
return null;
}
@@ -181,6 +183,9 @@
}
public void setActionEventListener(ActionEventListener listener) {
+ }
+
+ public void init(ActionProxy proxy) throws Exception {
}
}
}
Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java?rev=577728&r1=577727&r2=577728&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java (original)
+++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java Thu Sep 20 05:51:41 2007
@@ -38,6 +38,7 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
/**
@@ -61,13 +62,19 @@
private String className;
private boolean validate;
private String scopeKey;
+ private ObjectFactory objectFactory;
+
+ @Inject
+ public void setObjectFactory(ObjectFactory fac) {
+ this.objectFactory = fac;
+ }
public String execute() throws Exception {
ActionContext ctx = ActionContext.getContext();
ActionConfig actionConfig = ctx.getActionInvocation().getProxy().getConfig();
Action action = null;
try {
- action = (Action) ObjectFactory.getObjectFactory().buildBean(className, null);
+ action = (Action) objectFactory.buildBean(className, null);
} catch (Exception e) {
throw new StrutsException("Unable to create the legacy Struts Action", e, actionConfig);
}