husted 2002/10/31 06:32:08
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
ProcessFormAction.java ProcessDispatchAction.java
ProcessAction.java ParameterAction.java
BaseForm.java BaseAction.java
Log:
+ ProcessDispatchAction: Resolve problem in Scroller/ScrollBeanBase;
helper methods needed to be named UNlike properties to keep from
confusing BeanUtils.
+ ProcessDispatchAction: Change to bypass ProcessFormAction. Now works.
+ ProcessDispatchAction: Now causing a reflection error when used.
Revision Changes Path
1.6 +2 -3
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java
Index: ProcessFormAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessFormAction.java 12 Sep 2002 12:39:50 -0000 1.5
+++ ProcessFormAction.java 31 Oct 2002 14:32:07 -0000 1.6
@@ -4,8 +4,7 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.beanutils.BeanUtils; // Struts 1.1
-// import org.apache.struts.util.BeanUtils; // Struts 1.0.x
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.scaffold.lang.ChainedException;
import org.apache.commons.scaffold.lang.Log;
1.6 +4 -6
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java
Index: ProcessDispatchAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessDispatchAction.java 12 Sep 2002 12:39:50 -0000 1.5
+++ ProcessDispatchAction.java 31 Oct 2002 14:32:07 -0000 1.6
@@ -20,10 +20,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-// import org.apache.struts.util.BeanUtils; // Struts 1.0.x
-// import org.apache.struts.util.PropertyUtils; // Struts 1.0.x
-import org.apache.commons.beanutils.BeanUtils; // Struts 1.1
-import org.apache.commons.beanutils.PropertyUtils; // Struts 1.1
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
@@ -53,7 +51,7 @@
* @author OK State DEQ
* @version $Revision$ $Date$
*/
-public class ProcessDispatchAction extends ProcessFormAction {
+public class ProcessDispatchAction extends ProcessAction {
/**
* The set of argument type classes for the reflected method call.
1.5 +2 -3
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java
Index: ProcessAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessAction.java 27 Sep 2002 18:59:52 -0000 1.4
+++ ProcessAction.java 31 Oct 2002 14:32:07 -0000 1.5
@@ -16,8 +16,7 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.beanutils.PropertyUtils; // Struts 1.1
-// import org.apache.struts.util.PropertyUtils; // Struts 1.0.x
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
1.2 +6 -5
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ParameterAction.java
Index: ParameterAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ParameterAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParameterAction.java 14 Aug 2002 18:30:08 -0000 1.1
+++ ParameterAction.java 31 Oct 2002 14:32:08 -0000 1.2
@@ -52,12 +52,13 @@
// Get stub URI from mapping (/do/whatever?paramName=)
StringBuffer path = new StringBuffer(64);
- path.append(mapping.findForward(parameter).getPath());
+ ActionForward template = mapping.findForward(parameter);
+ path.append(template.getPath());
// Append the value passed (/do/whatever?paramName=paramProperty)
path.append(request.getParameter(paramName));
// Return a new forward based on stub+value
- return new ActionForward(path.toString());
+ return new ActionForward(path.toString(),template.getRedirect());
}
1.8 +3 -5
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java
Index: BaseForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseForm.java 27 Sep 2002 18:59:52 -0000 1.7
+++ BaseForm.java 31 Oct 2002 14:32:08 -0000 1.8
@@ -8,10 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-// import org.apache.struts.util.BeanUtils; // Struts 1.0.x
-// import org.apache.struts.util.PropertyUtils; // Struts 1.0.x
-import org.apache.commons.beanutils.BeanUtils; // Struts 1.1
-import org.apache.commons.beanutils.PropertyUtils; // Struts 1.1
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
1.6 +4 -5
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java
Index: BaseAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseAction.java 27 Sep 2002 18:59:52 -0000 1.5
+++ BaseAction.java 31 Oct 2002 14:32:08 -0000 1.6
@@ -13,8 +13,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-// import org.apache.struts.util.BeanUtils; // Struts 1.0.x
-import org.apache.commons.beanutils.BeanUtils; // Struts 1.1
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
@@ -58,8 +57,8 @@
* @deprecated Will be removed after Struts 1.1 final ships.
*/
private final boolean isStruts_1_0() {
- return true; // Struts 1.0.x
-// return false; // Struts 1.1
+ return true; // Struts 1.0.x
+// return false; // Struts 1.1
}
// ---------------------------------------------------------------- Log
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
