You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/11/21 01:10:25 UTC
svn commit: r1411944 - in /manifoldcf/trunk/connectors: rss/
rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/
sharepoint/
sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/
wiki/ wiki/connec...
Author: kwright
Date: Wed Nov 21 00:10:24 2012
New Revision: 1411944
URL: http://svn.apache.org/viewvc?rev=1411944&view=rev
Log:
Pull up various CONNECTORS-120 related fixes from the CONNECTORS-120 branch.
Modified:
manifoldcf/trunk/connectors/rss/ (props changed)
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
manifoldcf/trunk/connectors/sharepoint/ (props changed)
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/trunk/connectors/wiki/ (props changed)
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Propchange: manifoldcf/trunk/connectors/rss/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 21 00:10:24 2012
@@ -0,0 +1,43 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/rss:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/rss:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/rss:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/rss:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/rss:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/rss:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/rss:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/rss:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/rss:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/rss:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/rss:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/rss:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/rss:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/rss:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/rss:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/rss:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/rss:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/rss:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/rss:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/rss:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/rss:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/rss:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/rss:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/rss:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/rss:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/rss:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/rss:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/rss:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/rss:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/rss:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/rss:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/rss:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/rss:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/rss:1406712-1407974,1407982-1411043,1411049-1411943
+/manifoldcf/branches/CONNECTORS-470/connectors/rss:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/rss:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/rss:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/rss:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/rss:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/rss:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/rss:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/rss:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/rss:1381033-1382537
Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java?rev=1411944&r1=1411943&r2=1411944&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java Wed Nov 21 00:10:24 2012
@@ -26,6 +26,12 @@ import org.apache.manifoldcf.crawler.sys
import java.util.*;
import java.io.*;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.client.RedirectException;
+import org.apache.http.client.CircularRedirectException;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.HttpException;
+
/** This class is a cache of a specific URL's data. It's fetched early and kept,
* so that (1) an accurate data length can be found, and (2) we can compute a version
* checksum.
@@ -86,7 +92,7 @@ public class DataCache
throw new ServiceInterruption("Read timeout: "+e.getMessage(),e,currentTime + 300000L,
currentTime + 12 * 60 * 60000L,-1,false);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
Logging.connectors.warn("RSS: Connect timeout exception reading socket stream: "+e.getMessage(),e);
long currentTime = System.currentTimeMillis();
@@ -153,7 +159,7 @@ public class DataCache
{
throw new ManifoldCFException("Socket timeout exception creating temporary file: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket connect timeout exception creating temporary file: "+e.getMessage(),e);
}
Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1411944&r1=1411943&r2=1411944&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java Wed Nov 21 00:10:24 2012
@@ -32,15 +32,17 @@ import org.apache.manifoldcf.agents.comm
import org.apache.manifoldcf.agents.common.XMLStringContext;
import org.apache.manifoldcf.agents.common.XMLFileContext;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.client.RedirectException;
+import org.apache.http.client.CircularRedirectException;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.HttpException;
+
import java.io.*;
import java.util.*;
import java.net.*;
import java.util.regex.*;
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-import org.apache.commons.httpclient.params.*;
-
/** This is the RSS implementation of the IRepositoryConnector interface.
* This connector basically looks at an RSS document in order to seed the
* document queue. The document is always fetched from the same URL (it's
@@ -1147,7 +1149,7 @@ public class RSSConnector extends org.ap
Logging.connectors.warn("RSS: Socket timeout exception fetching document contents '"+urlValue+"' - skipping: "+e.getMessage(), e);
rval[i] = null;
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
Logging.connectors.warn("RSS: Connecto timeout exception fetching document contents '"+urlValue+"' - skipping: "+e.getMessage(), e);
rval[i] = null;
@@ -3412,7 +3414,7 @@ public class RSSConnector extends org.ap
{
throw new ManifoldCFException("Socket timeout error: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket connect timeout error: "+e.getMessage(),e);
}
Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java?rev=1411944&r1=1411943&r2=1411944&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java Wed Nov 21 00:10:24 2012
@@ -50,6 +50,7 @@ import org.apache.http.HttpHost;
import org.apache.http.Header;
import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.message.BasicHeader;
+import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.client.CircularRedirectException;
@@ -272,6 +273,7 @@ public class ThrottledFetcher
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,connectionTimeoutMilliseconds);
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,connectionTimeoutMilliseconds);
+ params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
DefaultHttpClient localHttpClient = new DefaultHttpClient(connectionManager,params);
localHttpClient.setRedirectStrategy(new DefaultRedirectStrategy());
Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 21 00:10:24 2012
@@ -0,0 +1,43 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/sharepoint:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/sharepoint:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/sharepoint:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/sharepoint:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/sharepoint:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/sharepoint:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/sharepoint:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/sharepoint:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/sharepoint:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/sharepoint:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/sharepoint:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/sharepoint:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/sharepoint:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/sharepoint:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/sharepoint:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/sharepoint:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/sharepoint:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/sharepoint:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/sharepoint:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/sharepoint:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/sharepoint:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/sharepoint:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/sharepoint:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/sharepoint:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/sharepoint:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/sharepoint:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/sharepoint:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/sharepoint:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/sharepoint:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/sharepoint:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/sharepoint:1406712-1407974,1411049-1411943
+/manifoldcf/branches/CONNECTORS-470/connectors/sharepoint:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/sharepoint:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/sharepoint:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/sharepoint:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/sharepoint:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/sharepoint:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/sharepoint:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/sharepoint:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/sharepoint:1381033-1382537
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1411944&r1=1411943&r2=1411944&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Wed Nov 21 00:10:24 2012
@@ -54,7 +54,7 @@ import org.apache.http.util.EntityUtils;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.CoreConnectionPNames;
-
+import org.apache.http.client.params.ClientPNames;
/** This is the "repository connector" for Microsoft SharePoint.
* Document identifiers for this connector come in three forms:
@@ -219,6 +219,7 @@ public class SharePointRepository extend
params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,60000);
+ params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
DefaultHttpClient localHttpClient = new DefaultHttpClient(connectionManager,params);
localHttpClient.setRedirectStrategy(new DefaultRedirectStrategy());
if (strippedUserName != null)
Propchange: manifoldcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 21 00:10:24 2012
@@ -0,0 +1,43 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/wiki:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/wiki:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/wiki:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/wiki:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/wiki:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/wiki:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/wiki:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/wiki:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/wiki:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/wiki:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/wiki:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/wiki:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/wiki:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/wiki:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/wiki:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/wiki:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/wiki:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/wiki:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/wiki:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/wiki:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/wiki:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/wiki:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/wiki:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/wiki:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/wiki:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/wiki:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/wiki:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/wiki:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/wiki:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/wiki:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/wiki:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/wiki:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/wiki:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/wiki:1406712-1407974,1407982-1411043,1411049-1411943
+/manifoldcf/branches/CONNECTORS-470/connectors/wiki:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/wiki:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/wiki:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/wiki:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/wiki:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/wiki:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/wiki:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/wiki:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/wiki:1381033-1382537
Modified: manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1411944&r1=1411943&r2=1411944&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Wed Nov 21 00:10:24 2012
@@ -49,6 +49,7 @@ import org.apache.http.message.BasicName
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EntityUtils;
import org.apache.http.message.BasicHeader;
+import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.client.CircularRedirectException;
@@ -174,6 +175,7 @@ public class WikiConnector extends org.a
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,300000);
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,300000);
+ params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
DefaultHttpClient localHttpClient = new DefaultHttpClient(connectionManager,params);
httpClient = localHttpClient;