cziegeler    01/04/09 04:15:47

  Modified:    src/org/apache/cocoon/environment Tag: xml-cocoon2
                        Request.java Response.java
  Log:
  Removed deprecated methods and cleaned up javadocs by removing references to 
javax.servlet classes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -19     
xml-cocoon/src/org/apache/cocoon/environment/Attic/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Request.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Request.java      2001/03/30 17:14:25     1.1.2.1
  +++ Request.java      2001/04/09 11:15:47     1.1.2.2
  @@ -21,7 +21,7 @@
    * Defines an interface to provide client request information .  
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/03/30 17:14:25 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/09 11:15:47 $
    *
    */
   
  @@ -240,8 +240,7 @@
       /**
        *
        * Stores an attribute in this request.
  -     * Attributes are reset between requests.  This method is most
  -     * often used in conjunction with [EMAIL PROTECTED] RequestDispatcher}.
  +     * Attributes are reset between requests.  
        *
        * <p>Attribute names should follow the same conventions as
        * package names. Names beginning with <code>java.*</code>,
  @@ -591,14 +590,10 @@
        * </table>
        * </blockquote>
        *
  -     * <p>To reconstruct an URL with a scheme and host, use
  -     * [EMAIL PROTECTED] HttpUtils#getRequestURL}.
  -     *
        * @return               a <code>String</code> containing
        *                       the part of the URL from the 
        *                       protocol name up to the query string
        *
  -     * @see          HttpUtils#getRequestURL
        *
        */
   
  @@ -683,7 +678,6 @@
        *
        * @see                  #getRequestedSessionId
        * @see                  #getSession
  -     * @see                  HttpSessionContext
        *
        */
   
  @@ -719,15 +713,4 @@
        */
       
       public boolean isRequestedSessionIdFromURL();
  -    
  -    /**
  -     *
  -     * @deprecated           As of Version 2.1 of the Java Servlet
  -     *                               API, use [EMAIL PROTECTED] 
#isRequestedSessionIdFromURL}
  -     *                               instead.
  -     *
  -     */
  -
  -    public boolean isRequestedSessionIdFromUrl();
  -
   }
  
  
  
  1.1.2.2   +3 -50     
xml-cocoon/src/org/apache/cocoon/environment/Attic/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Response.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Response.java     2001/03/30 17:14:25     1.1.2.1
  +++ Response.java     2001/04/09 11:15:47     1.1.2.2
  @@ -18,7 +18,7 @@
    * Defines an interface to provide client response information .  
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/03/30 17:14:25 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/09 11:15:47 $
    *
    */
   
  @@ -60,24 +60,17 @@
        * the client. The content type may include the type of character
        * encoding used, for example, <code>text/html; 
charset=ISO-8859-4</code>.
        *
  -     * <p>If obtaining a <code>PrintWriter</code>, this method should be 
  -     * called first.
        *
  -     *
        * @param type   a <code>String</code> specifying the MIME 
        *                       type of the content
        *
  -     * @see          #getOutputStream
  -     * @see          #getWriter
  -     *
        */
   
       public void setContentType(String type);
       
       /**
        * Sets the locale of the response, setting the headers (including the
  -     * Content-Type's charset) as appropriate.  This method should be called
  -     * before a call to [EMAIL PROTECTED] #getWriter}.  By default, the 
response locale
  +     * Content-Type's charset) as appropriate.  By default, the response 
locale
        * is the default locale for the server.
        * 
        * @param loc  the locale of the response
  @@ -160,33 +153,11 @@
        *                       the unchanged URL otherwise.
        *
        * @see #sendRedirect
  -     * @see #encodeUrl
        */
   
       public String encodeRedirectURL(String url);
   
       /**
  -     * @deprecated   As of version 2.1, use encodeURL(String url) instead
  -     *
  -     * @param        url     the url to be encoded.
  -     * @return               the encoded URL if encoding is needed; 
  -     *                       the unchanged URL otherwise.
  -     */
  -
  -    public String encodeUrl(String url);
  -    
  -    /**
  -     * @deprecated   As of version 2.1, use 
  -     *                       encodeRedirectURL(String url) instead
  -     *
  -     * @param        url     the url to be encoded.
  -     * @return               the encoded URL if encoding is needed; 
  -     *                       the unchanged URL otherwise.
  -     */
  -
  -    public String encodeRedirectUrl(String url);
  -
  -    /**
        * Sends a temporary redirect response to the client using the
        * specified redirect location URL.  This method can accept relative 
URLs;
        * the servlet container will convert the relative URL to an absolute URL
  @@ -269,32 +240,14 @@
       /**
        * Sets the status code for this response.  This method is used to
        * set the return status code when there is no error (for example,
  -     * for the status codes SC_OK or SC_MOVED_TEMPORARILY).  If there
  -     * is an error, the <code>sendError</code> method should be used
  -     * instead.
  +     * for the status codes SC_OK or SC_MOVED_TEMPORARILY).  
        *
        * @param        sc      the status code
        *
  -     * @see #sendError
        */
   
       public void setStatus(int sc);
     
  -    /**
  -     * @deprecated As of version 2.1, due to ambiguous meaning of the 
  -     * message parameter. To set a status code 
  -     * use <code>setStatus(int)</code>, to send an error with a description
  -     * use <code>sendError(int, String)</code>.
  -     *
  -     * Sets the status code and message for this response.
  -     * 
  -     * @param        sc      the status code
  -     * @param        sm      the status message
  -     */
  -
  -    public void setStatus(int sc, String sm);
  -
  -    
   }
   
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to