Author: husted Date: Tue Dec 28 16:58:03 2004 New Revision: 123586 URL: http://svn.apache.org/viewcvs?view=rev&rev=123586 Log: *** WARNING - PACKAGE IS UNDERGOING AN UPDATE AND *IS NOT STABLE*. ***
Begin process of updating Scaffold for the latest release of Struts and other packages. Fixme: * BaseAction - !MUST! provide equivalent of ActionFormBean formBean = servlet.findFormBean(helperName); * BizFormImple - Ditto. Changes: * BaseAction: Extend from DynaValidatorForm * Remove obsolete logging statements * Move to Global.* constants * Began updating code for latest releases. * Updated build.xml for latest releases. Modified: struts/sandbox/trunk/scaffold/build.xml struts/sandbox/trunk/scaffold/src/STATUS.txt struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java Modified: struts/sandbox/trunk/scaffold/build.xml Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/build.xml?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/build.xml&r1=123585&p2=struts/sandbox/trunk/scaffold/build.xml&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/build.xml (original) +++ struts/sandbox/trunk/scaffold/build.xml Tue Dec 28 16:58:03 2004 @@ -5,44 +5,37 @@ <project name="scaffold" default="compile.lib"> <!-- Change this to compile against a different version --> - <property name="compile.classpath" value="compile.classpath_1_0"/> + <property name="compile.classpath" value="compile.classpath_1_2"/> <!-- Local system paths --> - <property name="distpath.project" value="/projects/lib"/> - <property name="distpath.javasoft" value="/javasoft/lib"/> - <property name="distpath.jakarta" value="/jakarta/lib"/> + <property name="path.dist" value="./target"/> + <property name="path.javasoft" value="/opt/JavaSoft/lib"/> + <property name="path.jakarta" value="/opt/jakarta"/> + <property name="path.sf" value="/opt/sourceforge"/> + <property name="path.struts" value="/opt/struts/jakarta-struts-1.2.4-lib"/> <!-- Project settings --> <property name="project.title" value="scaffold"/> <property name="project.version" value="0.6"/> - <property name="project.distname" value="struts-scaffold_1_0"/> + <property name="project.distname" value="struts-scaffold_1_2"/> <!-- Standard Javasoft jars --> - <property name="servlet.jar" value="${distpath.javasoft}/servlet.jar"/> - <property name="jdbc20ext.jar" value="${distpath.javasoft}/jdbc2_0-stdext.jar"/> + <property name="servlet.jar" value="${path.javasoft}/servletapi_2_3.jar"/> + <property name="jdbc20ext.jar" value="${path.javasoft}/jdbc2_0-stdext.jar"/> <!-- Path settings --> <property name="doc.path" value="./doc/api"/> <property name="doc.src" value="./src/java"/> <!-- Build working classpath --> - <path id="compile.classpath_1_0"> - <pathelement path ="lib/commons-beanutils.jar"/> - <pathelement path ="lib/commons-digester.jar"/> - <pathelement path ="lib/commons-scaffold_1_0.jar"/> - <pathelement path ="lib/struts_1_0_2.jar"/> - <pathelement path ="lib/struts-validator_1_0.jar"/> - <pathelement path ="classes"/> - <pathelement path ="${classpath}"/> - </path> - - <!-- Build working classpath --> - <path id="compile.classpath_1_1"> - <pathelement path ="lib/lucene_1_2.jar"/> - <pathelement path ="lib/poolman_2_0_4.jar"/> - <pathelement path ="lib/commons-beanutils.jar"/> - <pathelement path ="lib/commons-digester.jar"/> - <pathelement path ="lib/struts_1_1_b1.jar"/> + <path id="compile.classpath_1_2"> + <pathelement path ="${path.jakarta}/lucene-1.4.3.jar"/> + <pathelement path ="${path.sf}/poolman-2-0-4/lib/poolman.jar"/> + <pathelement path ="${path.struts}/commons-beanutils.jar"/> + <pathelement path ="${path.struts}/commons-digester.jar"/> + <pathelement path ="${path.jakarta}/commons-scaffold.jar"/> + <pathelement path ="${path.jakarta}/commons-resources.jar"/> + <pathelement path ="${path.struts}/struts.jar"/> <pathelement path ="classes"/> <pathelement path ="${classpath}"/> </path> @@ -70,11 +63,12 @@ <!-- Normal build of application --> <target name="compile" depends="prepare,resources"> <copy - file="./LICENSE" + file="./LICENSE.txt" todir="classes"/> <!-- Remove "jikes" value if you must use javac instead --> <!-- property name="build.compiler" value="jikes"/ --> <javac srcdir="src" destdir="classes"> + <classpath path="${servlet.jar}:${jdbc20ext.jar}" /> <classpath refid="${compile.classpath}"/> </javac> </target> @@ -111,10 +105,10 @@ description="Create binary distribution"> <mkdir - dir="${distpath.project}"/> + dir="${path.dist}"/> <jar - jarfile="${distpath.project}/${project.distname}.jar" + jarfile="${path.dist}/${project.distname}.jar" basedir="./classes"/> </target> @@ -124,14 +118,14 @@ description="Create distribution"> <mkdir - dir="${distpath.project}"/> + dir="${path.dist}"/> - <zip zipfile="${distpath.project}/${project.distname}.zip"> + <zip zipfile="${path.dist}/${project.distname}.zip"> <zipfileset dir="." prefix="struts-scaffold"/> </zip> <jar - jarfile="${distpath.project}/${project.distname}.jar" + jarfile="${path.dist}/${project.distname}.jar" basedir="./classes"/> </target> Modified: struts/sandbox/trunk/scaffold/src/STATUS.txt Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/STATUS.txt?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/STATUS.txt&r1=123585&p2=struts/sandbox/trunk/scaffold/src/STATUS.txt&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/STATUS.txt (original) +++ struts/sandbox/trunk/scaffold/src/STATUS.txt Tue Dec 28 16:58:03 2004 @@ -3,12 +3,24 @@ ======================================================================= [Ordering is LIFO. Last thing done for a day is the first item listed.] + +*** WARNING - PACKAGE IS UNDERGOING AN UPDATE AND *IS NOT STABLE*. *** + + + // -------------------------------------------------------------- FIXME +BaseAction - !MUST! provide equivalent of +ActionFormBean formBean = servlet.findFormBean(helperName); +BizFormImple - Ditto. + RemoveAttributeAction - Needs to be tested. // ---------------------------------------------------------------- TODO +- BizAction - Resolve message handling with latest Commons Resources +- BizForm++ - Update for latest releases + - ProcessDispatchAction: Refactor with ProcessAction so there is not so much duplicate code here - BaseForm: Change from BeanUtil.populate to copyProperties @@ -16,9 +28,14 @@ - ProcessFormAction: Change from BeanUtil.populate to copyProperties - RemoveAttributeAction: Add support for multiple attributes - // ------------------------------------------------------------ CHANGES +[2004-12-28] ++ BaseAction: Extend from DynaValidatorForm ++ *: Remove obsolete logging statements ++ *: Move to Global.* constants ++ Began updating code for latest releases. ++ Updated build for latest releases. [2002-11-11] + BaseAction: Extend from ValidatorForm again. Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java Tue Dec 28 16:58:03 2004 @@ -1,14 +1,19 @@ /* - * $Id$ +// MUST! :FIXME: Need to provide equivalent of +// ActionFormBean formBean = servlet.findFormBean(helperName); +*/ + +/* + * $Id$ * * Copyright 2001-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +35,7 @@ import org.apache.struts.action.*; -import org.apache.struts.util.MessageResources; +import org.apache.struts.Globals; import org.apache.commons.scaffold.lang.BaseException; import org.apache.commons.scaffold.lang.Log; @@ -61,8 +66,7 @@ * @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 false; // Struts 1.1+ } // ---------------------------------------------------------------- Log @@ -73,7 +77,8 @@ * @param level The debug level to test */ protected boolean isLogLevel(int level) { - return (servlet.getDebug()>=level); + // FIXME: return servlet.getDebug()>=level); + return false; } @@ -81,7 +86,8 @@ * Is logging set to debugging? */ protected boolean isDebug() { - return (servlet.getDebug()>=Log.DEBUG); + // FIXME: return (servlet.getDebug()>=Log.DEBUG); + return false; } @@ -89,7 +95,8 @@ * Is logging set to verbose? */ protected boolean isVerbose() { - return (servlet.getDebug()>=Log.VERBOSE); + // FIXME: return (servlet.getDebug()>=Log.VERBOSE); + return false; } @@ -105,7 +112,7 @@ protected void setException( HttpServletRequest request, Exception e) { - request.setAttribute(EXCEPTION_KEY,e); + request.setAttribute(Globals.EXCEPTION_KEY,e); } @@ -115,7 +122,7 @@ * @param request The HTTP request we are processing */ protected Exception getException(HttpServletRequest request) { - return (Exception) request.getAttribute(EXCEPTION_KEY); + return (Exception) request.getAttribute(Globals.EXCEPTION_KEY); } @@ -136,7 +143,7 @@ Locale result = null; HttpSession session = request.getSession(); if (session!=null) { - result = (Locale) session.getAttribute(Action.LOCALE_KEY); + result = (Locale) session.getAttribute(Globals.LOCALE_KEY); if (result == null) result = Locale.getDefault(); } else { result = Locale.getDefault(); @@ -159,7 +166,7 @@ Locale locale) { HttpSession session = request.getSession(true); - session.setAttribute(Action.LOCALE_KEY,locale); + session.setAttribute(Globals.LOCALE_KEY,locale); } // end setLocale() @@ -215,15 +222,6 @@ /** - * Return the application resources for this web application, - * if any. - */ - protected MessageResources getMessageResources() { - return servlet.getResources(); - } - - - /** * Number of replacement parameters permitted in Struts 1.0. * See also saveConfirm. */ @@ -235,7 +233,7 @@ * parameters from a List, and adds them to an ActionErrors * collection. * - * // :FIXME: In 1.1 this should be updated to use the + * // :FIXME: This should be updated to use the * new ActionMessages superclass. * * @param request The request we are servicing @@ -295,7 +293,7 @@ * If it doesn't exist, and create is true, a new collection is * returned. * - * :FIXME: In 1.1 this should be the ActionMessage superclass + * :FIXME: This should be the ActionMessage superclass * @param request The HTTP request we are processing * @param create Whether to create a new collection if one does * not exist @@ -305,9 +303,8 @@ HttpServletRequest request, boolean create) { - // :FIXME: In 1.1 should use public static final String - MESSAGE_KEY = "org.apache.struts.action.ACTION_MESSAGE"; + MESSAGE_KEY = Globals.MESSAGE_KEY; ActionErrors alerts = (ActionErrors) request.getAttribute(MESSAGE_KEY); @@ -391,14 +388,14 @@ boolean create) { ActionErrors alerts = (ActionErrors) - request.getAttribute(ERROR_KEY); + request.getAttribute(Globals.ERROR_KEY); if ((null==alerts) && (create)) { alerts = new ActionErrors(); // Bypass Action.SaveError() since it // won't accept a blank collection - request.setAttribute(ERROR_KEY,alerts); + request.setAttribute(Globals.ERROR_KEY,alerts); } @@ -543,8 +540,9 @@ } Object bean = null; - - ActionFormBean formBean = servlet.findFormBean(helperName); + // MUST! :FIXME: Need to provide equivalent of + // ActionFormBean formBean = servlet.findFormBean(helperName); + ActionFormBean formBean = null; if (formBean != null) { String className = null; className = formBean.getType(); @@ -679,7 +677,6 @@ // override to provide functionality, like // myBusinessObject.execute(form); - servlet.log(Log.BASE_LOGIC_EXECUTING,Log.DEBUG); } // end executeLogic() Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java Tue Dec 28 16:58:03 2004 @@ -30,11 +30,10 @@ import org.apache.struts.action.Action; import org.apache.struts.action.ActionError; -// import org.apache.struts.action.ActionForm; 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.struts.validator.DynaValidatorForm; +import org.apache.struts.Globals; import org.apache.commons.scaffold.lang.ChainedException; import org.apache.commons.scaffold.lang.Log; @@ -44,10 +43,9 @@ /** * Enhanced base ActionForm. - * :TODO: Extend from DynaValidatorForm in 1.1 version. * @version $Rev$ $Date$ */ -public class BaseForm extends ValidatorForm { +public class BaseForm extends DynaValidatorForm { // ---------------------------------------------------------- Remote Host @@ -92,7 +90,7 @@ * The session attribute key for our session locale [Action.LOCALE_KEY]. * (Suggestion only, may be overridden by presentation framework */ - public static String STRUTS_LOCALE_KEY = Action.LOCALE_KEY; + public static String STRUTS_LOCALE_KEY = Globals.LOCALE_KEY; /** @@ -164,7 +162,7 @@ Locale locale = getSessionLocale(); if (null==locale) locale = Locale.getDefault(); - request.getSession(true).setAttribute(Action.LOCALE_KEY,locale); + request.getSession(true).setAttribute(Globals.LOCALE_KEY,locale); } // end putSessionLocale Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java Tue Dec 28 16:58:03 2004 @@ -23,7 +23,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import org.apache.commons.scaffold.lang.Log; import org.apache.commons.scaffold.lang.Tokens; @@ -55,9 +54,9 @@ * @param form The ActionForm * @param request The HTTP request we are processing * @param response The HTTP response we are creating - * @param helper The object instantiated from type given as parameter. - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @param helpers The object instantiated from type given as parameter. + * @exception java.io.IOException if an input/output error occurs + * @exception javax.servlet.ServletException if a servlet exception occurs */ protected void executeLogic( ActionMapping mapping, @@ -97,7 +96,6 @@ HttpServletResponse response) throws Exception { - servlet.log(Log.TOKENS_PARSING,Log.DEBUG); String[] tokens = tokenize(mapping.getParameter()); int helperCount = tokens.length; Object[] helpers = new Object[helperCount]; @@ -106,7 +104,6 @@ helpers[i] = createHelperObject(request,tokens[i]); } - servlet.log(Log.HELPER_EXECUTING,Log.DEBUG); executeLogic(mapping,form,request,response,helpers); } Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java Tue Dec 28 16:58:03 2004 @@ -17,10 +17,6 @@ */ package org.apache.struts.scaffold; - -import java.util.Map; - - /** * Enhanced base ActionForm for Struts 1.1 and later. * @@ -29,34 +25,6 @@ public class BaseMapForm extends BaseForm { // ----------------------------------------------------------- Properties - - /** - * The map for field properties [null]. - * Can be used since 1.1 as an alternative - * to individual properties for each field. - */ - private Map map = null; - - - /** - * Set the properties map. - * - * @param map The map to use for our properties - */ - public void setMap(Map map) throws Exception { - this.map = map; - } - - - /** - * Get the properties map. - * - * @return The map being used for our properties - */ - public Map getMap() throws Exception { - return this.map; - } - /** * Associates the specified value with the specified key in Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizAction.java Tue Dec 28 16:58:03 2004 @@ -40,9 +40,7 @@ import org.apache.commons.scaffold.util.BizRequest; import org.apache.commons.scaffold.util.BizResponse; import org.apache.commons.scaffold.util.BizService; -import org.apache.commons.scaffold.util.Message; -import org.apache.commons.scaffold.util.ResultList; -import org.apache.commons.scaffold.util.ResultListBase; +import org.apache.commons.resources.Message; /** * Advanced framework class to invoke a business service @@ -72,7 +70,6 @@ Object bean) { if ((null==scope) || (null==bean)) { - servlet.log(Log.PROCESS_BEAN_NULL_SCOPE,Log.DEBUG); return; } @@ -122,7 +119,6 @@ StringBuffer sb = new StringBuffer("exposeInScope: "); sb.append(scope); sb.append(Tokens.INVALID_SCOPE); - servlet.log(sb.toString(),Log.DEBUG); throw new IllegalArgumentException(sb.toString()); } @@ -233,7 +229,7 @@ * * @param mapping The ActionMapping used to select this instance * @param request The HTTP request we are processing - * @param BizResponse The BizResponse we are handling + * @param bizResponse The BizResponse we are handling */ protected void checkDispatch( ActionMapping mapping, @@ -261,7 +257,7 @@ * * @param mapping The ActionMapping used to select this instance * @param request The HTTP request we are processing - * @param BizResponse The BizResponse we are handling + * @param bizResponse The BizResponse we are handling */ protected void checkOutcome( ActionMapping mapping, @@ -270,8 +266,6 @@ if (bizResponse!=null) { - servlet.log(Log.HELPER_OUTCOME,Log.DEBUG); - if (bizResponse.isAggregate()) { // recurse for each BizResponse in collection Collection collection = (Collection) @@ -472,8 +466,7 @@ // Any other way to do this? BizResponse bizResponse = new org.apache.commons.scaffold.util.BizResponseImpl(); - Message message = - new org.apache.commons.scaffold.util.MessageImpl( + Message message = new org.apache.commons.scaffold.util.MessageImpl( template, mapping.getPath(), mapping.getParameter() @@ -550,7 +543,6 @@ Object[] helpers) throws Exception { BizResponse bizResponse = null; - servlet.log(Log.HELPER_PROCESSING,Log.DEBUG); try { // Cast our form bean; snag our request bean @@ -558,7 +550,6 @@ BizRequest bizRequest = bizForm.getBizRequest(); // Munge the parameter property - servlet.log(Log.TOKENS_PARSING,Log.DEBUG); String[] tokens = tokenize(mapping.getParameter()); // Create our business service helper @@ -566,7 +557,6 @@ BizService bizService = (BizService) helper; // Process business logic - servlet.log(Log.HELPER_EXECUTING,Log.DEBUG); if (tokens.length>1) { // Pass along the helper's parameter, if any Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizForm.java Tue Dec 28 16:58:03 2004 @@ -23,15 +23,9 @@ import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionErrors; -// 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; /** Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java Tue Dec 28 16:58:03 2004 @@ -26,13 +26,9 @@ import javax.servlet.http.HttpServletRequest; 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.ParameterException; 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; Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/MenuForm.java Tue Dec 28 16:58:03 2004 @@ -57,7 +57,7 @@ /** * Set the keyName. * - * @param key The new keyName + * @param keyName The new keyName */ public void setKeyName(String keyName) { this.keyName = keyName; @@ -88,7 +88,7 @@ /** * Set the value. * - * @param value The new value + * @param keyValue The new value */ public void setKeyValue(String keyValue) { this.keyValue = keyValue; @@ -112,7 +112,7 @@ /** * Set the page key * - * @param key The new page key + * @param page The new page key */ public void setPage(int page) { this.page = page; @@ -137,7 +137,7 @@ /** * Set the dispatch * - * @param key The new dispatch + * @param dispatch The new dispatch */ public void setDispatch(String dispatch) { this.dispatch = dispatch; @@ -221,7 +221,7 @@ * <p> * Mnemoric: T-V / value * - * @param value The new KeyValue + * @param keyValue The new KeyValue */ public void setT(String keyValue) { setKeyValue(keyValue); Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java Tue Dec 28 16:58:03 2004 @@ -63,7 +63,7 @@ Object bean) { if (null==scope) { - servlet.log(Log.PROCESS_BEAN_NULL_SCOPE,Log.DEBUG); + // } else if (Tokens.REQUEST.equals(scope)) { request.setAttribute(name,bean); @@ -78,7 +78,6 @@ StringBuffer sb = new StringBuffer("exposeInScope: "); sb.append(scope); sb.append(Tokens.INVALID_SCOPE); - servlet.log(sb.toString(),Log.DEBUG); throw new IllegalArgumentException(sb.toString()); } @@ -341,8 +340,6 @@ if (result!=null) { - servlet.log(Log.HELPER_OUTCOME,Log.DEBUG); - if (result.isAggregate()) { // recurse for each ProcessResult in collection Collection collection = (Collection) @@ -459,7 +456,6 @@ BaseForm userBean = getUserProfile(mapping,form,request,response); - servlet.log(Log.HELPER_PROCESSING,Log.DEBUG); Map properties = null; for (int i = 0; i < helpers.length; i++) { @@ -474,7 +470,6 @@ // Merge user profile (if found) // and our form into a single map - servlet.log(Log.HELPER_POPULATE,Log.DEBUG); properties = formBean.merge(userBean); // Pass up the Locale, RemoteNode, and RemoteServer (if any) @@ -492,7 +487,6 @@ } // Execute business logic, using values from map - servlet.log(Log.HELPER_EXECUTING,Log.DEBUG); ProcessResult result = (ProcessResult) dataBean.execute(properties); Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java Tue Dec 28 16:58:03 2004 @@ -102,16 +102,13 @@ BaseForm userBean = getUserProfile(mapping,form,request,response); - 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()); // 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 @@ -127,7 +124,6 @@ // Merge user profile (if found) // and our form into a single map - servlet.log(Log.HELPER_POPULATE,Log.DEBUG); properties = formBean.merge(userBean); // Pass up the Locale and RemoteServer (if any) @@ -144,8 +140,6 @@ } // Execute business logic, using values from map - servlet.log(Log.HELPER_EXECUTING,Log.DEBUG); - Method method = dataBean.getClass().getMethod(tokens[1],types); Object args[] = { properties }; Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java Tue Dec 28 16:58:03 2004 @@ -78,7 +78,7 @@ Object bean) { if (null==scope) { - servlet.log(Log.PROCESS_BEAN_NULL_SCOPE,Log.DEBUG); + // } if (null==bean) super.exposeInScope(request,response,name,scope,bean); else if (Tokens.REQUEST.equals(scope)) { @@ -127,7 +127,6 @@ StringBuffer sb = new StringBuffer("exposeInScope: "); sb.append(scope); sb.append(Tokens.INVALID_SCOPE); - servlet.log(sb.toString(),Log.DEBUG); throw new IllegalArgumentException(sb.toString()); } Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/RecreateSessionAction.java Tue Dec 28 16:58:03 2004 @@ -30,6 +30,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.Globals; import org.apache.commons.scaffold.lang.Tokens; @@ -61,13 +62,13 @@ HttpSession session = request.getSession(); - Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY); + Locale locale = (Locale) session.getAttribute(Globals.LOCALE_KEY); session.invalidate(); session = request.getSession(true); - session.setAttribute(Action.LOCALE_KEY,locale); + session.setAttribute(Globals.LOCALE_KEY,locale); return mapping.findForward(Tokens.SUCCESS); } Modified: struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java Url: http://svn.apache.org/viewcvs/struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java?view=diff&rev=123586&p1=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java&r1=123585&p2=struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java&r2=123586 ============================================================================== --- struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java (original) +++ struts/sandbox/trunk/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java Tue Dec 28 16:58:03 2004 @@ -17,7 +17,7 @@ */ -package org.apache.struts.scaffold.SetPathsAction; +package org.apache.struts.scaffold; import java.io.IOException; @@ -29,8 +29,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.scaffold.BaseAction; -import org.apache.commons.scaffold.lang.Log; -import org.apache.commons.scaffold.lang.Tokens; /** @@ -61,7 +59,6 @@ HttpServletResponse response) throws Exception { - servlet.log(Log.TOKENS_PARSING,Log.DEBUG); String[] tokens = tokenize(mapping.getParameter()); int helperCount = tokens.length; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
