hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r378645 - in /jakarta/httpcomponents/trunk: coyote-httpconnector/src/java/org/apache/http/coyote/ coyote-httpconnector/src/java/org/apache/http/coyote/impl/ http-async/src/java/org/apache/http/async/ http-async/src/java/org/apache/http/asyn...
Date Fri, 17 Feb 2006 22:34:57 GMT
Author: olegk
Date: Fri Feb 17 14:34:54 2006
New Revision: 378645

URL: http://svn.apache.org/viewcvs?rev=378645&view=rev
Log:
Removed HttpMutable interfaces  

Removed:
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMutableEntityEnclosingRequest.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMutableMessage.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMutableRequest.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMutableResponse.java
Modified:
    jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/CoyoteHttpConnection.java
    jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/CoyoteHttpConnectionImpl.java
    jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java
    jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpDispatcher.java
    jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpHandle.java
    jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AsyncHttpProcessor.java
    jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpDispatcher.java
    jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpHandle.java
    jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java
    jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipCompress.java
    jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipUncompress.java
    jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/spring/SpringHttpDemo.java
    jakarta/httpcomponents/trunk/http-core/src/examples/org/apache/http/examples/ElementalHttpServer.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpClientConnection.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpEntityEnclosingRequest.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMessage.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestFactory.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestInterceptor.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponse.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseFactory.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseInterceptor.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpServerConnection.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpMessage.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpRequest.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpResponse.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/AbstractHttpProcessor.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpRequestExecutor.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpService.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java
    jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java
    jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
    jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java

Modified: jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/CoyoteHttpConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/CoyoteHttpConnection.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/CoyoteHttpConnection.java (original)
+++ jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/CoyoteHttpConnection.java Fri Feb 17 14:34:54 2006
@@ -35,7 +35,7 @@
 import org.apache.coyote.OutputBuffer;
 import org.apache.http.HttpConnection;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.params.HttpParams;
 
@@ -52,7 +52,7 @@
 
     void setCommitTrigger(CommitTrigger commitTrigger);
 
-    HttpMutableRequest readRequest(HttpParams params)
+    HttpRequest readRequest(HttpParams params)
             throws HttpException, IOException; 
     
     void closeInput() 

Modified: jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/CoyoteHttpConnectionImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/CoyoteHttpConnectionImpl.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/CoyoteHttpConnectionImpl.java (original)
+++ jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/CoyoteHttpConnectionImpl.java Fri Feb 17 14:34:54 2006
@@ -43,7 +43,7 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
@@ -156,7 +156,7 @@
         this.commitTrigger = commitTrigger;
     }
 
-    public HttpMutableRequest readRequest(final HttpParams params) 
+    public HttpRequest readRequest(final HttpParams params) 
             throws HttpException, IOException {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
@@ -167,7 +167,7 @@
             throw new ConnectionClosedException("Client closed connection"); 
         }
         RequestLine requestline = RequestLine.parse(this.charbuffer, 0, this.charbuffer.length());
