Author: mrdon
Date: Tue Aug 9 21:24:37 2005
New Revision: 231166
URL: http://svn.apache.org/viewcvs?rev=231166&view=rev
Log:
* Adding unit tests for form scope handling
* Fixing small errors to get form scope to work correctly
Added:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Bean.java
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionProxyFactory.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainInvokeAction.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ManageFormScope.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Controller.jsrc
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletXWork.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/XDocletTestBase.java
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm Tue
Aug 9 21:24:37 2005
@@ -22,10 +22,10 @@
#set( $form = $method.doc.getTag("ti.form"))
#if( $form)
#if( $form.getAttributeValue("scope"))
- <param
name="formScope">${form.getAttributeScope("scope")}</param>
+ <param
name="formScope">${form.getAttributeValue("scope")}</param>
#end
#if ($form.getAttributeValue("name"))
- <param name="formName">${form.getAttributeScope("name")}</param>
+ <param name="formName">${form.getAttributeValue("name")}</param>
#end
#end
#set( $forwards = $method.doc.getTags("ti.forward"))
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
Tue Aug 9 21:24:37 2005
@@ -94,7 +94,7 @@
*/
protected String invokeAction(Object action, ActionConfig actionConfig)
throws Exception {
- return invokeAction(action, actionConfig);
+ return invokeAction.invokeAction(action, actionConfig);
}
public String invokeXWorkAction(Object action, ActionConfig actionConfig)
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionProxyFactory.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionProxyFactory.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionProxyFactory.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionProxyFactory.java
Tue Aug 9 21:24:37 2005
@@ -49,7 +49,7 @@
((ControllerActionInvocation)o).setInvokeAction((InvokeAction)beanFactory.getBean("invokeAction"));
if (beanFactory instanceof AutowireCapableBeanFactory) {
AutowireCapableBeanFactory f =
(AutowireCapableBeanFactory)beanFactory;
- f.autowireBeanProperties(o, f.AUTOWIRE_BY_TYPE, false);
+ f.autowireBeanProperties(o, f.AUTOWIRE_BY_NAME, false);
}
}
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainInvokeAction.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainInvokeAction.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainInvokeAction.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainInvokeAction.java
Tue Aug 9 21:24:37 2005
@@ -35,7 +35,7 @@
private static final Log log = LogFactory.getLog(ChainInvokeAction.class);
protected String catalogName = "struts-ti";
- protected String executeCmdName = "execute-action";
+ protected String executeCmdName = "executeAction";
public static final String RESULT = "actionResult";
public void setExecuteActionCommandName(String name) {
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ManageFormScope.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ManageFormScope.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ManageFormScope.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ManageFormScope.java
Tue Aug 9 21:24:37 2005
@@ -39,7 +39,7 @@
private static final Log log = LogFactory.getLog(ManageFormScope.class);
public boolean execute(Context origctx) throws Exception {
- log.debug("Managing form scope");
+ log.info("Managing form scope");
WebContext webCtx = (WebContext)origctx;
String formName = getFormName();
@@ -47,7 +47,8 @@
if (scope != null) {
Object form = scope.get(formName);
- if (form == null) {
+ if (form != null) {
+ log.info("returning from scope");
origctx.put(CreateFormChain.FORM_OBJECT, form);
return true;
}
@@ -57,11 +58,13 @@
public boolean postprocess(Context origctx, Exception ex) {
WebContext webCtx = (WebContext)origctx;
+ log.info("Managing form scope - post");
Map scope = getFormScope(webCtx);
if (scope != null) {
Object form = webCtx.get(CreateFormChain.FORM_OBJECT);
if (form != null) {
+ log.info("putting in scope");
String formName = getFormName();
scope.put(formName, form);
}
@@ -86,9 +89,11 @@
String scopeType =
(String)inv.getProxy().getConfig().getParams().get("formScope");
Map map = null;
if ("request".equals(scopeType)) {
+ log.info("found request scope");
map = webCtx.getRequestScope();
} else if ("session".equals(scopeType)) {
map = webCtx.getSessionScope();
+ log.info("found session scope");
}
return map;
}
Added: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Bean.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Bean.java?rev=231166&view=auto
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Bean.java (added)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Bean.java Tue Aug 9
21:24:37 2005
@@ -0,0 +1,13 @@
+package org.apache.ti.config;
+
+public class Bean {
+ private String name;
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+}
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Controller.jsrc
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Controller.jsrc?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Controller.jsrc
(original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/Controller.jsrc Tue
Aug 9 21:24:37 2005
@@ -25,4 +25,13 @@
return Action.SUCCESS;
}
+ /**
+ * @ti.action
+ * @ti.form scope="request" name="bob"
+ */
+ public String formAction(Bean bean) {
+ return Action.SUCCESS;
+ }
+
+
}
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletXWork.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletXWork.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletXWork.java
(original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletXWork.java
Tue Aug 9 21:24:37 2005
@@ -90,6 +90,12 @@
Document doc = runTemplate("foo/Controller.jsrc");
assertXPath(doc, "/xwork/[EMAIL PROTECTED]'foo' and
@namespace='/foo']");
}
+
+ public void testForm() throws Exception {
+ Document doc = runTemplate("Controller.jsrc");
+ assertXPath(doc, "/xwork/package/[EMAIL PROTECTED]'formAction']/[EMAIL
PROTECTED]'formScope' and text()='request']");
+ assertXPath(doc, "/xwork/package/[EMAIL PROTECTED]'formAction']/[EMAIL
PROTECTED]'formName' and text()='bob']");
+ }
protected Document runTemplate(String path) throws Exception {
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/XDocletTestBase.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/XDocletTestBase.java?rev=231166&r1=231165&r2=231166&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/XDocletTestBase.java
(original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/XDocletTestBase.java
Tue Aug 9 21:24:37 2005
@@ -82,6 +82,7 @@
//System.out.println("output:"+out);
} else {
out = output.getString();
+ //System.out.println("output:"+out);
}
Document doc = new SAXBuilder().build(new StringReader(out));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
