Branch: refs/heads/8.4.x Home: https://github.com/teiid/teiid Commit: f626502618fde0107e9f2315470f3d1fd13d880b https://github.com/teiid/teiid/commit/f626502618fde0107e9f2315470f3d1fd13... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-26 (Fri, 26 Jul 2013) Changed paths: M connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java M connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java M connectors/connector-salesforce/src/main/rar/META-INF/ra.xml M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java M connectors/connector-ws/src/main/rar/META-INF/ra.xml M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestRestWebserviceGeneration.java Log Message: ----------- TEIID-2597 expanding timeout logic to httpdispatch, connection timeouts, and salesforce