You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/09/08 17:53:40 UTC
svn commit: r573865 - in
/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http:
client/methods/ impl/client/
Author: rolandw
Date: Sat Sep 8 08:53:39 2007
New Revision: 573865
URL: http://svn.apache.org/viewvc?rev=573865&view=rev
Log:
HTTPCORE-107: replaced HttpVersion by ProtocolVersion wherever appropriate
Modified:
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java?rev=573865&r1=573864&r2=573865&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java Sat Sep 8 08:53:39 2007
@@ -34,7 +34,7 @@
import java.io.IOException;
import java.net.URI;
-import org.apache.http.HttpVersion;
+import org.apache.http.ProtocolVersion;
import org.apache.http.RequestLine;
import org.apache.http.conn.ConnectionReleaseTrigger;
import org.apache.http.message.AbstractHttpMessage;
@@ -62,7 +62,7 @@
public abstract String getMethod();
- public HttpVersion getHttpVersion() {
+ public ProtocolVersion getProtocolVersion() {
return HttpProtocolParams.getVersion(getParams());
}
@@ -72,7 +72,7 @@
public RequestLine getRequestLine() {
String method = getMethod();
- HttpVersion ver = getHttpVersion();
+ ProtocolVersion ver = getProtocolVersion();
URI uri = getURI();
String uritext;
if (uri != null) {
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java?rev=573865&r1=573864&r2=573865&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java Sat Sep 8 08:53:39 2007
@@ -34,7 +34,6 @@
import java.net.URI;
import org.apache.http.HttpRequest;
-import org.apache.http.HttpVersion;
/**
* Extended version of the {@link HttpRequest} interface that provides
@@ -51,8 +50,6 @@
public interface HttpUriRequest extends HttpRequest {
String getMethod();
-
- HttpVersion getHttpVersion();
URI getURI();
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java?rev=573865&r1=573864&r2=573865&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java Sat Sep 8 08:53:39 2007
@@ -49,7 +49,7 @@
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
+import org.apache.http.ProtocolVersion;
import org.apache.http.ProtocolException;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthScope;
@@ -728,7 +728,7 @@
buffer.append(Integer.toString(port));
String authority = buffer.toString();
- HttpVersion ver = HttpProtocolParams.getVersion(params);
+ ProtocolVersion ver = HttpProtocolParams.getVersion(params);
HttpRequest req = new BasicHttpRequest
("CONNECT", authority, ver);
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java?rev=573865&r1=573864&r2=573865&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java Sat Sep 8 08:53:39 2007
@@ -35,7 +35,7 @@
import java.net.URISyntaxException;
import org.apache.http.HttpRequest;
-import org.apache.http.HttpVersion;
+import org.apache.http.ProtocolVersion;
import org.apache.http.RequestLine;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.message.AbstractHttpMessage;
@@ -62,7 +62,7 @@
private URI uri;
private String method;
- private HttpVersion version;
+ private ProtocolVersion version;
public RequestWrapper(final HttpRequest request) throws URISyntaxException {
super();
@@ -82,7 +82,7 @@
RequestLine requestLine = request.getRequestLine();
this.uri = new URI(requestLine.getUri());
this.method = requestLine.getMethod();
- this.version = request.getHttpVersion();
+ this.version = request.getProtocolVersion();
}
}
@@ -97,7 +97,7 @@
this.method = method;
}
- public HttpVersion getHttpVersion() {
+ public ProtocolVersion getProtocolVersion() {
if (this.version != null) {
return this.version;
} else {
@@ -105,10 +105,11 @@
}
}
- public void setVersion(final HttpVersion version) {
+ public void setProtocolVersion(final ProtocolVersion version) {
this.version = version;
}
+
public URI getURI() {
return this.uri;
}
@@ -119,7 +120,7 @@
public RequestLine getRequestLine() {
String method = getMethod();
- HttpVersion ver = getHttpVersion();
+ ProtocolVersion ver = getProtocolVersion();
URI uri = getURI();
String uritext;
if (uri != null) {