struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From herma...@apache.org
Subject svn commit: r526222 - in /struts/struts2/branches/STRUTS_2_0_X: apps/portlet/src/main/resources/validators.xml assembly/pom.xml core/pom.xml core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java core/src/test/resources/validators.xml
Date Fri, 06 Apr 2007 16:37:55 GMT
Author: hermanns
Date: Fri Apr  6 09:37:54 2007
New Revision: 526222

URL: http://svn.apache.org/viewvc?view=rev&rev=526222
Log:
Updating the xwork dependency to 2.0.2-SNAPSHOT to fix several problems reported to XWork
and S2:

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.

Modified:
    struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/validators.xml
    struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
    struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/validators.xml?view=diff&rev=526222&r1=526221&r2=526222
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/validators.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/validators.xml Fri
Apr  6 09:37:54 2007
@@ -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"/>

Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?view=diff&rev=526222&r1=526221&r2=526222
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Fri Apr  6 09:37:54 2007
@@ -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>

Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?view=diff&rev=526222&r1=526221&r2=526222
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Fri Apr  6 09:37:54 2007
@@ -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>

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java?view=diff&rev=526222&r1=526221&r2=526222
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
Fri Apr  6 09:37:54 2007
@@ -33,6 +33,8 @@
 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 @@
 
         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 @@
 
         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 @@
         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();
     }
 }

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml?view=diff&rev=526222&r1=526221&r2=526222
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml Fri Apr  6
09:37:54 2007
@@ -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"/>



Mime
View raw message