struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject cvs commit: jakarta-struts/src/share/org/apache/struts/config PlugInConfig.java MessageResourcesConfig.java ForwardConfig.java FormPropertyConfig.java FormBeanConfig.java ExceptionConfig.java DataSourceConfig.java ControllerConfig.java ConfigRuleSet.java ApplicationConfig.java ActionConfig.java
Date Tue, 09 Jul 2002 23:57:38 GMT
husted      2002/07/09 16:57:38

  Modified:    src/share/org/apache/struts/config PlugInConfig.java
                        MessageResourcesConfig.java ForwardConfig.java
                        FormPropertyConfig.java FormBeanConfig.java
                        ExceptionConfig.java DataSourceConfig.java
                        ControllerConfig.java ConfigRuleSet.java
                        ApplicationConfig.java ActionConfig.java
  Log:
  Javadoc updates. No code changes.
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-struts/src/share/org/apache/struts/config/PlugInConfig.java
  
  Index: PlugInConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/PlugInConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PlugInConfig.java	23 Mar 2002 01:14:04 -0000	1.1
  +++ PlugInConfig.java	9 Jul 2002 23:57:37 -0000	1.2
  @@ -70,7 +70,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;plug-in&gt;</code> element in a Struts application
  + * <code>&lt;plug-in&gt;</code> element in a Struts
    * configuration file.</p>
    *
    * @author Craig R. McClanahan
  
  
  
  1.6       +5 -5      jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java
  
  Index: MessageResourcesConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MessageResourcesConfig.java	23 Mar 2002 00:08:01 -0000	1.5
  +++ MessageResourcesConfig.java	9 Jul 2002 23:57:37 -0000	1.6
  @@ -68,7 +68,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;message-resources&gt;</code> element in a Struts application
  + * <code>&lt;message-resources&gt;</code> element in a Struts
    * configuration file.</p>
    *
    * @author Craig R. McClanahan
  
  
  
  1.7       +10 -10    jakarta-struts/src/share/org/apache/struts/config/ForwardConfig.java
  
  Index: ForwardConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ForwardConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ForwardConfig.java	7 Jul 2002 23:45:21 -0000	1.6
  +++ ForwardConfig.java	9 Jul 2002 23:57:37 -0000	1.7
  @@ -68,7 +68,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;forward&gt;</code> element from a Struts application
  + * <code>&lt;forward&gt;</code> element from a Struts
    * configuration file.</p>
    *
    * @author Craig R. McClanahan
  @@ -144,7 +144,7 @@
       /**
        * Should the value of the <code>path</code> property be considered
        * context-relative if it starts with a slash (and therefore not
  -     * prefixed with the application prefix?
  +     * prefixed with the module prefix?
        */
       protected boolean contextRelative = false;
   
  @@ -184,16 +184,16 @@
        * interpreted according to the following rules:</p>
        * <li>If <code>contextRelative</code> property is <code>true</code>,
the
        *     path is considered to be context-relative within the current web
  -     *     application (even if we are in a sub-application).  It will be
  +     *     application (even if we are in a named module).  It will be
        *     prefixed by the context path to create a server-relative URL.</li>
        * <li>If the <code>contextRelative</code> property is false, the
