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

Updating the xwork dependency to 2.0.2-SNAPSHOT to fix several problems reported to XWork and S2:

Browse Source 
WW-1635 struts.xml include dependant packages not loading properly
WW-1856 s18n tag appears to be broken

NOTE on XWork 2.x updates: All validators.xml files are now validated, a DTD header is required.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@526222 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Hermanns
2007-04-06 16:37:54 +00:00
parent 20f7cdc513
commit e83468aee5
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/portlet/src/main/resources/validators.xml
+3
View File
@@ -1,3 +1,6 @@
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator Config 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
<validators>
<validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
<validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
assembly/pom.xml
+1 -1
View File
@@ -103,7 +103,7 @@
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
<classifier>javadoc</classifier>
<version>2.0.0</version>
<version>2.0.2-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
core/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<artifactItem>
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
+7 -2
View File
@@ -33,6 +33,8 @@ import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.util.XWorkConverter;
import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory;
/**
@@ -54,8 +56,8 @@ public class HttpHeaderResultTest extends StrutsTestCase {
Map values = new HashMap();
values.put("bar", "abc");
ActionContext.getContext().getValueStack().push(values);
ActionContext.getContext().getValueStack().push(values);
OgnlUtil.setProperties(params, result);
responseMock.expect("addHeader", C.args(C.eq("foo"), C.eq("${bar}")));
@@ -72,8 +74,8 @@ public class HttpHeaderResultTest extends StrutsTestCase {
Map values = new HashMap();
values.put("bar", "abc");
ActionContext.getContext().getValueStack().push(values);
ActionContext.getContext().getValueStack().push(values);
OgnlUtil.setProperties(params, result);
responseMock.expect("addHeader", C.args(C.eq("foo"), C.eq("abc")));
@@ -96,11 +98,14 @@ public class HttpHeaderResultTest extends StrutsTestCase {
response = (HttpServletResponse) responseMock.proxy();
invocation = (ActionInvocation) new Mock(ActionInvocation.class).proxy();
ServletActionContext.setResponse(response);
XWorkConverter.getInstance().setObjectTypeDeterminer(ObjectTypeDeterminerFactory.getInstance());
}
protected void tearDown() throws Exception {
super.tearDown();
ServletActionContext.setResponse(null);
ActionContext.setContext(null);
XWorkConverter.resetInstance();
}
}
core/src/test/resources/validators.xml
+3
View File
@@ -1,3 +1,6 @@
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator Config 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
<validators>
<validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
<validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>