You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2005/05/07 18:11:42 UTC
svn commit: r169091 [1/5] - in
/struts/core/trunk/src/share/org/apache/struts: ./ action/ actions/ chain/
chain/commands/ chain/commands/generic/ chain/commands/servlet/
chain/commands/util/ chain/contexts/ config/ config/impl/ mock/ plugins/
upload/ util/ validator/ validator/validwhen/
Author: martinc
Date: Sat May 7 09:11:38 2005
New Revision: 169091
URL: http://svn.apache.org/viewcvs?rev=169091&view=rev
Log:
Remove trailing spaces. Somebody doesn't have their editor set up properly...
Modified:
struts/core/trunk/src/share/org/apache/struts/Globals.java
struts/core/trunk/src/share/org/apache/struts/action/Action.java
struts/core/trunk/src/share/org/apache/struts/action/ActionError.java
struts/core/trunk/src/share/org/apache/struts/action/ActionErrors.java
struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java
struts/core/trunk/src/share/org/apache/struts/action/ActionFormBean.java
struts/core/trunk/src/share/org/apache/struts/action/ActionForward.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMessage.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
struts/core/trunk/src/share/org/apache/struts/action/ActionServletWrapper.java
struts/core/trunk/src/share/org/apache/struts/action/DynaActionForm.java
struts/core/trunk/src/share/org/apache/struts/action/DynaActionFormClass.java
struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
struts/core/trunk/src/share/org/apache/struts/action/ForwardingActionForward.java
struts/core/trunk/src/share/org/apache/struts/action/PlugIn.java
struts/core/trunk/src/share/org/apache/struts/action/RedirectingActionForward.java
struts/core/trunk/src/share/org/apache/struts/action/RequestActionMapping.java
struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java
struts/core/trunk/src/share/org/apache/struts/action/SessionActionMapping.java
struts/core/trunk/src/share/org/apache/struts/actions/ActionDispatcher.java
struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java
struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java
struts/core/trunk/src/share/org/apache/struts/actions/LookupDispatchAction.java
struts/core/trunk/src/share/org/apache/struts/actions/MappingDispatchAction.java
struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java
struts/core/trunk/src/share/org/apache/struts/chain/ComposableRequestProcessor.java
struts/core/trunk/src/share/org/apache/struts/chain/Constants.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractCreateAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractCreateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractExceptionHandler.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractExecuteAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractPerformForward.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractPerformInclude.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractRequestNoCache.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSelectAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSelectForward.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSelectInput.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSelectLocale.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSelectModule.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractSetContentType.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/AbstractValidateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/ActionCommand.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/ActionCommandBase.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/CreateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/ExecuteCommand.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/ExecuteForwardCommand.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/SelectInclude.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/UnauthorizedActionException.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/generic/CopyFormToContext.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/AuthorizeAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/ExceptionHandler.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/ExecuteAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/PerformForward.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/PerformInclude.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/PopulateActionForm.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/RequestNoCache.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SelectAction.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SelectForward.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SelectInput.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SelectLocale.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SelectModule.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/SetContentType.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/util/ClassUtils.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContext.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ContextWrapper.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/MockActionContext.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
struts/core/trunk/src/share/org/apache/struts/config/ActionConfig.java
struts/core/trunk/src/share/org/apache/struts/config/ActionConfigMatcher.java
struts/core/trunk/src/share/org/apache/struts/config/ConfigHelper.java
struts/core/trunk/src/share/org/apache/struts/config/ConfigHelperInterface.java
struts/core/trunk/src/share/org/apache/struts/config/ConfigRuleSet.java
struts/core/trunk/src/share/org/apache/struts/config/ControllerConfig.java
struts/core/trunk/src/share/org/apache/struts/config/ExceptionConfig.java
struts/core/trunk/src/share/org/apache/struts/config/FormBeanConfig.java
struts/core/trunk/src/share/org/apache/struts/config/FormPropertyConfig.java
struts/core/trunk/src/share/org/apache/struts/config/ForwardConfig.java
struts/core/trunk/src/share/org/apache/struts/config/MessageResourcesConfig.java
struts/core/trunk/src/share/org/apache/struts/config/ModuleConfig.java
struts/core/trunk/src/share/org/apache/struts/config/ModuleConfigFactory.java
struts/core/trunk/src/share/org/apache/struts/config/PlugInConfig.java
struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
struts/core/trunk/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java
struts/core/trunk/src/share/org/apache/struts/mock/MockAction.java
struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
struts/core/trunk/src/share/org/apache/struts/mock/MockEnumeration.java
struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java
struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletRequest.java
struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletResponse.java
struts/core/trunk/src/share/org/apache/struts/mock/MockHttpSession.java
struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java
struts/core/trunk/src/share/org/apache/struts/mock/MockPrincipal.java
struts/core/trunk/src/share/org/apache/struts/mock/MockServletConfig.java
struts/core/trunk/src/share/org/apache/struts/mock/MockServletContext.java
struts/core/trunk/src/share/org/apache/struts/mock/TestMockBase.java
struts/core/trunk/src/share/org/apache/struts/plugins/DigestingPlugIn.java
struts/core/trunk/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
struts/core/trunk/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
struts/core/trunk/src/share/org/apache/struts/upload/ContentLengthExceededException.java
struts/core/trunk/src/share/org/apache/struts/upload/DiskFile.java
struts/core/trunk/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java
struts/core/trunk/src/share/org/apache/struts/upload/MaxLengthExceededException.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartValueStream.java
struts/core/trunk/src/share/org/apache/struts/util/ImageButtonBean.java
struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java
struts/core/trunk/src/share/org/apache/struts/util/LabelValueBean.java
struts/core/trunk/src/share/org/apache/struts/util/MessageResources.java
struts/core/trunk/src/share/org/apache/struts/util/MessageResourcesFactory.java
struts/core/trunk/src/share/org/apache/struts/util/ModuleException.java
struts/core/trunk/src/share/org/apache/struts/util/ModuleUtils.java
struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResources.java
struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResourcesFactory.java
struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java
struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java
struts/core/trunk/src/share/org/apache/struts/util/ServletContextWriter.java
struts/core/trunk/src/share/org/apache/struts/util/TokenProcessor.java
struts/core/trunk/src/share/org/apache/struts/util/WildcardHelper.java
struts/core/trunk/src/share/org/apache/struts/validator/BeanValidatorForm.java
struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorForm.java
struts/core/trunk/src/share/org/apache/struts/validator/FieldChecks.java
struts/core/trunk/src/share/org/apache/struts/validator/LazyValidatorForm.java
struts/core/trunk/src/share/org/apache/struts/validator/Resources.java
struts/core/trunk/src/share/org/apache/struts/validator/ValidatorActionForm.java
struts/core/trunk/src/share/org/apache/struts/validator/ValidatorForm.java
struts/core/trunk/src/share/org/apache/struts/validator/ValidatorPlugIn.java
struts/core/trunk/src/share/org/apache/struts/validator/validwhen/ValidWhen.java
struts/core/trunk/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.g
Modified: struts/core/trunk/src/share/org/apache/struts/Globals.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/Globals.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/Globals.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/Globals.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -64,9 +64,9 @@
*/
public static final String MODULE_KEY =
"org.apache.struts.action.MODULE";
-
+
/**
- * The ServletContext attribute under which we store the module prefixes
+ * The ServletContext attribute under which we store the module prefixes
* String[].
* @since Struts 1.2
*/
@@ -179,7 +179,7 @@
*/
public static final String TRANSACTION_TOKEN_KEY =
"org.apache.struts.action.TOKEN";
-
+
/**
* The page attributes key under which xhtml status is stored. This may be "true"
* or "false". When set to true, the html tags output xhtml.
Modified: struts/core/trunk/src/share/org/apache/struts/action/Action.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/Action.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/Action.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/Action.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -554,8 +554,8 @@
/**
* <p>Save the specified error messages keys into the appropriate session
- * attribute for use by the <html:messages> tag (if messages="false")
- * or <html:errors>, if any error messages are required. Otherwise,
+ * attribute for use by the <html:messages> tag (if messages="false")
+ * or <html:errors>, if any error messages are required. Otherwise,
* ensure that the session attribute is empty.</p>
*
* @param session The session to save the error messages in.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionError.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionError.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionError.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionError.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionErrors.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionErrors.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionErrors.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionErrors.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -47,7 +47,7 @@
/**
* The "property name" marker to use for global errors, as opposed to
* those related to a specific property.
- * @deprecated Use ActionMessages.GLOBAL_MESSAGE instead. This will be
+ * @deprecated Use ActionMessages.GLOBAL_MESSAGE instead. This will be
* removed after Struts 1.2.
*/
public static final String GLOBAL_ERROR = "org.apache.struts.action.GLOBAL_ERROR";
@@ -62,9 +62,9 @@
}
/**
- * Create an <code>ActionErrors</code> object initialized with the given
+ * Create an <code>ActionErrors</code> object initialized with the given
* messages.
- *
+ *
* @param messages The messages to be initially added to this object.
* This parameter can be <code>null</code>.
* @since Struts 1.1
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionFormBean.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionFormBean.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionFormBean.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionFormBean.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionForward.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionForward.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionForward.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionForward.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionMessage.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMessage.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMessage.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMessage.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -95,7 +95,7 @@
*/
public ActionMessage(String key, Object value0, Object value1,
Object value2, Object value3) {
-
+
this(key, new Object[] { value0, value1, value2, value3 });
}
@@ -121,7 +121,7 @@
* @param resource Indicates whether the key is a bundle key or literal value
*/
public ActionMessage(String key, boolean resource) {
-
+
this.key = key;
this.resource = resource;
@@ -179,7 +179,7 @@
return (this.resource);
}
-
+
/**
* <p>Returns a String in the format: key[value1, value2, etc].</p>
*
@@ -200,7 +200,7 @@
if (i < this.values.length - 1) {
buff.append(", ");
}
-
+
}
}
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -112,7 +112,7 @@
/**
* <p>Create an <code>ActionMessages</code> object initialized with the given
* messages.</p>
- *
+ *
* @param messages The messages to be initially added to this object.
* This parameter can be <code>null</code>.
* @since Struts 1.1
@@ -157,8 +157,8 @@
* <code>ActionMessages</code> object, it is added to the end of the list for that
* property. If a message's property is not in the current list it is added to the end
* of the properties.</p>
- *
- * @param messages The <code>ActionMessages</code> object to be added.
+ *
+ * @param messages The <code>ActionMessages</code> object to be added.
* This parameter can be <code>null</code>.
* @since Struts 1.1
*/
@@ -167,7 +167,7 @@
if (messages == null) {
return;
}
-
+
// loop over properties
Iterator props = messages.properties();
while (props.hasNext()) {
@@ -215,7 +215,7 @@
public Iterator get() {
this.accessed = true;
-
+
if (messages.isEmpty()) {
return Collections.EMPTY_LIST.iterator();
}
@@ -252,7 +252,7 @@
public Iterator get(String property) {
this.accessed = true;
-
+
ActionMessageItem item = (ActionMessageItem) messages.get(property);
if (item == null) {
@@ -260,7 +260,7 @@
} else {
return (item.getList().iterator());
}
-
+
}
@@ -309,7 +309,7 @@
}
return results.iterator();
-
+
}
@@ -350,7 +350,7 @@
* <p>Returns a String representation of this ActionMessages'
* property name=message list mapping.</p>
* @see java.lang.Object#toString()
- */
+ */
public String toString() {
return this.messages.toString();
}
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -62,11 +62,11 @@
// ----------------------------------------------------- Static variables
/**
- * <p>Commons logging instance.</p>
- */
+ * <p>Commons logging instance.</p>
+ */
protected static final Log log = LogFactory.getLog(ActionRedirect.class);
-
-
+
+
// ----------------------------------------------------- Instance variables
/**
@@ -154,7 +154,7 @@
* @param valueObj the value for this parameter
*/
public void addParameter(String fieldName, Object valueObj) {
-
+
String value = (valueObj != null) ? valueObj.toString() : "";
if (parameterValues == null) {
initializeParameters();
@@ -168,19 +168,19 @@
// log.error(errorMsg, uce);
// throw new RuntimeException(errorMsg, uce);
// }
-
- Object currentValue = parameterValues.get(fieldName);
+
+ 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));
@@ -249,22 +249,22 @@
*/
public String getParameterString() {
StringBuffer strParam = new StringBuffer(256);
-
+
// loop through all parameters
Iterator iterator = parameterValues.keySet().iterator();
while (iterator.hasNext()) {
// get the parameter name
String name = (String) iterator.next();
-
+
// get the value for this parameter
Object value = parameterValues.get(name);
-
+
if (value instanceof String) {
// just one value for this param
strParam.append(name)
.append("=")
.append(value);
-
+
} else if (value instanceof String[]) {
// loop through all values for this param
String[] values = (String[]) value;
@@ -276,7 +276,7 @@
strParam.append("&");
}
}
-
+
if (iterator.hasNext()) {
strParam.append("&");
}
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -166,7 +166,7 @@
* loaded. (Since Struts 1.1)</li>
* <li><strong>validating</strong> - Should we use a validating XML parser to
* process the configuration file (strongly recommended)? [true]</li>
- * <li><strong>chainConfig</strong> - Comma-separated list of either
+ * <li><strong>chainConfig</strong> - Comma-separated list of either
* context-relative or classloader path(s) to load commons-chain catalog
* definitions from. If none specified, the default Struts catalog that is
* provided with Struts will be used.</li>
@@ -188,7 +188,7 @@
/**
- * <p>Comma-separated list of context or classloader-relative path(s) that
+ * <p>Comma-separated list of context or classloader-relative path(s) that
* contain the configuration for the default commons-chain catalog(s).</p>
*/
protected String chainConfig = "org/apache/struts/chain/chain-config.xml";
@@ -308,7 +308,7 @@
CatalogFactory.clear();
PropertyUtils.clearDescriptors();
}
-
+
/**
@@ -328,7 +328,7 @@
initOther();
initServlet();
initChain();
-
+
getServletContext().setAttribute(Globals.ACTION_SERVLET_KEY, this);
initModuleConfigFactory();
// Initialize modules as needed
@@ -340,7 +340,7 @@
initModuleExceptionConfigs(moduleConfig);
initModuleActions(moduleConfig);
moduleConfig.freeze();
-
+
Enumeration names = getServletConfig().getInitParameterNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
@@ -358,23 +358,23 @@
initModuleActions(moduleConfig);
moduleConfig.freeze();
}
-
+
this.initModulePrefixes(this.getServletContext());
-
+
this.destroyConfigDigester();
} catch (UnavailableException ex) {
throw ex;
} catch (Throwable t) {
// The follow error message is not retrieved from internal message
- // resources as they may not have been able to have been
+ // resources as they may not have been able to have been
// initialized
log.error("Unable to initialize Struts ActionServlet due to an "
+ "unexpected exception or error thrown, so marking the "
+ "servlet as unavailable. Most likely, this is due to an "
+ "incorrect or missing library dependency.", t);
throw new UnavailableException(t.getMessage());
- }
+ }
}
/**
@@ -682,7 +682,7 @@
digester.push(config);
this.parseModuleConfigFile(digester, url);
}
-
+
getServletContext().setAttribute(
Globals.MODULE_KEY + config.getPrefix(),
config);
@@ -699,7 +699,7 @@
*
* @throws UnavailableException if file cannot be read or parsed
* @since Struts 1.2
- * @deprecated use parseModuleConfigFile(Digester digester, URL url)
+ * @deprecated use parseModuleConfigFile(Digester digester, URL url)
* instead
*/
protected void parseModuleConfigFile(Digester digester, String path)
@@ -720,7 +720,7 @@
handleConfigException(path, ex);
}
}
-
+
/**
* <p>Parses one module config file.</p>
*
@@ -770,71 +770,71 @@
throw new UnavailableException(msg);
}
-
+
/**
* <p>Handle errors related to creating an instance of the specified
* class.</p>
- *
+ *
* @param className The className that could not be instantiated.
* @param e The exception that was caught.
- *
+ *
* @throws ServletException to communicate the error.
- */
- private void handleCreationException (String className, Exception e)
+ */
+ private void handleCreationException (String className, Exception e)
throws ServletException {
-
+
String errorMessage = internal.getMessage(
"configExtends.creation", className);
log.error(errorMessage, e);
throw new UnavailableException(errorMessage);
}
-
+
/**
* <p>General handling for exceptions caught while inheriting config
* information.</p>
- *
- * @param configType The type of configuration object of
+ *
+ * @param configType The type of configuration object of
* <code>configName</code>.
- * @param configName The name of the config that could not be
+ * @param configName The name of the config that could not be
* extended.
* @param e The exception that was caught.
- *
+ *
* @throws ServletException to communicate the error.
- */
+ */
private void handleGeneralExtensionException
- (String configType, String configName, Exception e)
+ (String configType, String configName, Exception e)
throws ServletException {
-
+
String errorMessage = internal.getMessage(
"configExtends", configType, configName);
log.error(errorMessage, e);
throw new UnavailableException(errorMessage);
}
-
+
/**
* <p>Handle errors caused by required fields that were not specified.</p>
- *
+ *
* @param field The name of the required field that was not found.
- * @param configType The type of configuration object of
+ * @param configType The type of configuration object of
* <code>configName</code>.
* @param configName The name of the config that's missing the required
* value.
- *
+ *
* @throws ServletException to communicate the error.
- */
- private void handleValueRequiredException
- (String field, String configType, String configName)
+ */
+ private void handleValueRequiredException
+ (String field, String configType, String configName)
throws ServletException {
-
- String errorMessage = internal.getMessage("configFieldRequired",
+
+ String errorMessage = internal.getMessage("configFieldRequired",
field, configType, configName);
log.error(errorMessage);
throw new UnavailableException(errorMessage);
}
-
+
/**
* <p>Initialize the plug ins for the specified module.</p>
*
@@ -895,8 +895,8 @@
}
}
-
-
+
+
/**
* <p>Initialize the form beans for the specified module.</p>
*
@@ -909,7 +909,7 @@
(ModuleConfig config) throws ServletException {
if (log.isDebugEnabled()) {
- log.debug("Initializing module path '"
+ log.debug("Initializing module path '"
+ config.getPrefix() + "' form beans");
}
@@ -919,7 +919,7 @@
FormBeanConfig beanConfig = formBeans[i];
processFormBeanExtension(beanConfig, config);
}
-
+
for (int i = 0; i < formBeans.length; i++) {
FormBeanConfig formBean = formBeans[i];
@@ -938,28 +938,28 @@
"form property");
}
}
-
+
// Force creation and registration of DynaActionFormClass instances
- // for all dynamic form beans
+ // for all dynamic form beans
if (formBean.getDynamic()) {
formBean.getDynaActionFormClass();
}
-
+
}
}
-
-
+
+
/**
* <p>Extend the form bean's configuration as necessary.</p>
- *
+ *
* @param beanConfig the configuration to process.
* @param moduleConfig the module configuration for this module.
- *
+ *
* @throws ServletException if initialization cannot be performed.
- */
+ */
protected void processFormBeanExtension(FormBeanConfig beanConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
try {
if (!beanConfig.isExtensionProcessed()) {
@@ -975,7 +975,7 @@
} catch (ServletException e) {
throw e;
} catch (Exception e) {
- handleGeneralExtensionException("FormBeanConfig",
+ handleGeneralExtensionException("FormBeanConfig",
beanConfig.getName(), e);
}
}
@@ -984,19 +984,19 @@
/**
* <p>Checks if the current beanConfig is using the correct class based on
* the class of its ancestor form bean config.</p>
- *
+ *
* @param beanConfig The form bean to check.
* @param moduleConfig The config for the current module.
- *
+ *
* @return The form bean config using the correct class as determined
* by the config's ancestor and its own overridden value.
- *
+ *
* @throws UnavailableException if an instance of the form bean config
- * class cannot be created.
- */
+ * class cannot be created.
+ */
protected FormBeanConfig processFormBeanConfigClass(
FormBeanConfig beanConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
String ancestor = beanConfig.getExtends();
if (ancestor == null) {
@@ -1005,8 +1005,8 @@
}
// Make sure that this bean is of the right class
- FormBeanConfig baseConfig =
- moduleConfig.findFormBeanConfig(ancestor);
+ FormBeanConfig baseConfig =
+ moduleConfig.findFormBeanConfig(ancestor);
if (baseConfig == null) {
throw new UnavailableException("Unable to find "
+ "form bean '" + ancestor + "' to extend.");
@@ -1015,20 +1015,20 @@
// Was our bean's class overridden already?
if (beanConfig.getClass().equals(FormBeanConfig.class)) {
- // Ensure that our bean is using the correct class
+ // Ensure that our bean is using the correct class
if (!baseConfig.getClass().equals(beanConfig.getClass())) {
// Replace the bean with an instance of the correct class
FormBeanConfig newBeanConfig = null;
String baseConfigClassName = baseConfig.getClass().getName();
try {
- newBeanConfig = (FormBeanConfig)
+ newBeanConfig = (FormBeanConfig)
RequestUtils.applicationInstance(
baseConfigClassName);
// copy the values
BeanUtils.copyProperties(newBeanConfig, beanConfig);
- FormPropertyConfig[] fpc =
+ FormPropertyConfig[] fpc =
beanConfig.findFormPropertyConfigs();
for (int i = 0; i < fpc.length; i++) {
newBeanConfig.addFormPropertyConfig(fpc[i]);
@@ -1060,7 +1060,7 @@
(ModuleConfig config) throws ServletException {
if (log.isDebugEnabled()) {
- log.debug("Initializing module path '"
+ log.debug("Initializing module path '"
+ config.getPrefix() + "' forwards");
}
@@ -1070,7 +1070,7 @@
ForwardConfig forward = forwards[i];
processForwardExtension(forward, config);
}
-
+
for (int i = 0; i < forwards.length; i++) {
ForwardConfig forward = forwards[i];
@@ -1083,17 +1083,17 @@
}
-
+
/**
* <p>Extend the forward's configuration as necessary.</p>
- *
+ *
* @param forwardConfig the configuration to process.
* @param moduleConfig the module configuration for this module.
- *
+ *
* @throws ServletException if initialization cannot be performed.
- */
+ */
protected void processForwardExtension(ForwardConfig forwardConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
try {
if (!forwardConfig.isExtensionProcessed()) {
@@ -1102,7 +1102,7 @@
+ forwardConfig.getName() + "'");
}
- forwardConfig =
+ forwardConfig =
processForwardConfigClass(forwardConfig, moduleConfig);
forwardConfig.processExtends(moduleConfig, null);
@@ -1110,28 +1110,28 @@
} catch (ServletException e) {
throw e;
} catch (Exception e) {
- handleGeneralExtensionException("Forward",
+ handleGeneralExtensionException("Forward",
forwardConfig.getName(), e);
}
}
/**
- * <p>Checks if the current forwardConfig is using the correct class based
+ * <p>Checks if the current forwardConfig is using the correct class based
* on the class of its configuration ancestor.</p>
- *
+ *
* @param forwardConfig The forward to check.
* @param moduleConfig The config for the current module.
- *
+ *
* @return The forward config using the correct class as determined
* by the config's ancestor and its own overridden value.
- *
+ *
* @throws UnavailableException if an instance of the forward config
- * class cannot be created.
- */
+ * class cannot be created.
+ */
protected ForwardConfig processForwardConfigClass(
ForwardConfig forwardConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
String ancestor = forwardConfig.getExtends();
if (ancestor == null) {
@@ -1140,8 +1140,8 @@
}
// Make sure that this config is of the right class
- ForwardConfig baseConfig =
- moduleConfig.findForwardConfig(ancestor);
+ ForwardConfig baseConfig =
+ moduleConfig.findForwardConfig(ancestor);
if (baseConfig == null) {
throw new UnavailableException("Unable to find "
+ "forward '" + ancestor + "' to extend.");
@@ -1150,14 +1150,14 @@
// Was our forwards's class overridden already?
if (forwardConfig.getClass().equals(ActionForward.class)) {
- // Ensure that our forward is using the correct class
+ // Ensure that our forward is using the correct class
if (!baseConfig.getClass().equals(forwardConfig.getClass())) {
// Replace the config with an instance of the correct class
ForwardConfig newForwardConfig = null;
String baseConfigClassName = baseConfig.getClass().getName();
try {
- newForwardConfig = (ForwardConfig)
+ newForwardConfig = (ForwardConfig)
RequestUtils.applicationInstance(
baseConfigClassName);
@@ -1191,7 +1191,7 @@
(ModuleConfig config) throws ServletException {
if (log.isDebugEnabled()) {
- log.debug("Initializing module path '"
+ log.debug("Initializing module path '"
+ config.getPrefix() + "' forwards");
}
@@ -1201,30 +1201,30 @@
ExceptionConfig exception = exceptions[i];
processExceptionExtension(exception, config);
}
-
+
for (int i = 0; i < exceptions.length; i++) {
ExceptionConfig exception = exceptions[i];
// Verify that required fields are all present for the config
if (exception.getKey() == null) {
- handleValueRequiredException("key", exception.getType(),
+ handleValueRequiredException("key", exception.getType(),
"global exception config");
}
}
}
-
+
/**
* <p>Extend the exception's configuration as necessary.</p>
- *
+ *
* @param exceptionConfig the configuration to process.
* @param moduleConfig the module configuration for this module.
- *
+ *
* @throws ServletException if initialization cannot be performed.
- */
+ */
protected void processExceptionExtension(ExceptionConfig exceptionConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
try {
if (!exceptionConfig.isExtensionProcessed()) {
@@ -1241,28 +1241,28 @@
} catch (ServletException e) {
throw e;
} catch (Exception e) {
- handleGeneralExtensionException("Exception",
+ handleGeneralExtensionException("Exception",
exceptionConfig.getType(), e);
}
}
/**
- * <p>Checks if the current exceptionConfig is using the correct class
+ * <p>Checks if the current exceptionConfig is using the correct class
* based on the class of its configuration ancestor.</p>
- *
+ *
* @param exceptionConfig The config to check.
* @param moduleConfig The config for the current module.
- *
+ *
* @return The exception config using the correct class as determined
* by the config's ancestor and its own overridden value.
- *
+ *
* @throws UnavailableException if an instance of the exception config
- * class cannot be created.
- */
+ * class cannot be created.
+ */
protected ExceptionConfig processExceptionConfigClass(
ExceptionConfig exceptionConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
String ancestor = exceptionConfig.getExtends();
if (ancestor == null) {
@@ -1271,8 +1271,8 @@
}
// Make sure that this config is of the right class
- ExceptionConfig baseConfig =
- moduleConfig.findExceptionConfig(ancestor);
+ ExceptionConfig baseConfig =
+ moduleConfig.findExceptionConfig(ancestor);
if (baseConfig == null) {
throw new UnavailableException("Unable to find "
+ "exception config '" + ancestor + "' to extend.");
@@ -1281,19 +1281,19 @@
// Was our config's class overridden already?
if (exceptionConfig.getClass().equals(ExceptionConfig.class)) {
- // Ensure that our config is using the correct class
+ // Ensure that our config is using the correct class
if (!baseConfig.getClass().equals(exceptionConfig.getClass())) {
// Replace the config with an instance of the correct class
ExceptionConfig newExceptionConfig = null;
String baseConfigClassName = baseConfig.getClass().getName();
try {
- newExceptionConfig =
+ newExceptionConfig =
(ExceptionConfig) RequestUtils.applicationInstance(
baseConfigClassName);
// copy the values
- BeanUtils.copyProperties(newExceptionConfig,
+ BeanUtils.copyProperties(newExceptionConfig,
exceptionConfig);
} catch (Exception e) {
handleCreationException(baseConfigClassName, e);
@@ -1323,7 +1323,7 @@
(ModuleConfig config) throws ServletException {
if (log.isDebugEnabled()) {
- log.debug("Initializing module path '"
+ log.debug("Initializing module path '"
+ config.getPrefix() + "' action configs");
}
@@ -1333,7 +1333,7 @@
ActionConfig actionConfig = actionConfigs[i];
processActionConfigExtension(actionConfig, config);
}
-
+
for (int i = 0; i < actionConfigs.length; i++) {
ActionConfig actionConfig = actionConfigs[i];
@@ -1343,37 +1343,37 @@
ForwardConfig forward = forwards[j];
if (forward.getPath() == null) {
- handleValueRequiredException("path",
+ handleValueRequiredException("path",
forward.getName(), "action forward");
}
}
-
+
// ... and the exception configs
ExceptionConfig[] exceptions = actionConfig.findExceptionConfigs();
for (int j = 0; j < exceptions.length; j++) {
ExceptionConfig exception = exceptions[j];
if (exception.getKey() == null) {
- handleValueRequiredException("key",
+ handleValueRequiredException("key",
exception.getType(), "action exception config");
}
}
-
+
}
}
-
+
/**
* <p>Extend the action's configuration as necessary.</p>
- *
+ *
* @param actionConfig the configuration to process.
* @param moduleConfig the module configuration for this module.
- *
+ *
* @throws ServletException if initialization cannot be performed.
- */
+ */
protected void processActionConfigExtension(ActionConfig actionConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
try {
if (!actionConfig.isExtensionProcessed()) {
@@ -1382,7 +1382,7 @@
+ actionConfig.getPath() + "'");
}
- actionConfig =
+ actionConfig =
processActionConfigClass(actionConfig, moduleConfig);
actionConfig.processExtends(moduleConfig);
@@ -1390,7 +1390,7 @@
} catch (ServletException e) {
throw e;
} catch (Exception e) {
- handleGeneralExtensionException("Action",
+ handleGeneralExtensionException("Action",
actionConfig.getPath(), e);
}
}
@@ -1399,19 +1399,19 @@
/**
* <p>Checks if the current actionConfig is using the correct class based on
* the class of its ancestor ActionConfig.</p>
- *
+ *
* @param actionConfig The action config to check.
* @param moduleConfig The config for the current module.
- *
+ *
* @return The config object using the correct class as determined
* by the config's ancestor and its own overridden value.
- *
+ *
* @throws UnavailableException if an instance of the action config
- * class cannot be created.
- */
+ * class cannot be created.
+ */
protected ActionConfig processActionConfigClass(
ActionConfig actionConfig,
- ModuleConfig moduleConfig)
+ ModuleConfig moduleConfig)
throws ServletException {
String ancestor = actionConfig.getExtends();
if (ancestor == null) {
@@ -1420,8 +1420,8 @@
}
// Make sure that this config is of the right class
- ActionConfig baseConfig =
- moduleConfig.findActionConfig(ancestor);
+ ActionConfig baseConfig =
+ moduleConfig.findActionConfig(ancestor);
if (baseConfig == null) {
throw new UnavailableException("Unable to find "
+ "action config for '" + ancestor + "' to extend.");
@@ -1430,28 +1430,28 @@
// Was our actionConfig's class overridden already?
if (actionConfig.getClass().equals(ActionMapping.class)) {
- // Ensure that our config is using the correct class
+ // Ensure that our config is using the correct class
if (!baseConfig.getClass().equals(actionConfig.getClass())) {
// Replace the config with an instance of the correct class
ActionConfig newActionConfig = null;
String baseConfigClassName = baseConfig.getClass().getName();
try {
- newActionConfig = (ActionConfig)
+ newActionConfig = (ActionConfig)
RequestUtils.applicationInstance(
baseConfigClassName);
// copy the values
BeanUtils.copyProperties(newActionConfig, actionConfig);
-
+
// copy the forward and exception configs, too
- ForwardConfig[] forwards =
+ ForwardConfig[] forwards =
actionConfig.findForwardConfigs();
for (int i = 0; i < forwards.length; i++) {
newActionConfig.addForwardConfig(forwards[i]);
}
-
- ExceptionConfig[] exceptions =
+
+ ExceptionConfig[] exceptions =
actionConfig.findExceptionConfigs();
for (int i = 0; i < exceptions.length; i++) {
newActionConfig.addExceptionConfig(exceptions[i]);
@@ -1640,7 +1640,7 @@
/**
- * <p>Parse the configuration documents specified by the
+ * <p>Parse the configuration documents specified by the
* <code>chainConfig</code> init-param to configure the default
* {@link Catalog} that is registered in the {@link CatalogFactory}
* instance for this application.</p>
@@ -1654,7 +1654,7 @@
if (value != null) {
chainConfig = value;
}
-
+
ConfigParser parser = new ConfigParser();
List urls = splitAndResolvePaths(chainConfig);
URL resource = null;
@@ -1790,7 +1790,7 @@
}
}
-
+
/**
* Takes a comma-delimited string and splits it into paths, then resolves
* those paths using the ServletContext and appropriate ClassLoader. When
@@ -1805,11 +1805,11 @@
*/
protected List splitAndResolvePaths(String paths) throws ServletException {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
+ if (loader == null) {
loader = this.getClass().getClassLoader();
}
ArrayList resolvedUrls = new ArrayList();
-
+
URL resource = null;
String path = null;
try {
@@ -1823,15 +1823,15 @@
path = paths.trim();
paths = "";
}
-
+
if (path.length() < 1) {
break;
}
-
+
if (path.charAt(0) == '/') {
resource = getServletContext().getResource(path);
}
-
+
if (resource == null) {
if (log.isDebugEnabled()) {
log.debug("Unable to locate "+path+" in the servlet "
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionServletWrapper.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionServletWrapper.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionServletWrapper.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionServletWrapper.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/DynaActionForm.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/DynaActionForm.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/DynaActionForm.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/DynaActionForm.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -511,7 +511,7 @@
if (dynaClass == null) {
return sb.append("null]").toString();
}
-
+
sb.append(dynaClass.getName());
DynaProperty props[] = dynaClass.getDynaProperties();
if (props == null) {
Modified: struts/core/trunk/src/share/org/apache/struts/action/DynaActionFormClass.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/DynaActionFormClass.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/DynaActionFormClass.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/DynaActionFormClass.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java Sat May 7 09:11:38 2005
@@ -1,21 +1,21 @@
/*
- * $Id$
+ * $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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.struts.action;
import javax.servlet.ServletException;
@@ -33,17 +33,17 @@
* <p>An <strong>ExceptionHandler</strong> is configured in the Struts
* configuration file to handle a specific type of exception thrown
* by an <code>Action.execute</code> method.</p>
- *
+ *
* @since Struts 1.1
*/
public class ExceptionHandler {
-
+
/**
* <p>Commons logging instance.</p>
*/
private static final Log log = LogFactory.getLog(ExceptionHandler.class);
-
+
/**
* <p>The message resources for this package.</p>
@@ -51,7 +51,7 @@
private static MessageResources messages =
MessageResources.getMessageResources(
"org.apache.struts.action.LocalStrings");
-
+
/**
* <p>Handle the <code>Exception</code>.
Modified: struts/core/trunk/src/share/org/apache/struts/action/ForwardingActionForward.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ForwardingActionForward.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ForwardingActionForward.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ForwardingActionForward.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/PlugIn.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/PlugIn.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/PlugIn.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/PlugIn.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/RedirectingActionForward.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/RedirectingActionForward.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/RedirectingActionForward.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/RedirectingActionForward.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/RequestActionMapping.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/RequestActionMapping.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/RequestActionMapping.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/RequestActionMapping.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -137,7 +137,7 @@
synchronized (actions) {
actions.clear();
}
-
+
this.servlet = servlet;
this.moduleConfig = moduleConfig;
}
@@ -166,7 +166,7 @@
if (path == null) {
return;
}
-
+
if (log.isDebugEnabled()) {
log.debug("Processing a '" + request.getMethod() +
"' for path '" + path + "'");
@@ -183,7 +183,7 @@
if (!processPreprocess(request, response)) {
return;
}
-
+
this.processCachedMessages(request, response);
// Identify the mapping for this request
@@ -208,7 +208,7 @@
if (!processForward(request, response, mapping)) {
return;
}
-
+
if (!processInclude(request, response, mapping)) {
return;
}
@@ -274,7 +274,7 @@
if (log.isTraceEnabled()) {
log.trace(" Creating new Action instance");
}
-
+
try {
instance = (Action) RequestUtils.applicationInstance(className);
// :TODO: Maybe we should propagate this exception
@@ -283,14 +283,14 @@
log.error(
getInternal().getMessage("actionCreate", mapping.getPath()),
e);
-
+
response.sendError(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
getInternal().getMessage("actionCreate", mapping.getPath()));
-
+
return (null);
}
-
+
instance.setServlet(this.servlet);
actions.put(className, instance);
}
@@ -358,14 +358,14 @@
if (forward == null) {
return;
}
-
+
if (log.isDebugEnabled()) {
log.debug("processForwardConfig(" + forward + ")");
}
-
+
String forwardPath = forward.getPath();
String uri = null;
-
+
// paths not starting with / should be passed through without any processing
// (ie. they're absolute)
if (forwardPath.startsWith("/")) {
@@ -373,14 +373,14 @@
} else {
uri = forwardPath;
}
-
+
if (forward.getRedirect()) {
// only prepend context path for relative uri
if (uri.startsWith("/")) {
uri = request.getContextPath() + uri;
}
response.sendRedirect(response.encodeRedirectURL(uri));
-
+
} else {
doForward(uri, request, response);
}
@@ -422,12 +422,12 @@
}
}
-
+
/**
- * <p>Removes any <code>ActionMessages</code> object stored in the session
- * under <code>Globals.MESSAGE_KEY</code> and <code>Globals.ERROR_KEY</code>
- * if the messages' <code>isAccessed</code> method returns true. This
- * allows messages to be stored in the session, display one time, and be
+ * <p>Removes any <code>ActionMessages</code> object stored in the session
+ * under <code>Globals.MESSAGE_KEY</code> and <code>Globals.ERROR_KEY</code>
+ * if the messages' <code>isAccessed</code> method returns true. This
+ * allows messages to be stored in the session, display one time, and be
* released here.</p>
*
* @param request The servlet request we are processing.
@@ -454,7 +454,7 @@
session.removeAttribute(Globals.MESSAGE_KEY);
}
}
-
+
// Remove error messages as needed
messages = (ActionMessages) session.getAttribute(Globals.ERROR_KEY);
@@ -463,7 +463,7 @@
session.removeAttribute(Globals.ERROR_KEY);
}
}
-
+
}
@@ -662,7 +662,7 @@
String msg = getInternal().getMessage("processInvalid", path);
log.error(msg);
response.sendError(HttpServletResponse.SC_NOT_FOUND, msg);
-
+
return null;
}
@@ -678,7 +678,7 @@
if (!"POST".equalsIgnoreCase(request.getMethod())) {
return (request);
}
-
+
String contentType = request.getContentType();
if ((contentType != null) &&
contentType.startsWith("multipart/form-data")) {
@@ -746,13 +746,13 @@
if (!path.startsWith(prefix)) {
String msg =
getInternal().getMessage("processPath", request.getRequestURI());
-
+
log.error(msg);
response.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
return null;
}
-
+
path = path.substring(prefix.length());
int slash = path.lastIndexOf("/");
int period = path.lastIndexOf(".");
@@ -792,22 +792,22 @@
if (log.isDebugEnabled()) {
log.debug(" Populating bean properties from this request");
}
-
+
form.setServlet(this.servlet);
form.reset(mapping, request);
-
+
if (mapping.getMultipartClass() != null) {
request.setAttribute(Globals.MULTIPART_KEY,
mapping.getMultipartClass());
}
-
+
RequestUtils.populate(form, mapping.getPrefix(), mapping.getSuffix(),
request);
// Set the cancellation request attribute if appropriate
if ((request.getParameter(Globals.CANCEL_PROPERTY) != null) ||
(request.getParameter(Globals.CANCEL_PROPERTY_X) != null)) {
-
+
request.setAttribute(Globals.CANCEL_KEY, Boolean.TRUE);
}
@@ -871,11 +871,11 @@
log.debug(" User '" + request.getRemoteUser() +
"' does not have any required role, denying access");
}
-
+
response.sendError(
HttpServletResponse.SC_FORBIDDEN,
getInternal().getMessage("notAuthorized", mapping.getPath()));
-
+
return (false);
}
@@ -988,7 +988,7 @@
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
-
+
// Construct a request dispatcher for the specified path
uri = moduleConfig.getPrefix() + uri;
@@ -1019,7 +1019,7 @@
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
-
+
// Construct a request dispatcher for the specified path
uri = moduleConfig.getPrefix() + uri;
@@ -1046,7 +1046,7 @@
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
-
+
// Unwrap the multipart request, if there is one.
if (request instanceof MultipartRequestWrapper) {
request = ((MultipartRequestWrapper) request).getRequest();
@@ -1077,7 +1077,7 @@
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
-
+
// Unwrap the multipart request, if there is one.
if (request instanceof MultipartRequestWrapper) {
request = ((MultipartRequestWrapper) request).getRequest();
Modified: struts/core/trunk/src/share/org/apache/struts/action/SessionActionMapping.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/SessionActionMapping.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/SessionActionMapping.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/SessionActionMapping.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
Modified: struts/core/trunk/src/share/org/apache/struts/actions/ActionDispatcher.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/ActionDispatcher.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/ActionDispatcher.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/ActionDispatcher.java Sat May 7 09:11:38 2005
@@ -49,10 +49,10 @@
* <p/>
* <pre>
* public class MyCustomAction extends Action {
- *
+ *
* protected ActionDispatcher dispatcher
* = new ActionDispatcher(this, ActionDispatcher.MAPPING_FLAVOR);
- *
+ *
* public ActionForward execute(ActionMapping mapping,
* ActionForm form,
* HttpServletRequest request,
@@ -223,10 +223,10 @@
/**
- * <p>Dispatches to the target class' <code>unspecified</code> method,
- * if present, otherwise throws a ServletException. Classes utilizing
- * <code>ActionDispatcher</code> should provide an <code>unspecified</code>
- * method if they wish to provide behavior different than
+ * <p>Dispatches to the target class' <code>unspecified</code> method,
+ * if present, otherwise throws a ServletException. Classes utilizing
+ * <code>ActionDispatcher</code> should provide an <code>unspecified</code>
+ * method if they wish to provide behavior different than
* throwing a ServletException..</p>
*/
protected ActionForward unspecified(ActionMapping mapping,
@@ -257,9 +257,9 @@
}
/**
- * <p>Dispatches to the target class' cancelled method, if present,
- * otherwise returns null. Classes utilizing <code>ActionDispatcher</code>
- * should provide a <code>cancelled</code> method if they wish to provide
+ * <p>Dispatches to the target class' cancelled method, if present,
+ * otherwise returns null. Classes utilizing <code>ActionDispatcher</code>
+ * should provide a <code>cancelled</code> method if they wish to provide
* behavior different than returning null.</p>
*/
protected ActionForward cancelled(ActionMapping mapping,
@@ -404,7 +404,7 @@
if ("".equals(parameter)) {
parameter = null;
}
-
+
if ((parameter == null) && (flavor == DEFAULT_FLAVOR)) {
// use "method" for DEFAULT_FLAVOR if no parameter was provided
return "method";
Modified: struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id: DispatchAction.java 54929 2004-10-16 16:38:42Z germuska $
+ * $Id: DispatchAction.java 54929 2004-10-16 16:38:42Z germuska $
*
* 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.
@@ -32,12 +32,12 @@
*/
public abstract class BaseAction extends Action{
-
+
/**
* The message resources for this package.
*/
protected static MessageResources messages = MessageResources.getMessageResources
("org.apache.struts.actions.LocalStrings");
-
+
}
Modified: struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java Sat May 7 09:11:38 2005
@@ -1,12 +1,12 @@
/*
* Copyright 1999-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.
Modified: struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
@@ -187,7 +187,7 @@
-
+
/**
* Method which is dispatched to when there is no value for specified
* request parameter included in the request. Subclasses of
Modified: struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java Sat May 7 09:11:38 2005
@@ -1,12 +1,12 @@
/*
* Copyright 1999-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.
Modified: struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: Code Formatting in Eclipse (Re: svn commit: r169091 [1/5] ...)
Posted by Craig McClanahan <cr...@gmail.com>.
I can appreciate your concern for controlling the tab width on the
screen based on physical dimensions. Can you appreciate my concern
that CVS (well, now SVN) commit notices with tabs are often totally
unreadable?
And I don't care whether you created the tabs with vi or emacs either :-).
Craig
On 5/8/05, James Mitchell <jm...@apache.org> wrote:
>
> I know there are definitely varying opinions on the tabs vs spaces debate,
> but I am solidly in the tabs camp and not without reason. All IDEs I've
> ever used and most decent text editors have the option to set the 'display
> length of tabs' AND 'convert spaces to tabs' on save.
>
> It is for that reason alone, I am able to regain some real estate on my
> screen because I can set the tabs length to display as 2 spaces (when on my
> laptop) or 4 spaces (when I'm using my 19" LCD). Sorry, can't do that if
> they are all spaces. This actually works out best in a team environment
> because some of us have desktops, some of us have laptops and a few use
> docking stations.
>
> I pity the poor fools that still fight the vi vs. emacs debate, because I
> use neither when I can use Eclipse or Textpad, and as a consequence, I can
> code and refactor at 100 times the speed of a conventional text editor.
>
> --
> James Mitchell
> Software Engineer / Open Source Evangelist
> Consulting / Mentoring / Freelance
> EdgeTech, Inc.
> http://www.edgetechservices.net/
> 678.910.8017
> AIM: jmitchtx
> Yahoo: jmitchtx
> MSN: jmitchell@apache.org
>
>
> > -----Original Message-----
> > From: Joe Germuska [mailto:Joe@Germuska.com]
> > Sent: Saturday, May 07, 2005 3:42 PM
> > To: Martin Cooper; Struts Developers List; Don Brown
> > Subject: Code Formatting in Eclipse (Re: svn commit: r169091
> > [1/5] ...)
> >
> > At 10:39 AM -0700 5/7/05, Martin Cooper wrote:
> > >On 5/7/05, Don Brown <do...@gmail.com> wrote:
> > >> Hmm...I don't think vi has that setting... :)
> > >
> > >But then, I don't believe that vi is in the habit of adding
> > gratuitous
> > >whitespace, either. ;-) In my experience, Eclipse is pretty bad at
> > >this, but I don't know it well enough to know how to stop it doing
> > >that. If there isn't a way, I was wondering if there was a way we
> > >could have an svn commit hook that would strip trailing whitespace on
> > >checkin...
> >
> > The thing about hooks like this is that then your code is always out
> > of sync with what's in the repository. Well, not if you do an
> > immediate update after committing, but... I tried for a while to use
> > a formatter as a CVS commit hook, and I found that annoying.
> > (Admittedly, code formatting is more disruptive to diff engines than
> > white space trimming.)
> >
> > I'm not an Eclipse expert, but I do know where people can set another
> > setting you've recently cleaned up: for converting tabs to white
> > space, go to:
> >
> > Window menu-> Preferences
> >
> > then choose the Java -> Editor pane and the "Typing" tab. There's a
> > checkbox, "insert spaces for tab". This setting correlates with one
> > under the "Java -> Code Style -> Code Formatter" pane, "Indentation"
> > tab, where you can set the number of spaces for tab/indent. (I think
> > we use 4 spaces, right?)
> >
> > I didn't see anything about trimming trailing whitespace, but can't
> > we also set SVN to be pretty smart about whitespace in doing diffs?
> > I imagine that's the biggest reason for strong feelings about
> > trailing whitespace.
> >
> > Joe
> >
> > --
> > Joe Germuska
> > Joe@Germuska.com
> > http://blog.germuska.com
> > "Narrow minds are weapons made for mass destruction" -The Ex
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> > For additional commands, e-mail: dev-help@struts.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
RE: Code Formatting in Eclipse (Re: svn commit: r169091 [1/5] ...)
Posted by James Mitchell <jm...@apache.org>.
I know there are definitely varying opinions on the tabs vs spaces debate,
but I am solidly in the tabs camp and not without reason. All IDEs I've
ever used and most decent text editors have the option to set the 'display
length of tabs' AND 'convert spaces to tabs' on save.
It is for that reason alone, I am able to regain some real estate on my
screen because I can set the tabs length to display as 2 spaces (when on my
laptop) or 4 spaces (when I'm using my 19" LCD). Sorry, can't do that if
they are all spaces. This actually works out best in a team environment
because some of us have desktops, some of us have laptops and a few use
docking stations.
I pity the poor fools that still fight the vi vs. emacs debate, because I
use neither when I can use Eclipse or Textpad, and as a consequence, I can
code and refactor at 100 times the speed of a conventional text editor.
--
James Mitchell
Software Engineer / Open Source Evangelist
Consulting / Mentoring / Freelance
EdgeTech, Inc.
http://www.edgetechservices.net/
678.910.8017
AIM: jmitchtx
Yahoo: jmitchtx
MSN: jmitchell@apache.org
> -----Original Message-----
> From: Joe Germuska [mailto:Joe@Germuska.com]
> Sent: Saturday, May 07, 2005 3:42 PM
> To: Martin Cooper; Struts Developers List; Don Brown
> Subject: Code Formatting in Eclipse (Re: svn commit: r169091
> [1/5] ...)
>
> At 10:39 AM -0700 5/7/05, Martin Cooper wrote:
> >On 5/7/05, Don Brown <do...@gmail.com> wrote:
> >> Hmm...I don't think vi has that setting... :)
> >
> >But then, I don't believe that vi is in the habit of adding
> gratuitous
> >whitespace, either. ;-) In my experience, Eclipse is pretty bad at
> >this, but I don't know it well enough to know how to stop it doing
> >that. If there isn't a way, I was wondering if there was a way we
> >could have an svn commit hook that would strip trailing whitespace on
> >checkin...
>
> The thing about hooks like this is that then your code is always out
> of sync with what's in the repository. Well, not if you do an
> immediate update after committing, but... I tried for a while to use
> a formatter as a CVS commit hook, and I found that annoying.
> (Admittedly, code formatting is more disruptive to diff engines than
> white space trimming.)
>
> I'm not an Eclipse expert, but I do know where people can set another
> setting you've recently cleaned up: for converting tabs to white
> space, go to:
>
> Window menu-> Preferences
>
> then choose the Java -> Editor pane and the "Typing" tab. There's a
> checkbox, "insert spaces for tab". This setting correlates with one
> under the "Java -> Code Style -> Code Formatter" pane, "Indentation"
> tab, where you can set the number of spaces for tab/indent. (I think
> we use 4 spaces, right?)
>
> I didn't see anything about trimming trailing whitespace, but can't
> we also set SVN to be pretty smart about whitespace in doing diffs?
> I imagine that's the biggest reason for strong feelings about
> trailing whitespace.
>
> Joe
>
> --
> Joe Germuska
> Joe@Germuska.com
> http://blog.germuska.com
> "Narrow minds are weapons made for mass destruction" -The Ex
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Code Formatting in Eclipse (Re: svn commit: r169091 [1/5] ...)
Posted by Joe Germuska <Jo...@Germuska.com>.
At 10:39 AM -0700 5/7/05, Martin Cooper wrote:
>On 5/7/05, Don Brown <do...@gmail.com> wrote:
>> Hmm...I don't think vi has that setting... :)
>
>But then, I don't believe that vi is in the habit of adding gratuitous
>whitespace, either. ;-) In my experience, Eclipse is pretty bad at
>this, but I don't know it well enough to know how to stop it doing
>that. If there isn't a way, I was wondering if there was a way we
>could have an svn commit hook that would strip trailing whitespace on
>checkin...
The thing about hooks like this is that then your code is always out
of sync with what's in the repository. Well, not if you do an
immediate update after committing, but... I tried for a while to use
a formatter as a CVS commit hook, and I found that annoying.
(Admittedly, code formatting is more disruptive to diff engines than
white space trimming.)
I'm not an Eclipse expert, but I do know where people can set another
setting you've recently cleaned up: for converting tabs to white
space, go to:
Window menu-> Preferences
then choose the Java -> Editor pane and the "Typing" tab. There's a
checkbox, "insert spaces for tab". This setting correlates with one
under the "Java -> Code Style -> Code Formatter" pane, "Indentation"
tab, where you can set the number of spaces for tab/indent. (I think
we use 4 spaces, right?)
I didn't see anything about trimming trailing whitespace, but can't
we also set SVN to be pretty smart about whitespace in doing diffs?
I imagine that's the biggest reason for strong feelings about
trailing whitespace.
Joe
--
Joe Germuska
Joe@Germuska.com
http://blog.germuska.com
"Narrow minds are weapons made for mass destruction" -The Ex
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r169091 [1/5] - in /struts/core/trunk/src/share/org/apache/struts: ./ action/ actions/ chain/ chain/commands/ chain/commands/generic/ chain/commands/servlet/ chain/commands/util/ chain/contexts/ config/ config/impl/ mock/ plugins/ upl
Posted by Martin Cooper <mf...@gmail.com>.
On 5/7/05, Don Brown <do...@gmail.com> wrote:
> Hmm...I don't think vi has that setting... :)
But then, I don't believe that vi is in the habit of adding gratuitous
whitespace, either. ;-) In my experience, Eclipse is pretty bad at
this, but I don't know it well enough to know how to stop it doing
that. If there isn't a way, I was wondering if there was a way we
could have an svn commit hook that would strip trailing whitespace on
checkin...
--
Martin Cooper
> Don
>
> On 5/7/05, martinc@apache.org <ma...@apache.org> wrote:
> > Author: martinc
> > Date: Sat May 7 09:11:38 2005
> > New Revision: 169091
> >
> > URL: http://svn.apache.org/viewcvs?rev=169091&view=rev
> > Log:
> > Remove trailing spaces. Somebody doesn't have their editor set up properly...
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r169091 [1/5] - in /struts/core/trunk/src/share/org/apache/struts: ./ action/ actions/ chain/ chain/commands/ chain/commands/generic/ chain/commands/servlet/ chain/commands/util/ chain/contexts/ config/ config/impl/ mock/ plugins/ upl
Posted by Don Brown <do...@gmail.com>.
Hmm...I don't think vi has that setting... :)
Don
On 5/7/05, martinc@apache.org <ma...@apache.org> wrote:
> Author: martinc
> Date: Sat May 7 09:11:38 2005
> New Revision: 169091
>
> URL: http://svn.apache.org/viewcvs?rev=169091&view=rev
> Log:
> Remove trailing spaces. Somebody doesn't have their editor set up properly...
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org