vmassol     02/04/14 03:35:45

  Modified:    framework/src/java/j2ee13/org/apache/cactus/server
                        FilterConfigWrapper.java FilterImplicitObjects.java
                        FilterTestCaller.java FilterTestController.java
                        FilterTestRedirector.java
                        HttpServletRequestWrapper.java
                        PageContextWrapper.java
                        RequestDispatcherWrapper.java
                        ServletConfigWrapper.java
                        ServletContextWrapper.java
  Log:
  corrected checkstyle reported errors
  
  Revision  Changes    Path
  1.2       +8 -5      
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterConfigWrapper.java
  
  Index: FilterConfigWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterConfigWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FilterConfigWrapper.java  1 Mar 2002 00:43:45 -0000       1.1
  +++ FilterConfigWrapper.java  14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -66,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: FilterConfigWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: FilterConfigWrapper.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    * @see ServletContext
    */
   public class FilterConfigWrapper implements FilterConfig
  
  
  
  1.3       +9 -6      
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterImplicitObjects.java
  
  Index: FilterImplicitObjects.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterImplicitObjects.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilterImplicitObjects.java        10 Mar 2002 13:58:25 -0000      1.2
  +++ FilterImplicitObjects.java        14 Apr 2002 10:35:44 -0000      1.3
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -63,7 +66,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: FilterImplicitObjects.java,v 1.2 2002/03/10 13:58:25 vmassol Exp $
  + * @version $Id: FilterImplicitObjects.java,v 1.3 2002/04/14 10:35:44 vmassol Exp $
    */
   public class FilterImplicitObjects extends AbstractWebImplicitObjects
   {
  @@ -102,7 +105,7 @@
       }
   
       /**
  -     * @param theRequest the <code>FilterChain</code> implicit object
  +     * @param theFilterChain the <code>FilterChain</code> implicit object
        */
       public void setFilterChain(FilterChain theFilterChain)
       {
  
  
  
  1.2       +8 -7      
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java
  
  Index: FilterTestCaller.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FilterTestCaller.java     1 Mar 2002 00:43:45 -0000       1.1
  +++ FilterTestCaller.java     14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -59,8 +62,6 @@
   import org.apache.cactus.AbstractTestCase;
   import org.apache.cactus.FilterTestCase;
   import org.apache.cactus.ServletURL;
  -import org.apache.cactus.util.log.Log;
  -import org.apache.cactus.util.log.LogService;
   
   /**
    * Responsible for instanciating the <code>TestCase</code> class on the server
  @@ -68,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: FilterTestCaller.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: FilterTestCaller.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    */
   public class FilterTestCaller extends AbstractTestCaller
   {
  
  
  
  1.2       +8 -5      
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestController.java
  
  Index: FilterTestController.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestController.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FilterTestController.java 1 Mar 2002 00:43:45 -0000       1.1
  +++ FilterTestController.java 14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -61,7 +64,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: FilterTestController.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: FilterTestController.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    */
   public class FilterTestController extends AbstractTestController
   {
  
  
  
  1.2       +16 -7     
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestRedirector.java
  
  Index: FilterTestRedirector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestRedirector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FilterTestRedirector.java 1 Mar 2002 00:43:45 -0000       1.1
  +++ FilterTestRedirector.java 14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -71,7 +74,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: FilterTestRedirector.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: FilterTestRedirector.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    * @see FilterTestCaller
    */
   public class FilterTestRedirector implements Filter
  @@ -81,8 +84,7 @@
        * details from the correct properties file. Initialization is done here
        * as this servlet is the first point of entry to the server code.
        */
  -    static
  -    {
  +    static {
           LogService.getInstance().init("/log_server.properties");
       }
   
  @@ -106,6 +108,9 @@
        *                   information on the test case and method to call
        * @param theResponse the response to send back to the client side
        * @param theFilterChain contains the chain of filters.
  +     * @exception IOException if an error occurred during test on server side
  +     * @exception ServletException if an error occurred during test on server
  +     *            side
        */
       public void doFilter(ServletRequest theRequest,
           ServletResponse theResponse, FilterChain theFilterChain)
  @@ -141,6 +146,8 @@
       /**
        * Provided so that it works with containers that do not support the
        * latest Filter spec yet ! (ex: Orion 1.5.2 !)
  +     *
  +     * @param theConfig the Filter Config
        */
       public void setFilterConfig(FilterConfig theConfig)
       {
  @@ -150,6 +157,8 @@
       /**
        * Provided so that it works with containers that do not support the
        * latest Filter spec yet ! (ex: Orion 1.5.2 !)
  +     *
  +     * @return the Filter Config
        */
       public FilterConfig getFilterConfig()
       {
  
  
  
  1.3       +10 -7     
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/HttpServletRequestWrapper.java
  
  Index: HttpServletRequestWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/HttpServletRequestWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpServletRequestWrapper.java    28 Mar 2002 16:04:45 -0000      1.2
  +++ HttpServletRequestWrapper.java    14 Apr 2002 10:35:44 -0000      1.3
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -71,7 +74,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: HttpServletRequestWrapper.java,v 1.2 2002/03/28 16:04:45 vmassol 
Exp $
  + * @version $Id: HttpServletRequestWrapper.java,v 1.3 2002/04/14 10:35:44 vmassol 
Exp $
    */
   public class HttpServletRequestWrapper extends AbstractHttpServletRequestWrapper
   {
  @@ -117,10 +120,10 @@
       /**
        * @see HttpServletRequest#setCharacterEncoding(String)
        */
  -    public void setCharacterEncoding(String env)
  +    public void setCharacterEncoding(String theEnvironment)
           throws UnsupportedEncodingException
       {
  -        this.request.setCharacterEncoding(env);
  +        this.request.setCharacterEncoding(theEnvironment);
       }
   
       /**
  
  
  
  1.2       +11 -6     
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/PageContextWrapper.java
  
  Index: PageContextWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/PageContextWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageContextWrapper.java   1 Mar 2002 00:43:45 -0000       1.1
  +++ PageContextWrapper.java   14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -66,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: PageContextWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: PageContextWrapper.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    */
   public class PageContextWrapper extends AbstractPageContextWrapper
   {
  @@ -87,10 +90,12 @@
   
       // Unmodified overridden methods -----------------------------------------
   
  +    /**
  +     * @see PageContext#handlePageException(Throwable)
  +     */
       public void handlePageException(Throwable theThrowable)
           throws ServletException, IOException
       {
           this.originalPageContext.handlePageException(theThrowable);
       }
  -
   }
  
  
  
  1.2       +12 -5     
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/RequestDispatcherWrapper.java
  
  Index: RequestDispatcherWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/RequestDispatcherWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RequestDispatcherWrapper.java     1 Mar 2002 00:43:45 -0000       1.1
  +++ RequestDispatcherWrapper.java     14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -66,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: RequestDispatcherWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol 
Exp $
  + * @version $Id: RequestDispatcherWrapper.java,v 1.2 2002/04/14 10:35:44 vmassol 
Exp $
    */
   public class RequestDispatcherWrapper implements RequestDispatcher
   {
  @@ -90,6 +93,8 @@
        *
        * @param theRequest the simulation HTTP request
        * @param theResponse the original HTTP response
  +     * @exception IOException {@link RequestDispatcher#forward}
  +     * @exception ServletException {@link RequestDispatcher#forward}
        */
       public void forward(ServletRequest theRequest, ServletResponse theResponse)
           throws IOException, ServletException
  @@ -107,6 +112,8 @@
        *
        * @param theRequest the simulation HTTP request
        * @param theResponse the original HTTP response
  +     * @exception IOException {@link RequestDispatcher#forward}
  +     * @exception ServletException {@link RequestDispatcher#forward}
        */
       public void include(ServletRequest theRequest, ServletResponse theResponse)
           throws IOException, ServletException
  
  
  
  1.2       +8 -5      
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/ServletConfigWrapper.java
  
  Index: ServletConfigWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/ServletConfigWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletConfigWrapper.java 1 Mar 2002 00:43:45 -0000       1.1
  +++ ServletConfigWrapper.java 14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -66,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: ServletConfigWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: ServletConfigWrapper.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    * @see ServletContext
    */
   public class ServletConfigWrapper implements ServletConfig
  
  
  
  1.2       +13 -5     
jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/ServletContextWrapper.java
  
  Index: ServletContextWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/ServletContextWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletContextWrapper.java        1 Mar 2002 00:43:45 -0000       1.1
  +++ ServletContextWrapper.java        14 Apr 2002 10:35:44 -0000      1.2
  @@ -1,4 +1,6 @@
   /*
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  @@ -23,10 +25,10 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  + * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
  + *    Foundation" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  @@ -50,6 +52,7 @@
    * individuals on behalf of the Apache Software Foundation.  For more
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  + *
    */
   package org.apache.cactus.server;
   
  @@ -64,7 +67,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: ServletContextWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
  + * @version $Id: ServletContextWrapper.java,v 1.2 2002/04/14 10:35:44 vmassol Exp $
    * @see RequestDispatcherWrapper
    */
   public class ServletContextWrapper extends AbstractServletContextWrapper
  @@ -77,6 +80,9 @@
           super(theOriginalContext);
       }
   
  +    /**
  +     * @see ServletContext#getServletContextName()
  +     */
       public String getServletContextName()
       {
           return this.originalContext.getServletContextName();
  @@ -116,6 +122,8 @@
        * 17/03/2001 (in anticipation of the upcoming draft of Servlet 2.3). Kept
        * the method without parameters for servlet engines that do not have
        * upgraded yet to the new signature.
  +     *
  +     * @see ServletContext#getResourcePaths(String
        */
       public Set getResourcePaths(String thePath)
       {
  
  
  

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

Reply via email to