You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/01/21 01:21:00 UTC
svn commit: r370938 [1/50] - in /struts: action/trunk/
action/trunk/conf/java/ action/trunk/src/java/org/apache/struts/
action/trunk/src/java/org/apache/struts/action/
action/trunk/src/java/org/apache/struts/chain/
action/trunk/src/java/org/apache/stru...
Author: husted
Date: Fri Jan 20 16:19:02 2006
New Revision: 370938
URL: http://svn.apache.org/viewcvs?rev=370938&view=rev
Log:
CheckStyle pass
* Reformat with Jalopy and IDEA
* No code or content changes
Modified:
struts/action/trunk/conf/java/chain-config.xml
struts/action/trunk/conf/java/validator-rules.xml
struts/action/trunk/maven.xml
struts/action/trunk/pom.xml
struts/action/trunk/project.xml
struts/action/trunk/src/java/org/apache/struts/Globals.java
struts/action/trunk/src/java/org/apache/struts/action/Action.java
struts/action/trunk/src/java/org/apache/struts/action/ActionErrors.java
struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java
struts/action/trunk/src/java/org/apache/struts/action/ActionFormBean.java
struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java
struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java
struts/action/trunk/src/java/org/apache/struts/action/ActionMessage.java
struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java
struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
struts/action/trunk/src/java/org/apache/struts/action/ActionServletWrapper.java
struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java
struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java
struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java
struts/action/trunk/src/java/org/apache/struts/action/ForwardingActionForward.java
struts/action/trunk/src/java/org/apache/struts/action/PlugIn.java
struts/action/trunk/src/java/org/apache/struts/action/RedirectingActionForward.java
struts/action/trunk/src/java/org/apache/struts/action/RequestActionMapping.java
struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
struts/action/trunk/src/java/org/apache/struts/action/SessionActionMapping.java
struts/action/trunk/src/java/org/apache/struts/action/package.html
struts/action/trunk/src/java/org/apache/struts/chain/ComposableRequestProcessor.java
struts/action/trunk/src/java/org/apache/struts/chain/Constants.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractCreateAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractPerformForward.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectForward.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectInput.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectModule.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSetContentType.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/ActionCommand.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/ActionCommandBase.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/CreateActionForm.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/ExecuteCommand.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/InvalidPathException.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/SelectInclude.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/UnauthorizedActionException.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/CreateAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/PerformForward.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/PerformInclude.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SelectAction.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SelectForward.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SelectInput.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SelectLocale.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SelectModule.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SetContentType.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java
struts/action/trunk/src/java/org/apache/struts/chain/commands/util/ClassUtils.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContext.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/ContextWrapper.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/MockActionContext.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/ServletActionContext.java
struts/action/trunk/src/java/org/apache/struts/chain/contexts/WebActionContext.java
struts/action/trunk/src/java/org/apache/struts/config/ActionConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ActionConfigMatcher.java
struts/action/trunk/src/java/org/apache/struts/config/BaseConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ConfigHelper.java
struts/action/trunk/src/java/org/apache/struts/config/ConfigHelperInterface.java
struts/action/trunk/src/java/org/apache/struts/config/ConfigRuleSet.java
struts/action/trunk/src/java/org/apache/struts/config/ControllerConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ExceptionConfig.java
struts/action/trunk/src/java/org/apache/struts/config/FormBeanConfig.java
struts/action/trunk/src/java/org/apache/struts/config/FormPropertyConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ForwardConfig.java
struts/action/trunk/src/java/org/apache/struts/config/MessageResourcesConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ModuleConfig.java
struts/action/trunk/src/java/org/apache/struts/config/ModuleConfigFactory.java
struts/action/trunk/src/java/org/apache/struts/config/PlugInConfig.java
struts/action/trunk/src/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java
struts/action/trunk/src/java/org/apache/struts/config/package.html
struts/action/trunk/src/java/org/apache/struts/mock/MockAction.java
struts/action/trunk/src/java/org/apache/struts/mock/MockActionServlet.java
struts/action/trunk/src/java/org/apache/struts/mock/MockEnumeration.java
struts/action/trunk/src/java/org/apache/struts/mock/MockFormBean.java
struts/action/trunk/src/java/org/apache/struts/mock/MockHttpServletRequest.java
struts/action/trunk/src/java/org/apache/struts/mock/MockHttpServletResponse.java
struts/action/trunk/src/java/org/apache/struts/mock/MockHttpSession.java
struts/action/trunk/src/java/org/apache/struts/mock/MockPageContext.java
struts/action/trunk/src/java/org/apache/struts/mock/MockPrincipal.java
struts/action/trunk/src/java/org/apache/struts/mock/MockServletConfig.java
struts/action/trunk/src/java/org/apache/struts/mock/MockServletContext.java
struts/action/trunk/src/java/org/apache/struts/mock/TestMockBase.java
struts/action/trunk/src/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
struts/action/trunk/src/java/org/apache/struts/upload/FormFile.java
struts/action/trunk/src/java/org/apache/struts/upload/MultipartRequestHandler.java
struts/action/trunk/src/java/org/apache/struts/upload/MultipartRequestWrapper.java
struts/action/trunk/src/java/org/apache/struts/upload/package.html
struts/action/trunk/src/java/org/apache/struts/util/ImageButtonBean.java
struts/action/trunk/src/java/org/apache/struts/util/IteratorAdapter.java
struts/action/trunk/src/java/org/apache/struts/util/LabelValueBean.java
struts/action/trunk/src/java/org/apache/struts/util/MessageResources.java
struts/action/trunk/src/java/org/apache/struts/util/MessageResourcesFactory.java
struts/action/trunk/src/java/org/apache/struts/util/ModuleException.java
struts/action/trunk/src/java/org/apache/struts/util/ModuleUtils.java
struts/action/trunk/src/java/org/apache/struts/util/PropertyMessageResources.java
struts/action/trunk/src/java/org/apache/struts/util/PropertyMessageResourcesFactory.java
struts/action/trunk/src/java/org/apache/struts/util/RequestUtils.java
struts/action/trunk/src/java/org/apache/struts/util/ResponseUtils.java
struts/action/trunk/src/java/org/apache/struts/util/ServletContextWriter.java
struts/action/trunk/src/java/org/apache/struts/util/TokenProcessor.java
struts/action/trunk/src/java/org/apache/struts/util/WildcardHelper.java
struts/action/trunk/src/java/org/apache/struts/util/package.html
struts/action/trunk/src/java/org/apache/struts/validator/BeanValidatorForm.java
struts/action/trunk/src/java/org/apache/struts/validator/DynaValidatorActionForm.java
struts/action/trunk/src/java/org/apache/struts/validator/DynaValidatorForm.java
struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java
struts/action/trunk/src/java/org/apache/struts/validator/LazyValidatorForm.java
struts/action/trunk/src/java/org/apache/struts/validator/Resources.java
struts/action/trunk/src/java/org/apache/struts/validator/ValidatorActionForm.java
struts/action/trunk/src/java/org/apache/struts/validator/ValidatorForm.java
struts/action/trunk/src/java/org/apache/struts/validator/ValidatorPlugIn.java
struts/action/trunk/src/java/org/apache/struts/validator/package.html
struts/action/trunk/src/java/org/apache/struts/validator/validwhen/ValidWhen.java
struts/action/trunk/src/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
struts/action/trunk/src/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
struts/action/trunk/src/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
struts/action/trunk/src/test/org/apache/struts/action/TestActionMessage.java
struts/action/trunk/src/test/org/apache/struts/action/TestActionMessages.java
struts/action/trunk/src/test/org/apache/struts/action/TestActionRedirect.java
struts/action/trunk/src/test/org/apache/struts/action/TestActionServlet.java
struts/action/trunk/src/test/org/apache/struts/action/TestDynaActionForm.java
struts/action/trunk/src/test/org/apache/struts/action/TestDynaActionFormClass.java
struts/action/trunk/src/test/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java
struts/action/trunk/src/test/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java
struts/action/trunk/src/test/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java
struts/action/trunk/src/test/org/apache/struts/chain/commands/servlet/TestPerformForward.java
struts/action/trunk/src/test/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java
struts/action/trunk/src/test/org/apache/struts/config/CustomMappingTest.java
struts/action/trunk/src/test/org/apache/struts/config/TestActionConfig.java
struts/action/trunk/src/test/org/apache/struts/config/TestActionConfigMatcher.java
struts/action/trunk/src/test/org/apache/struts/config/TestFormBeanConfig.java
struts/action/trunk/src/test/org/apache/struts/config/TestFormPropertyConfig.java
struts/action/trunk/src/test/org/apache/struts/config/TestForwardConfig.java
struts/action/trunk/src/test/org/apache/struts/config/TestModuleConfig.java
struts/action/trunk/src/test/org/apache/struts/config/struts-config-1.1.xml
struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping.xml
struts/action/trunk/src/test/org/apache/struts/config/struts-config.xml
struts/action/trunk/src/test/org/apache/struts/util/TestRequestUtils.java
struts/action/trunk/src/test/org/apache/struts/validator/PojoBean.java
struts/action/trunk/src/test/org/apache/struts/validator/TestValidWhen.java
struts/action/trunk/xdocs/faqs/actionForm.xml
struts/action/trunk/xdocs/faqs/apps.xml
struts/action/trunk/xdocs/faqs/db-howto.xml
struts/action/trunk/xdocs/faqs/eclipse.xml
struts/action/trunk/xdocs/faqs/index.xml
struts/action/trunk/xdocs/faqs/kickstart.xml
struts/action/trunk/xdocs/faqs/navigation.xml
struts/action/trunk/xdocs/faqs/netbeans40.xml
struts/action/trunk/xdocs/faqs/newbie.xml
struts/action/trunk/xdocs/faqs/works.xml
struts/action/trunk/xdocs/index.xml
struts/action/trunk/xdocs/learning.xml
struts/action/trunk/xdocs/milestones.xml
struts/action/trunk/xdocs/navigation.xml
struts/action/trunk/xdocs/roadmap.xml
struts/action/trunk/xdocs/userGuide/building_controller.xml
struts/action/trunk/xdocs/userGuide/building_model.xml
struts/action/trunk/xdocs/userGuide/building_view.xml
struts/action/trunk/xdocs/userGuide/configuration.xml
struts/action/trunk/xdocs/userGuide/dev_util.xml
struts/action/trunk/xdocs/userGuide/index.xml
struts/action/trunk/xdocs/userGuide/installation-1.0.xml
struts/action/trunk/xdocs/userGuide/installation-ip.xml
struts/action/trunk/xdocs/userGuide/installation-ipas.xml
struts/action/trunk/xdocs/userGuide/installation-jetty.xml
struts/action/trunk/xdocs/userGuide/installation-jr30.xml
struts/action/trunk/xdocs/userGuide/installation-novell.xml
struts/action/trunk/xdocs/userGuide/installation-oas.xml
struts/action/trunk/xdocs/userGuide/installation-sas.xml
struts/action/trunk/xdocs/userGuide/installation-tc.xml
struts/action/trunk/xdocs/userGuide/installation-ubs72.xml
struts/action/trunk/xdocs/userGuide/installation-was352-x.xml
struts/action/trunk/xdocs/userGuide/installation-was352.xml
struts/action/trunk/xdocs/userGuide/installation-wls5.xml
struts/action/trunk/xdocs/userGuide/installation.xml
struts/action/trunk/xdocs/userGuide/introduction.xml
struts/action/trunk/xdocs/userGuide/navigation.xml
struts/action/trunk/xdocs/userGuide/preface.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0-b1.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0-b2.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0-b3.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0.1.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0.2.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.0.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1-b1.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1-b2.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1-b3.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1-rc1.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1-rc2.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.1.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.2.4.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.2.7.xml
struts/action/trunk/xdocs/userGuide/release-notes-1.2.8.xml
struts/action/trunk/xdocs/userGuide/release-notes.xml
struts/build/trunk/maven.xml
struts/build/trunk/pom.xml
struts/build/trunk/project.xml
struts/build/trunk/struts_checks.xml
Modified: struts/action/trunk/conf/java/chain-config.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/conf/java/chain-config.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/conf/java/chain-config.xml (original)
+++ struts/action/trunk/conf/java/chain-config.xml Fri Jan 20 16:19:02 2006
@@ -31,227 +31,227 @@
-->
-<catalog name="struts">
+<catalog name="struts">
- <define name= "lookup"
- className= "org.apache.commons.chain.generic.LookupCommand" />
+ <define name="lookup"
+ className="org.apache.commons.chain.generic.LookupCommand"/>
<!-- ========== Servlet Complete Request Chain ========================= -->
- <chain name="servlet-standard">
+ <chain name="servlet-standard">
- <!-- Establish exception handling filter -->
- <command
- className="org.apache.struts.chain.commands.ExceptionCatcher"
- catalogName="struts"
- exceptionCommand="servlet-exception"/>
-
- <lookup
- catalogName="struts"
- name="process-action"
- optional="false"/>
-
- <lookup
- catalogName="struts"
- name="process-view"
- optional="false"/>
+ <!-- Establish exception handling filter -->
+ <command
+ className="org.apache.struts.chain.commands.ExceptionCatcher"
+ catalogName="struts"
+ exceptionCommand="servlet-exception"/>
+
+ <lookup
+ catalogName="struts"
+ name="process-action"
+ optional="false"/>
+
+ <lookup
+ catalogName="struts"
+ name="process-view"
+ optional="false"/>
</chain>
<!-- ========== View Processing chain ======================== -->
- <chain name="process-action">
+ <chain name="process-action">
- <!--
- This chain attempts to emulate (most of) the standard request
- processing in the standard org.apache.struts.action.RequestProcessor
- class, by performing the corresponding tasks in individual Commands
- that are composable. The following list defines a cross reference
- between the processXxx methods and the Commands that perform the
- corresponding functionality:
+ <!--
+ This chain attempts to emulate (most of) the standard request
+ processing in the standard org.apache.struts.action.RequestProcessor
+ class, by performing the corresponding tasks in individual Commands
+ that are composable. The following list defines a cross reference
+ between the processXxx methods and the Commands that perform the
+ corresponding functionality:
- processMultipart Integrated into servlet and legacy classes
+ processMultipart Integrated into servlet and legacy classes
- processPath SelectAction (which also does processMapping)
+ processPath SelectAction (which also does processMapping)
- processException ExceptionCatcher / ExceptionHandler
+ processException ExceptionCatcher / ExceptionHandler
- processLocale SelectLocale
+ processLocale SelectLocale
- processContent SetContentType
+ processContent SetContentType
- processNoCache RequestNoCache
+ processNoCache RequestNoCache
- processPreprocess LookupCommand with optional="true". Multiple
- occurrences of this can easily be added, to
- support additional processing hooks at any
- point in the chain without modifying the
- standard definition.
+ processPreprocess LookupCommand with optional="true". Multiple
+ occurrences of this can easily be added, to
+ support additional processing hooks at any
+ point in the chain without modifying the
+ standard definition.
- processMapping SelectAction (which also does processPath)
+ processMapping SelectAction (which also does processPath)
- processRoles AuthorizeAction
+ processRoles AuthorizeAction
- processActionForm CreateActionForm
+ processActionForm CreateActionForm
- processPopulate PopulateActionForm
+ processPopulate PopulateActionForm
- processValidate ValidateActionForm / SelectInput
+ processValidate ValidateActionForm / SelectInput
- processForward SelectForward
+ processForward SelectForward
- processInclude SelectInclude / PerformInclude
+ processInclude SelectInclude / PerformInclude
- processActionCreate CreateAction
+ processActionCreate CreateAction
- processActionPerform ExecuteAction
- -->
+ processActionPerform ExecuteAction
+ -->
- <!-- Look up optional preprocess command -->
- <lookup
- catalogName="struts"
- name="servlet-standard-preprocess"
- optional="true"/>
+ <!-- Look up optional preprocess command -->
+ <lookup
+ catalogName="struts"
+ name="servlet-standard-preprocess"
+ optional="true"/>
- <!-- Identify the Locale for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.SelectLocale"/>
-
+ <!-- Identify the Locale for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SelectLocale"/>
- <!-- Set (if needed) the URI of the original request -->
- <command
- className="org.apache.struts.chain.commands.servlet.SetOriginalURI"/>
-
-
- <!-- Set (if needed) no cache HTTP response headers -->
- <command
- className="org.apache.struts.chain.commands.servlet.RequestNoCache"/>
-
-
- <!-- Set (if needed) the HTTP response content type -->
- <command
- className="org.apache.struts.chain.commands.servlet.SetContentType"/>
+ <!-- Set (if needed) the URI of the original request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SetOriginalURI"/>
- <!-- Identify the ActionConfig for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.SelectAction"/>
-
-
- <!-- Authorize the selected ActionConfig for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.AuthorizeAction"/>
+ <!-- Set (if needed) no cache HTTP response headers -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.RequestNoCache"/>
- <!-- Create (if needed) the ActionForm for this request -->
- <command
- className="org.apache.struts.chain.commands.CreateActionForm"/>
+ <!-- Set (if needed) the HTTP response content type -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SetContentType"/>
- <!-- Populate the ActionForm for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.PopulateActionForm"/>
+ <!-- Identify the ActionConfig for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SelectAction"/>
- <!-- Validate the ActionForm for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.ValidateActionForm"/>
+ <!-- Authorize the selected ActionConfig for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.AuthorizeAction"/>
- <!-- Select the appropriate ForwardConfig for return to input page -->
- <command
- className="org.apache.struts.chain.commands.servlet.SelectInput"/>
-
-
- <!-- Lookup and execute a chain command if the current ActionConfig is
- so-configured. -->
- <command
- className="org.apache.struts.chain.commands.ExecuteCommand"/>
-
-
- <!-- Select the appropriate ForwardConfig for action mappings that only
- have an ActionForward -->
- <command
- className="org.apache.struts.chain.commands.servlet.SelectForward"/>
-
-
- <!-- Select the include uri (if any) for the current action mapping -->
- <command
- className="org.apache.struts.chain.commands.SelectInclude"/>
-
-
- <!-- Perform the include (if needed) -->
- <command
- className="org.apache.struts.chain.commands.servlet.PerformInclude"/>
+ <!-- Create (if needed) the ActionForm for this request -->
+ <command
+ className="org.apache.struts.chain.commands.CreateActionForm"/>
- <!-- Create (if needed) the Action for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.CreateAction"/>
+ <!-- Populate the ActionForm for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.PopulateActionForm"/>
- <!-- Execute the Action for this request -->
- <command
- className="org.apache.struts.chain.commands.servlet.ExecuteAction"/>
+
+ <!-- Validate the ActionForm for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.ValidateActionForm"/>
+
+
+ <!-- Select the appropriate ForwardConfig for return to input page -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SelectInput"/>
+
+
+ <!-- Lookup and execute a chain command if the current ActionConfig is
+ so-configured. -->
+ <command
+ className="org.apache.struts.chain.commands.ExecuteCommand"/>
+
+
+ <!-- Select the appropriate ForwardConfig for action mappings that only
+ have an ActionForward -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.SelectForward"/>
+
+
+ <!-- Select the include uri (if any) for the current action mapping -->
+ <command
+ className="org.apache.struts.chain.commands.SelectInclude"/>
+
+
+ <!-- Perform the include (if needed) -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.PerformInclude"/>
+
+
+ <!-- Create (if needed) the Action for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.CreateAction"/>
+
+
+ <!-- Execute the Action for this request -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.ExecuteAction"/>
</chain>
<!-- ========== View Processing chain ======================== -->
<chain name="process-view">
- <!-- Lookup and execute a chain command if the current ForwardConfig is
- so-configured. -->
- <command
- className="org.apache.struts.chain.commands.ExecuteForwardCommand"/>
-
- <!--
- If you want to use Tiles, uncomment this command, and the one in the
- 'servlet-exception' chain below, and make sure you have the
- struts-tiles JAR included in your web application.
-
- <command
- className="org.apache.struts.tiles.commands.TilesPreProcessor"/>
-
- -->
-
-
- <!-- Follow the returned ForwardConfig (if any) -->
- <command
- className="org.apache.struts.chain.commands.servlet.PerformForward"/>
+ <!-- Lookup and execute a chain command if the current ForwardConfig is
+ so-configured. -->
+ <command
+ className="org.apache.struts.chain.commands.ExecuteForwardCommand"/>
+
+ <!--
+ If you want to use Tiles, uncomment this command, and the one in the
+ 'servlet-exception' chain below, and make sure you have the
+ struts-tiles JAR included in your web application.
+
+ <command
+ className="org.apache.struts.tiles.commands.TilesPreProcessor"/>
+
+ -->
+
+
+ <!-- Follow the returned ForwardConfig (if any) -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.PerformForward"/>
</chain>
-
+
<!-- ========== Servlet Exception Handler Chain ======================== -->
- <chain name="servlet-exception">
+ <chain name="servlet-exception">
- <!--
- This chain is designed to be invoked (by o.a.s.c.ExceptionCatcher)
- if an unhandled exception is thrown by any subsequent command
- in a processing chain (including the one that invokes a Struts
- action). The standard definition of this chain supports the
- exception mapping of Struts 1.1, but can be replaced in order
- to handle exceptions differently.
- -->
-
- <!-- Execute the configured exception handler (if any) -->
- <command
- className="org.apache.struts.chain.commands.servlet.ExceptionHandler"/>
-
- <!--
- If you want to use Tiles, uncomment this command, and the one in the
- 'servlet-standard' chain below. This one is needed to allow Tiles to
- be used from global exception handlers.
-
- <command
- className="org.apache.struts.chain.servlet.TilesPreProcessor"/>
- -->
-
- <!-- Follow the returned ForwardConfig (if any) -->
- <command
- className="org.apache.struts.chain.commands.servlet.PerformForward"/>
+ <!--
+ This chain is designed to be invoked (by o.a.s.c.ExceptionCatcher)
+ if an unhandled exception is thrown by any subsequent command
+ in a processing chain (including the one that invokes a Struts
+ action). The standard definition of this chain supports the
+ exception mapping of Struts 1.1, but can be replaced in order
+ to handle exceptions differently.
+ -->
+
+ <!-- Execute the configured exception handler (if any) -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.ExceptionHandler"/>
+
+ <!--
+ If you want to use Tiles, uncomment this command, and the one in the
+ 'servlet-standard' chain below. This one is needed to allow Tiles to
+ be used from global exception handlers.
+
+ <command
+ className="org.apache.struts.chain.servlet.TilesPreProcessor"/>
+ -->
+
+ <!-- Follow the returned ForwardConfig (if any) -->
+ <command
+ className="org.apache.struts.chain.commands.servlet.PerformForward"/>
</chain>
Modified: struts/action/trunk/conf/java/validator-rules.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/conf/java/validator-rules.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/conf/java/validator-rules.xml (original)
+++ struts/action/trunk/conf/java/validator-rules.xml Fri Jan 20 16:19:02 2006
@@ -1,6 +1,6 @@
<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
<!--
$Id$
@@ -48,35 +48,35 @@
<form-validation>
- <global>
+ <global>
- <validator name="required"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateRequired"
- methodParams="java.lang.Object,
+ <validator name="required"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateRequired"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- msg="errors.required"/>
+ msg="errors.required"/>
- <validator name="requiredif"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateRequiredIf"
- methodParams="java.lang.Object,
+ <validator name="requiredif"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateRequiredIf"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- msg="errors.required"/>
+ msg="errors.required"/>
- <validator name="validwhen"
- msg="errors.required"
- classname="org.apache.struts.validator.validwhen.ValidWhen"
- method="validateValidWhen"
- methodParams="java.lang.Object,
+ <validator name="validwhen"
+ msg="errors.required"
+ classname="org.apache.struts.validator.validwhen.ValidWhen"
+ method="validateValidWhen"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
@@ -84,321 +84,318 @@
javax.servlet.http.HttpServletRequest"/>
- <validator name="minlength"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateMinLength"
- methodParams="java.lang.Object,
+ <validator name="minlength"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateMinLength"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.minlength"
- jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+ depends=""
+ msg="errors.minlength"
+ jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
- <validator name="maxlength"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateMaxLength"
- methodParams="java.lang.Object,
+ <validator name="maxlength"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateMaxLength"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.maxlength"
- jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+ depends=""
+ msg="errors.maxlength"
+ jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
-
- <validator name="mask"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateMask"
- methodParams="java.lang.Object,
+ <validator name="mask"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateMask"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.invalid"/>
+ depends=""
+ msg="errors.invalid"/>
- <validator name="byte"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateByte"
- methodParams="java.lang.Object,
+ <validator name="byte"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateByte"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.byte"
- jsFunctionName="ByteValidations"/>
+ depends=""
+ msg="errors.byte"
+ jsFunctionName="ByteValidations"/>
- <validator name="short"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateShort"
- methodParams="java.lang.Object,
+ <validator name="short"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateShort"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.short"
- jsFunctionName="ShortValidations"/>
+ depends=""
+ msg="errors.short"
+ jsFunctionName="ShortValidations"/>
- <validator name="integer"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateInteger"
- methodParams="java.lang.Object,
+ <validator name="integer"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateInteger"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.integer"
- jsFunctionName="IntegerValidations"/>
-
+ depends=""
+ msg="errors.integer"
+ jsFunctionName="IntegerValidations"/>
- <validator name="long"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateLong"
- methodParams="java.lang.Object,
+ <validator name="long"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateLong"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.long"/>
+ depends=""
+ msg="errors.long"/>
- <validator name="float"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateFloat"
- methodParams="java.lang.Object,
+ <validator name="float"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateFloat"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.float"
- jsFunctionName="FloatValidations"/>
+ depends=""
+ msg="errors.float"
+ jsFunctionName="FloatValidations"/>
- <validator name="double"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateDouble"
- methodParams="java.lang.Object,
+ <validator name="double"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDouble"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.double"/>
+ depends=""
+ msg="errors.double"/>
- <validator name="byteLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateByteLocale"
- methodParams="java.lang.Object,
+ <validator name="byteLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateByteLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.byte"/>
+ depends=""
+ msg="errors.byte"/>
- <validator name="shortLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateShortLocale"
- methodParams="java.lang.Object,
+ <validator name="shortLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateShortLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.short"/>
+ depends=""
+ msg="errors.short"/>
- <validator name="integerLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateIntegerLocale"
- methodParams="java.lang.Object,
+ <validator name="integerLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateIntegerLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.integer"/>
-
+ depends=""
+ msg="errors.integer"/>
- <validator name="longLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateLongLocale"
- methodParams="java.lang.Object,
+ <validator name="longLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateLongLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.long"/>
+ depends=""
+ msg="errors.long"/>
- <validator name="floatLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateFloatLocale"
- methodParams="java.lang.Object,
+ <validator name="floatLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateFloatLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.float"/>
+ depends=""
+ msg="errors.float"/>
- <validator name="doubleLocale"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateDoubleLocale"
- methodParams="java.lang.Object,
+ <validator name="doubleLocale"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDoubleLocale"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.double"/>
-
-
- <validator name="date"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateDate"
- methodParams="java.lang.Object,
+ depends=""
+ msg="errors.double"/>
+
+
+ <validator name="date"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDate"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.date"
- jsFunctionName="DateValidations"/>
+ depends=""
+ msg="errors.date"
+ jsFunctionName="DateValidations"/>
- <validator name="intRange"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateIntRange"
- methodParams="java.lang.Object,
+ <validator name="intRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateIntRange"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="integer"
- msg="errors.range"/>
+ depends="integer"
+ msg="errors.range"/>
- <validator name="longRange"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateLongRange"
- methodParams="java.lang.Object,
+ <validator name="longRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateLongRange"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="long"
- msg="errors.range"/>
+ depends="long"
+ msg="errors.range"/>
- <validator name="floatRange"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateFloatRange"
- methodParams="java.lang.Object,
+ <validator name="floatRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateFloatRange"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="float"
- msg="errors.range"/>
+ depends="float"
+ msg="errors.range"/>
- <validator name="doubleRange"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateDoubleRange"
- methodParams="java.lang.Object,
+ <validator name="doubleRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDoubleRange"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="double"
- msg="errors.range"/>
+ depends="double"
+ msg="errors.range"/>
- <validator name="creditCard"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateCreditCard"
- methodParams="java.lang.Object,
+ <validator name="creditCard"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateCreditCard"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.creditcard"/>
+ depends=""
+ msg="errors.creditcard"/>
- <validator name="email"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateEmail"
- methodParams="java.lang.Object,
+ <validator name="email"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateEmail"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.email"/>
+ depends=""
+ msg="errors.email"/>
- <validator name="url"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateUrl"
- methodParams="java.lang.Object,
+ <validator name="url"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateUrl"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.url"/>
+ depends=""
+ msg="errors.url"/>
- <!--
- This simply allows struts to include the validateUtilities into a page, it should
- not be used as a validation rule.
- -->
- <validator name="includeJavaScriptUtilities"
- classname=""
- method=""
- methodParams=""
- depends=""
- msg=""
- jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+ <!--
+ This simply allows struts to include the validateUtilities into a page, it should
+ not be used as a validation rule.
+ -->
+ <validator name="includeJavaScriptUtilities"
+ classname=""
+ method=""
+ methodParams=""
+ depends=""
+ msg=""
+ jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
- </global>
+ </global>
</form-validation>
Modified: struts/action/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/maven.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/maven.xml (original)
+++ struts/action/trunk/maven.xml Fri Jan 20 16:19:02 2006
@@ -1,36 +1,35 @@
<?xml version="1.0"?>
-<project
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
- <postGoal name="dist:prepare-bin-filesystem">
-
- <!-- Copy configuration files -->
- <j:set var="docsDest" value="${maven.docs.dest}"/>
- <ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
- <ant:fileset dir="./conf/java">
- <ant:include name="*.xml"/>
- <ant:include name="*.dtd"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
-
-
- <postGoal name="dist:prepare-src-filesystem">
-
- <!-- Copy configuration files -->
- <j:set var="docsDest" value="${maven.docs.dest}"/>
- <ant:copy todir="${maven.dist.src.assembly.dir}/conf/java">
- <ant:fileset dir="./conf/java">
- <ant:include name="*.xml"/>
- <ant:include name="*.dtd"/>
- </ant:fileset>
- </ant:copy>
+<project
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
- </postGoal>
-
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <!-- Copy configuration files -->
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
+ <ant:fileset dir="./conf/java">
+ <ant:include name="*.xml"/>
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <!-- Copy configuration files -->
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
+ <ant:copy todir="${maven.dist.src.assembly.dir}/conf/java">
+ <ant:fileset dir="./conf/java">
+ <ant:include name="*.xml"/>
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
</project>
Modified: struts/action/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Fri Jan 20 16:19:02 2006
@@ -31,150 +31,153 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>struts</groupId>
- <artifactId>struts-build</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
- <artifactId>struts-action</artifactId>
- <packaging>jar</packaging>
- <version>1.3.0-SNAPSHOT</version>
- <name>Struts Action Framework</name>
- <url>http://struts.apache.org</url>
-
- <scm>
- <connection>svm:svn:http://svn.apache.org/repos/asf/struts/action/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/struts/action/trunk</url>
- </scm>
-
- <build>
-
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
-
- <resources>
- <resource>
- <directory>src/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/resources</targetPath>
- <includes>
- <include>**/*.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/chain</targetPath>
- <includes>
- <include>chain-config.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/validator</targetPath>
- <includes>
- <include>validator-rules.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>build</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <targetPath>org/apache/struts/resources</targetPath>
- <directory>conf/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.dtd</include>
- </includes>
- </testResource>
- <testResource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- </testResources>
-
- </build>
-
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>struts</groupId>
+ <artifactId>struts-action</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.0-SNAPSHOT</version>
+ <name>Struts Action Framework</name>
+ <url>http://struts.apache.org</url>
+
+ <scm>
+ <connection>
+ svm:svn:http://svn.apache.org/repos/asf/struts/action/trunk</connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/struts/action/trunk</url>
+ </scm>
+
+ <build>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/resources</targetPath>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/chain</targetPath>
+ <includes>
+ <include>chain-config.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/validator</targetPath>
+ <includes>
+ <include>validator-rules.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <targetPath>org/apache/struts/resources</targetPath>
+ <directory>conf/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.dtd</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ </dependencies>
</project>
Modified: struts/action/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/project.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/project.xml (original)
+++ struts/action/trunk/project.xml Fri Jan 20 16:19:02 2006
@@ -1,177 +1,181 @@
<?xml version="1.0"?>
<project>
-<!--
-/*
- * Copyright 2001-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.
- */
- -->
-
-
- <extend>build/project.xml</extend>
- <id>struts-action</id>
- <name>Struts Action Framework</name>
-
+ <!--
+ /*
+ * Copyright 2001-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.
+ */
+ -->
+
+
+ <extend>build/project.xml</extend>
+ <id>struts-action</id>
+ <name>Struts Action Framework</name>
<!-- ################################################################ -->
<!-- Project management section -->
<!-- ################################################################ -->
- <description>
+ <description>
Struts Action Framework is a flexible control layer based on
- <a href="userGuide/preface.html">standard technologies</a> like Java
+ <a href="userGuide/preface.html">standard technologies</a>
+ like Java
Servlets, JavaBeans, ResourceBundles, and XML, as well as various
<a href="http://jakarta.apache.org/commons/index.html">Jakarta
- Commons</a> packages, like BeanUtils and Chain of Responsibility.
- Struts Action Framework helps you create an extensible development environment for your
+ Commons</a>
+ packages, like BeanUtils and Chain of Responsibility.
+ Struts Action Framework helps you create an extensible development
+ environment for your
application, based on published standards and proven design patterns.
- </description>
+ </description>
+
+ <siteAddress>people.apache.org</siteAddress>
+ <siteDirectory>/www/struts.apache.org/struts-action/</siteDirectory>
- <siteAddress>people.apache.org</siteAddress>
- <siteDirectory>/www/struts.apache.org/struts-action/</siteDirectory>
+ <repository>
+ <connection>
+ scm|svn|http|//svn.apache.org/repos/asf/struts/action/trunk</connection>
+ <developerConnection>
+ scm|svn|https|//svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/struts/action/trunk</url>
+ </repository>
+ <versions>
+ <version>
+ <id>1.0.2</id>
+ <name>1.0.2</name>
+ <tag>STRUTS_1_0_2</tag>
+ </version>
+ <version>
+ <id>1.1.0</id>
+ <name>1.1.0</name>
+ <tag>STRUTS_1_1</tag>
+ </version>
+ <version>
+ <id>1.2.0</id>
+ <name>1.2.0</name>
+ <tag>STRUTS_1_2_0</tag>
+ </version>
+ <version>
+ <id>1.2.1</id>
+ <name>1.2.1</name>
+ <tag>STRUTS_1_2_1</tag>
+ </version>
+ <version>
+ <id>1.2.2</id>
+ <name>1.2.2</name>
+ <tag>STRUTS_1_2_2</tag>
+ </version>
+ <version>
+ <id>1.2.3</id>
+ <name>1.2.3</name>
+ <tag>STRUTS_1_2_3</tag>
+ </version>
+ <version>
+ <id>1.2.4</id>
+ <name>1.2.4</name>
+ <tag>STRUTS_1_2_4</tag>
+ </version>
+ <version>
+ <id>1.2.5</id>
+ <name>1.2.5</name>
+ <tag>STRUTS_1_2_5</tag>
+ </version>
+ <version>
+ <id>1.2.6</id>
+ <name>1.2.6</name>
+ <tag>STRUTS_1_2_6</tag>
+ </version>
+ </versions>
+
+ <branches>
+ <branch>
+ <tag>STRUTS_1_0_BRANCH</tag>
+ </branch>
+ <branch>
+ <tag>STRUTS_1_1_BRANCH</tag>
+ </branch>
+ <branch>
+ <tag>STRUTS_1_2_BRANCH</tag>
+ </branch>
+ </branches>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/resources</targetPath>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/resources</targetPath>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/chain</targetPath>
+ <includes>
+ <include>chain-config.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf/java</directory>
+ <targetPath>org/apache/struts/validator</targetPath>
+ <includes>
+ <include>validator-rules.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
- <repository>
- <connection>scm|svn|http|//svn.apache.org/repos/asf/struts/action/trunk</connection>
- <developerConnection>scm|svn|https|//svn.apache.org/repos/asf/struts/action/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/struts/action/trunk</url>
- </repository>
- <versions>
- <version>
- <id>1.0.2</id>
- <name>1.0.2</name>
- <tag>STRUTS_1_0_2</tag>
- </version>
- <version>
- <id>1.1.0</id>
- <name>1.1.0</name>
- <tag>STRUTS_1_1</tag>
- </version>
- <version>
- <id>1.2.0</id>
- <name>1.2.0</name>
- <tag>STRUTS_1_2_0</tag>
- </version>
- <version>
- <id>1.2.1</id>
- <name>1.2.1</name>
- <tag>STRUTS_1_2_1</tag>
- </version>
- <version>
- <id>1.2.2</id>
- <name>1.2.2</name>
- <tag>STRUTS_1_2_2</tag>
- </version>
- <version>
- <id>1.2.3</id>
- <name>1.2.3</name>
- <tag>STRUTS_1_2_3</tag>
- </version>
- <version>
- <id>1.2.4</id>
- <name>1.2.4</name>
- <tag>STRUTS_1_2_4</tag>
- </version>
- <version>
- <id>1.2.5</id>
- <name>1.2.5</name>
- <tag>STRUTS_1_2_5</tag>
- </version>
- <version>
- <id>1.2.6</id>
- <name>1.2.6</name>
- <tag>STRUTS_1_2_6</tag>
- </version>
- </versions>
-
- <branches>
- <branch>
- <tag>STRUTS_1_0_BRANCH</tag>
- </branch>
- <branch>
- <tag>STRUTS_1_1_BRANCH</tag>
- </branch>
- <branch>
- <tag>STRUTS_1_2_BRANCH</tag>
- </branch>
- </branches>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <resources>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/resources</targetPath>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- <resources>
- <resource>
- <directory>src/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/resources</targetPath>
- <includes>
- <include>**/*.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/chain</targetPath>
- <includes>
- <include>chain-config.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>conf/java</directory>
- <targetPath>org/apache/struts/validator</targetPath>
- <includes>
- <include>validator-rules.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>build</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- </build>
-
- <reports>
- <!-- report>maven-cactus-plugin</report -->
+ <reports>
+ <!-- report>maven-cactus-plugin</report -->
- <!-- add any reports specific to action -->
- </reports>
+ <!-- add any reports specific to action -->
+ </reports>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r370938 [1/50] - in /struts: action/trunk/ action/trunk/conf/java/ action/trunk/src/java/org/apache/struts/ action/trunk/src/java/org/apache/struts/action/ action/trunk/src/java/org/apache/struts/chain/ action/trunk/src/java/org/apache/stru
Posted by Niall Pemberton <ni...@blueyonder.co.uk>.
I haven't time to look through all 50 commit messages for this change - but
a quick look at a few of the messages already brought up a couple of issues:
* The reformatting of the svn keyswords @version $Rev$ $Date$ has moved the
$ sign from the end of Date to the next line - effectively disabling the
keyword and committing the expanded text - saw this on FormBeanConfig and
FormPropertyConfig - assume its happened everywhere.
* The class javadoc for ActionServlet - has merged all the list items (i.e.
<li>....</li>) into one big paragraph - same things happended in
FormPropertyConfig on the javadoc for the initial() method. I guess anywhere
we've used lists in the javadoc, a similar thing has happened.
Alot of the changes seem trivial and unnecessary - much of the reformatting
IMO doesn't improve anything. Where it has made major changes is to
re-organise the order of variables/methods which is going to make it more
difficult to look back and find out when/if something changed. The other
thing is that this is such a big change there is no way to check it all out
and be sure that it hasn't screwed up in other ways, other than just
formatting. Before seeing the effects of automated re-formatting, I was
neutral - now I'm pretty sure I don't like it. Something passive like
checkstyle is fine, but this direction seems like bad news to me.
Niall
----- Original Message -----
From: <hu...@apache.org>
To: <co...@struts.apache.org>
Sent: Saturday, January 21, 2006 12:21 AM
Subject: svn commit: r370938 [1/50] - in /struts: action/trunk/
action/trunk/conf/java/ action/trunk/src/java/org/apache/struts/
action/trunk/src/java/org/apache/struts/action/
action/trunk/src/java/org/apache/struts/chain/
action/trunk/src/java/org/apache/stru...
> Author: husted
> Date: Fri Jan 20 16:19:02 2006
> New Revision: 370938
>
> URL: http://svn.apache.org/viewcvs?rev=370938&view=rev
> Log:
> CheckStyle pass
> * Reformat with Jalopy and IDEA
> * No code or content changes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org