husted 2002/11/23 11:09:08
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
ProcessDispatchAction.java ProcessAction.java
Added: contrib/scaffold/src/java/org/apache/struts/scaffold
BizFormImpl.java
Log:
+ BizFormImpl: Initial version, reusing code from ProcessAction. Interface and
BizAction to follow.
+ BaseForm: Add createHelper method (from BaseAction)
+ ProcessDispatchAction: Add support for an optional parameter.
+ ProcessAction: Pass up remoteNode.
Revision Changes Path
1.7 +10 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProcessDispatchAction.java 31 Oct 2002 14:32:07 -0000 1.6
+++ ProcessDispatchAction.java 23 Nov 2002 19:09:07 -0000 1.7
@@ -51,7 +51,7 @@
* @author OK State DEQ
* @version $Revision$ $Date$
*/
-public class ProcessDispatchAction extends ProcessAction {
+public class ProcessDispatchAction extends ProcessFormAction {
/**
* The set of argument type classes for the reflected method call.
@@ -106,13 +106,19 @@
servlet.log(Log.HELPER_PROCESSING,Log.DEBUG);
Map properties = null;
+ // Munge the parameter property
servlet.log(Log.TOKENS_PARSING,Log.DEBUG);
String[] tokens = tokenize(mapping.getParameter());
- // :TODO: This could loop and instantiate every other
- // token [class;method;class;method]
+
+ // Create our ProcessBean helper
Object helper = createHelperObject(request,tokens[0]);
servlet.log(Log.HELPER_EXECUTING,Log.DEBUG);
ProcessBean dataBean = (ProcessBean) helper;
+
+ // Pass along the helper's parameter, if any
+ if (tokens.length>2) {
+ dataBean.setParameter(tokens[2]);
+ }
properties = null;
if (null!=form) {
1.6 +3 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessAction.java 31 Oct 2002 14:32:07 -0000 1.5
+++ ProcessAction.java 23 Nov 2002 19:09:07 -0000 1.6
@@ -475,8 +475,9 @@
servlet.log(Log.HELPER_POPULATE,Log.DEBUG);
properties = formBean.merge(userBean);
- // Pass up the Locale and RemoteServer (if any)
+ // Pass up the Locale, RemoteNode, and RemoteServer (if any)
dataBean.setLocale(formBean.getSessionLocale());
+ dataBean.setRemoteNode(getRemoteNode(request));
dataBean.setRemoteServer(getRemoteServer());
}
else {
1.1
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java
Index: BizFormImpl.java
===================================================================
package org.apache.struts.scaffold;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
// import org.apache.struts.validator.ValidatorForm; // Struts 1.1
import com.wintecinc.struts.action.ValidatorForm; // Struts 1.0.x
import org.apache.commons.scaffold.lang.Tokens;
import org.apache.commons.scaffold.util.BizRequest;
import org.apache.commons.scaffold.util.Message;
import org.apache.commons.scaffold.util.MessageImpl;
import org.apache.commons.scaffold.util.Messages;
import org.apache.commons.scaffold.util.MessagesImpl;
/**
* @author Ted Husted
* @version $Revision: 1.1 $ $Date: 2002/11/23 19:09:07 $
*/
public class BizFormImpl extends BaseForm {
/**
* The session attribute key for our user profile bean ["USER_PROFILE"].
* (Suggestion only, may be overridden by presentation framework
*/
public static String USER_PROFILE_KEY = "USER_PROFILE";
// ------------------------------------------------------ Business Request
/**
* The business request type to create, populate, and validate.
*/
private String bizType = null;
/**
* Return our bizType property.
*/
public String getBizType() {
return (this.bizType);
}
/**
* Set our bizType property.
*/
public void setBizType(String bizType) {
this.bizType = bizType;
}
/**
* The business request object.
*/
private BizRequest bizRequest = null;
/**
* Return our bizRequest property.
*/
public BizRequest getBizRequest() {
return (this.bizRequest);
}
/**
* Set our bizRequest property.
*/
public void setBizRequest(BizRequest bizRequest) {
this.bizRequest = bizRequest;
}
/**
* Factory method to create business request object.
*/
public BizRequest createBizRequest(String bizType) {
BizRequest bizRequest = (BizRequest) createObject(bizType) ;
return bizRequest;
}
// ------------------------------------------------------ User Profile
/**
* The business request type to create, populate, and validate.
*/
private Object userProfile = null;
/**
* Return our userProfile property.
*/
public Object getUserProfile() {
return (this.userProfile);
}
/**
* Set our userProfile property.
*/
public void setUserProfile(Object userProfile) {
this.userProfile = userProfile;
}
/**
* Returns name of result server to be used by this Action,
* [BizRequest.USER_PROFILE_KEY]
*/
protected String getUserProfileName() {
return USER_PROFILE_KEY;
}
/**
* Retrieve from session under known key
* (<code>ProcessBean.USER_PROFILE_KEY</code>).
* Override this approach to implement another method (e.g cookies).
* Also revise UpdateProfile action-mapping to store changes.
*
* @param mapping The ActionMapping used to select this instance
* @param form The ActionForm
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*/
protected void resetUserProfile(HttpServletRequest request) {
setUserProfile(
request.getSession().getAttribute(getUserProfileName())
);
}
// ------------------------------------------------------ Remote Server
/**
* The business request type to create, populate, and validate.
*/
private Object remoteServer = null;
/**
* Return our remoteServer property.
*/
public Object getRemoteServer() {
return (this.remoteServer);
}
/**
* Set our remoteServer property.
*/
public void setRemoteServer(Object remoteServer) {
this.remoteServer = remoteServer;
}
/**
* Returns name of result server to be used by this Action,
* [BizRequest.RESULT_SERVER_KEY].
*/
protected String getRemoteServerName() {
return BizRequest.REMOTE_SERVER_KEY;
}
/**
* Checks application scope for the remote server object
* specified by <code>getRemoteServerName</code>
*/
protected void resetRemoteServer(HttpServletRequest request) {
setRemoteServer(servlet.getServletContext().getAttribute(
getRemoteServerName()));
}
// --------------------------------------------------------------------
/**
* Copy messages from business tier message class to presentation
* tier error class.
* :TODO: Refactor once everything is based on a root Commons
* Messages class.
*/
public void addMessages(ActionErrors errors, Messages messages) {
//:TODO: add functionality
}
/**
* Call superclass reset and other reset* methods in this class.
*/
public void reset(ActionMapping mapping,
HttpServletRequest request) {
super.reset(mapping,request);
if (isMutable()) {
resetUserProfile(request);
resetRemoteServer(request);
}
}
/**
* Call superclass validate.
* If returns null, return an empty ActionErrors for the
* benefit of our subclasses.
*/
public ActionErrors validate(ActionMapping mapping,
HttpServletRequest request) {
ActionErrors errors = super.validate(mapping,request);
if (null==errors) errors = new ActionErrors();
if (isMutable()) {
String bizType = getBizType();
if ((errors.empty()) && (null!=bizType)) {
Messages messages = new MessagesImpl();
try {
BizRequest bizRequest =
createBizRequest(bizType);
Map properties = merge(getUserProfile());
BeanUtils.copyProperties(bizRequest,properties);
}
catch (Throwable t) {
messages.add(new MessageImpl(
Tokens.ERROR_GENERAL,
t.toString()
));
}
if (messages.isEmpty()) {
messages.add(
bizRequest.validate(mapping.getAttribute()));
}
if (messages.isEmpty()) {
setBizRequest(bizRequest);
}
else {
setBizRequest(null);
addMessages(errors,messages);
}
} // end errors empty
} // end isMutable
return errors;
}
} // end BizFormImpl
/*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
