svn commit: r1448874 - in /manifoldcf/trunk: ./ connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/

[kwright]

Author: kwright
Date: Fri Feb 22 01:08:08 2013
New Revision: 1448874

URL: http://svn.apache.org/r1448874
Log:
Fix for CONNECTORS-650.  Make sure there's a connection timeout for the meridio 
and sharepoint connectors.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
    
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1448874&r1=1448873&r2=1448874&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Feb 22 01:08:08 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.2-dev =====================
 
+CONNECTORS-650: Set a reasonable socket timeout for SharePoint
+and Meridio connectors.
+(Mark Lugert, Karl Wright)
+
 CONNECTORS-648: Revamp how tld's are used, for compatibility with
 Tomcat.
 (Jan Høydahl)

Modified: 
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java?rev=1448874&r1=1448873&r2=1448874&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
 (original)
+++ 
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java
 Fri Feb 22 01:08:08 2013
@@ -261,6 +261,7 @@ public class MeridioWrapper
     BasicHttpParams dmwsParams = new BasicHttpParams();
     dmwsParams.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
     
dmwsParams.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
+    dmwsParams.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,60000);
     dmwsParams.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,900000);
     dmwsParams.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
     DefaultHttpClient localDmwsHttpClient = new 
DefaultHttpClient(connectionManager,dmwsParams);
@@ -305,6 +306,7 @@ public class MeridioWrapper
     BasicHttpParams rmwsParams = new BasicHttpParams();
     rmwsParams.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
     
rmwsParams.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
+    rmwsParams.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,60000);
     rmwsParams.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,900000);
     rmwsParams.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
     DefaultHttpClient localRmwsHttpClient = new 
DefaultHttpClient(connectionManager,rmwsParams);
@@ -351,6 +353,7 @@ public class MeridioWrapper
       BasicHttpParams mcwsParams = new BasicHttpParams();
       mcwsParams.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
       
mcwsParams.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
+      
mcwsParams.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,60000);
       mcwsParams.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,900000);
       
mcwsParams.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
       DefaultHttpClient localMcwsHttpClient = new 
DefaultHttpClient(connectionManager,mcwsParams);

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=1448874&r1=1448873&r2=1448874&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
 Fri Feb 22 01:08:08 2013
@@ -220,6 +220,7 @@ public class SharePointRepository extend
       BasicHttpParams params = new BasicHttpParams();
       params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
       
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,false);
+      params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,60000);
       params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,900000);
       params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
       DefaultHttpClient localHttpClient = new 
DefaultHttpClient(connectionManager,params);