[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- Downloads was last edited by mprudhom (05:39 PM). | http://cwiki.apache.org/confluence/display/openjpa/Downloads Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- How does the Camel API compare to was created by jstrachan (07:05 AM). | http://cwiki.apache.org/confluence/display/CAMEL/How+does+the+Camel+API+compare+to |-- Site was last edited by jstrachan (08:06 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Site |-- Spring XML Extensions was last edited by jstrachan (08:04 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Spring+XML+Extensions |-- How do I configure endpoints was last edited by jstrachan (08:00 AM). | http://cwiki.apache.org/confluence/display/CAMEL/How+do+I+configure+endpoints |-- Spring was last edited by jstrachan (07:59 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Spring |-- Xml Configuration was last edited by jstrachan (07:55 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Xml+Configuration |-- User Guide was last edited by jstrachan (07:53 AM). | http://cwiki.apache.org/confluence/display/CAMEL/User+Guide |-- OldLinks was last edited by jstrachan (07:42 AM). | http://cwiki.apache.org/confluence/display/CAMEL/OldLinks |-- Overview was last edited by jstrachan (07:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Overview |-- Documentation was last edited by jstrachan (07:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Documentation |-- Developers was last edited by jstrachan (07:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Developers |-- Community was last edited by jstrachan (07:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Community |-- SiteMap was last edited by jstrachan (07:38 AM). | http://cwiki.apache.org/confluence/display/CAMEL/SiteMap |-- Examples was last edited by jstrachan (07:12 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Examples |-- What are the dependencies was last edited by jstrachan (07:11 AM). | http://cwiki.apache.org/confluence/display/CAMEL/What+are+the+dependencies |-- Point to Point Channel was last edited by jstrachan (06:48 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Point+to+Point+Channel |-- Pipes and Filters was last edited by jstrachan (06:46 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Pipes+and+Filters |-- Download was last edited by jstrachan (06:02 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Download Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- JSON Plugin was last edited by musachy (08:00 PM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/JSON+Plugin Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Why does my setter not get called by the params interceptor was created by phil (06:58 AM). | http://cwiki.apache.org/confluence/display/WW/Why+does+my+setter+not+get+called+by+the+params+interceptor |-- FAQs was last edited by phil (06:57 AM). | http://cwiki.apache.org/confluence/display/WW/FAQs Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Deleting Objects was last edited by nirvdrum (06:31 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Deleting+Objects |-- DataObject Validation was last edited by nirvdrum (06:07 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/DataObject+Validation |-- DataObjectUtils was last edited by nirvdrum (06:04 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/DataObjectUtils |-- Accessing PK and FK values was last edited by nirvdrum (06:01 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Accessing+PK+and+FK+values Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- TuscanyLogos was last edited by edwardsmj (01:26 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/TuscanyLogos |-- SCA Java Development was last edited by [EMAIL PROTECTED] (12:35 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+Development |-- Navigation was created by svkrish (09:39 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Navigation |-- SCA Java Extension Guide was created by slaws (09:04 AM). | http://cwiki.apache.org/confluence/display/TUSCANY
svn commit: r539805 - /struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
Author: mrdon Date: Sat May 19 15:18:56 2007 New Revision: 539805 URL: http://svn.apache.org/viewvc?view=rev&rev=539805 Log: Changed to correct snapshot jar of struts-annotations WW-1834 Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml 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=539805&r1=539804&r2=539805 == --- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Sat May 19 15:18:56 2007 @@ -461,7 +461,7 @@ org.apache.struts struts-annotations -1.0-SNAPSHOT +1.0.2-SNAPSHOT true
svn commit: r539806 - /struts/struts2/trunk/core/pom.xml
Author: mrdon Date: Sat May 19 15:19:32 2007 New Revision: 539806 URL: http://svn.apache.org/viewvc?view=rev&rev=539806 Log: Switched to latest struts-annotations snapshot WW-1715 Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=539806&r1=539805&r2=539806 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Sat May 19 15:19:32 2007 @@ -467,7 +467,7 @@ org.apache.struts struts-annotations -1.0-SNAPSHOT +1.0.2-SNAPSHOT true
svn commit: r539808 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Author: pbenedict
Date: Sat May 19 16:13:07 2007
New Revision: 539808
URL: http://svn.apache.org/viewvc?view=rev&rev=539808
Log:
STR-3042: Retrieve page through methods
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java?view=diff&rev=539808&r1=539807&r2=539808
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Sat May 19 16:13:07 2007
@@ -110,7 +110,7 @@
Validator validator =
Resources.initValidator(validationKey, this, application, request,
-errors, page);
+errors, getPage());
try {
validatorResults = validator.validate();
@@ -141,7 +141,7 @@
*/
public void reset(ActionMapping mapping, HttpServletRequest request) {
super.reset(mapping, request);
-page = 0;
+setPage(0);
validatorResults = null;
}
svn commit: r539817 - /struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
Author: mrdon Date: Sat May 19 20:02:23 2007 New Revision: 539817 URL: http://svn.apache.org/viewvc?view=rev&rev=539817 Log: Updated blank pom to use newer jetty plugin WW-1715 Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?view=diff&rev=539817&r1=539816&r2=539817 == --- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Sat May 19 20:02:23 2007 @@ -47,7 +47,7 @@ org.mortbay.jetty -maven-jetty6-plugin +maven-jetty-plugin 10
svn commit: r539819 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/resources/template/simple/ test/java/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/views/jsp/ui/ test/resour
Author: mrdon
Date: Sat May 19 20:06:34 2007
New Revision: 539819
URL: http://svn.apache.org/viewvc?view=rev&rev=539819
Log:
Improving opt groups to use toString on key, adding tests
WW-1672
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optgroup.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optgroup.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optgroup.ftl?view=diff&rev=539819&r1=539818&r2=539819
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optgroup.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optgroup.ftl
Sat May 19 20:06:34 2007
@@ -14,8 +14,9 @@
<#assign trash=stack.push(optGroupBean) />
<#assign
tmpKey=stack.findValue(optGroupInternalListUiBean.parameters.listKey) />
<#assign
tmpValue=stack.findValue(optGroupInternalListUiBean.parameters.listValue) />
-
+ <#assign tmpKeyStr = tmpKey.toString() />
+
selected="selected"
>${tmpValue}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java?view=diff&rev=539819&r1=539818&r2=539819
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
Sat May 19 20:06:34 2007
@@ -97,6 +97,20 @@
requestMock.verify();
responseMock.verify();
}
+
+public void testMultipleParametersRedirect() throws Exception {
+view.setLocation("foo.jsp?foo=bar&baz=jim");
+requestMock.expectAndReturn("getParameterMap", new HashMap());
+requestMock.expectAndReturn("getServletPath",
"/namespace/some.action");
+requestMock.expectAndReturn("getAttribute", C.ANY_ARGS, null);
+responseMock.expectAndReturn("encodeRedirectURL",
"/context/namespace/foo.jsp?foo=bar&baz=jim",
"/context/namespace/foo.jsp?foo=bar&baz=jim");
+responseMock.expect("sendRedirect",
C.args(C.eq("/context/namespace/foo.jsp?foo=bar&baz=jim")));
+
+view.execute(ai);
+
+requestMock.verify();
+responseMock.verify();
+}
protected void setUp() throws Exception {
super.setUp();
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java?view=diff&rev=539819&r1=539818&r2=539819
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
Sat May 19 20:06:34 2007
@@ -20,6 +20,9 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.LinkedHashMap;
+
+import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
/**
@@ -27,7 +30,6 @@
*/
public class OptGroupTest extends AbstractUITagTest {
-
public void testOptGroupSimple() throws Exception {
SelectTag selectTag = new SelectTag();
selectTag.setName("mySelection");
@@ -119,5 +121,41 @@
//System.out.println(writer.toString());
verify(SelectTag.class.getResource("OptGroup-3.txt"));
+}
+
+public void testOptGroupNumbers() throws Exception {
+
+ ((TestAction)action).setMap(new LinkedHashMap() {{
+ put("AAA", "aaa");
+ put(new Long(11), "bbb");
+ put("CCC", "ccc");
+ }});
+
+SelectTag selectTag = new SelectTag();
+selectTag.setName("mySelection");
+selectTag.setLabel("My Selection");
+selectTag.setList("%{#{'ONE':'one','TWO':'two','THREE':'three'}}");
+
+OptGroupTag optGroupTag1 = new OptGroupTag();
+optGroupTag1.setLabel("My Label 1");
+optGroupTag1.setList("ma
svn commit: r539825 - in /struts/struts2/branches/STRUTS_2_0_X/core/src/test: java/org/apache/struts2/ java/org/apache/struts2/views/jsp/ui/ resources/org/apache/struts2/views/jsp/ui/
Author: mrdon
Date: Sat May 19 21:28:35 2007
New Revision: 539825
URL: http://svn.apache.org/viewvc?view=rev&rev=539825
Log:
Added tests showing WW-1519 has been fixed
WW-1519
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java?view=auto&rev=539825
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
(added)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
Sat May 19 21:28:35 2007
@@ -0,0 +1,20 @@
+package org.apache.struts2;
+
+public enum SomeEnum {
+
+ INIT("init"), COMPLETED("completed");
+
+ private String displayName;
+
+ SomeEnum(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getName() {
+ return name();
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+}
\ No newline at end of file
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java?view=diff&rev=539825&r1=539824&r2=539825
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/TestAction.java
Sat May 19 21:28:35 2007
@@ -20,6 +20,7 @@
*/
package org.apache.struts2;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,7 @@
private String[][] list;
private List list2;
private List list3;
+private SomeEnum status = SomeEnum.COMPLETED;
public Collection getCollection() {
return collection;
@@ -146,6 +148,18 @@
public String doInput() throws Exception {
return INPUT;
+}
+
+ public SomeEnum getStatus() {
+ return status;
+ }
+
+ public void setStatus(SomeEnum status) {
+ this.status = status;
+ }
+
+public List getStatusList() {
+ return Arrays.asList(SomeEnum.values());
}
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=539825&r1=539824&r2=539825
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Sat May 19 21:28:35 2007
@@ -512,6 +512,22 @@
verify(SelectTag.class.getResource("Select-11.txt"));
}
+
+public void testEnumList() throws Exception {
+
+SelectTag tag = new SelectTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("status");
+tag.setList("statusList");
+tag.setListKey("name");
+tag.setListValue("displayName");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(SelectTag.class.getResource("Select-13.txt"));
+}
public class IdName {
private String name;
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt?view=auto&rev=539825
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
(added)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
Sat May 19 21:28:35 2007
@@ -0,0 +1,7 @@
+
+mylabel:
+
+init
+completed
+
+
svn commit: r539826 - in /struts/struts2/trunk/core/src: main/resources/template/simple/ test/java/org/apache/struts2/ test/java/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/views/jsp/u
Author: mrdon
Date: Sat May 19 21:52:35 2007
New Revision: 539826
URL: http://svn.apache.org/viewvc?view=rev&rev=539826
Log:
Merging tests disproving WW-1519
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/SomeEnum.java
- copied unchanged from r539825,
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
- copied unchanged from r539819,
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
- copied unchanged from r539825,
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptGroupTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl?view=diff&rev=539826&r1=539825&r2=539826
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
Sat May 19 21:52:35 2007
@@ -14,8 +14,9 @@
<#assign trash=stack.push(optGroupBean) />
<#assign
tmpKey=stack.findValue(optGroupInternalListUiBean.parameters.listKey) />
<#assign
tmpValue=stack.findValue(optGroupInternalListUiBean.parameters.listValue) />
-
+ <#assign tmpKeyStr = tmpKey.toString() />
+
selected="selected"
>${tmpValue}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?view=diff&rev=539826&r1=539825&r2=539826
==
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
(original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
Sat May 19 21:52:35 2007
@@ -20,6 +20,7 @@
*/
package org.apache.struts2;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,7 @@
private String[][] list;
private List list2;
private List list3;
+private SomeEnum status = SomeEnum.COMPLETED;
public Collection getCollection() {
return collection;
@@ -146,6 +148,18 @@
public String doInput() throws Exception {
return INPUT;
+}
+
+ public SomeEnum getStatus() {
+ return status;
+ }
+
+ public void setStatus(SomeEnum status) {
+ this.status = status;
+ }
+
+public List getStatusList() {
+ return Arrays.asList(SomeEnum.values());
}
}
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=539826&r1=539825&r2=539826
==
---
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
Sat May 19 21:52:35 2007
@@ -97,6 +97,20 @@
requestMock.verify();
responseMock.verify();
}
+
+public void testMultipleParametersRedirect() throws Exception {
+view.setLocation("foo.jsp?foo=bar&baz=jim");
+requestMock.expectAndReturn("getParameterMap", new HashMap());
+requestMock.expectAndReturn("getServletPath",
"/namespace/some.action");
+requestMock.expectAndReturn("getAttribute", C.ANY_ARGS, null);
+responseMock.expectAndReturn("encodeRedirectURL",
"/context/namespace/foo.jsp?foo=bar&baz=jim",
"/context/namespace/foo.jsp?foo=bar&baz=jim");
+responseMock.expect("sendRedirect",
C.args(C.eq("/context/namespace/foo.jsp?foo=bar&baz=jim")));
+
+view.execute(ai);
+
+requestMock.verify();
+responseMock.verify();
+}
protected void setUp() throws Exception {
super.setUp();
Modified:
struts/str
