struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r421119 [1/4] - in /struts/struts1/trunk/core/src: main/java/org/apache/struts/ main/java/org/apache/struts/action/ main/java/org/apache/struts/chain/ main/java/org/apache/struts/chain/commands/ main/java/org/apache/struts/chain/commands/ge...
Date Wed, 12 Jul 2006 04:49:16 GMT
Author: wsmoak
Date: Tue Jul 11 21:49:11 2006
New Revision: 421119

URL: http://svn.apache.org/viewvc?rev=421119&view=rev
Log:
Correct svn properties: keywords and eol-style.  No other changes.

Modified:
    struts/struts1/trunk/core/src/main/java/org/apache/struts/Globals.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionErrors.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionFormBean.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ExceptionHandler.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/PlugIn.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestActionMapping.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/action/SessionActionMapping.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/Constants.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformInclude.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectForward.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectInput.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectLocale.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectModule.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SetContentType.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/ActionContext.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/ActionContextBase.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/ContextWrapper.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/MockActionContext.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java   (contents, props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfigMatcher.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigHelper.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigHelperInterface.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ControllerConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ModuleConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ModuleConfigFactory.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/PlugInConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockAction.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockActionServlet.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockEnumeration.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockFormBean.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockHttpSession.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockPageContext.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockPrincipal.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockServletConfig.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockServletContext.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/TestMockBase.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/MultipartRequestHandler.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/MultipartRequestWrapper.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/ImageButtonBean.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/IteratorAdapter.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/LabelValueBean.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/MessageResources.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/MessageResourcesFactory.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/ModuleException.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/ModuleUtils.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResourcesFactory.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/ResponseUtils.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/ServletContextWriter.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/TokenProcessor.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/BeanValidatorForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/DynaValidatorForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/LazyValidatorForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/Resources.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java   (props changed)
    struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java   (props changed)
    struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionMessage.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionMessages.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java   (contents, props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java   (contents, props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java   (contents, props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/chain/commands/servlet/TestPerformForward.java   (contents, props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java   (contents, props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/config/CustomMappingTest.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtils.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java   (props changed)
    struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java   (props changed)

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/Globals.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionErrors.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionForm.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionFormBean.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionForward.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java Tue Jul 11 21:49:11 2006
@@ -1,346 +1,346 @@
-/*
- * $Id$
- *
- * Copyright 2000-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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.action;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.config.ForwardConfig;
-import org.apache.struts.util.ResponseUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p> A subclass of {@link ActionForward} which is designed for use in
- * redirecting requests, with support for adding parameters at runtime. <br/>
- * An {@link ForwardConfig} (or subclass) can be passed to the constructor to
- * copy its configuration: </p> <p>
- * <pre>
- * public ActionForward execute(ActionMapping mapping,
- *                              ActionForm form,
- *                              HttpServletRequest request,
- *                              HttpServletResponse response)
- *         throws Exception {
- *     ActionRedirect redirect =
- *             new ActionRedirect(mapping.findForward("doRedirect"));
- *     redirect.addParameter("param1","value1");
- *     redirect.addParameter("param2","2");
- *     redirect.addParameter("param3","3.0");
- *     return redirect;
- * }
- * </pre>
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public class ActionRedirect extends ActionForward {
-    // ----------------------------------------------------- Manifest constants
-
-    /**
-     * <p>Default allocation size for string buffers.</p>
-     */
-    private static final int DEFAULT_BUFFER_SIZE = 256;
-
-    // ----------------------------------------------------- Static variables
-
-    /**
-     * <p>Commons logging instance.</p>
-     */
-    protected static final Log LOG = LogFactory.getLog(ActionRedirect.class);
-
-    // ----------------------------------------------------- Instance variables
-
-    /**
-     * <p>Holds the redirect parameters. Each entry is either a String or a
-     * String[] depending on whether it has one or more entries.</p>
-     */
-    protected Map parameterValues = null;
-
-    /**
-     * <p>Holds the anchor value.</p>
-     */
-    protected String anchorValue = null;
-
-    // ----------------------------------------------------- Constructors
-
-    /**
-     * <p>Construct a new instance with redirect set to true and initialize
-     * parameter lists.</p>
-     */
-    public ActionRedirect() {
-        setRedirect(true);
-        initializeParameters();
-    }
-
-    /**
-     * <p>Construct a new instance with the specified path and initialize
-     * parameter lists.</p>
-     *
-     * @param path Path for this instance
-     */
-    public ActionRedirect(String path) {
-        super(path);
-        setRedirect(true);
-        initializeParameters();
-    }
-
-    /**
-     * <p>Construct a new instance with the specified values and initialize
-     * parameter lists.</p>
-     *
-     * @param name   Name of this instance
-     * @param path   Path for this instance
-     * @param module Module prefix, if any
-     */
-    public ActionRedirect(String name, String path, String module) {
-        super(name, path, true);
-        setModule(module);
-        initializeParameters();
-    }
-
-    /**
-     * <p>Construct a new instance with a {@link ForwardConfig} object to copy
-     * name, path, and contextRelative values from.</p>
-     *
-     * @param baseConfig the {@link ForwardConfig} to copy configuration
-     *                   values from
-     */
-    public ActionRedirect(ForwardConfig baseConfig) {
-        setName(baseConfig.getName());
-        setPath(baseConfig.getPath());
-        setModule(baseConfig.getModule());
-        setRedirect(baseConfig.getRedirect());
-        initializeParameters();
-    }
-
-    // ----------------------------------------------------- Private methods
-
-    /**
-     * <p>Initializes the internal objects used to hold parameter values.</p>
-     */
-    private void initializeParameters() {
-        parameterValues = new HashMap();
-    }
-
-    // ----------------------------------------------------- Public methods
-
-    /**
-     * <p>Adds the object's toString() to the list of parameters if it's not
-     * null, or an empty string with the given fieldName if it is.</p>
-     *
-     * @param fieldName the name to use for the parameter
-     * @param valueObj  the value for this parameter
-     * @return The ActionRedirect instance this method is called on
-     */
-    public ActionRedirect addParameter(String fieldName, Object valueObj) {
-        String value = (valueObj != null) ? valueObj.toString() : "";
-
-        if (parameterValues == null) {
-            initializeParameters();
-        }
-
-        //try {
-        value = ResponseUtils.encodeURL(value);
-
-        //} catch (UnsupportedEncodingException uce) {
-        // this shouldn't happen since UTF-8 is the W3C Recommendation
-        //     String errorMsg = "UTF-8 Character Encoding not supported";
-        //     LOG.error(errorMsg, uce);
-        //     throw new RuntimeException(errorMsg, uce);
-        // }
-        Object currentValue = parameterValues.get(fieldName);
-
-        if (currentValue == null) {
-            // there's no value for this param yet; add it to the map
-            parameterValues.put(fieldName, value);
-        } else if (currentValue instanceof String) {
-            // there's already a value; let's use an array for these parameters
-            String[] newValue = new String[2];
-
-            newValue[0] = (String) currentValue;
-            newValue[1] = value;
-            parameterValues.put(fieldName, newValue);
-        } else if (currentValue instanceof String[]) {
-            // add the value to the list of existing values
-            List newValues =
-                new ArrayList(Arrays.asList((Object[]) currentValue));
-
-            newValues.add(value);
-            parameterValues.put(fieldName,
-                newValues.toArray(new String[newValues.size()]));
-        }
-        return this;
-    }
-
-    /**
-     * <p>Adds an anchor to the path.  Technically, the anchor value is
-     * just stored for later and will be added to the path in getPath().
-     * Note that this is a considerably simpler method than the
-     * addParmaeter method because aside from encoding the value, there
-     * isn't really anything to do.  Passing in null is fine because that
-     * is the value that will be checked for later to determine whether
-     * to append an anchor to the path or not.</p>
-     *
-     * @param anchorValue The anchor to append to the path
-     * @return The ActionRefirect instance this method is called on
-     */
-    public ActionRedirect setAnchor(String anchorValue) {
-        this.anchorValue = ResponseUtils.encodeURL(anchorValue);
-        return this;
-    }
-
-    /**
-     * <p>Get the original path without the parameters added at runtime.</p>
-     *
-     * @return the original path as configured.
-     */
-    public String getOriginalPath() {
-        return super.getPath();
-    }
-
-    /**
-     * <p>Get the path for this object, including any parameters that may have
-     * been added at runtime.</p>
-     *
-     * @return The path for this object.
-     */
-    public String getPath() {
-        // get the original path and the parameter string that was formed
-        String originalPath = getOriginalPath();
-        String parameterString = getParameterString();
-        String anchorString = getAnchorString();
-
-        StringBuffer result = new StringBuffer(originalPath);
-
-        if ((parameterString != null) && (parameterString.length() > 0)) {
-            // the parameter separator we're going to use
-            String paramSeparator = "?";
-
-            // true if we need to use a parameter separator after originalPath
-            boolean needsParamSeparator = true;
-
-            // does the original path already have a "?"?
-            int paramStartIndex = originalPath.indexOf("?");
-
-            if (paramStartIndex > 0) {
-                // did the path end with "?"?
-                needsParamSeparator = (paramStartIndex != (originalPath.length()
-                    - 1));
-
-                if (needsParamSeparator) {
-                    paramSeparator = "&";
-                }
-            }
-
-            if (needsParamSeparator) {
-                result.append(paramSeparator);
-            }
-
-            result.append(parameterString);
-        }
-
-        // append anchor string (or blank if none was set)
-        result.append(anchorString);
-
-
-        return result.toString();
-    }
-
-    /**
-     * <p>Forms the string containing the parameters
-     *  passed onto this object thru calls to addParameter().</p>
-     *
-     * @return a string which can be appended to the URLs.  The
-     *    return string includes a leading hash
-     *    mark (#).
-     */
-    public String getAnchorString() {
-        String retVal = "";
-        if (anchorValue != null) {
-            retVal = "#" + anchorValue;
-        }
-        return retVal;
-    }
-
-    /**
-     * <p>Forms the string containing the parameters passed onto this object
-     * thru calls to addParameter().</p>
-     *
-     * @return a string which can be appended to the URLs.  The return string
-     *         does not include a leading question mark (?).
-     */
-    public String getParameterString() {
-        StringBuffer strParam = new StringBuffer(DEFAULT_BUFFER_SIZE);
-
-        // loop through all parameters
-        Iterator iterator = parameterValues.keySet().iterator();
-
-        while (iterator.hasNext()) {
-            // get the parameter name
-            String paramName = (String) iterator.next();
-
-            // get the value for this parameter
-            Object value = parameterValues.get(paramName);
-
-            if (value instanceof String) {
-                // just one value for this param
-                strParam.append(paramName).append("=").append(value);
-            } else if (value instanceof String[]) {
-                // loop through all values for this param
-                String[] values = (String[]) value;
-
-                for (int i = 0; i < values.length; i++) {
-                    strParam.append(paramName).append("=").append(values[i]);
-
-                    if (i < (values.length - 1)) {
-                        strParam.append("&");
-                    }
-                }
-            }
-
-            if (iterator.hasNext()) {
-                strParam.append("&");
-            }
-        }
-
-        return strParam.toString();
-    }
-
-    // ----------------------------------------------------- toString()
-
-    /**
-     * <p>Return a string description of this object.</p>
-     *
-     * @return a string containing the original path for this object and the
-     *         parameters it currently holds
-     */
-    public String toString() {
-        StringBuffer result = new StringBuffer(DEFAULT_BUFFER_SIZE);
-
-        result.append("ActionRedirect [");
-        result.append("originalPath=").append(getOriginalPath()).append(";");
-        result.append("parameterString=").append(getParameterString()).append("]");
-        result.append("anchorString=").append(getAnchorString()).append("]");
-
-        return result.toString();
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2000-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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.action;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.util.ResponseUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p> A subclass of {@link ActionForward} which is designed for use in
+ * redirecting requests, with support for adding parameters at runtime. <br/>
+ * An {@link ForwardConfig} (or subclass) can be passed to the constructor to
+ * copy its configuration: </p> <p>
+ * <pre>
+ * public ActionForward execute(ActionMapping mapping,
+ *                              ActionForm form,
+ *                              HttpServletRequest request,
+ *                              HttpServletResponse response)
+ *         throws Exception {
+ *     ActionRedirect redirect =
+ *             new ActionRedirect(mapping.findForward("doRedirect"));
+ *     redirect.addParameter("param1","value1");
+ *     redirect.addParameter("param2","2");
+ *     redirect.addParameter("param3","3.0");
+ *     return redirect;
+ * }
+ * </pre>
+ * </p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class ActionRedirect extends ActionForward {
+    // ----------------------------------------------------- Manifest constants
+
+    /**
+     * <p>Default allocation size for string buffers.</p>
+     */
+    private static final int DEFAULT_BUFFER_SIZE = 256;
+
+    // ----------------------------------------------------- Static variables
+
+    /**
+     * <p>Commons logging instance.</p>
+     */
+    protected static final Log LOG = LogFactory.getLog(ActionRedirect.class);
+
+    // ----------------------------------------------------- Instance variables
+
+    /**
+     * <p>Holds the redirect parameters. Each entry is either a String or a
+     * String[] depending on whether it has one or more entries.</p>
+     */
+    protected Map parameterValues = null;
+
+    /**
+     * <p>Holds the anchor value.</p>
+     */
+    protected String anchorValue = null;
+
+    // ----------------------------------------------------- Constructors
+
+    /**
+     * <p>Construct a new instance with redirect set to true and initialize
+     * parameter lists.</p>
+     */
+    public ActionRedirect() {
+        setRedirect(true);
+        initializeParameters();
+    }
+
+    /**
+     * <p>Construct a new instance with the specified path and initialize
+     * parameter lists.</p>
+     *
+     * @param path Path for this instance
+     */
+    public ActionRedirect(String path) {
+        super(path);
+        setRedirect(true);
+        initializeParameters();
+    }
+
+    /**
+     * <p>Construct a new instance with the specified values and initialize
+     * parameter lists.</p>
+     *
+     * @param name   Name of this instance
+     * @param path   Path for this instance
+     * @param module Module prefix, if any
+     */
+    public ActionRedirect(String name, String path, String module) {
+        super(name, path, true);
+        setModule(module);
+        initializeParameters();
+    }
+
+    /**
+     * <p>Construct a new instance with a {@link ForwardConfig} object to copy
+     * name, path, and contextRelative values from.</p>
+     *
+     * @param baseConfig the {@link ForwardConfig} to copy configuration
+     *                   values from
+     */
+    public ActionRedirect(ForwardConfig baseConfig) {
+        setName(baseConfig.getName());
+        setPath(baseConfig.getPath());
+        setModule(baseConfig.getModule());
+        setRedirect(baseConfig.getRedirect());
+        initializeParameters();
+    }
+
+    // ----------------------------------------------------- Private methods
+
+    /**
+     * <p>Initializes the internal objects used to hold parameter values.</p>
+     */
+    private void initializeParameters() {
+        parameterValues = new HashMap();
+    }
+
+    // ----------------------------------------------------- Public methods
+
+    /**
+     * <p>Adds the object's toString() to the list of parameters if it's not
+     * null, or an empty string with the given fieldName if it is.</p>
+     *
+     * @param fieldName the name to use for the parameter
+     * @param valueObj  the value for this parameter
+     * @return The ActionRedirect instance this method is called on
+     */
+    public ActionRedirect addParameter(String fieldName, Object valueObj) {
+        String value = (valueObj != null) ? valueObj.toString() : "";
+
+        if (parameterValues == null) {
+            initializeParameters();
+        }
+
+        //try {
+        value = ResponseUtils.encodeURL(value);
+
+        //} catch (UnsupportedEncodingException uce) {
+        // this shouldn't happen since UTF-8 is the W3C Recommendation
+        //     String errorMsg = "UTF-8 Character Encoding not supported";
+        //     LOG.error(errorMsg, uce);
+        //     throw new RuntimeException(errorMsg, uce);
+        // }
+        Object currentValue = parameterValues.get(fieldName);
+
+        if (currentValue == null) {
+            // there's no value for this param yet; add it to the map
+            parameterValues.put(fieldName, value);
+        } else if (currentValue instanceof String) {
+            // there's already a value; let's use an array for these parameters
+            String[] newValue = new String[2];
+
+            newValue[0] = (String) currentValue;
+            newValue[1] = value;
+            parameterValues.put(fieldName, newValue);
+        } else if (currentValue instanceof String[]) {
+            // add the value to the list of existing values
+            List newValues =
+                new ArrayList(Arrays.asList((Object[]) currentValue));
+
+            newValues.add(value);
+            parameterValues.put(fieldName,
+                newValues.toArray(new String[newValues.size()]));
+        }
+        return this;
+    }
+
+    /**
+     * <p>Adds an anchor to the path.  Technically, the anchor value is
+     * just stored for later and will be added to the path in getPath().
+     * Note that this is a considerably simpler method than the
+     * addParmaeter method because aside from encoding the value, there
+     * isn't really anything to do.  Passing in null is fine because that
+     * is the value that will be checked for later to determine whether
+     * to append an anchor to the path or not.</p>
+     *
+     * @param anchorValue The anchor to append to the path
+     * @return The ActionRefirect instance this method is called on
+     */
+    public ActionRedirect setAnchor(String anchorValue) {
+        this.anchorValue = ResponseUtils.encodeURL(anchorValue);
+        return this;
+    }
+
+    /**
+     * <p>Get the original path without the parameters added at runtime.</p>
+     *
+     * @return the original path as configured.
+     */
+    public String getOriginalPath() {
+        return super.getPath();
+    }
+
+    /**
+     * <p>Get the path for this object, including any parameters that may have
+     * been added at runtime.</p>
+     *
+     * @return The path for this object.
+     */
+    public String getPath() {
+        // get the original path and the parameter string that was formed
+        String originalPath = getOriginalPath();
+        String parameterString = getParameterString();
+        String anchorString = getAnchorString();
+
+        StringBuffer result = new StringBuffer(originalPath);
+
+        if ((parameterString != null) && (parameterString.length() > 0)) {
+            // the parameter separator we're going to use
+            String paramSeparator = "?";
+
+            // true if we need to use a parameter separator after originalPath
+            boolean needsParamSeparator = true;
+
+            // does the original path already have a "?"?
+            int paramStartIndex = originalPath.indexOf("?");
+
+            if (paramStartIndex > 0) {
+                // did the path end with "?"?
+                needsParamSeparator = (paramStartIndex != (originalPath.length()
+                    - 1));
+
+                if (needsParamSeparator) {
+                    paramSeparator = "&";
+                }
+            }
+
+            if (needsParamSeparator) {
+                result.append(paramSeparator);
+            }
+
+            result.append(parameterString);
+        }
+
+        // append anchor string (or blank if none was set)
+        result.append(anchorString);
+
+
+        return result.toString();
+    }
+
+    /**
+     * <p>Forms the string containing the parameters
+     *  passed onto this object thru calls to addParameter().</p>
+     *
+     * @return a string which can be appended to the URLs.  The
+     *    return string includes a leading hash
+     *    mark (#).
+     */
+    public String getAnchorString() {
+        String retVal = "";
+        if (anchorValue != null) {
+            retVal = "#" + anchorValue;
+        }
+        return retVal;
+    }
+
+    /**
+     * <p>Forms the string containing the parameters passed onto this object
+     * thru calls to addParameter().</p>
+     *
+     * @return a string which can be appended to the URLs.  The return string
+     *         does not include a leading question mark (?).
+     */
+    public String getParameterString() {
+        StringBuffer strParam = new StringBuffer(DEFAULT_BUFFER_SIZE);
+
+        // loop through all parameters
+        Iterator iterator = parameterValues.keySet().iterator();
+
+        while (iterator.hasNext()) {
+            // get the parameter name
+            String paramName = (String) iterator.next();
+
+            // get the value for this parameter
+            Object value = parameterValues.get(paramName);
+
+            if (value instanceof String) {
+                // just one value for this param
+                strParam.append(paramName).append("=").append(value);
+            } else if (value instanceof String[]) {
+                // loop through all values for this param
+                String[] values = (String[]) value;
+
+                for (int i = 0; i < values.length; i++) {
+                    strParam.append(paramName).append("=").append(values[i]);
+
+                    if (i < (values.length - 1)) {
+                        strParam.append("&");
+                    }
+                }
+            }
+
+            if (iterator.hasNext()) {
+                strParam.append("&");
+            }
+        }
+
+        return strParam.toString();
+    }
+
+    // ----------------------------------------------------- toString()
+
+    /**
+     * <p>Return a string description of this object.</p>
+     *
+     * @return a string containing the original path for this object and the
+     *         parameters it currently holds
+     */
+    public String toString() {
+        StringBuffer result = new StringBuffer(DEFAULT_BUFFER_SIZE);
+
+        result.append("ActionRedirect [");
+        result.append("originalPath=").append(getOriginalPath()).append(";");
+        result.append("parameterString=").append(getParameterString()).append("]");
+        result.append("anchorString=").append(getAnchorString()).append("]");
+
+        return result.toString();
+    }
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ExceptionHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java Tue Jul 11 21:49:11 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: Action.java 376862 2006-02-10 21:14:54Z husted $
+ * $Id$
  *
  * Copyright 2000-2004 The Apache Software Foundation.
  *

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/InvalidCancelException.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/PlugIn.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestActionMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/RequestProcessor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/SessionActionMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/Constants.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java Tue Jul 11 21:49:11 2006
@@ -1,58 +1,58 @@
-/*
- * $Id: RequestProcessor.java 370938 2006-01-21 00:19:02Z husted $
- *
- * Copyright 2003-2005 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.chain.commands;
-
-import org.apache.struts.Globals;
-import org.apache.struts.chain.contexts.ActionContext;
-
-/**
- * <p>Check to original uri is set, and if not, set it for this request.</p>
- *
- * @version $Rev: 179995 $ $Date: 2005-06-04 07:58:46 -0700 (Sat, 04 Jun 2005)
- *          $
- */
-public abstract class AbstractSetOriginalURI extends ActionCommandBase {
-    // ---------------------------------------------------------- Public Methods
-
-    /**
-     * <p>Check to original uri is set, and if not, set it for this
-     * request.</p>
-     *
-     * @param actionCtx The <code>Context</code> for the current request
-     * @return <code>false</code> so that processing continues
-     * @throws Exception if thrown by the Action class
-     */
-    public boolean execute(ActionContext actionCtx)
-        throws Exception {
-        // Set the original uri if not already set
-        if (!actionCtx.getRequestScope().containsKey(Globals.ORIGINAL_URI_KEY)) {
-            setOriginalURI(actionCtx);
-        }
-
-        return (false);
-    }
-
-    // ------------------------------------------------------- Protected Methods
-
-    /**
-     * <p>Set the original uri.</p>
-     *
-     * @param context The <code>Context</code> for this request
-     */
-    protected abstract void setOriginalURI(ActionContext context);
-}
+/*
+ * $Id$
+ *
+ * Copyright 2003-2005 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.chain.commands;
+
+import org.apache.struts.Globals;
+import org.apache.struts.chain.contexts.ActionContext;
+
+/**
+ * <p>Check to original uri is set, and if not, set it for this request.</p>
+ *
+ * @version $Rev$ $Date: 2005-06-04 07:58:46 -0700 (Sat, 04 Jun 2005)
+ *          $
+ */
+public abstract class AbstractSetOriginalURI extends ActionCommandBase {
+    // ---------------------------------------------------------- Public Methods
+
+    /**
+     * <p>Check to original uri is set, and if not, set it for this
+     * request.</p>
+     *
+     * @param actionCtx The <code>Context</code> for the current request
+     * @return <code>false</code> so that processing continues
+     * @throws Exception if thrown by the Action class
+     */
+    public boolean execute(ActionContext actionCtx)
+        throws Exception {
+        // Set the original uri if not already set
+        if (!actionCtx.getRequestScope().containsKey(Globals.ORIGINAL_URI_KEY)) {
+            setOriginalURI(actionCtx);
+        }
+
+        return (false);
+    }
+
+    // ------------------------------------------------------- Protected Methods
+
+    /**
+     * <p>Set the original uri.</p>
+     *
+     * @param context The <code>Context</code> for this request
+     */
+    protected abstract void setOriginalURI(ActionContext context);
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java Tue Jul 11 21:49:11 2006
@@ -1,35 +1,35 @@
-/*
- * $Id: RequestProcessor.java 370938 2006-01-21 00:19:02Z husted $
- *
- * Copyright 2003-2005 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.chain.commands;
-
-import org.apache.commons.chain.Command;
-import org.apache.struts.chain.contexts.ActionContext;
-
-/**
- * <p>Marks a commons-chain <code>Command</code> which expects to operate upon
- * a Struts <code>ActionContext</code>.</p>
- */
-public interface ActionCommand extends Command {
-    /**
-     * @param actionContext The <code>Context</code> for the current request
-     * @return TRUE if processing should halt
-     * @throws Exception On any error
-     */
-    boolean execute(ActionContext actionContext)
-        throws Exception;
-}
+/*
+ * $Id$
+ *
+ * Copyright 2003-2005 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.chain.commands;
+
+import org.apache.commons.chain.Command;
+import org.apache.struts.chain.contexts.ActionContext;
+
+/**
+ * <p>Marks a commons-chain <code>Command</code> which expects to operate upon
+ * a Struts <code>ActionContext</code>.</p>
+ */
+public interface ActionCommand extends Command {
+    /**
+     * @param actionContext The <code>Context</code> for the current request
+     * @return TRUE if processing should halt
+     * @throws Exception On any error
+     */
+    boolean execute(ActionContext actionContext)
+        throws Exception;
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java Tue Jul 11 21:49:11 2006
@@ -1,50 +1,50 @@
-/*
- * $Id$
- *
- * Copyright 2005-2006 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.chain.commands;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.chain.Context;
-import org.apache.struts.chain.contexts.ActionContext;
-
-/**
- * <p>Simple abstract class which avoids frequent casting to
- * <code>ActionContext</code> in commands explicitly intended for use with
- * that class.</p>
- */
-public abstract class ActionCommandBase implements ActionCommand {
-
-    /**
-     * <p> Provide Commons Logging instance for this class. </p>
-     */
-    private static final Log LOG =
-        LogFactory.getLog(ActionCommandBase.class);
-
-    // See interface for Javadoc
-    public abstract boolean execute(ActionContext actionContext)
-        throws Exception;
-
-    // See interface for Javadoc
-    public boolean execute(Context context)
-        throws Exception {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Executing " + getClass().getName());
-        }
-        return execute((ActionContext) context);
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005-2006 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.chain.commands;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.chain.Context;
+import org.apache.struts.chain.contexts.ActionContext;
+
+/**
+ * <p>Simple abstract class which avoids frequent casting to
+ * <code>ActionContext</code> in commands explicitly intended for use with
+ * that class.</p>
+ */
+public abstract class ActionCommandBase implements ActionCommand {
+
+    /**
+     * <p> Provide Commons Logging instance for this class. </p>
+     */
+    private static final Log LOG =
+        LogFactory.getLog(ActionCommandBase.class);
+
+    // See interface for Javadoc
+    public abstract boolean execute(ActionContext actionContext)
+        throws Exception;
+
+    // See interface for Javadoc
+    public boolean execute(Context context)
+        throws Exception {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Executing " + getClass().getName());
+        }
+        return execute((ActionContext) context);
+    }
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java Tue Jul 11 21:49:11 2006
@@ -1,153 +1,153 @@
-/*
- * $Id$
- *
- * Copyright 2003-2005 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.chain.commands;
-
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Command;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.chain.contexts.ActionContext;
-import org.apache.struts.config.ActionConfig;
-
-/**
- * <p>Invoke the appropriate <code>Command</code> for this request.  If the
- * context's <code>ActionConfig</code> has no <code>command</code> property
- * defined, no action will be taken.  If the specified command cannot be
- * found, a warning will be logged, but processing will continue.  Depending
- * on how the chain is configured, this can be used in place of an
- * <code>Action</code> or as a method of performing pre-processing. </p>
- *
- * <p>If used instead of an action, the command which is looked up should put
- * an ActionForward into the context, unless it has already dealt with the
- * response.</p>
- *
- * @version $Id$
- */
-public class ExecuteCommand extends ActionCommandBase {
-    // ------------------------------------------------------ Instance Variables
-
-    /**
-     * Provide Commons Logging instance for this class.
-     */
-    private static final Log LOG = LogFactory.getLog(ExecuteCommand.class);
-
-    // ---------------------------------------------------------- Public Methods
-
-    /**
-     * <p>If the <code>context</code> is "valid", lookup a command and execute
-     * it.</p>
-     *
-     * @param actionCtx The <code>Context</code> for the current request
-     * @return the result of the lookup command's <code>execute</code> method,
-     *         if executed, or <code>false</code> if it was not executed.
-     * @throws Exception on any error
-     */
-    public boolean execute(ActionContext actionCtx)
-        throws Exception {
-        if (shouldProcess(actionCtx)) {
-            Command command = getCommand(actionCtx);
-
-            if (command != null) {
-                return (command.execute(actionCtx));
-            }
-        }
-
-        return (false);
-    }
-
-    /**
-     * <p>Evaluate the current context to see if a command should even be
-     * executed.</p>
-     *
-     * @param context A valid ActionContext
-     * @return TRUE if the pending Command should be executed
-     */
-    protected boolean shouldProcess(ActionContext context) {
-        // Skip processing if the current request is not valid
-        Boolean valid = context.getFormValid();
-
-        return ((valid != null) && valid.booleanValue());
-    }
-
-    /**
-     * <p>Find the <code>ActionConfig</code> in the current context and, if it
-     * is properly configured, lookup the appropriate <code>commons-chain</code>
-     * command.</p>
-     *
-     * @param context A valid ActionContext
-     * @return a <code>Command</code> to execute, or null if none is specified
-     *         or if the specified command cannot be found.
-     */
-    protected Command getCommand(ActionContext context) {
-        ActionConfig actionConfig = context.getActionConfig();
-
-        String commandName = actionConfig.getCommand();
-
-        if (commandName == null) {
-            return null;
-        }
-
-        String catalogName = actionConfig.getCatalog();
-
-        return getCommand(commandName, catalogName);
-    }
-
-    /**
-     * <p> Retrieve the specified Command from the specified Catalog. </p>
-     *
-     * @param commandName The Command to retrieve.
-     * @param catalogName The Catalog to search.
-     * @return Instantiated Command, or null
-     */
-    protected Command getCommand(String commandName, String catalogName) {
-        if (commandName == null) {
-            return null;
-        }
-
-        Catalog catalog;
-
-        if (catalogName != null) {
-            catalog = CatalogFactory.getInstance().getCatalog(catalogName);
-
-            if (catalog == null) {
-                LOG.warn("When looking up " + commandName + ","
-                    + " no catalog found under " + catalogName);
-
-                return null;
-            }
-        } else {
-            catalogName = "the default catalog";
-            catalog = CatalogFactory.getInstance().getCatalog();
-
-            if (catalog == null) {
-                LOG.warn("When looking up " + commandName + ","
-                    + " no default catalog found.");
-
-                return null;
-            }
-        }
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("looking up command " + commandName + " in "
-                + catalogName);
-        }
-
-        return catalog.getCommand(commandName);
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2003-2005 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.chain.commands;
+
+import org.apache.commons.chain.Catalog;
+import org.apache.commons.chain.CatalogFactory;
+import org.apache.commons.chain.Command;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.chain.contexts.ActionContext;
+import org.apache.struts.config.ActionConfig;
+
+/**
+ * <p>Invoke the appropriate <code>Command</code> for this request.  If the
+ * context's <code>ActionConfig</code> has no <code>command</code> property
+ * defined, no action will be taken.  If the specified command cannot be
+ * found, a warning will be logged, but processing will continue.  Depending
+ * on how the chain is configured, this can be used in place of an
+ * <code>Action</code> or as a method of performing pre-processing. </p>
+ *
+ * <p>If used instead of an action, the command which is looked up should put
+ * an ActionForward into the context, unless it has already dealt with the
+ * response.</p>
+ *
+ * @version $Id$
+ */
+public class ExecuteCommand extends ActionCommandBase {
+    // ------------------------------------------------------ Instance Variables
+
+    /**
+     * Provide Commons Logging instance for this class.
+     */
+    private static final Log LOG = LogFactory.getLog(ExecuteCommand.class);
+
+    // ---------------------------------------------------------- Public Methods
+
+    /**
+     * <p>If the <code>context</code> is "valid", lookup a command and execute
+     * it.</p>
+     *
+     * @param actionCtx The <code>Context</code> for the current request
+     * @return the result of the lookup command's <code>execute</code> method,
+     *         if executed, or <code>false</code> if it was not executed.
+     * @throws Exception on any error
+     */
+    public boolean execute(ActionContext actionCtx)
+        throws Exception {
+        if (shouldProcess(actionCtx)) {
+            Command command = getCommand(actionCtx);
+
+            if (command != null) {
+                return (command.execute(actionCtx));
+            }
+        }
+
+        return (false);
+    }
+
+    /**
+     * <p>Evaluate the current context to see if a command should even be
+     * executed.</p>
+     *
+     * @param context A valid ActionContext
+     * @return TRUE if the pending Command should be executed
+     */
+    protected boolean shouldProcess(ActionContext context) {
+        // Skip processing if the current request is not valid
+        Boolean valid = context.getFormValid();
+
+        return ((valid != null) && valid.booleanValue());
+    }
+
+    /**
+     * <p>Find the <code>ActionConfig</code> in the current context and, if it
+     * is properly configured, lookup the appropriate <code>commons-chain</code>
+     * command.</p>
+     *
+     * @param context A valid ActionContext
+     * @return a <code>Command</code> to execute, or null if none is specified
+     *         or if the specified command cannot be found.
+     */
+    protected Command getCommand(ActionContext context) {
+        ActionConfig actionConfig = context.getActionConfig();
+
+        String commandName = actionConfig.getCommand();
+
+        if (commandName == null) {
+            return null;
+        }
+
+        String catalogName = actionConfig.getCatalog();
+
+        return getCommand(commandName, catalogName);
+    }
+
+    /**
+     * <p> Retrieve the specified Command from the specified Catalog. </p>
+     *
+     * @param commandName The Command to retrieve.
+     * @param catalogName The Catalog to search.
+     * @return Instantiated Command, or null
+     */
+    protected Command getCommand(String commandName, String catalogName) {
+        if (commandName == null) {
+            return null;
+        }
+
+        Catalog catalog;
+
+        if (catalogName != null) {
+            catalog = CatalogFactory.getInstance().getCatalog(catalogName);
+
+            if (catalog == null) {
+                LOG.warn("When looking up " + commandName + ","
+                    + " no catalog found under " + catalogName);
+
+                return null;
+            }
+        } else {
+            catalogName = "the default catalog";
+            catalog = CatalogFactory.getInstance().getCatalog();
+
+            if (catalog == null) {
+                LOG.warn("When looking up " + commandName + ","
+                    + " no default catalog found.");
+
+                return null;
+            }
+        }
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("looking up command " + commandName + " in "
+                + catalogName);
+        }
+
+        return catalog.getCommand(commandName);
+    }
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java?rev=421119&r1=421118&r2=421119&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java Tue Jul 11 21:49:11 2006
@@ -1,59 +1,59 @@
-/*
- * $Id$
- *
- * Copyright 2003-2005 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.chain.commands;
-
-import org.apache.commons.chain.Command;
-import org.apache.struts.chain.contexts.ActionContext;
-import org.apache.struts.config.ForwardConfig;
-
-/**
- * <p>Look up and execute a commons-chain <code>Command</code> based on
- * properties of the ActionContext's <code>forwardConfig</code> property.
- * </p>
- */
-public class ExecuteForwardCommand extends ExecuteCommand {
-    /**
-     * <p>Return the command specified by the <code>command</code> and
-     * <code>catalog</code> properties of the <code>forwardConfig</code>
-     * property of the given <code>ActionContext</code>.  If
-     * <code>forwardConfig</code> is null, return null.</p>
-     *
-     * @param context Our ActionContext
-     * @return Command to execute or null
-     */
-    protected Command getCommand(ActionContext context) {
-        ForwardConfig forwardConfig = context.getForwardConfig();
-
-        if (forwardConfig == null) {
-            return null;
-        }
-
-        return getCommand(forwardConfig.getCommand(), forwardConfig.getCatalog());
-    }
-
-    /**
-     * <p> Determine whether the forwardConfig should be processed. </p>
-     *
-     * @param context The ActionContext we are processing
-     * @return <p><code>true</code> if the given <code>ActionContext</code>
-     *         has a non-null <code>forwardConfig</code> property.</p>
-     */
-    protected boolean shouldProcess(ActionContext context) {
-        return (context.getForwardConfig() != null);
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2003-2005 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.chain.commands;
+
+import org.apache.commons.chain.Command;
+import org.apache.struts.chain.contexts.ActionContext;
+import org.apache.struts.config.ForwardConfig;
+
+/**
+ * <p>Look up and execute a commons-chain <code>Command</code> based on
+ * properties of the ActionContext's <code>forwardConfig</code> property.
+ * </p>
+ */
+public class ExecuteForwardCommand extends ExecuteCommand {
+    /**
+     * <p>Return the command specified by the <code>command</code> and
+     * <code>catalog</code> properties of the <code>forwardConfig</code>
+     * property of the given <code>ActionContext</code>.  If
+     * <code>forwardConfig</code> is null, return null.</p>
+     *
+     * @param context Our ActionContext
+     * @return Command to execute or null
+     */
+    protected Command getCommand(ActionContext context) {
+        ForwardConfig forwardConfig = context.getForwardConfig();
+
+        if (forwardConfig == null) {
+            return null;
+        }
+
+        return getCommand(forwardConfig.getCommand(), forwardConfig.getCatalog());
+    }
+
+    /**
+     * <p> Determine whether the forwardConfig should be processed. </p>
+     *
+     * @param context The ActionContext we are processing
+     * @return <p><code>true</code> if the given <code>ActionContext</code>
+     *         has a non-null <code>forwardConfig</code> property.</p>
+     */
+    protected boolean shouldProcess(ActionContext context) {
+        return (context.getForwardConfig() != null);
+    }
+}

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL

Propchange: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 11 21:49:11 2006
@@ -1 +1 @@
-date author id rev
+Date Author Id Revision HeadURL



Mime
View raw message