-        HttpMutableRequest request = this.requestfactory.newHttpRequest(requestline);
+        HttpRequest request = this.requestfactory.newHttpRequest(requestline);
         request.getParams().setDefaults(params);
         Header[] headers = Header.parseAll(this.datareceiver);
         for (i = 0; i < headers.length; i++) {

Modified: jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java (original)
+++ jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java Fri Feb 17 14:34:54 2006
@@ -50,8 +50,6 @@
 import org.apache.http.Header;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -105,8 +103,8 @@
     private final Request coyotereq;
     private final Response coyoteres;
     
-    private HttpMutableRequest httpreq = null;
-    private HttpMutableResponse httpres = null;
+    private HttpRequest httpreq = null;
+    private HttpResponse httpres = null;
     
     public HttpConnectionProcessor(
             final CoyoteHttpConnection conn,
@@ -216,7 +214,7 @@
         this.context.setAttribute(HttpContext.HTTP_REQUEST, this.httpreq);
     }
 
-    private HttpMutableResponse createResponse(int status) {
+    private HttpResponse createResponse(int status) {
         BasicHttpResponse response = new BasicHttpResponse();
     	response.getParams().setDefaults(this.params);
         if (this.httpreq != null) {
@@ -228,7 +226,7 @@
     	return response;
     }
     
-    private HttpMutableResponse processHttpException(final HttpException ex) {
+    private HttpResponse processHttpException(final HttpException ex) {
     	LOG.debug("Processing HTTP exception");
         if (ex instanceof MethodNotSupportedException) {
             return createResponse(HttpStatus.SC_NOT_IMPLEMENTED);
@@ -330,7 +328,6 @@
                 } catch (UnknownHostException ex) {
                     defaulthost = "localhost";
                 }
-                this.coyotereq.setLocalHost(defaulthost);
                 this.coyotereq.serverName().setString(defaulthost);
                 this.coyotereq.setServerPort(CoyoteParams.getPort(httpreq.getParams()));
             }

Modified: jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpDispatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpDispatcher.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpDispatcher.java (original)
+++ jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpDispatcher.java Fri Feb 17 14:34:54 2006
@@ -29,7 +29,6 @@
 
 package org.apache.http.async;
 
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -37,8 +36,8 @@
 import org.apache.http.HttpClientConnection;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.protocol.HttpContext;
 
 /**
@@ -94,7 +93,7 @@
      *    can not be used here, since it could call this method!
      */
     protected abstract void postprocessResponse(AbstractHttpHandle handle,
-                                                HttpMutableResponse response)
+                                                HttpResponse response)
         throws HttpException, IOException
         ;
 
@@ -182,7 +181,7 @@
      * @throws IOException        in case of an IO problem
      */
     protected static
-        HttpMutableResponse obtainResponse(AsyncHttpProcessor   proc,
+        HttpResponse obtainResponse(AsyncHttpProcessor   proc,
                                            HttpRequest          request,
                                            HttpContext          context,
                                            HttpClientConnection connection)
@@ -206,7 +205,7 @@
      * @throws IOException        in case of an IO problem
      */
     protected static void finishResponse(AsyncHttpProcessor  proc,
-                                         HttpMutableResponse response,
+                                         HttpResponse response,
                                          HttpContext         context)
         throws HttpException, IOException {
 

Modified: jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpHandle.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpHandle.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpHandle.java (original)
+++ jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AbstractHttpHandle.java Fri Feb 17 14:34:54 2006
@@ -29,15 +29,13 @@
 
 package org.apache.http.async;
 
-
 import java.io.IOException;
 
 import org.apache.http.HttpRequest;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpException;
+import org.apache.http.HttpResponse;
 import org.apache.http.protocol.HttpContext;
 
-
 /**
  * Base class for implementations of {@link HttpHandle HttpHandle}.
  *
@@ -231,7 +229,7 @@
      * @throws HttpException      in case of a problem
      * @throws IOException        in case of an IO problem
      */
-    protected final void dispatcherPostprocess(HttpMutableResponse response)
+    protected final void dispatcherPostprocess(HttpResponse response)
         throws HttpException, IOException
         {
             if (http_dispatcher != null)

Modified: jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AsyncHttpProcessor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AsyncHttpProcessor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AsyncHttpProcessor.java (original)
+++ jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/AsyncHttpProcessor.java Fri Feb 17 14:34:54 2006
@@ -35,8 +35,8 @@
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.ProtocolException;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpExecutionContext;
@@ -160,7 +160,7 @@
      * @throws IOException        in case of an IO problem
      */
     protected
-        HttpMutableResponse obtainResponse(HttpRequest          request,
+        HttpResponse obtainResponse(HttpRequest          request,
                                            HttpContext          context,
                                            HttpClientConnection connection)
         throws HttpException, IOException {
@@ -185,7 +185,7 @@
      * @throws HttpException      in case of a problem
      * @throws IOException        in case of an IO problem
      */
-    protected void finishResponse(HttpMutableResponse response,
+    protected void finishResponse(HttpResponse response,
                                   HttpContext context)
         throws HttpException, IOException {
 

Modified: jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpDispatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpDispatcher.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpDispatcher.java (original)
+++ jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpDispatcher.java Fri Feb 17 14:34:54 2006
@@ -37,7 +37,6 @@
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpClientConnection;
@@ -198,7 +197,7 @@
 
     // non-javadoc, see base class AbstractHttpDispatcher
     protected void postprocessResponse(AbstractHttpHandle handle,
-                                       HttpMutableResponse response)
+                                       HttpResponse response)
         throws HttpException, IOException {
 
         if (handle == null)
@@ -387,7 +386,7 @@
                                         client_connection);
 
                         //@@@ TODO: timeout handling!
-                        HttpMutableResponse response = 
+                        HttpResponse response = 
                             obtainResponse(async_processor,
                                            handle.getRequest(),
                                            handle.getContext(),

Modified: jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpHandle.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpHandle.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpHandle.java (original)
+++ jakarta/httpcomponents/trunk/http-async/src/java/org/apache/http/async/impl/SimpleHttpHandle.java Fri Feb 17 14:34:54 2006
@@ -29,17 +29,14 @@
 
 package org.apache.http.async.impl;
 
-
 import java.io.IOException;
 
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpException;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.async.AbstractHttpHandle;
 
-
 /**
  * Handles for the {@link SimpleHttpDispatcher SimpleHttpDispatcher}.
  *
@@ -59,7 +56,7 @@
 
 
     /** The response. It may or may not be postprocessed. */
-    HttpMutableResponse response_object;
+    HttpResponse response_object;
 
     /** The state of the response. */
     private int response_state;
@@ -188,7 +185,7 @@
      *
      * @param response    the response, received but not post-processed
      */
-    public final void provideResponse(HttpMutableResponse response) {
+    public final void provideResponse(HttpResponse response) {
 
         synchronized (response_monitor) {
             response_object = response;

Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java Fri Feb 17 14:34:54 2006
@@ -33,7 +33,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.protocol.HttpContext;
 
@@ -51,7 +51,7 @@
     private static final String ACCEPT_ENCODING = "Accept-Encoding";
     private static final String GZIP_CODEC = "gzip";
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
+    public void process(final HttpRequest request, final HttpContext context) 
             throws HttpException, IOException {
         if (!request.containsHeader(ACCEPT_ENCODING)) {
             request.addHeader(new Header(ACCEPT_ENCODING, GZIP_CODEC, true));

Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipCompress.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipCompress.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipCompress.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipCompress.java Fri Feb 17 14:34:54 2006
@@ -34,8 +34,8 @@
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.protocol.HttpContext;
 
@@ -53,7 +53,7 @@
     private static final String ACCEPT_ENCODING = "Accept-Encoding";
     private static final String GZIP_CODEC = "gzip";
     
-    public void process(final HttpMutableResponse response, final HttpContext context) 
+    public void process(final HttpResponse response, final HttpContext context) 
             throws HttpException, IOException {
         if (context == null) {
             throw new IllegalArgumentException("HTTP context may not be null");

Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipUncompress.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipUncompress.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipUncompress.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/ResponseGzipUncompress.java Fri Feb 17 14:34:54 2006
@@ -35,7 +35,7 @@
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.protocol.HttpContext;
 
@@ -52,7 +52,7 @@
 
     private static final String GZIP_CODEC = "gzip";
     
-    public void process(final HttpMutableResponse response, final HttpContext context) 
+    public void process(final HttpResponse response, final HttpContext context) 
             throws HttpException, IOException {
         if (context == null) {
             throw new IllegalArgumentException("HTTP context may not be null");

Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/spring/SpringHttpDemo.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/spring/SpringHttpDemo.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/spring/SpringHttpDemo.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/spring/SpringHttpDemo.java Fri Feb 17 14:34:54 2006
@@ -31,7 +31,7 @@
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpClientConnection;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
@@ -71,7 +71,7 @@
         ConnectionReuseStrategy connStrategy = (ConnectionReuseStrategy) beanfactory.getBean("conn-reuse-strategy");
         conn.setTargetHost(host);
         try {
-            HttpMutableRequest request1 = requestfactory.newHttpRequest("GET", "/");
+            HttpRequest request1 = requestfactory.newHttpRequest("GET", "/");
             HttpResponse response1 = httpexec.execute(request1, conn);
             System.out.println("<< Response: " + response1.getStatusLine());
             System.out.println(EntityUtils.toString(response1.getEntity()));
@@ -82,7 +82,7 @@
                 conn.close();
                 System.out.println("Connection closed...");
             }
-            HttpMutableRequest request2 = requestfactory.newHttpRequest("GET", "/stuff");
+            HttpRequest request2 = requestfactory.newHttpRequest("GET", "/stuff");
             HttpResponse response2 = httpexec.execute(request2, conn);
             System.out.println("<< Response: " + response2.getStatusLine());
             System.out.println(EntityUtils.toString(response2.getEntity()));

Modified: jakarta/httpcomponents/trunk/http-core/src/examples/org/apache/http/examples/ElementalHttpServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/examples/org/apache/http/examples/ElementalHttpServer.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/examples/org/apache/http/examples/ElementalHttpServer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/examples/org/apache/http/examples/ElementalHttpServer.java Fri Feb 17 14:34:54 2006
@@ -37,8 +37,8 @@
 import java.net.URLDecoder;
 
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpServerConnection;
 import org.apache.http.HttpStatus;
 import org.apache.http.MethodNotSupportedException;
@@ -80,7 +80,7 @@
             super(conn);
         }
 
-        protected void doService(final HttpRequest request, final HttpMutableResponse response) 
+        protected void doService(final HttpRequest request, final HttpResponse response) 
                 throws HttpException, IOException {
             String method = request.getRequestLine().getMethod();
             if (!method.equalsIgnoreCase("GET") && !method.equalsIgnoreCase("HEAD")) {

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpClientConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpClientConnection.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpClientConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpClientConnection.java Fri Feb 17 14:34:54 2006
@@ -65,10 +65,10 @@
     void sendRequestEntity(HttpEntityEnclosingRequest request) 
         throws HttpException, IOException;
 
-    HttpMutableResponse receiveResponseHeader(HttpParams params) 
+    HttpResponse receiveResponseHeader(HttpParams params) 
         throws HttpException, IOException;
 
-    void receiveResponseEntity(HttpMutableResponse response) 
+    void receiveResponseEntity(HttpResponse response) 
         throws HttpException, IOException;
     
     void flush() throws IOException;

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpEntityEnclosingRequest.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpEntityEnclosingRequest.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpEntityEnclosingRequest.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpEntityEnclosingRequest.java Fri Feb 17 14:34:54 2006
@@ -42,6 +42,8 @@
 
 	boolean expectContinue();
 	
+    void setEntity(HttpEntity entity);
+    
     HttpEntity getEntity();
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMessage.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMessage.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMessage.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMessage.java Fri Feb 17 14:34:54 2006
@@ -29,6 +29,8 @@
 
 package org.apache.http;
 
+import java.util.Iterator;
+
 import org.apache.http.params.HttpParams;
 
 /**
@@ -53,6 +55,18 @@
 
     Header[] getAllHeaders();
 
+    void addHeader(Header header);
+
+    void setHeader(Header header);
+
+    void removeHeader(Header header);
+    
+    void removeHeaders(String name);
+    
+    Iterator headerIterator();
+    
     HttpParams getParams();
     
+    void setParams(HttpParams params);
+        
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestFactory.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestFactory.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestFactory.java Fri Feb 17 14:34:54 2006
@@ -40,10 +40,10 @@
  */
 public interface HttpRequestFactory {
     
-    HttpMutableRequest newHttpRequest(RequestLine requestline) 
+    HttpRequest newHttpRequest(RequestLine requestline) 
         throws MethodNotSupportedException;
     
-    HttpMutableRequest newHttpRequest(String method, String uri) 
+    HttpRequest newHttpRequest(String method, String uri) 
     	throws MethodNotSupportedException;
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestInterceptor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestInterceptor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestInterceptor.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpRequestInterceptor.java Fri Feb 17 14:34:54 2006
@@ -45,7 +45,7 @@
  */
 public interface HttpRequestInterceptor {
 
-    void process(HttpMutableRequest request, HttpContext context) 
+    void process(HttpRequest request, HttpContext context) 
         throws HttpException, IOException;
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponse.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponse.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponse.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponse.java Fri Feb 17 14:34:54 2006
@@ -42,6 +42,12 @@
 
     StatusLine getStatusLine();
 
+    void setStatusLine(StatusLine statusline);
+    
+    void setStatusCode(int code);
+    
     HttpEntity getEntity();
+    
+    void setEntity(HttpEntity entity);
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseFactory.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseFactory.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseFactory.java Fri Feb 17 14:34:54 2006
@@ -40,8 +40,8 @@
  */
 public interface HttpResponseFactory {
     
-    HttpMutableResponse newHttpResponse(HttpVersion ver, int status);
+    HttpResponse newHttpResponse(HttpVersion ver, int status);
     
-    HttpMutableResponse newHttpResponse(StatusLine statusline);
+    HttpResponse newHttpResponse(StatusLine statusline);
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseInterceptor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseInterceptor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseInterceptor.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpResponseInterceptor.java Fri Feb 17 14:34:54 2006
@@ -45,7 +45,7 @@
  */
 public interface HttpResponseInterceptor {
 
-    void process(HttpMutableResponse response, HttpContext context) 
+    void process(HttpResponse response, HttpContext context) 
         throws HttpException, IOException;
     
 }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpServerConnection.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpServerConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpServerConnection.java Fri Feb 17 14:34:54 2006
@@ -49,10 +49,10 @@
     void bind(Socket socket, HttpParams params) 
         throws IOException;
     
-    HttpMutableRequest receiveRequestHeader(HttpParams params) 
+    HttpRequest receiveRequestHeader(HttpParams params) 
         throws HttpException, IOException;
 
-    void receiveRequestEntity(HttpMutableEntityEnclosingRequest request) 
+    void receiveRequestEntity(HttpEntityEnclosingRequest request) 
         throws HttpException, IOException;
 
     void sendResponseHeader(HttpResponse response) 

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java Fri Feb 17 14:34:54 2006
@@ -39,8 +39,8 @@
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.ProtocolException;
@@ -209,18 +209,18 @@
         this.datatransmitter.writeLine(this.buffer);
     }
 
-    public HttpMutableResponse receiveResponseHeader(final HttpParams params) 
+    public HttpResponse receiveResponseHeader(final HttpParams params) 
             throws HttpException, IOException {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         assertOpen();
-        HttpMutableResponse response = readResponseStatusLine(params);
+        HttpResponse response = readResponseStatusLine(params);
         readResponseHeaders(response);
         return response;
     }
 
-    public void receiveResponseEntity(final HttpMutableResponse response)
+    public void receiveResponseEntity(final HttpResponse response)
             throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP response may not be null");
@@ -251,7 +251,7 @@
         }
     }
     
-    protected HttpMutableResponse readResponseStatusLine(final HttpParams params) 
+    protected HttpResponse readResponseStatusLine(final HttpParams params) 
                 throws HttpException, IOException {
         // clear the buffer
         this.buffer.clear();
@@ -278,13 +278,13 @@
         } while(true);
         //create the status line from the status string
         StatusLine statusline = StatusLine.parse(this.buffer, 0, this.buffer.length());
-        HttpMutableResponse response = this.responsefactory.newHttpResponse(statusline);
+        HttpResponse response = this.responsefactory.newHttpResponse(statusline);
         response.getParams().setDefaults(params);
         return response;
     }
 
-    protected void readResponseHeaders(
-            final HttpMutableResponse response) throws HttpException, IOException {
+    protected void readResponseHeaders(final HttpResponse response) 
+            throws HttpException, IOException {
         Header[] headers = Header.parseAll(this.datareceiver);
         for (int i = 0; i < headers.length; i++) {
             response.addHeader(headers[i]);

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java Fri Feb 17 14:34:54 2006
@@ -29,7 +29,7 @@
 
 package org.apache.http.impl;
 
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestFactory;
 import org.apache.http.MethodNotSupportedException;
 import org.apache.http.RequestLine;
@@ -51,7 +51,7 @@
         super();
     }
 
-    public HttpMutableRequest newHttpRequest(final RequestLine requestline)
+    public HttpRequest newHttpRequest(final RequestLine requestline)
             throws MethodNotSupportedException {
         if (requestline == null) {
             throw new IllegalArgumentException("Request line may not be null");
@@ -68,7 +68,7 @@
         }
     }
 
-    public HttpMutableRequest newHttpRequest(final String method, final String uri)
+    public HttpRequest newHttpRequest(final String method, final String uri)
 			throws MethodNotSupportedException {
 		if ("GET".equalsIgnoreCase(method)) {
 			return new BasicHttpRequest(method, uri);

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java Fri Feb 17 14:34:54 2006
@@ -29,7 +29,7 @@
 
 package org.apache.http.impl;
 
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
@@ -51,7 +51,7 @@
         super();
     }
 
-    public HttpMutableResponse newHttpResponse(final HttpVersion ver, final int status) {
+    public HttpResponse newHttpResponse(final HttpVersion ver, final int status) {
         if (ver == null) {
             throw new IllegalArgumentException("HTTP version may not be null");
         }
@@ -59,7 +59,7 @@
         return new BasicHttpResponse(statusline); 
     }
     
-    public HttpMutableResponse newHttpResponse(final StatusLine statusline) {
+    public HttpResponse newHttpResponse(final StatusLine statusline) {
         if (statusline == null) {
             throw new IllegalArgumentException("Status line may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java Fri Feb 17 14:34:54 2006
@@ -35,9 +35,9 @@
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableEntityEnclosingRequest;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpServerConnection;
@@ -104,18 +104,18 @@
         super.bind(socket, params);
     }
 
-    public HttpMutableRequest receiveRequestHeader(final HttpParams params) 
+    public HttpRequest receiveRequestHeader(final HttpParams params) 
             throws HttpException, IOException {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         assertOpen();
-        HttpMutableRequest request = receiveRequestLine(params);
+        HttpRequest request = receiveRequestLine(params);
         receiveRequestHeaders(request);
         return request;
     }
     
-    public void receiveRequestEntity(final HttpMutableEntityEnclosingRequest request) 
+    public void receiveRequestEntity(final HttpEntityEnclosingRequest request) 
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -125,7 +125,7 @@
         request.setEntity(entity);
     }
 
-    protected HttpMutableRequest receiveRequestLine(final HttpParams params)
+    protected HttpRequest receiveRequestLine(final HttpParams params)
             throws HttpException, IOException {
         this.buffer.clear();
         int i = this.datareceiver.readLine(this.buffer);
@@ -133,12 +133,12 @@
             throw new ConnectionClosedException("Client closed connection"); 
         }
         RequestLine requestline = RequestLine.parse(this.buffer, 0, this.buffer.length());
-        HttpMutableRequest request = this.requestfactory.newHttpRequest(requestline);
+        HttpRequest request = this.requestfactory.newHttpRequest(requestline);
         request.getParams().setDefaults(params);
         return request;
     }
     
-    protected void receiveRequestHeaders(final HttpMutableRequest request) 
+    protected void receiveRequestHeaders(final HttpRequest request) 
             throws HttpException, IOException {
         Header[] headers = Header.parseAll(this.datareceiver);
         for (int i = 0; i < headers.length; i++) {

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java Fri Feb 17 14:34:54 2006
@@ -31,7 +31,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpMutableEntityEnclosingRequest;
+import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.RequestLine;
 import org.apache.http.protocol.HTTP;
 
@@ -45,7 +45,7 @@
  * @since 4.0
  */
 public class BasicHttpEntityEnclosingRequest 
-            extends BasicHttpRequest implements HttpMutableEntityEnclosingRequest {
+            extends BasicHttpRequest implements HttpEntityEnclosingRequest {
     
     private HttpEntity entity = null;
     

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpMessage.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpMessage.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpMessage.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpMessage.java Fri Feb 17 14:34:54 2006
@@ -32,7 +32,7 @@
 import java.util.Iterator;
 
 import org.apache.http.Header;
-import org.apache.http.HttpMutableMessage;
+import org.apache.http.HttpMessage;
 import org.apache.http.impl.DefaultHttpParams;
 import org.apache.http.impl.HeaderGroup;
 import org.apache.http.params.HttpParams;
@@ -46,7 +46,7 @@
  * 
  * @since 4.0
  */
-public class BasicHttpMessage implements HttpMutableMessage {
+public class BasicHttpMessage implements HttpMessage {
     
     private final HeaderGroup headergroup;
     

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpRequest.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpRequest.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpRequest.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpRequest.java Fri Feb 17 14:34:54 2006
@@ -29,7 +29,7 @@
 
 package org.apache.http.message;
 
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpVersion;
 import org.apache.http.RequestLine;
 import org.apache.http.params.HttpProtocolParams;
@@ -43,7 +43,7 @@
  * 
  * @since 4.0
  */
-public class BasicHttpRequest extends BasicHttpMessage implements HttpMutableRequest {
+public class BasicHttpRequest extends BasicHttpMessage implements HttpRequest {
     
     private final RequestLine requestline;
     private final String method;

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpResponse.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpResponse.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpResponse.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/message/BasicHttpResponse.java Fri Feb 17 14:34:54 2006
@@ -30,7 +30,7 @@
 package org.apache.http.message;
 
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.StatusLine;
 import org.apache.http.params.HttpProtocolParams;
@@ -44,7 +44,7 @@
  * 
  * @since 4.0
  */
-public class BasicHttpResponse extends BasicHttpMessage implements HttpMutableResponse {
+public class BasicHttpResponse extends BasicHttpMessage implements HttpResponse {
     
     private StatusLine statusline = null;
     private HttpEntity entity = null;

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/AbstractHttpProcessor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/AbstractHttpProcessor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/AbstractHttpProcessor.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/AbstractHttpProcessor.java Fri Feb 17 14:34:54 2006
@@ -35,9 +35,9 @@
 import java.util.List;
 
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 
 /**
@@ -147,8 +147,9 @@
     }
     
     protected void preprocessRequest(
-            final HttpMutableRequest request,
-            final HttpContext context) throws IOException, HttpException {
+            final HttpRequest request,
+            final HttpContext context) 
+                throws IOException, HttpException {
         if (this.requestInterceptors != null) {
             for (int i = 0; i < this.requestInterceptors.size(); i++) {
                 HttpRequestInterceptor interceptor = (HttpRequestInterceptor) this.requestInterceptors.get(i);
@@ -158,9 +159,9 @@
     }
 
     protected void postprocessResponse(
-            final HttpMutableResponse response,
+            final HttpResponse response,
             final HttpContext context) 
-            throws IOException, HttpException {
+                throws IOException, HttpException {
         if (this.responseInterceptors != null) {
             for (int i = 0; i < this.responseInterceptors.size(); i++) {
                 HttpResponseInterceptor interceptor = (HttpResponseInterceptor) this.responseInterceptors.get(i);

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpRequestExecutor.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpRequestExecutor.java Fri Feb 17 14:34:54 2006
@@ -36,8 +36,6 @@
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableRequest;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -194,7 +192,7 @@
         this.defaultContext.setAttribute(HttpExecutionContext.HTTP_REQUEST, 
                 request);
         
-        HttpMutableResponse response = null;
+        HttpResponse response = null;
         // loop until the method is successfully processed, the retryHandler 
         // returns false or a non-recoverable exception is thrown
         for (int execCount = 0; ; execCount++) {
@@ -250,9 +248,7 @@
         }
         // link default parameters
         request.getParams().setDefaults(this.params);
-        if (request instanceof HttpMutableRequest) {
-            preprocessRequest((HttpMutableRequest) request, context);
-        }
+        preprocessRequest(request, context);
     }
 
     /**
@@ -321,7 +317,7 @@
      * @throws HttpException      in case of a protocol or processing problem
      * @throws IOException        in case of an I/O problem
      */
-    protected HttpMutableResponse sendRequest(
+    protected HttpResponse sendRequest(
             final HttpRequest request,
             final HttpClientConnection conn,
             final HttpContext context)
@@ -336,7 +332,7 @@
             throw new IllegalArgumentException("HTTP context may not be null");
         }
 
-        HttpMutableResponse response = null;
+        HttpResponse response = null;
         context.setAttribute(HttpExecutionContext.HTTP_REQ_SENT, Boolean.FALSE);
 
         conn.sendRequestHeader(request);
@@ -391,7 +387,7 @@
      * @throws HttpException      in case of a protocol or processing problem
      * @throws IOException        in case of an I/O problem
      */
-    protected HttpMutableResponse receiveResponse(
+    protected HttpResponse receiveResponse(
             final HttpRequest          request,
             final HttpClientConnection conn,
             final HttpContext          context)
@@ -406,7 +402,7 @@
             throw new IllegalArgumentException("HTTP context may not be null");
         }
         // see HttpRequestExecutor.doExecute, final part
-        HttpMutableResponse response = null;
+        HttpResponse response = null;
         int statuscode = 0;
 
         while (response == null || statuscode < HttpStatus.SC_OK) {
@@ -437,7 +433,7 @@
      * @throws IOException        in case of an I/O problem
      */
     protected void finishResponse(
-            final HttpMutableResponse response,
+            final HttpResponse response,
             final HttpContext context)
                 throws HttpException, IOException {
         if (response == null) {

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpService.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpService.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/HttpService.java Fri Feb 17 14:34:54 2006
@@ -36,10 +36,8 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableEntityEnclosingRequest;
-import org.apache.http.HttpMutableRequest;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpServerConnection;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
@@ -105,9 +103,9 @@
         BasicHttpResponse response = new BasicHttpResponse();
         response.getParams().setDefaults(this.params);
         try {
-            HttpMutableRequest request = this.conn.receiveRequestHeader(this.params);
+            HttpRequest request = this.conn.receiveRequestHeader(this.params);
             if (request instanceof HttpEntityEnclosingRequest) {
-                if (((HttpMutableEntityEnclosingRequest) request).expectContinue()) {
+                if (((HttpEntityEnclosingRequest) request).expectContinue()) {
 
                     logMessage("Expected 100 (Continue)");
                     
@@ -117,7 +115,7 @@
                     this.conn.sendResponseHeader(ack);
                     this.conn.flush();
                 }
-                this.conn.receiveRequestEntity((HttpMutableEntityEnclosingRequest) request);
+                this.conn.receiveRequestEntity((HttpEntityEnclosingRequest) request);
             }
             preprocessRequest(request, this.context);
             logMessage("Request received");
@@ -167,7 +165,7 @@
         }
     }
     
-    protected void handleException(final HttpException ex, final HttpMutableResponse response) {
+    protected void handleException(final HttpException ex, final HttpResponse response) {
         if (ex instanceof MethodNotSupportedException) {
             response.setStatusCode(HttpStatus.SC_NOT_IMPLEMENTED);
         } else if (ex instanceof ProtocolException) {
@@ -177,7 +175,7 @@
         }
     }
     
-    protected void doService(final HttpRequest request, final HttpMutableResponse response) 
+    protected void doService(final HttpRequest request, final HttpResponse response) 
             throws HttpException, IOException {
         HttpVersion ver = request.getRequestLine().getHttpVersion();
         if (ver.lessEquals(HttpVersion.HTTP_1_1)) {

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java Fri Feb 17 14:34:54 2006
@@ -33,7 +33,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 
 /**
@@ -51,8 +51,8 @@
         super();
     }
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpRequest request, final HttpContext context) 
+            throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java Fri Feb 17 14:34:54 2006
@@ -35,7 +35,7 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolException;
@@ -55,8 +55,8 @@
         super();
     }
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpRequest request, final HttpContext context) 
+            throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java Fri Feb 17 14:34:54 2006
@@ -35,7 +35,7 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.HttpVersion;
 import org.apache.http.params.HttpProtocolParams;
@@ -55,8 +55,8 @@
         super();
     }
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpRequest request, final HttpContext context) 
+            throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java Fri Feb 17 14:34:54 2006
@@ -34,7 +34,7 @@
 import org.apache.http.Header;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.params.HttpProtocolParams;
 
@@ -53,8 +53,8 @@
         super();
     }
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpRequest request, final HttpContext context) 
+            throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java Fri Feb 17 14:34:54 2006
@@ -33,7 +33,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableRequest;
+import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.params.HttpProtocolParams;
 
@@ -52,7 +52,7 @@
         super();
     }
     
-    public void process(final HttpMutableRequest request, final HttpContext context) 
+    public void process(final HttpRequest request, final HttpContext context) 
         throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java Fri Feb 17 14:34:54 2006
@@ -34,8 +34,8 @@
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
@@ -56,8 +56,8 @@
         super();
     }
     
-    public void process(final HttpMutableResponse response, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpResponse response, final HttpContext context) 
+            throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java Fri Feb 17 14:34:54 2006
@@ -34,7 +34,7 @@
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpVersion;
 
@@ -54,8 +54,8 @@
         super();
     }
     
-    public void process(final HttpMutableResponse response, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpResponse response, final HttpContext context) 
+            throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java Fri Feb 17 14:34:54 2006
@@ -33,7 +33,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpStatus;
 
@@ -55,8 +55,8 @@
         super();
     }
 
-    public void process(final HttpMutableResponse response, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpResponse response, final HttpContext context) 
+            throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java Fri Feb 17 14:34:54 2006
@@ -33,7 +33,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpException;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.params.HttpProtocolParams;
 
@@ -53,8 +53,8 @@
         super();
     }
 
-    public void process(final HttpMutableResponse response, final HttpContext context) 
-        throws HttpException, IOException {
+    public void process(final HttpResponse response, final HttpContext context) 
+            throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }

Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Fri Feb 17 14:34:54 2006
@@ -30,7 +30,7 @@
 
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.Header;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.StatusLine;
 import org.apache.http.entity.BasicHttpEntity;
@@ -73,7 +73,7 @@
         entity.setChunked(false);
         entity.setContentLength(-1);
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.setEntity(entity);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
@@ -85,7 +85,7 @@
         entity.setChunked(false);
         entity.setContentLength(-1);
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.setEntity(entity);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
@@ -97,7 +97,7 @@
         entity.setChunked(true);
         entity.setContentLength(-1);
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.setEntity(entity);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
@@ -109,7 +109,7 @@
         entity.setChunked(false);
         entity.setContentLength(-1);
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.addHeader(new Header("Connection", "keep-alive"));
         response.setEntity(entity);
 
@@ -123,7 +123,7 @@
         entity.setContentLength(-1);
         // Use HTTP 1.1
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.addHeader(new Header("Connection", "close"));
         response.setEntity(entity);
 
@@ -137,7 +137,7 @@
         entity.setContentLength(10);
         // Use HTTP 1.0
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.addHeader(new Header("Connection", "keep-alive"));
         response.setEntity(entity);
 
@@ -147,7 +147,7 @@
 
     public void testHTTP10Default() throws Exception {
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
         assertFalse(s.keepAlive(response));
@@ -155,7 +155,7 @@
     
     public void testHTTP11Default() throws Exception {
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
         assertTrue(s.keepAlive(response));
@@ -163,7 +163,7 @@
 
     public void testFutureHTTP() throws Exception {
         StatusLine statusline = new StatusLine(new HttpVersion(3, 45), 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
         assertTrue(s.keepAlive(response));
@@ -172,7 +172,7 @@
     public void testBrokenConnectionDirective1() throws Exception {
         // Use HTTP 1.0
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.addHeader(new Header("Connection", "keep--alive"));
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();
@@ -182,7 +182,7 @@
     public void testBrokenConnectionDirective2() throws Exception {
         // Use HTTP 1.0
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); 
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.addHeader(new Header("Connection", null));
 
         ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy();

Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java?rev=378645&r1=378644&r2=378645&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java Fri Feb 17 14:34:54 2006
@@ -32,7 +32,7 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpMutableMessage;
+import org.apache.http.HttpMessage;
 import org.apache.http.ProtocolException;
 import org.apache.http.entity.EntityGenerator;
 import org.apache.http.impl.entity.DefaultEntityGenerator;
@@ -84,7 +84,7 @@
 
     public void testEntityWithTransferEncoding() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
         
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -110,7 +110,7 @@
     public void testEntityWithIdentityTransferEncoding() throws Exception {
         HttpDataReceiver datareceiver = 
         	new HttpDataReceiverMockup(new byte[] {});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
         
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -126,7 +126,7 @@
 
     public void testEntityWithUnsupportedTransferEncoding() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
         
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -152,7 +152,7 @@
 
     public void testChunkedTransferEncodingMustBeLast() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
         
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -178,7 +178,7 @@
 
     public void testEntityWithContentLength() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
         
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -194,7 +194,7 @@
 
     public void testEntityWithMultipleContentLength() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
 
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -223,7 +223,7 @@
     
     public void testEntityWithMultipleContentLengthSomeWrong() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
 
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -252,7 +252,7 @@
     
     public void testEntityWithMultipleContentLengthAllWrong() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
 
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -281,7 +281,7 @@
 
     public void testEntityWithInvalidContentLength() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
 
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -309,7 +309,7 @@
 
     public void testEntityNeitherContentLengthNorTransferEncoding() throws Exception {
         HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
-        HttpMutableMessage message = new HttpMessageMockup();
+        HttpMessage message = new HttpMessageMockup();
 
         // lenient mode 
         message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);



Mime
View raw message