Modified: struts/action/trunk/src/java/org/apache/struts/config/ModuleConfig.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/config/ModuleConfig.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/config/ModuleConfig.java (original) +++ struts/action/trunk/src/java/org/apache/struts/config/ModuleConfig.java Fri Feb 10 13:14:54 2006 @@ -33,47 +33,37 @@ */ public interface ModuleConfig { /** - * <p> - * Has this module been completely configured yet. Once this flag has + * <p> Has this module been completely configured yet. Once this flag has * been set, any attempt to modify the configuration will return an - * IllegalStateException. - * </p> + * IllegalStateException. </p> */ boolean getConfigured(); /** - * <p> - * The controller configuration object for this module. - * </p> + * <p> The controller configuration object for this module. </p> */ ControllerConfig getControllerConfig(); /** - * <p> - * The controller configuration object for this module. - * </p> + * <p> The controller configuration object for this module. </p> * * @param cc The controller configuration object for this module. */ void setControllerConfig(ControllerConfig cc); /** - * <p> - * The prefix of the context-relative portion of the request URI, used to - * select this configuration versus others supported by the controller + * <p> The prefix of the context-relative portion of the request URI, used + * to select this configuration versus others supported by the controller * servlet. A configuration with a prefix of a zero-length String is the - * default configuration for this web module. - * </p> + * default configuration for this web module. </p> */ String getPrefix(); /** - * <p> - * The prefix of the context-relative portion of the request URI, used to - * select this configuration versus others supported by the controller + * <p> The prefix of the context-relative portion of the request URI, used + * to select this configuration versus others supported by the controller * servlet. A configuration with a prefix of a zero-length String is the - * default configuration for this web module. - * </p> + * default configuration for this web module. </p> * * @param prefix The prefix of the context-relative portion of the request * URI. @@ -81,18 +71,14 @@ public void setPrefix(String prefix); /** - * <p> - * The default class name to be used when creating action form bean - * instances. - * </p> + * <p> The default class name to be used when creating action form bean + * instances. </p> */ String getActionFormBeanClass(); /** - * <p> - * The default class name to be used when creating action form bean - * instances. - * </p> + * <p> The default class name to be used when creating action form bean + * instances. </p> * * @param actionFormBeanClass default class name to be used when creating * action form bean instances. @@ -100,18 +86,14 @@ void setActionFormBeanClass(String actionFormBeanClass); /** - * <p> - * The default class name to be used when creating action mapping - * instances. - * </p> + * <p> The default class name to be used when creating action mapping + * instances. </p> */ String getActionMappingClass(); /** - * <p> - * The default class name to be used when creating action mapping - * instances. - * </p> + * <p> The default class name to be used when creating action mapping + * instances. </p> * * @param actionMappingClass default class name to be used when creating * action mapping instances. @@ -119,10 +101,8 @@ void setActionMappingClass(String actionMappingClass); /** - * <p> - * Add a new <code>ActionConfig</code> instance to the set associated with - * this module. - * </p> + * <p> Add a new <code>ActionConfig</code> instance to the set associated + * with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -131,10 +111,8 @@ void addActionConfig(ActionConfig config); /** - * <p> - * Add a new <code>ExceptionConfig</code> instance to the set associated - * with this module. - * </p> + * <p> Add a new <code>ExceptionConfig</code> instance to the set + * associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -143,10 +121,8 @@ void addExceptionConfig(ExceptionConfig config); /** - * <p> - * Add a new <code>FormBeanConfig</code> instance to the set associated - * with this module. - * </p> + * <p> Add a new <code>FormBeanConfig</code> instance to the set + * associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -155,18 +131,14 @@ void addFormBeanConfig(FormBeanConfig config); /** - * <p> - * The default class name to be used when creating action forward - * instances. - * </p> + * <p> The default class name to be used when creating action forward + * instances. </p> */ String getActionForwardClass(); /** - * <p> - * The default class name to be used when creating action forward - * instances. - * </p> + * <p> The default class name to be used when creating action forward + * instances. </p> * * @param actionForwardClass default class name to be used when creating * action forward instances. @@ -174,10 +146,8 @@ void setActionForwardClass(String actionForwardClass); /** - * <p> - * Add a new <code>ForwardConfig</code> instance to the set of global - * forwards associated with this module. - * </p> + * <p> Add a new <code>ForwardConfig</code> instance to the set of global + * forwards associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -186,10 +156,8 @@ void addForwardConfig(ForwardConfig config); /** - * <p> - * Add a new <code>MessageResourcesConfig</code> instance to the set - * associated with this module. - * </p> + * <p> Add a new <code>MessageResourcesConfig</code> instance to the set + * associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -198,51 +166,41 @@ void addMessageResourcesConfig(MessageResourcesConfig config); /** - * <p> - * Add a newly configured [EMAIL PROTECTED] PlugInConfig} instance to the set of - * plug-in Actions for this module. - * </p> + * <p> Add a newly configured [EMAIL PROTECTED] PlugInConfig} instance to the set of + * plug-in Actions for this module. </p> * * @param plugInConfig The new configuration instance to be added */ void addPlugInConfig(PlugInConfig plugInConfig); /** - * <p> - * Return the action configuration for the specified path, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the action configuration for the specified path, if any; + * otherwise return <code>null</code>. </p> * * @param path Path of the action configuration to return */ ActionConfig findActionConfig(String path); /** - * <p> - * Return the action configurations for this module. If there are none, a - * zero-length array is returned. - * </p> + * <p> Return the action configurations for this module. If there are + * none, a zero-length array is returned. </p> */ ActionConfig[] findActionConfigs(); /** - * <p> - * Return the exception configuration for the specified type, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the exception configuration for the specified type, if any; + * otherwise return <code>null</code>. </p> * * @param type Exception class name to find a configuration for */ ExceptionConfig findExceptionConfig(String type); /** - * <p> - * Perform a recursive search for an ExceptionConfig registered for this - * class, or for any superclass. This should only be used in the case - * when an <code>ActionConfig</code> is not available; otherwise, use + * <p> Perform a recursive search for an ExceptionConfig registered for + * this class, or for any superclass. This should only be used in the + * case when an <code>ActionConfig</code> is not available; otherwise, use * <code>ActionConfig.findException(Class)</code> to preserve the search - * order. - * </p> + * order. </p> * * @param type Exception class name to find a configuration for * @see ActionConfig findException(Class) @@ -250,16 +208,13 @@ ExceptionConfig findException(Class type); /** - * <p> - * Return the exception configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the exception configurations for this module. If there are + * none, a zero-length array is returned. </p> */ ExceptionConfig[] findExceptionConfigs(); /** - * <p> - * Return the form bean configuration for the specified key, if any; + * <p> Return the form bean configuration for the specified key, if any; * otherwise return <code>null</code>. * * @param name Name of the form bean configuration to return @@ -267,70 +222,54 @@ FormBeanConfig findFormBeanConfig(String name); /** - * <p> - * Return the form bean configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the form bean configurations for this module. If there are + * none, a zero-length array is returned. </p> */ FormBeanConfig[] findFormBeanConfigs(); /** - * <p> - * Return the forward configuration for the specified key, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the forward configuration for the specified key, if any; + * otherwise return <code>null</code>. </p> * * @param name Name of the forward configuration to return */ ForwardConfig findForwardConfig(String name); /** - * <p> - * Return the form bean configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the form bean configurations for this module. If there are + * none, a zero-length array is returned. </p> */ ForwardConfig[] findForwardConfigs(); /** - * <p> - * Return the message resources configuration for the specified key, if - * any; otherwise return <code>null</code>. - * </p> + * <p> Return the message resources configuration for the specified key, + * if any; otherwise return <code>null</code>. </p> * * @param key Key of the data source configuration to return */ MessageResourcesConfig findMessageResourcesConfig(String key); /** - * <p> - * Return the message resources configurations for this module. If there - * are none, a zero-length array is returned. - * </p> + * <p> Return the message resources configurations for this module. If + * there are none, a zero-length array is returned. </p> */ MessageResourcesConfig[] findMessageResourcesConfigs(); /** - * <p> - * Return the configured plug-in actions for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the configured plug-in actions for this module. If there + * are none, a zero-length array is returned. </p> */ PlugInConfig[] findPlugInConfigs(); /** - * <p> - * Freeze the configuration of this module. After this method returns, - * any attempt to modify the configuration will return an - * IllegalStateException. - * </p> + * <p> Freeze the configuration of this module. After this method + * returns, any attempt to modify the configuration will return an + * IllegalStateException. </p> */ void freeze(); /** - * <p> - * Remove the specified action configuration instance. - * </p> + * <p> Remove the specified action configuration instance. </p> * * @param config ActionConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -339,9 +278,7 @@ void removeActionConfig(ActionConfig config); /** - * <p> - * Remove the specified exception configuration instance. - * </p> + * <p> Remove the specified exception configuration instance. </p> * * @param config ActionConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -350,9 +287,7 @@ void removeExceptionConfig(ExceptionConfig config); /** - * <p> - * Remove the specified form bean configuration instance. - * </p> + * <p> Remove the specified form bean configuration instance. </p> * * @param config FormBeanConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -361,9 +296,7 @@ void removeFormBeanConfig(FormBeanConfig config); /** - * <p> - * Remove the specified forward configuration instance. - * </p> + * <p> Remove the specified forward configuration instance. </p> * * @param config ForwardConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -372,8 +305,7 @@ void removeForwardConfig(ForwardConfig config); /** - * <p> - * Remove the specified message resources configuration instance. + * <p> Remove the specified message resources configuration instance. * </p> * * @param config MessageResourcesConfig instance to be removed
Modified: struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java (original) +++ struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java Fri Feb 10 13:14:54 2006 @@ -307,10 +307,8 @@ } /** - * <p> - * Add a new <code>FormBeanConfig</code> instance to the set associated - * with this module. - * </p> + * <p> Add a new <code>FormBeanConfig</code> instance to the set + * associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -329,20 +327,16 @@ } /** - * <p> - * The default class name to be used when creating action forward - * instances. - * </p> + * <p> The default class name to be used when creating action forward + * instances. </p> */ public String getActionForwardClass() { return this.actionForwardClass; } /** - * <p> - * The default class name to be used when creating action forward - * instances. - * </p> + * <p> The default class name to be used when creating action forward + * instances. </p> * * @param actionForwardClass default class name to be used when creating * action forward instances. @@ -352,10 +346,8 @@ } /** - * <p> - * Add a new <code>ForwardConfig</code> instance to the set of global - * forwards associated with this module. - * </p> + * <p> Add a new <code>ForwardConfig</code> instance to the set of global + * forwards associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -374,10 +366,8 @@ } /** - * <p> - * Add a new <code>MessageResourcesConfig</code> instance to the set - * associated with this module. - * </p> + * <p> Add a new <code>MessageResourcesConfig</code> instance to the set + * associated with this module. </p> * * @param config The new configuration instance to be added * @throws IllegalStateException if this module configuration has been @@ -396,10 +386,8 @@ } /** - * <p> - * Add a newly configured [EMAIL PROTECTED] org.apache.struts.config.PlugInConfig} - * instance to the set of plug-in Actions for this module. - * </p> + * <p> Add a newly configured [EMAIL PROTECTED] org.apache.struts.config.PlugInConfig} + * instance to the set of plug-in Actions for this module. </p> * * @param plugInConfig The new configuration instance to be added */ @@ -409,11 +397,9 @@ } /** - * <p> - * Return the action configuration for the specified path, first looking a - * direct match, then if none found, a wildcard pattern match; otherwise - * return <code>null</code>. - * </p> + * <p> Return the action configuration for the specified path, first + * looking a direct match, then if none found, a wildcard pattern match; + * otherwise return <code>null</code>. </p> * * @param path Path of the action configuration to return */ @@ -430,10 +416,8 @@ } /** - * <p> - * Return the action configurations for this module. If there are none, a - * zero-length array is returned. - * </p> + * <p> Return the action configurations for this module. If there are + * none, a zero-length array is returned. </p> */ public ActionConfig[] findActionConfigs() { ActionConfig[] results = new ActionConfig[actionConfigList.size()]; @@ -442,10 +426,8 @@ } /** - * <p> - * Return the exception configuration for the specified type, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the exception configuration for the specified type, if any; + * otherwise return <code>null</code>. </p> * * @param type Exception class name to find a configuration for */ @@ -496,10 +478,8 @@ } /** - * <p> - * Return the exception configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the exception configurations for this module. If there are + * none, a zero-length array is returned. </p> */ public ExceptionConfig[] findExceptionConfigs() { ExceptionConfig[] results = new ExceptionConfig[exceptions.size()]; @@ -508,10 +488,8 @@ } /** - * <p> - * Return the form bean configuration for the specified key, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the form bean configuration for the specified key, if any; + * otherwise return <code>null</code>. </p> * * @param name Name of the form bean configuration to return */ @@ -520,10 +498,8 @@ } /** - * <p> - * Return the form bean configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the form bean configurations for this module. If there are + * none, a zero-length array is returned. </p> */ public FormBeanConfig[] findFormBeanConfigs() { FormBeanConfig[] results = new FormBeanConfig[formBeans.size()]; @@ -532,10 +508,8 @@ } /** - * <p> - * Return the forward configuration for the specified key, if any; - * otherwise return <code>null</code>. - * </p> + * <p> Return the forward configuration for the specified key, if any; + * otherwise return <code>null</code>. </p> * * @param name Name of the forward configuration to return */ @@ -544,10 +518,8 @@ } /** - * <p> - * Return the form bean configurations for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the form bean configurations for this module. If there are + * none, a zero-length array is returned. </p> */ public ForwardConfig[] findForwardConfigs() { ForwardConfig[] results = new ForwardConfig[forwards.size()]; @@ -556,10 +528,8 @@ } /** - * <p> - * Return the message resources configuration for the specified key, if - * any; otherwise return <code>null</code>. - * </p> + * <p> Return the message resources configuration for the specified key, + * if any; otherwise return <code>null</code>. </p> * * @param key Key of the data source configuration to return */ @@ -568,10 +538,8 @@ } /** - * <p> - * Return the message resources configurations for this module. If there - * are none, a zero-length array is returned. - * </p> + * <p> Return the message resources configurations for this module. If + * there are none, a zero-length array is returned. </p> */ public MessageResourcesConfig[] findMessageResourcesConfigs() { MessageResourcesConfig[] results = @@ -581,10 +549,8 @@ } /** - * <p> - * Return the configured plug-in actions for this module. If there are - * none, a zero-length array is returned. - * </p> + * <p> Return the configured plug-in actions for this module. If there + * are none, a zero-length array is returned. </p> */ public PlugInConfig[] findPlugInConfigs() { PlugInConfig[] results = new PlugInConfig[plugIns.size()]; @@ -593,11 +559,9 @@ } /** - * <p> - * Freeze the configuration of this module. After this method returns, - * any attempt to modify the configuration will return an - * IllegalStateException. - * </p> + * <p> Freeze the configuration of this module. After this method + * returns, any attempt to modify the configuration will return an + * IllegalStateException. </p> */ public void freeze() { super.freeze(); @@ -644,9 +608,7 @@ } /** - * <p> - * Remove the specified action configuration instance. - * </p> + * <p> Remove the specified action configuration instance. </p> * * @param config ActionConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -660,9 +622,7 @@ } /** - * <p> - * Remove the specified exception configuration instance. - * </p> + * <p> Remove the specified exception configuration instance. </p> * * @param config ActionConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -674,9 +634,7 @@ } /** - * <p> - * Remove the specified form bean configuration instance. - * </p> + * <p> Remove the specified form bean configuration instance. </p> * * @param config FormBeanConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -688,9 +646,7 @@ } /** - * <p> - * Remove the specified forward configuration instance. - * </p> + * <p> Remove the specified forward configuration instance. </p> * * @param config ForwardConfig instance to be removed * @throws IllegalStateException if this module configuration has been @@ -702,8 +658,7 @@ } /** - * <p> - * Remove the specified message resources configuration instance. + * <p> Remove the specified message resources configuration instance. * </p> * * @param config MessageResourcesConfig instance to be removed Modified: struts/action/trunk/src/java/org/apache/struts/mock/MockPageContext.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/mock/MockPageContext.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/mock/MockPageContext.java (original) +++ struts/action/trunk/src/java/org/apache/struts/mock/MockPageContext.java Fri Feb 10 13:14:54 2006 @@ -75,9 +75,7 @@ } /** - * <p> - * Construct a new PageContext impl. - * </p> + * <p> Construct a new PageContext impl. </p> * * @param throwIOException Determines if the returned JspWriter should * throw an IOException on any method call. @@ -216,10 +214,8 @@ } /** - * <p> - * Custom JspWriter that throws the specified exception (supplied on the - * constructor...if any), else it simply returns. - * </p> + * <p> Custom JspWriter that throws the specified exception (supplied on + * the constructor...if any), else it simply returns. </p> */ public JspWriter getOut() { JspWriter jspWriter = Modified: struts/action/trunk/src/java/org/apache/struts/util/MessageResourcesFactory.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/util/MessageResourcesFactory.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/util/MessageResourcesFactory.java (original) +++ struts/action/trunk/src/java/org/apache/struts/util/MessageResourcesFactory.java Fri Feb 10 13:14:54 2006 @@ -29,9 +29,9 @@ * * <ul> * - * <li>Call <code>MessageResourcesFactory().createFactory()</code> - * to retrieve a <code>MessageResourcesFactory</code> instance.</li> <li>Set - * properties as required to configure this factory instance to create + * <li>Call <code>MessageResourcesFactory().createFactory()</code> to retrieve + * a <code>MessageResourcesFactory</code> instance.</li> <li>Set properties as + * required to configure this factory instance to create * <code>MessageResources</code> instances with desired characteristics.</li> * * <li>Call the <code>createResources()</code> method of the factory to Modified: struts/action/trunk/src/java/org/apache/struts/util/RequestUtils.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/util/RequestUtils.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/util/RequestUtils.java (original) +++ struts/action/trunk/src/java/org/apache/struts/util/RequestUtils.java Fri Feb 10 13:14:54 2006 @@ -671,8 +671,8 @@ * * <ul> * - * <li><strong>$M</strong> - Replaced by the - * module prefix for the application module processing this request.</li> + * <li><strong>$M</strong> - Replaced by the module prefix for the + * application module processing this request.</li> * * <li><strong>$P</strong> - Replaced by the <code>path</code> property of * the specified [EMAIL PROTECTED] ForwardConfig}, prepended with a slash if it does @@ -710,36 +710,34 @@ * <li>If the <code>contextRelative</code> property is set, it is assumed * that the <code>path</code> property contains a path that is already * context-relative: <ul> - - * <li>If the <code>path</code> property value - * starts with a slash, it is returned unmodified.</li> <li>If the - * <code>path</code> property value does not start with a slash, a slash - * is prepended.</li> + * + * <li>If the <code>path</code> property value starts with a slash, it is + * returned unmodified.</li> <li>If the <code>path</code> property value + * does not start with a slash, a slash is prepended.</li> * * </ul></li> * - * <li>Acquire the <code>forwardPattern</code> - * property from the <code>ControllerConfig</code> for the application - * module used to process this request. If no pattern was configured, - * default to a pattern of <code>$M$P</code>, which is compatible with the - * hard-coded mapping behavior in Struts 1.0.</li> - * - * <li>Process the - * acquired <code>forwardPattern</code>, performing the following - * substitutions: <ul> <li><strong>$M</strong> - Replaced by the module - * prefix for the application module processing this request.</li> + * <li>Acquire the <code>forwardPattern</code> property from the + * <code>ControllerConfig</code> for the application module used to + * process this request. If no pattern was configured, default to a + * pattern of <code>$M$P</code>, which is compatible with the hard-coded + * mapping behavior in Struts 1.0.</li> + * + * <li>Process the acquired <code>forwardPattern</code>, performing the + * following substitutions: <ul> <li><strong>$M</strong> - Replaced by the + * module prefix for the application module processing this request.</li> * * <li><strong>$P</strong> - Replaced by the <code>path</code> property of * the specified [EMAIL PROTECTED] ForwardConfig}, prepended with a slash if it does * not start with one.</li> * - * <li><strong>$$</strong> - Replaced by a single - * dollar sign character.</li> + * <li><strong>$$</strong> - Replaced by a single dollar sign + * character.</li> * - * <li><strong>$x</strong> (where "x" is any - * charater not listed above) - Silently omit these two characters from - * the result value. (This has the side effect of causing all other - * $+letter combinations to be reserved.)</li> + * <li><strong>$x</strong> (where "x" is any charater not listed above) - + * Silently omit these two characters from the result value. (This has + * the side effect of causing all other $+letter combinations to be + * reserved.)</li> * * </ul></li></ul> * Modified: struts/action/trunk/src/java/org/apache/struts/util/TokenProcessor.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/util/TokenProcessor.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/util/TokenProcessor.java (original) +++ struts/action/trunk/src/java/org/apache/struts/util/TokenProcessor.java Fri Feb 10 13:14:54 2006 @@ -61,10 +61,10 @@ } /** - * <p>Return <code>true</code> if there is a transaction token stored in the - * user's current session, and the value submitted as a request parameter - * with this action matches it. Returns <code>false</code> under any of - * the following circumstances:</p> + * <p>Return <code>true</code> if there is a transaction token stored in + * the user's current session, and the value submitted as a request + * parameter with this action matches it. Returns <code>false</code> + * under any of the following circumstances:</p> * * <ul> * Modified: struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java (original) +++ struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java Fri Feb 10 13:14:54 2006 @@ -1171,10 +1171,9 @@ * * <ul> * - * <li>Variable - * <code>allow2slashes</code> can be set to <code>true</code> or - * <code>false</code> to control whether two slashes are allowed - default - * is <code>false</code> (i.e. two slashes are NOT allowed).</li> + * <li>Variable <code>allow2slashes</code> can be set to <code>true</code> + * or <code>false</code> to control whether two slashes are allowed - + * default is <code>false</code> (i.e. two slashes are NOT allowed).</li> * * <li>Variable <code>nofragments</code> can be set to <code>true</code> * or <code>false</code> to control whether fragments are allowed - @@ -1185,11 +1184,10 @@ * allowed - default is <code>false</code> (i.e. all schemes are NOT * allowed).</li> * - * <li>Variable <code>schemes</code> can be set to a comma - * delimited list of valid schemes. This value is ignored if - * <code>allowallschemes</code> is set to <code>true</code>. Default - * schemes allowed are "http", "https" and "ftp" if this variable is not - * specified.</li> + * <li>Variable <code>schemes</code> can be set to a comma delimited list + * of valid schemes. This value is ignored if <code>allowallschemes</code> + * is set to <code>true</code>. Default schemes allowed are "http", + * "https" and "ftp" if this variable is not specified.</li> * * </ul> * Modified: struts/action/trunk/src/java/org/apache/struts/validator/LazyValidatorForm.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/validator/LazyValidatorForm.java?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/src/java/org/apache/struts/validator/LazyValidatorForm.java (original) +++ struts/action/trunk/src/java/org/apache/struts/validator/LazyValidatorForm.java Fri Feb 10 13:14:54 2006 @@ -39,12 +39,12 @@ * * <ul> * - * <li><b><i>lazy</i> property addition</b> - properties - * which do not exist are automatically added.</li> + * <li><b><i>lazy</i> property addition</b> - properties which do not exist + * are automatically added.</li> * - * <li><b><i>lazy</i> List - * facilities</b> - automatically <i>grows</i> a <code>List</code> or - * <code>Array</code> to accomodate the index value being set.</li> + * <li><b><i>lazy</i> List facilities</b> - automatically <i>grows</i> a + * <code>List</code> or <code>Array</code> to accomodate the index value being + * set.</li> * * <li><b><i>lazy</i> List creation</b> - automatic creation of a * <code>List</code> or <code>Array</code> for <i>indexed</i> properties, if Modified: struts/action/trunk/xdocs/userGuide/release-notes.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/xdocs/userGuide/release-notes.xml?rev=376862&r1=376861&r2=376862&view=diff ============================================================================== --- struts/action/trunk/xdocs/userGuide/release-notes.xml (original) +++ struts/action/trunk/xdocs/userGuide/release-notes.xml Fri Feb 10 13:14:54 2006 @@ -86,7 +86,8 @@ On the <a href="http://struts.apache.org/volunteers.html";> volunteer</a> - front, eight new committers accepted invitations to join us. + front, eight new committers accepted invitations to join + us. We welcome <i>Wendy Smoak</i> , @@ -100,7 +101,10 @@ , <i>Richard Feit</i> , - <i>Jason Carreira</i>, and <i>Patrick Lightbody</i>. + <i>Jason Carreira</i> + , and + <i>Patrick Lightbody</i> + . </p> <h3>Struts Action Library</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
