husted      2002/07/09 17:00:19

  Modified:    src/share/org/apache/struts/util RequestUtils.java
                        StrutsValidatorUtil.java AppException.java
  Log:
  Javadoc updates. No code changes.
  
  Revision  Changes    Path
  1.46      +24 -24    
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
  
  Index: RequestUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- RequestUtils.java 7 Jul 2002 23:45:21 -0000       1.45
  +++ RequestUtils.java 10 Jul 2002 00:00:19 -0000      1.46
  @@ -355,7 +355,7 @@
        * @param forward Logical forward name for which to look up
        *  the context-relative URI (if specified)
        * @param href URL to be utilized unmodified (if specified)
  -     * @param page Application-relative page for which a URL should
  +     * @param page Module-relative page for which a URL should
        *  be created (if specified)
        *
        * @param params Map of parameters to be dynamically included (if any)
  @@ -388,7 +388,7 @@
                   (messages.getMessage("computeURL.specifier"));
           }
   
  -        // Look up the application configuration for this request
  +        // Look up the application module configuration for this request
           ApplicationConfig config = (ApplicationConfig)
               pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
           if (config == null) { // Backwards compatibility hack
  @@ -528,7 +528,7 @@
        *
        * @param request The servlet request we are processing
        * @param mapping The action mapping for this request
  -     * @param appConfig The application configuration for this sub-application
  +     * @param appConfig The application configuration for this module
        */
       public static ActionForm createActionForm(HttpServletRequest request,
                                                 ActionMapping mapping,
  @@ -738,7 +738,7 @@
   
       /**
        * Look up and return current user locale, based on the specified parameters.
  -     * 
  +     *
        * @param pageContext The PageContext associated with this request
        * @param locale Name of the session attribute for our user's Locale
        */
  @@ -1142,8 +1142,8 @@
   
       /**
        * Return the context-relative URL that corresponds to the specified
  -     * {@link ActionConfig}, relative to the sub-application associated
  -     * with the current subapp's {@link ApplicationConfig}.
  +     * {@link ActionConfig}, relative to the application module associated
  +     * with the current modules's {@link ApplicationConfig}.
        *
        * @param request The servlet request we are processing
        * @param action ActionConfig to be evaluated
  @@ -1175,8 +1175,8 @@
   
       /**
        * Return the context-relative URL that corresponds to the specified
  -     * {@link ForwardConfig}, relative to the sub-application associated
  -     * with the current subapp's {@link ApplicationConfig}.
  +     * {@link ForwardConfig}, relative to the module associated
  +     * with the current {@link ApplicationConfig}.
        *
        * @param request The servlet request we are processing
        * @param forward ForwardConfig to be evaluated
  @@ -1248,12 +1248,12 @@
       /**
        * Return the context-relative URL that corresponds to the specified
        * <code>page</code> attribute value, calculated based on the
  -     * <code>pagePattern</code> property of the current subapp's
  +     * <code>pagePattern</code> property of the current module's
        * {@link ApplicationConfig}.
        *
        * @param request The servlet request we are processing
  -     * @param page The application-relative URL to be substituted in
  -     *  to the <code>pagePattern</code> pattern for the current subapp
  +     * @param page The module-relative URL to be substituted in
  +     *  to the <code>pagePattern</code> pattern for the current module.
        *
        * @since Struts 1.1b2
        */
  @@ -1376,10 +1376,10 @@
   
   
       /**
  -     * Select the sub-application to which the specified request belongs, and
  +     * Select the application module to which the specified request belongs, and
        * add corresponding request attributes to this request.
        *
  -     * @param prefix The sub-application prefix of the desired sub-application
  +     * @param prefix The module prefix of the desired application module
        * @param request The servlet request we are processing
        * @param context The ServletContext for this web application
        */
  @@ -1387,7 +1387,7 @@
                                            HttpServletRequest request,
                                            ServletContext context) {
   
  -        // Expose the resources for this sub-application
  +        // Expose the resources for this application module
           ApplicationConfig config = (ApplicationConfig)
               context.getAttribute(Action.APPLICATION_KEY + prefix);
           if (config != null) {
  @@ -1407,7 +1407,7 @@
   
   
       /**
  -     * Select the sub-application to which the specified request belongs, and
  +     * Select the module to which the specified request belongs, and
        * add corresponding request attributes to this request.
        *
        * @param request The servlet request we are processing
  @@ -1416,14 +1416,14 @@
       public static void selectApplication(HttpServletRequest request,
                                            ServletContext context) {
   
  -        // Acquire the path used to compute the sub-application
  +        // Acquire the path used to compute the module
           String matchPath = (String)
               request.getAttribute(RequestProcessor.INCLUDE_SERVLET_PATH);
           if (matchPath == null) {
               matchPath = request.getServletPath();
           }
   
  -        // Match against the list of sub-application prefixes
  +        // Match against the list of module prefixes
           String prefix = "";
           String prefixes[] = getApplicationPrefixes(context);
           for (int i = 0; i < prefixes.length; i++) {
  @@ -1433,16 +1433,16 @@
               }
           }
   
  -        // Expose the resources for this sub-application
  +        // Expose the resources for this module
           selectApplication(prefix, request, context);
   
       }
   
   
       /**
  -     * Return the list of sub-application prefixes that are defined for
  +     * Return the list of module prefixes that are defined for
        * this web application, creating it if necessary.  <strong>NOTE</strong> -
  -     * the "" prefix for the default application is not included in this list.
  +     * the "" prefix for the default module is not included in this list.
        *
        * @param context The ServletContext for this web application
        */
  
  
  
  1.4       +11 -11    
jakarta-struts/src/share/org/apache/struts/util/StrutsValidatorUtil.java
  
  Index: StrutsValidatorUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/StrutsValidatorUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StrutsValidatorUtil.java  25 Jun 2002 18:27:52 -0000      1.3
  +++ StrutsValidatorUtil.java  10 Jul 2002 00:00:19 -0000      1.4
  @@ -106,25 +106,25 @@
      private static Locale defaultLocale = Locale.getDefault();
   
      /**
  -    * Retrieve <code>ValidatorResources</code> for the application.
  +    * Retrieve <code>ValidatorResources</code> for the module.
      */
      public static ValidatorResources getValidatorResources(ServletContext 
application) {
         return 
(ValidatorResources)application.getAttribute(ValidatorPlugIn.VALIDATOR_KEY);
      }
   
      /**
  -    * Retrieve <code>MessageResources</code> for the application.
  +    * Retrieve <code>MessageResources</code> for the application module.
       *
       * @deprecated This method can only return the resources for the default
  -    *  sub-application.  Use getMessageResources(HttpServletRequest) to get the
  -    *  resources for the current sub-application.
  +    *  module.  Use getMessageResources(HttpServletRequest) to get the
  +    *  resources for the current application module.
      */
      public static MessageResources getMessageResources(ServletContext application) {
         return (MessageResources)application.getAttribute(Action.MESSAGES_KEY);
      }
   
      /**
  -    * Retrieve <code>MessageResources</code> for the application.
  +    * Retrieve <code>MessageResources</code> for the application module.
      */
      public static MessageResources getMessageResources(HttpServletRequest request) {
         return (MessageResources)request.getAttribute(Action.MESSAGES_KEY);
  @@ -255,7 +255,7 @@
       * Writes a message based on the <code>Writer</code> defined in 
<code>MessageResources</code>.
       *
       * @deprecated This method can only return the resources for the default
  -    *  sub-application.  Use Commons Logging package instead.
  +    *  module.  Use Commons Logging package instead.
      */
      public static void log(ServletContext application, String message) {
         MessageResources messages = getMessageResources(application);
  @@ -269,7 +269,7 @@
       * Writes a message based on the <code>Writer</code> defined in 
<code>MessageResources</code>.
       *
       * @deprecated This method can only return the resources for the default
  -    *  sub-application.  Use Commons Logging package instead.
  +    *  module.  Use Commons Logging package instead.
      */
      public static void log(ServletContext application, String message, Throwable t) {
         MessageResources messages = getMessageResources(application);
  
  
  
  1.2       +5 -5      
jakarta-struts/src/share/org/apache/struts/util/AppException.java
  
  Index: AppException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/AppException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AppException.java 31 Dec 2001 01:14:36 -0000      1.1
  +++ AppException.java 10 Jul 2002 00:00:19 -0000      1.2
  @@ -67,7 +67,7 @@
   
   
       /**
  -     * Construct an application exception with no replacement values.
  +     * Construct an application module exception with no replacement values.
        *
        * @param key Message key for this error message
        */
  @@ -77,7 +77,7 @@
       }
   
       /**
  -     * Construct an application exception with the specified replacement values.
  +     * Construct an application module exception with the specified replacement 
values.
        *
        * @param key Message key for this error message
        * @param value0 First replacement value
  @@ -88,7 +88,7 @@
       }
   
       /**
  -     * Construct an application exception with the specified replacement values.
  +     * Construct an application module exception with the specified replacement 
values.
        *
        * @param key Message key for this error message
        * @param value0 First replacement value
  @@ -100,7 +100,7 @@
       }
   
       /**
  -     * Construct an application exception with the specified replacement values.
  +     * Construct an application module exception with the specified replacement 
values.
        *
        * @param key Message key for this error message
        * @param value0 First replacement value
  @@ -113,7 +113,7 @@
       }
   
       /**
  -     * Construct an application exception with the specified replacement values.
  +     * Construct an application module exception with the specified replacement 
values.
        *
        * @param key Message key for this error message
        * @param value0 First replacement value
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to