Author: kwright
Date: Mon Dec 14 08:04:47 2015
New Revision: 1719861
URL: http://svn.apache.org/viewvc?rev=1719861&view=rev
Log:
Pull up fix for CONNECTORS-1265 from trunk.
Modified:
manifoldcf/branches/release-2.3-branch/ (props changed)
manifoldcf/branches/release-2.3-branch/CHANGES.txt
manifoldcf/branches/release-2.3-branch/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
manifoldcf/branches/release-2.3-branch/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
manifoldcf/branches/release-2.3-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
manifoldcf/branches/release-2.3-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java
manifoldcf/branches/release-2.3-branch/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
manifoldcf/branches/release-2.3-branch/connectors/rss/ (props changed)
manifoldcf/branches/release-2.3-branch/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/ (props
changed)
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/branches/release-2.3-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/branches/release-2.3-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
manifoldcf/branches/release-2.3-branch/connectors/wiki/ (props changed)
manifoldcf/branches/release-2.3-branch/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Propchange: manifoldcf/branches/release-2.3-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 08:04:47 2015
@@ -134,3 +134,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1719754
Modified: manifoldcf/branches/release-2.3-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/CHANGES.txt?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
--- manifoldcf/branches/release-2.3-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.3-branch/CHANGES.txt Mon Dec 14 08:04:47 2015
@@ -1,8 +1,12 @@
ManifoldCF Change Log
$Id$
+
======================= Release 2.3 =====================
+CONNECTORS-1265: Adjust interval for checking validity of http connection.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-1263: New version of Alfresco-indexer package.
(Maurizio Pillitu)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Mon Dec 14 08:04:47 2015
@@ -146,7 +146,7 @@ public class ConfluenceClient {
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
Mon Dec 14 08:04:47 2015
@@ -119,7 +119,7 @@ public class ElasticSearchConnector exte
// Set up connection manager
PoolingHttpClientConnectionManager poolingConnectionManager = new
PoolingHttpClientConnectionManager();
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
Mon Dec 14 08:04:47 2015
@@ -135,7 +135,7 @@ public class JiraSession {
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
Mon Dec 14 08:04:47 2015
@@ -132,7 +132,7 @@ public class JiraSession {
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Mon Dec 14 08:04:47 2015
@@ -545,7 +545,7 @@ public class LivelinkConnector extends o
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/meridio/MeridioWrapper.java
Mon Dec 14 08:04:47 2015
@@ -269,7 +269,7 @@ public class MeridioWrapper
.register("https", myFactory)
.build());
poolingDmwsConnectionManager.setDefaultMaxPerRoute(1);
- poolingDmwsConnectionManager.setValidateAfterInactivity(60000);
+ poolingDmwsConnectionManager.setValidateAfterInactivity(2000);
poolingDmwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
@@ -281,7 +281,7 @@ public class MeridioWrapper
.register("https", myFactory)
.build());
poolingRmwsConnectionManager.setDefaultMaxPerRoute(1);
- poolingRmwsConnectionManager.setValidateAfterInactivity(60000);
+ poolingRmwsConnectionManager.setValidateAfterInactivity(2000);
poolingRmwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
@@ -293,7 +293,7 @@ public class MeridioWrapper
.register("https", myFactory)
.build());
poolingMcwsConnectionManager.setDefaultMaxPerRoute(1);
- poolingMcwsConnectionManager.setValidateAfterInactivity(60000);
+ poolingMcwsConnectionManager.setValidateAfterInactivity(2000);
poolingMcwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
Mon Dec 14 08:04:47 2015
@@ -110,7 +110,7 @@ public class OpenSearchServerConnector e
PoolingHttpClientConnectionManager poolingConnectionManager = new
PoolingHttpClientConnectionManager();
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Propchange: manifoldcf/branches/release-2.3-branch/connectors/rss/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 08:04:47 2015
@@ -53,3 +53,4 @@
/manifoldcf/branches/CONNECTORS-912/connectors/rss:1579605-1582723
/manifoldcf/branches/CONNECTORS-962/connectors/rss:1602683-1603198
/manifoldcf/branches/CONNECTORS-990/connectors/rss:1610284-1610707
+/manifoldcf/trunk/connectors/rss:1719754
Modified:
manifoldcf/branches/release-2.3-branch/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
Mon Dec 14 08:04:47 2015
@@ -265,7 +265,7 @@ public class ThrottledFetcher
PoolingHttpClientConnectionManager poolingConnectionManager = new
PoolingHttpClientConnectionManager();
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(connectionTimeoutMilliseconds)
Propchange: manifoldcf/branches/release-2.3-branch/connectors/sharepoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 08:04:47 2015
@@ -61,3 +61,4 @@
/manifoldcf/branches/CONNECTORS-891/connectors/sharepoint:1568778-1568807
/manifoldcf/branches/CONNECTORS-912/connectors/sharepoint:1579605-1582723
/manifoldcf/branches/CONNECTORS-990/connectors/sharepoint:1610284-1610707
+/manifoldcf/trunk/connectors/sharepoint:1719754
Modified:
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
Mon Dec 14 08:04:47 2015
@@ -811,7 +811,7 @@ public class SharePointAuthority extends
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Mon Dec 14 08:04:47 2015
@@ -274,7 +274,7 @@ public class SharePointRepository extend
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Mon Dec 14 08:04:47 2015
@@ -237,7 +237,7 @@ public class HttpPoster
.register("https", myFactory)
.build());
connectionManager.setDefaultMaxPerRoute(1);
- connectionManager.setValidateAfterInactivity(60000);
+ connectionManager.setValidateAfterInactivity(2000);
connectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Mon Dec 14 08:04:47 2015
@@ -476,7 +476,7 @@ public class ThrottledFetcher
.register("https", myFactory)
.build());
poolingConnManager.setDefaultMaxPerRoute(1);
- poolingConnManager.setValidateAfterInactivity(60000);
+ poolingConnManager.setValidateAfterInactivity(2000);
poolingConnManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeoutMilliseconds)
Propchange: manifoldcf/branches/release-2.3-branch/connectors/wiki/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 08:04:47 2015
@@ -54,3 +54,4 @@
/manifoldcf/branches/CONNECTORS-774/connectors/wiki:1521768-1523232
/manifoldcf/branches/CONNECTORS-912/connectors/wiki:1579605-1582723
/manifoldcf/branches/CONNECTORS-962/connectors/wiki:1602683-1603198
+/manifoldcf/trunk/connectors/wiki:1719754
Modified:
manifoldcf/branches/release-2.3-branch/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1719861&r1=1719860&r2=1719861&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Mon Dec 14 08:04:47 2015
@@ -239,7 +239,7 @@ public class WikiConnector extends org.a
.register("https", myFactory)
.build());
poolingConnectionManager.setDefaultMaxPerRoute(1);
- poolingConnectionManager.setValidateAfterInactivity(60000);
+ poolingConnectionManager.setValidateAfterInactivity(2000);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeout)
