Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Date: 16 Feb 2000 17:56:12 -0000
Message-ID: <20000216175612.38908.qmail@locus.apache.org>
From: costin@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Request.java Response.java

costin      00/02/16 09:56:12

  Modified:    src/share/org/apache/tomcat/core Request.java Response.java
  Log:
  Review Request, commented few more methods, deprecated methods that are
  used internaly ( and shouldn't be part of the interface )
  
  Revision  Changes    Path
  1.28      +46 -25    jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Request.java	2000/02/16 00:30:29	1.27
  +++ Request.java	2000/02/16 17:56:11	1.28
  @@ -150,6 +150,8 @@
        */
       String getPathTranslated() ;
   
  +    /**
  +     */
       void setPathTranslated(String path) ;
   
       /** Path Info - set be mappers or from adapter
  @@ -164,24 +166,11 @@
   
       public String getServletPath() ;
   
  -    /** Wrapper - the servlet that will execute the request
  -     *  Similar with "handler" in Apache.
  -     */
  -    public ServletWrapper getWrapper() ;
  -    
  -    public void setWrapper(ServletWrapper handler) ;
   
       public Container getContainer() ;
       
       public void setContainer(Container handler) ;
   
  -    /** The file - result of mapping the request ( using aliases and other
  -     *  mapping rules. Usefull only for static resources.
  -     */
  -    public String getMappedPath() ;
  -
  -    public void setMappedPath( String m ) ;
  -
       // -------------------- Security --------------------
       // Will be set by security interceptors
   
  @@ -194,11 +183,7 @@
       void setRemoteUser(String s) ;
   
       boolean isSecure() ;
  -	
  -    Principal getUserPrincipal() ;
  -
  -    boolean isUserInRole(String role) ;
  -
  +    
   
       // -------------------- Session --------------------
       // Will be set by session interceptors
  @@ -217,12 +202,6 @@
       boolean isRequestedSessionIdValid() ;
   
       // -------------------- Parameters --------------------
  -    // Derived from parsing query string and body (for POST)
  -
  -    public void setParameters( Hashtable h ) ;
  -
  -    public Hashtable getParameters() ;
  -
       /** Set query string - will be called by forward
        */
       public void setQueryString(String queryString) ;
  @@ -241,6 +220,8 @@
       public Enumeration getAttributeNames() ;
   
       // -------------------- Input --------------------
  +
  +    // XXX review - do we need both reader and IS ? 
       public BufferedReader getReader() 	throws IOException;
   
       public ServletInputStream getInputStream() 	throws IOException;
  @@ -259,5 +240,45 @@
       /** One-to-One with Facade
        */
       public HttpServletRequestFacade getFacade() ;
  -    
  +
  +    // -------------------- Internal/deprecated--------------------
  +    // Derived from parsing query string and body (for POST)
  +
  +    /** @deprecated internal use only */
  +    public void setParameters( Hashtable h ) ;
  +
  +    /** @deprecated internal use only */
  +    public Hashtable getParameters() ;
  +
  +    /** @deprecated  */
  +    Principal getUserPrincipal() ;
  +
  +    /** @deprecated  */
  +    boolean isUserInRole(String role) ;
  +
  +
  +    /** Wrapper - the servlet that will execute the request
  +     *  Similar with "handler" in Apache.
  +     *  @deprecated - use Container instead
  +     */
  +    public ServletWrapper getWrapper() ;
  +
  +    /**
  +     *  @deprecated - use Container instead
  +     */
  +    public void setWrapper(ServletWrapper handler) ;
  +
  +    /** The file - result of mapping the request ( using aliases and other
  +     *  mapping rules. Usefull only for static resources.
  +     *  @deprecated - internal use only
  +     */
  +    public String getMappedPath() ;
  +
  +    /**
  +     *  @deprecated - internal use only
  +     */
  +    public void setMappedPath( String m ) ;
  +
  +
  +
   }
  
  
  
  1.16      +5 -3      jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Response.java	2000/02/16 17:13:23	1.15
  +++ Response.java	2000/02/16 17:56:11	1.16
  @@ -104,12 +104,12 @@
       public boolean isUsingStream();
       
       /** Signal that we're done with a particular request, the
  -	server can go on and read more requests or close the socket
  -    */
  +     *	server can go on and read more requests or close the socket
  +     */
       public void finish() throws IOException ;
   
       /** Either re-implement getOutputStream or return BufferedServletOutputStream(this)
  -	and implement doWrite();
  +     *  and implement doWrite();
        */
       public ServletOutputStream getOutputStream() ;
   
  @@ -137,6 +137,8 @@
   
       public void reset() throws IllegalStateException ;
   
  +    /** Any implementation needs to notify ContextManger
  +     */
       public void flushBuffer() throws IOException ;
   
       // -------------------- Cookies --------------------