path is
  -     *     considered to be the application-relative portion of the URL.
  +     *     considered to be the module-relative portion of the URL.
        *     It will be used as the replacement for the <code>$F</code>
        *     marker in the <code>forwardPattern</code> property defined on the
  -     *     {@link ControllerConfig} element for our current sub-application.
  +     *     {@link ControllerConfig} element for our current module.
        *     For the default <code>forwardPattern</code> value of
        *     <code>$C$A$P</code>, the resulting server-relative URL will be
  -     *     the concatenation of the context path, the sub-application prefix,
  +     *     the concatenation of the context path, the module prefix,
        *     and the <code>path</code> from this <code>ForwardConfig</code>.</li>
        * </ul>
        */
  
  
  
  1.7       +5 -5      jakarta-struts/src/share/org/apache/struts/config/FormPropertyConfig.java
  
  Index: FormPropertyConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/FormPropertyConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FormPropertyConfig.java	30 Jun 2002 01:49:21 -0000	1.6
  +++ FormPropertyConfig.java	9 Jul 2002 23:57:37 -0000	1.7
  @@ -70,7 +70,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;form-property&gt;</code> element in a Struts application
  + * <code>&lt;form-property&gt;</code> element in a Struts
    * configuration file.<p>
    *
    * @author Craig R. McClanahan
  
  
  
  1.6       +7 -7      jakarta-struts/src/share/org/apache/struts/config/FormBeanConfig.java
  
  Index: FormBeanConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/FormBeanConfig.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FormBeanConfig.java	29 Jun 2002 03:14:19 -0000	1.5
  +++ FormBeanConfig.java	9 Jul 2002 23:57:37 -0000	1.6
  @@ -69,7 +69,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;form-bean&gt;</code> element in a Struts application
  + * <code>&lt;form-bean&gt;</code> element in a Struts
    * configuration file.<p>
    *
    * @author Craig R. McClanahan
  @@ -163,7 +163,7 @@
   
       /**
        * Add a new <code>FormPropertyConfig</code> instance to the set associated
  -     * with this application.
  +     * with this module.
        *
        * @param config The new configuration instance to be added
        *
  @@ -199,7 +199,7 @@
   
   
       /**
  -     * Return the form property configurations for this application.  If there
  +     * Return the form property configurations for this module.  If there
        * are none, a zero-length array is returned.
        */
       public FormPropertyConfig[] findFormPropertyConfigs() {
  
  
  
  1.5       +6 -6      jakarta-struts/src/share/org/apache/struts/config/ExceptionConfig.java
  
  Index: ExceptionConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ExceptionConfig.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExceptionConfig.java	30 Jun 2002 04:37:32 -0000	1.4
  +++ ExceptionConfig.java	9 Jul 2002 23:57:37 -0000	1.5
  @@ -68,7 +68,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of an
  - * <code>&lt;exception&gt;</code> element from a Struts application
  + * <code>&lt;exception&gt;</code> element from a Struts
    * configuration file.</p>
    *
    * @author Craig R. McClanahan
  @@ -94,7 +94,7 @@
       /**
        * The servlet context attribute under which the message resources bundle
        * to be used for this exception is located.  If not set, the default
  -     * message resources for the current subapp is assumed.
  +     * message resources for the current module is assumed.
        */
       protected String bundle = null;
   
  
  
  
  1.6       +5 -5      jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java
  
  Index: DataSourceConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DataSourceConfig.java	23 Mar 2002 00:08:01 -0000	1.5
  +++ DataSourceConfig.java	9 Jul 2002 23:57:37 -0000	1.6
  @@ -71,7 +71,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;data-source&gt;</code> element from a Struts application
  + * <code>&lt;data-source&gt;</code> element from a Struts
    * configuration file.</p>
    *
    * <p><strong>WARNING</strong> - The properties of this configuration
bean
  
  
  
  1.7       +13 -13    jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java
  
  Index: ControllerConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ControllerConfig.java	5 Jul 2002 22:05:58 -0000	1.6
  +++ ControllerConfig.java	9 Jul 2002 23:57:37 -0000	1.7
  @@ -68,7 +68,7 @@
   
   /**
    * <p>A JavaBean representing the configuration information of a
  - * <code>&lt;controller&gt;</code> element in a Struts application
  + * <code>&lt;controller&gt;</code> element in a Struts
    * configuration file.</p>
    *
    * @author Craig R. McClanahan
  @@ -147,8 +147,8 @@
        * from a {@link ForwardConfig} element.  The pattern may consist of any
        * combination of the following markers and characters:</p>
        * <ul>
  -     * <li><code><strong>$A</strong></code> - Replaced by
the application
  -     *     prefix for the current subapplication.</li>
  +     * <li><code><strong>$A</strong></code> - Replaced by
the module
  +     *     prefix for the current application module.</li>
        * <li><code><strong>$P</strong></code> - Replaced by
the <code>path</code>
        *     property of a {@link ForwardConfig} instance.</li>
        * <li><code><strong>$$</strong></code> - Renders a literal
dollar sign
  @@ -176,12 +176,12 @@
   
       /**
        * <p>Should the <code>input</code> property of {@link ActionConfig}
  -     * instances associated with this sub-application be treated as the
  +     * instances associated with this module be treated as the
        * name of a corresponding {@link ForwardConfig}.  A <code>false</code>
  -     * value treats them as a sub-application relative path (consistent
  +     * value treats them as a module-relative path (consistent
        * with the hard coded behavior of earlier versions of Struts.</p>
        *
  -     * @since 1.1b2
  +     * @since Struts 1.1b2
        */
       protected boolean inputForward = false;
   
  @@ -270,8 +270,8 @@
        * properties.  The pattern may consist of any combination of the
        * following markers and characters:</p>
        * <ul>
  -     * <li><code><strong>$A</strong></code> - Replaced by
the application
  -     *     prefix for the current subapplication.</li>
  +     * <li><code><strong>$A</strong></code> - Replaced by
the module
  +     *     prefix for the current application module.</li>
        * <li><code><strong>$P</strong></code> - Replaced by
the <code>page</code>
        *     attribute value being evaluated.</li>
        * <li><code><strong>$$</strong></code> - Renders a literal
dollar sign
  @@ -299,7 +299,7 @@
   
       /**
        * The fully qualified class name of the RequestProcessor implementation
  -     * class to be used for this application.
  +     * class to be used for this module.
        */
       protected String processorClass =
           "org.apache.struts.action.RequestProcessor";
  
  
  
  1.12      +5 -5      jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java
  
  Index: ConfigRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ConfigRuleSet.java	23 Mar 2002 01:14:04 -0000	1.11
  +++ ConfigRuleSet.java	9 Jul 2002 23:57:37 -0000	1.12
  @@ -72,7 +72,7 @@
   
   
   /**
  - * <p>The set of Digester rules required to parse a Struts application
  + * <p>The set of Digester rules required to parse a Struts
    * configuration file (<code>struts-config.xml</code>).</p>
    *
    * @author Craig R. McClanahan
  
  
  
  1.16      +42 -42    jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java
  
  Index: ApplicationConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApplicationConfig.java	25 Jun 2002 01:30:40 -0000	1.15
  +++ ApplicationConfig.java	9 Jul 2002 23:57:37 -0000	1.16
  @@ -68,12 +68,12 @@
   import java.util.HashMap;
   import javax.servlet.ServletException;
   import javax.servlet.UnavailableException;
  - 
  +
   
   
   /**
    * <p>The collection of static configuration information that describes a
  - * Struts-based application or sub-application.  Multiple sub-applications
  + * Struts-based application module.  Multiple application modules
    * are identified by a <em>prefix</em> at the beginning of the context
    * relative portion of the request URI.  If no application prefix can be
    * matched, the default configuration (with a prefix equal to a zero-length
  @@ -95,7 +95,7 @@
        * Construct an ApplicationConfig object according to the specified
        * parameter values.
        *
  -     * @param prefix Context-relative URI prefix for this application
  +     * @param prefix Context-relative URI prefix for this module
        */
       public ApplicationConfig(String prefix) {
   
  @@ -109,7 +109,7 @@
   
   
       /**
  -     * The set of action configurations for this application, if any,
  +     * The set of action configurations for this module, if any,
        * keyed by the <code>path</code> property.
        */
       protected HashMap actionConfigs = new HashMap();
  @@ -117,27 +117,27 @@
   
       /**
        * The set of JDBC data source configurations for this
  -     * application, if any, keyed by the <code>key</code> property.
  +     * module, if any, keyed by the <code>key</code> property.
        */
       protected HashMap dataSources = new HashMap();
   
   
       /**
        * The set of exception handling configurations for this
  -     * application, if any, keyed by the <code>type</code> property.
  +     * module, if any, keyed by the <code>type</code> property.
        */
       protected HashMap exceptions = new HashMap();
   
   
       /**
  -     * The set of form bean configurations for this application, if any,
  +     * The set of form bean configurations for this module, if any,
        * keyed by the <code>name</code> property.
        */
       protected HashMap formBeans = new HashMap();
   
   
       /**
  -     * The set of global forward configurations for this application, if any,
  +     * The set of global forward configurations for this module, if any,
        * keyed by the <code>name</code> property.
        */
       protected HashMap forwards = new HashMap();
  @@ -145,13 +145,13 @@
   
       /**
        * The set of message resources configurations for this
  -     * application, if any, keyed by the <code>key</code> property.
  +     * module, if any, keyed by the <code>key</code> property.
        */
       protected HashMap messageResources = new HashMap();
   
   
       /**
  -     * The set of configured plug in modules for this application,
  +     * The set of configured plug-in Actions for this module,
        * if any, in the order they were declared and configured.
        */
       protected ArrayList plugIns = new ArrayList();
  @@ -161,7 +161,7 @@
   
   
       /**
  -     * Has this application been completely configured yet.  Once this flag
  +     * Has this module been completely configured yet.  Once this flag
        * has been set, any attempt to modify the configuration will return an
        * IllegalStateException.
        */
  @@ -173,7 +173,7 @@
   
   
       /**
  -     * The controller configuration object for this application.
  +     * The controller configuration object for this module.
        */
       protected ControllerConfig controllerConfig = null;
   
  @@ -226,11 +226,11 @@
   
       /**
        * Add a new <code>ActionConfig</code> instance to the set associated
  -     * with this application.
  +     * with this module.
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addActionConfig(ActionConfig config) {
  @@ -246,11 +246,11 @@
   
       /**
        * Add a new <code>DataSourceConfig</code> instance to the set associated
  -     * with this application.
  +     * with this module.
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addDataSourceConfig(DataSourceConfig config) {
  @@ -269,7 +269,7 @@
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addExceptionConfig(ExceptionConfig config) {
  @@ -284,11 +284,11 @@
   
       /**
        * Add a new <code>FormBeanConfig</code> instance to the set associated
  -     * with this application.
  +     * with this module.
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addFormBeanConfig(FormBeanConfig config) {
  @@ -303,11 +303,11 @@
   
       /**
        * Add a new <code>ForwardConfig</code> instance to the set of global
  -     * forwards associated with this application.
  +     * forwards associated with this module.
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addForwardConfig(ForwardConfig config) {
  @@ -322,11 +322,11 @@
   
       /**
        * Add a new <code>MessageResourcesConfig</code> instance to the set
  -     * associated with this application.
  +     * associated with this module.
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addMessageResourcesConfig(MessageResourcesConfig config) {
  @@ -341,7 +341,7 @@
   
       /**
        * Add a newly configured {@link PlugInConfig} instance to the set of
  -     * plug in modules for this application.
  +     * plug-in Actions for this module.
        *
        * @param plugInConfig The new configuration instance to be added
        */
  @@ -369,7 +369,7 @@
   
   
       /**
  -     * Return the action configurations for this application.  If there are
  +     * Return the action configurations for this module.  If there are
        * none, a zero-length array is returned.
        */
       public ActionConfig[] findActionConfigs() {
  @@ -394,7 +394,7 @@
   
   
       /**
  -     * Return the data source configurations for this application.  If there
  +     * Return the data source configurations for this module.  If there
        * are none, a zero-length array is returned.
        */
       public DataSourceConfig[] findDataSourceConfigs() {
  @@ -419,7 +419,7 @@
   
   
       /**
  -     * Return the exception configurations for this application.  If there
  +     * Return the exception configurations for this module.  If there
        * are none, a zero-length array is returned.
        */
       public ExceptionConfig[] findExceptionConfigs() {
  @@ -444,7 +444,7 @@
   
   
       /**
  -     * Return the form bean configurations for this application.  If there
  +     * Return the form bean configurations for this module.  If there
        * are none, a zero-length array is returned.
        */
       public FormBeanConfig[] findFormBeanConfigs() {
  @@ -469,7 +469,7 @@
   
   
       /**
  -     * Return the form bean configurations for this application.  If there
  +     * Return the form bean configurations for this module.  If there
        * are none, a zero-length array is returned.
        */
       public ForwardConfig[] findForwardConfigs() {
  @@ -494,7 +494,7 @@
   
   
       /**
  -     * Return the message resources configurations for this application.
  +     * Return the message resources configurations for this module.
        * If there are none, a zero-length array is returned.
        */
       public MessageResourcesConfig[] findMessageResourcesConfigs() {
  @@ -508,7 +508,7 @@
   
   
       /**
  -     * Return the configured plug in modules for this application.  If there
  +     * Return the configured plug-in actions for this module.  If there
        * are none, a zero-length array is returned.
        */
       public PlugInConfig[] findPlugInConfigs() {
  @@ -520,7 +520,7 @@
   
   
       /**
  -     * Freeze the configuration of this application.  After this method
  +     * Freeze the configuration of this module.  After this method
        * returns, any attempt to modify the configuration will return
        * an IllegalStateException.
        */
  @@ -573,7 +573,7 @@
        *
        * @param config ActionConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeActionConfig(ActionConfig config) {
  @@ -592,7 +592,7 @@
        *
        * @param config ActionConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeExceptionConfig(ExceptionConfig config) {
  @@ -610,7 +610,7 @@
        *
        * @param config DataSourceConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeDataSourceConfig(DataSourceConfig config) {
  @@ -628,7 +628,7 @@
        *
        * @param config FormBeanConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeFormBeanConfig(FormBeanConfig config) {
  @@ -646,7 +646,7 @@
        *
        * @param config ForwardConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeForwardConfig(ForwardConfig config) {
  @@ -664,7 +664,7 @@
        *
        * @param config MessageResourcesConfig instance to be removed
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void removeMessageResourcesConfig(MessageResourcesConfig config) {
  
  
  
  1.7       +7 -7      jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java
  
  Index: ActionConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ActionConfig.java	16 Jun 2002 05:11:36 -0000	1.6
  +++ ActionConfig.java	9 Jul 2002 23:57:37 -0000	1.7
  @@ -72,7 +72,7 @@
   /**
    * <p>A JavaBean representing the configuration information of an
    * <code>&lt;action&gt;</code> element from a Struts application
  - * configuration file.</p>
  + * module configuration file.</p>
    *
    * @author Craig R. McClanahan
    * @version $Revision$ $Date$
  @@ -447,7 +447,7 @@
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addExceptionConfig(ExceptionConfig config) {
  @@ -466,7 +466,7 @@
        *
        * @param config The new configuration instance to be added
        *
  -     * @exception IllegalStateException if this application configuration
  +     * @exception IllegalStateException if this module configuration
        *  has been frozen
        */
       public void addForwardConfig(ForwardConfig config) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@jakarta.apache.org>


Mime
View raw message