You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/09/28 20:46:04 UTC
svn commit: r292248 - in /jakarta/httpclient/trunk/http-common/src:
examples/org/apache/http/examples/ java/org/apache/http/impl/
java/org/apache/http/message/ java/org/apache/http/request/
java/org/apache/http/response/ test/org/apache/http/impl/ test...
Author: olegk
Date: Wed Sep 28 11:45:35 2005
New Revision: 292248
URL: http://svn.apache.org/viewcvs?rev=292248&view=rev
Log:
Moved basic HTTP request and response classes from impl package to public package org.apache.http.message
Added:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpEntityEnclosingRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpMessage.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpMessage.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpRequest.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpResponse.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpResponse.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpGetRequest.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpGetRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpPostRequest.java
- copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpPostRequest.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java (with props)
Removed:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpEntityEnclosingRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpMessage.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpResponse.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpGetRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpPostRequest.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/request/
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/response/
Modified:
jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestBasicRequest.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java
Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java (original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java Wed Sep 28 11:45:35 2005
@@ -50,11 +50,11 @@
import org.apache.http.ProtocolException;
import org.apache.http.entity.EntityConsumer;
import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.BasicHttpResponse;
import org.apache.http.impl.ConnectionReuseStrategy;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpParams;
import org.apache.http.impl.DefaultHttpServerConnection;
+import org.apache.http.message.BasicHttpResponse;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java (original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java Wed Sep 28 11:45:35 2005
@@ -37,9 +37,9 @@
import org.apache.http.entity.EntityConsumer;
import org.apache.http.impl.DefaultHttpClientConnection;
import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.HttpGetRequest;
import org.apache.http.impl.io.PlainSocketFactory;
import org.apache.http.io.SocketFactory;
+import org.apache.http.message.HttpGetRequest;
import org.apache.http.params.HttpParams;
/**
Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java (original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java Wed Sep 28 11:45:35 2005
@@ -43,9 +43,9 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.DefaultHttpClientConnection;
import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.HttpPostRequest;
import org.apache.http.impl.io.PlainSocketFactory;
import org.apache.http.io.SocketFactory;
+import org.apache.http.message.HttpPostRequest;
import org.apache.http.params.HttpParams;
/**
Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java (original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java Wed Sep 28 11:45:35 2005
@@ -38,9 +38,9 @@
import org.apache.http.executor.HttpRequestExecutor;
import org.apache.http.impl.DefaultHttpClientConnection;
import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.HttpGetRequest;
import org.apache.http.impl.io.PlainSocketFactory;
import org.apache.http.io.SocketFactory;
+import org.apache.http.message.HttpGetRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.RequestConnControl;
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequestFactory.java Wed Sep 28 11:45:35 2005
@@ -33,6 +33,8 @@
import org.apache.http.HttpRequestFactory;
import org.apache.http.MethodNotSupportedException;
import org.apache.http.RequestLine;
+import org.apache.http.message.BasicHttpEntityEnclosingRequest;
+import org.apache.http.message.BasicHttpRequest;
/**
* <p>
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpResponseFactory.java Wed Sep 28 11:45:35 2005
@@ -34,6 +34,7 @@
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.StatusLine;
+import org.apache.http.message.BasicHttpResponse;
/**
* <p>
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpEntityEnclosingRequest.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpEntityEnclosingRequest.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpEntityEnclosingRequest.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java Wed Sep 28 11:45:35 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
@@ -51,11 +51,11 @@
private HttpEntity entity = null;
- protected BasicHttpEntityEnclosingRequest(final String method, final String uri) {
+ public BasicHttpEntityEnclosingRequest(final String method, final String uri) {
super(method, uri);
}
- protected BasicHttpEntityEnclosingRequest(final RequestLine requestline) {
+ public BasicHttpEntityEnclosingRequest(final RequestLine requestline) {
super(requestline);
}
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpMessage.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpMessage.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpMessage.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpMessage.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpMessage.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpMessage.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpMessage.java Wed Sep 28 11:45:35 2005
@@ -27,12 +27,14 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
import java.util.Iterator;
import org.apache.http.Header;
import org.apache.http.HttpMutableMessage;
+import org.apache.http.impl.DefaultHttpParams;
+import org.apache.http.impl.HeaderGroup;
import org.apache.http.params.HttpParams;
/**
@@ -44,7 +46,7 @@
*
* @since 4.0
*/
-class BasicHttpMessage implements HttpMutableMessage {
+public class BasicHttpMessage implements HttpMutableMessage {
private final HeaderGroup headergroup;
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpRequest.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpRequest.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpRequest.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpRequest.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpRequest.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpRequest.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpRequest.java Wed Sep 28 11:45:35 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
import org.apache.http.HttpMutableRequest;
import org.apache.http.HttpVersion;
@@ -49,7 +49,7 @@
private final String method;
private final String uri;
- protected BasicHttpRequest(final String method, final String uri) {
+ public BasicHttpRequest(final String method, final String uri) {
super();
if (method == null) {
throw new IllegalArgumentException("Method name may not be null");
@@ -62,7 +62,7 @@
this.requestline = null;
}
- protected BasicHttpRequest(final RequestLine requestline) {
+ public BasicHttpRequest(final RequestLine requestline) {
super();
if (requestline == null) {
throw new IllegalArgumentException("Request line may not be null");
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpResponse.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpResponse.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpResponse.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpResponse.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpResponse.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/BasicHttpResponse.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/BasicHttpResponse.java Wed Sep 28 11:45:35 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
import org.apache.http.HttpEntity;
import org.apache.http.HttpMutableResponse;
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpGetRequest.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpGetRequest.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpGetRequest.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpGetRequest.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpGetRequest.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpGetRequest.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpGetRequest.java Wed Sep 28 11:45:35 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
/**
* <p>
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpPostRequest.java (from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpPostRequest.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpPostRequest.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpPostRequest.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpPostRequest.java&r1=239377&r2=292248&rev=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/HttpPostRequest.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/message/HttpPostRequest.java Wed Sep 28 11:45:35 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.message;
/**
* <p>
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestBasicRequest.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestBasicRequest.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestBasicRequest.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestBasicRequest.java Wed Sep 28 11:45:35 2005
@@ -35,6 +35,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpVersion;
import org.apache.http.RequestLine;
+import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpProtocolParams;
public class TestBasicRequest extends TestCase {
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Wed Sep 28 11:45:35 2005
@@ -34,6 +34,7 @@
import org.apache.http.HttpVersion;
import org.apache.http.StatusLine;
import org.apache.http.impl.entity.BasicHttpEntity;
+import org.apache.http.message.BasicHttpResponse;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultEntityGenerator.java Wed Sep 28 11:45:35 2005
@@ -39,6 +39,7 @@
import org.apache.http.io.HttpDataInputStream;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.mockup.HttpDataReceiverMockup;
+import org.apache.http.mockup.HttpMessageMockup;
import org.apache.http.params.HttpProtocolParams;
import junit.framework.Test;
@@ -81,7 +82,7 @@
public void testEntityWithTransferEncoding() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -107,7 +108,7 @@
public void testEntityWithIdentityTransferEncoding() throws Exception {
HttpDataReceiver datareceiver =
new HttpDataReceiverMockup(new byte[] {});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -123,7 +124,7 @@
public void testEntityWithUnsupportedTransferEncoding() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -149,7 +150,7 @@
public void testChunkedTransferEncodingMustBeLast() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup("0\r\n", "US-ASCII");
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -175,7 +176,7 @@
public void testEntityWithContentLength() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -191,7 +192,7 @@
public void testEntityWithMultipleContentLength() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -219,7 +220,7 @@
public void testEntityWithMultipleContentLengthSomeWrong() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -247,7 +248,7 @@
public void testEntityWithMultipleContentLengthAllWrong() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -275,7 +276,7 @@
public void testEntityWithInvalidContentLength() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
@@ -302,7 +303,7 @@
public void testEntityNeitherContentLengthNorTransferEncoding() throws Exception {
HttpDataReceiver datareceiver = new HttpDataReceiverMockup(new byte[] {'0'});
- HttpMutableMessage message = new BasicHttpMessage();
+ HttpMutableMessage message = new HttpMessageMockup();
// lenient mode
message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false);
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java?rev=292248&r1=292247&r2=292248&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java Wed Sep 28 11:45:35 2005
@@ -37,6 +37,7 @@
import org.apache.http.HttpVersion;
import org.apache.http.StatusLine;
import org.apache.http.impl.entity.BasicHttpEntity;
+import org.apache.http.message.BasicHttpResponse;
import org.apache.http.mockup.HttpConnectionMockup;
import junit.framework.Test;
Added: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java?rev=292248&view=auto
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java (added)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java Wed Sep 28 11:45:35 2005
@@ -0,0 +1,45 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.mockup;
+
+import org.apache.http.message.BasicHttpMessage;
+
+/**
+ * {@link HttpMessage} mockup implementation.
+ *
+ * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
+ */
+public class HttpMessageMockup extends BasicHttpMessage {
+
+ public HttpMessageMockup() {
+ super();
+ }
+
+}
Propchange: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpMessageMockup.java
------------------------------------------------------------------------------
svn:mime-type = text/plain