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/01 17:32:48 UTC
svn commit: r571808 - in
/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http:
client/params/ conn/params/ impl/client/ impl/conn/
Author: rolandw
Date: Sat Sep 1 08:32:48 2007
New Revision: 571808
URL: http://svn.apache.org/viewvc?rev=571808&view=rev
Log:
HTTPCLIENT-669: moved DefaultRoutePlanner from client to conn
Added:
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java (with props)
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
- copied, changed from r571807, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRoutePlanner.java
Removed:
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRoutePlanner.java
Modified:
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java?rev=571808&r1=571807&r2=571808&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java Sat Sep 1 08:32:48 2007
@@ -162,15 +162,6 @@
* </p>
*/
public static final String DEFAULT_HOST = "http.default-host";
-
- /**
- * Defines the default proxy. The default value will be used if the proxy
- * information is not explicitly specified in the request route.
- * <p>
- * This parameter expects a value of type {@link org.apache.http.HttpHost}.
- * </p>
- */
- public static final String DEFAULT_PROXY = "http.default-proxy";
private HttpClientParams() {
super();
Added: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java?rev=571808&view=auto
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java (added)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java Sat Sep 1 08:32:48 2007
@@ -0,0 +1,64 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.conn.params;
+
+import org.apache.http.HttpHost;
+import org.apache.http.params.HttpParams;
+
+
+/**
+ * An adaptor for accessing HTTP connection parameters in {@link HttpParams}.
+ *
+ * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
+ *
+ * @version $Revision$
+ *
+ * @since 4.0
+ */
+public class HttpConnParams {
+
+ /**
+ * Defines the default proxy. The default value will be used
+ * by some {@link org.apache.http.conn.HttpRoutePlanner HttpRoutePlanner}
+ * implementations, in particular the default implementation.
+ * <p>
+ * This parameter expects a value of type {@link org.apache.http.HttpHost}.
+ * </p>
+ */
+ public static final String DEFAULT_PROXY = "http.default-proxy";
+
+
+ /** Disabled default constructor. */
+ private HttpConnParams() {
+ // no body
+ }
+}
+
Propchange: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java?rev=571808&r1=571807&r2=571808&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java Sat Sep 1 08:32:48 2007
@@ -63,7 +63,7 @@
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.auth.BasicSchemeFactory;
import org.apache.http.impl.auth.DigestSchemeFactory;
-import org.apache.http.impl.client.DefaultHttpRoutePlanner; //@@@ move to conn
+import org.apache.http.impl.conn.DefaultHttpRoutePlanner;
import org.apache.http.impl.conn.SingleClientConnManager;
import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
@@ -294,9 +294,9 @@
return new RoutedRequest.Impl(request, route);
}
-
-
- //non-javadoc, see base class AbstractHttpClient
+
+
+ // non-javadoc, see base class AbstractHttpClient
protected HttpRoutePlanner createHttpRoutePlanner() {
return new DefaultHttpRoutePlanner(getConnectionManager());
}
Copied: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java (from r571807, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRoutePlanner.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java?p2=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java&p1=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRoutePlanner.java&r1=571807&r2=571808&rev=571808&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRoutePlanner.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java Sat Sep 1 08:32:48 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.impl.client;
+package org.apache.http.impl.conn;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
@@ -41,8 +41,7 @@
import org.apache.http.conn.HttpRoutePlanner;
import org.apache.http.conn.Scheme;
-//@@@ move this class to conn when this dependency is gone:
-import org.apache.http.client.params.HttpClientParams; //@@@
+import org.apache.http.conn.params.HttpConnParams;
/**
@@ -83,7 +82,7 @@
}
HttpHost proxy = (HttpHost)
- request.getParams().getParameter(HttpClientParams.DEFAULT_PROXY);
+ request.getParams().getParameter(HttpConnParams.DEFAULT_PROXY);
Scheme schm = this.connectionManager.getSchemeRegistry().
getScheme(target.getSchemeName());