Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD34817C77 for ; Fri, 10 Apr 2015 20:03:54 +0000 (UTC) Received: (qmail 55901 invoked by uid 500); 10 Apr 2015 20:03:54 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 55850 invoked by uid 500); 10 Apr 2015 20:03:54 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 55841 invoked by uid 99); 10 Apr 2015 20:03:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 20:03:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 7D24CAC00B4 for ; Fri, 10 Apr 2015 20:03:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1672741 - in /manifoldcf/branches/dev_1x: ./ connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/ connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/ connectors/live... Date: Fri, 10 Apr 2015 20:03:54 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150410200354.7D24CAC00B4@hades.apache.org> Author: kwright Date: Fri Apr 10 20:03:53 2015 New Revision: 1672741 URL: http://svn.apache.org/r1672741 Log: Pull up fix for CONNECTORS-1186 from trunk Modified: manifoldcf/branches/dev_1x/ (props changed) manifoldcf/branches/dev_1x/CHANGES.txt manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java manifoldcf/branches/dev_1x/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java manifoldcf/branches/dev_1x/connectors/sharepoint/ (props changed) manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java manifoldcf/branches/dev_1x/connectors/wiki/ (props changed) manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java manifoldcf/branches/dev_1x/framework/ (props changed) Propchange: manifoldcf/branches/dev_1x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 10 20:03:53 2015 @@ -123,4 +123,4 @@ /manifoldcf/branches/CONNECTORS-981:1605049-1605773 /manifoldcf/branches/CONNECTORS-989:1611600-1612101 /manifoldcf/branches/CONNECTORS-990:1610284-1610707 -/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163 4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476, 1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616 +/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163 4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476, 1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737 Modified: manifoldcf/branches/dev_1x/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/CHANGES.txt (original) +++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Apr 10 20:03:53 2015 @@ -3,6 +3,10 @@ $Id$ ======================= 1.9-dev ===================== +CONNECTORS-1186: HttpClient 4.4 requires that you set the SSL socket +factory at the connection manager level. +(Karl Wright) + CONNECTORS-1185: Fix HttpClient deprecation warnings, and make sure socket timeouts are actually honored in http connections. (Karl Wright) Modified: manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java (original) +++ manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java Fri Apr 10 20:03:53 2015 @@ -62,7 +62,10 @@ import org.apache.http.impl.client.Defau import org.apache.http.util.EntityUtils; import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.protocol.HttpContext; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.ContentType; import org.apache.http.client.AuthCache; @@ -126,7 +129,10 @@ public class JiraSession { SSLConnectionSocketFactory myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout), NoopHostnameVerifier.INSTANCE); - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -178,7 +184,6 @@ public class JiraSession { .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setDefaultCredentialsProvider(credentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); Modified: manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java (original) +++ manifoldcf/branches/dev_1x/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java Fri Apr 10 20:03:53 2015 @@ -60,7 +60,10 @@ import org.apache.http.impl.client.Defau import org.apache.http.util.EntityUtils; import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.protocol.HttpContext; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.ContentType; import org.apache.http.client.AuthCache; @@ -124,7 +127,10 @@ public class JiraSession { SSLConnectionSocketFactory myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout), NoopHostnameVerifier.INSTANCE); - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -177,7 +183,6 @@ public class JiraSession { .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setDefaultCredentialsProvider(credentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); Modified: manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original) +++ manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Fri Apr 10 20:03:53 2015 @@ -48,7 +48,10 @@ import org.apache.http.client.HttpClient import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.NameValuePair; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -497,8 +500,23 @@ public class LivelinkConnector extends o int socketTimeout = 900000; int connectionTimeout = 300000; + // Set up ingest ssl if indicated + SSLConnectionSocketFactory myFactory = null; + if (ingestKeystoreManager != null) + { + myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(ingestKeystoreManager.getSecureSocketFactory(), connectionTimeout), + NoopHostnameVerifier.INSTANCE); + } + else + { + myFactory = SSLConnectionSocketFactory.getSocketFactory(); + } + // Set up connection manager - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -509,14 +527,6 @@ public class LivelinkConnector extends o CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - // Set up ingest ssl if indicated - SSLConnectionSocketFactory myFactory = null; - if (ingestKeystoreManager != null) - { - myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(ingestKeystoreManager.getSecureSocketFactory(), connectionTimeout), - NoopHostnameVerifier.INSTANCE); - } - // Set up authentication to use if (ingestNtlmDomain != null) { @@ -538,9 +548,6 @@ public class LivelinkConnector extends o .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()); - if (myFactory != null) - builder.setSSLSocketFactory(myFactory); - httpClient = builder.build(); // System.out.println("Connection server object = "+llServer.toString()); Modified: manifoldcf/branches/dev_1x/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java (original) +++ manifoldcf/branches/dev_1x/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/meridiowrapper/MeridioWrapper.java Fri Apr 10 20:03:53 2015 @@ -81,8 +81,11 @@ import org.apache.http.client.config.Req import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.config.SocketConfig; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.DefaultRedirectStrategy; import org.apache.http.auth.AuthScope; import org.apache.http.auth.NTCredentials; @@ -218,7 +221,11 @@ public class MeridioWrapper SSLConnectionSocketFactory myFactory = null; if (mySSLFactory != null) { - myFactory = new SSLConnectionSocketFactory(mySSLFactory, new BrowserCompatHostnameVerifier()); + myFactory = new SSLConnectionSocketFactory(mySSLFactory, new NoopHostnameVerifier()); + } + else + { + myFactory = SSLConnectionSocketFactory.getSocketFactory(); } // Set up the pool. @@ -257,7 +264,10 @@ public class MeridioWrapper int socketTimeout = 900000; int connectionTimeout = 300000; - PoolingHttpClientConnectionManager poolingDmwsConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingDmwsConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingDmwsConnectionManager.setDefaultMaxPerRoute(1); poolingDmwsConnectionManager.setValidateAfterInactivity(60000); poolingDmwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -266,7 +276,10 @@ public class MeridioWrapper .build()); dmwsConnectionManager = poolingDmwsConnectionManager; - PoolingHttpClientConnectionManager poolingRmwsConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingRmwsConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingRmwsConnectionManager.setDefaultMaxPerRoute(1); poolingRmwsConnectionManager.setValidateAfterInactivity(60000); poolingRmwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -275,7 +288,10 @@ public class MeridioWrapper .build()); rmwsConnectionManager = poolingRmwsConnectionManager; - PoolingHttpClientConnectionManager poolingMcwsConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingMcwsConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingMcwsConnectionManager.setDefaultMaxPerRoute(1); poolingMcwsConnectionManager.setValidateAfterInactivity(60000); poolingMcwsConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -350,7 +366,6 @@ public class MeridioWrapper .disableAutomaticRetries() .setDefaultRequestConfig(dmwsRequestBuilder.build()) .setDefaultCredentialsProvider(dmwsCredentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); @@ -360,7 +375,6 @@ public class MeridioWrapper .disableAutomaticRetries() .setDefaultRequestConfig(rmwsRequestBuilder.build()) .setDefaultCredentialsProvider(rmwsCredentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); @@ -404,7 +418,6 @@ public class MeridioWrapper .disableAutomaticRetries() .setDefaultRequestConfig(mcwsRequestBuilder.build()) .setDefaultCredentialsProvider(mcwsCredentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); Propchange: manifoldcf/branches/dev_1x/connectors/sharepoint/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 10 20:03:53 2015 @@ -59,4 +59,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:1621613,1621855,1622740,1623599,1625023,1625108,1626973,1630188,1633668,1640199,1642531,1665848,1672616 +/manifoldcf/trunk/connectors/sharepoint:1621613,1621855,1622740,1623599,1625023,1625108,1626973,1630188,1633668,1640199,1642531,1665848,1672616,1672737 Modified: manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original) +++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Fri Apr 10 20:03:53 2015 @@ -44,7 +44,10 @@ import org.apache.http.client.config.Req import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.config.SocketConfig; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -791,7 +794,21 @@ public class SharePointAuthority extends // Set up ssl if indicated - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + SSLConnectionSocketFactory myFactory = null; + if (keystoreData != null) + { + keystoreManager = KeystoreManagerFactory.make("",keystoreData); + myFactory = new SSLConnectionSocketFactory(keystoreManager.getSecureSocketFactory(), new DefaultHostnameVerifier()); + } + else + { + myFactory = SSLConnectionSocketFactory.getSocketFactory(); + } + + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -802,13 +819,6 @@ public class SharePointAuthority extends CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - SSLConnectionSocketFactory myFactory = null; - if (keystoreData != null) - { - keystoreManager = KeystoreManagerFactory.make("",keystoreData); - myFactory = new SSLConnectionSocketFactory(keystoreManager.getSecureSocketFactory(), new DefaultHostnameVerifier()); - } - if (strippedUserName != null) { credentialsProvider.setCredentials( @@ -850,8 +860,6 @@ public class SharePointAuthority extends .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setDefaultCredentialsProvider(credentialsProvider); - if (myFactory != null) - builder.setSSLSocketFactory(myFactory); builder.setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()); httpClient = builder.build(); Modified: manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original) +++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Fri Apr 10 20:03:53 2015 @@ -54,7 +54,10 @@ import org.apache.http.client.config.Req import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.config.SocketConfig; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -254,7 +257,21 @@ public class SharePointRepository extend int connectionTimeout = 60000; int socketTimeout = 900000; - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + SSLConnectionSocketFactory myFactory = null; + if (keystoreData != null) + { + keystoreManager = KeystoreManagerFactory.make("",keystoreData); + myFactory = new SSLConnectionSocketFactory(keystoreManager.getSecureSocketFactory(), new DefaultHostnameVerifier()); + } + else + { + myFactory = SSLConnectionSocketFactory.getSocketFactory(); + } + + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() @@ -265,13 +282,6 @@ public class SharePointRepository extend CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - SSLConnectionSocketFactory myFactory = null; - if (keystoreData != null) - { - keystoreManager = KeystoreManagerFactory.make("",keystoreData); - myFactory = new SSLConnectionSocketFactory(keystoreManager.getSecureSocketFactory(), new DefaultHostnameVerifier()); - } - if (strippedUserName != null) { credentialsProvider.setCredentials( @@ -313,8 +323,6 @@ public class SharePointRepository extend .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setDefaultCredentialsProvider(credentialsProvider); - if (myFactory != null) - builder.setSSLSocketFactory(myFactory); builder.setRequestExecutor(new HttpRequestExecutor(socketTimeout)) .setRedirectStrategy(new DefaultRedirectStrategy()); httpClient = builder.build(); Modified: manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original) +++ manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Fri Apr 10 20:03:53 2015 @@ -22,7 +22,10 @@ import org.apache.http.client.Credential import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.config.SocketConfig; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.*; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; @@ -216,14 +219,6 @@ public class HttpPoster } // Initialize standard solr-j. - // First, we need an HttpClient where basic auth is properly set up. - connectionManager = new PoolingHttpClientConnectionManager(); - connectionManager.setDefaultMaxPerRoute(1); - connectionManager.setValidateAfterInactivity(60000); - connectionManager.setDefaultSocketConfig(SocketConfig.custom() - .setTcpNoDelay(true) - .setSoTimeout(socketTimeout) - .build()); SSLConnectionSocketFactory myFactory; if (keystoreManager != null) @@ -236,6 +231,18 @@ public class HttpPoster myFactory = new SSLConnectionSocketFactory(KeystoreManagerFactory.getTrustingSecureSocketFactory(),NoopHostnameVerifier.INSTANCE); } + // First, we need an HttpClient where basic auth is properly set up. + connectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); + connectionManager.setDefaultMaxPerRoute(1); + connectionManager.setValidateAfterInactivity(60000); + connectionManager.setDefaultSocketConfig(SocketConfig.custom() + .setTcpNoDelay(true) + .setSoTimeout(socketTimeout) + .build()); + RequestConfig.Builder requestBuilder = RequestConfig.custom() .setCircularRedirectsAllowed(true) .setSocketTimeout(socketTimeout) @@ -245,11 +252,9 @@ public class HttpPoster HttpClientBuilder clientBuilder = HttpClients.custom() .setConnectionManager(connectionManager) - .setMaxConnTotal(1) .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setRedirectStrategy(new DefaultRedirectStrategy()) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeout)); Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java (original) +++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Fri Apr 10 20:03:53 2015 @@ -47,7 +47,10 @@ import org.apache.http.config.SocketConf import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.NameValuePair; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -467,7 +470,10 @@ public class ThrottledFetcher if (connManager == null) { - PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnManager.setDefaultMaxPerRoute(1); poolingConnManager.setValidateAfterInactivity(60000); poolingConnManager.setDefaultSocketConfig(SocketConfig.custom() @@ -526,10 +532,8 @@ public class ThrottledFetcher .disableAutomaticRetries() .setDefaultRequestConfig(requestBuilder.build()) .setDefaultCredentialsProvider(credentialsProvider) - .setSSLSocketFactory(myFactory) .setRequestExecutor(new HttpRequestExecutor(socketTimeoutMilliseconds)) .setRedirectStrategy(new DefaultRedirectStrategy()) - // ??? need to add equivalent of setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY) .build(); /* Propchange: manifoldcf/branches/dev_1x/connectors/wiki/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 10 20:03:53 2015 @@ -52,4 +52,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:1621613,1621855,1622740,1625103,1628798,1630188,1633108,1633202,1672616 +/manifoldcf/trunk/connectors/wiki:1621613,1621855,1622740,1625103,1628798,1630188,1633108,1633202,1672616,1672737 Modified: manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1672741&r1=1672740&r2=1672741&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original) +++ manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Fri Apr 10 20:03:53 2015 @@ -62,7 +62,10 @@ import org.apache.http.util.EntityUtils; import org.apache.http.message.BasicHeader; import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.protocol.HttpContext; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.ContentType; @@ -229,7 +232,10 @@ public class WikiConnector extends org.a NoopHostnameVerifier.INSTANCE); // Set up connection manager - PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(); + PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", myFactory) + .build()); poolingConnectionManager.setDefaultMaxPerRoute(1); poolingConnectionManager.setValidateAfterInactivity(60000); poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom() Propchange: manifoldcf/branches/dev_1x/framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 10 20:03:53 2015 @@ -113,4 +113,4 @@ /manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101 /manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707 /manifoldcf/trunk:1629122 -/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1 641724,1641911,1642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647585,1647608,1649605,1650351,1650911,1651332,1651539,1651921,1655377,1655411,1657346,1658004,1658036,1660258,1660276,1669487,1670614,1672616 +/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1 641724,1641911,1642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647585,1647608,1649605,1650351,1650911,1651332,1651539,1651921,1655377,1655411,1657346,1658004,1658036,1660258,1660276,1669487,1670614,1672616,1672737