[teiid-commits] [teiid/teiid] 80f569: TEIID-2598 ensuring 7.4 compatibility

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 80f5698b85e3b2f247889aeb35fbcdfe8712c6ae https://github.com/teiid/teiid/commit/80f5698b85e3b2f247889aeb35fbcdfe871... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-25 (Thu, 25 Jul 2013) Changed paths: M client/src/main/java/org/teiid/client/BatchSerializer.java Log Message: ----------- TEIID-2598 ensuring 7.4 compatibility 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 Commit: 5c333285a0764578eb3210d7ab072d399cd9094d https://github.com/teiid/teiid/commit/5c333285a0764578eb3210d7ab072d399cd... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-26 (Fri, 26 Jul 2013) Changed paths: M build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml M build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml Log Message: ----------- TEIID-2597 updating sample ds configs Commit: 54b78022e7499066791c3ecba299758c3d31991b https://github.com/teiid/teiid/commit/54b78022e7499066791c3ecba299758c3d3... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-26 (Fri, 26 Jul 2013) Changed paths: M admin/src/main/java/org/teiid/adminapi/AdminFactory.java M admin/src/main/java/org/teiid/adminapi/AdminPlugin.java M admin/src/main/resources/org/teiid/adminapi/i18n.properties Log Message: ----------- TEIID-2600 adding property value validation and minor exception handling changes Commit: 873713366063438973ef0f2d18b1f4895130c6b5 https://github.com/teiid/teiid/commit/873713366063438973ef0f2d18b1f489513... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M common-core/src/main/java/org/teiid/core/types/Streamable.java M connectors/translator-ws/src/main/java/org/teiid/translator/ws/BinaryWSProcedureExecution.java M engine/src/main/java/org/teiid/common/buffer/LobManager.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java M engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java M runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M runtime/src/test/java/org/teiid/deployers/TestVDBStatusChecker.java M test-integration/common/pom.xml M test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestRelate.java M test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java Log Message: ----------- TEIID-2601 better handling for streaming lobs and improving the design/thread-safety of connectormanager Commit: cb013e9d87607ee27f9373245868d04af1a8604c https://github.com/teiid/teiid/commit/cb013e9d87607ee27f9373245868d04af1a... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M admin/src/main/java/org/teiid/adminapi/AdminFactory.java M admin/src/main/java/org/teiid/adminapi/AdminPlugin.java M admin/src/main/resources/org/teiid/adminapi/i18n.properties M build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml M build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml M client/src/main/java/org/teiid/client/BatchSerializer.java M common-core/src/main/java/org/teiid/core/types/Streamable.java 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 connectors/translator-ws/src/main/java/org/teiid/translator/ws/BinaryWSProcedureExecution.java M engine/src/main/java/org/teiid/common/buffer/LobManager.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java M engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M runtime/src/test/java/org/teiid/deployers/TestVDBStatusChecker.java M test-integration/common/pom.xml M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestRestWebserviceGeneration.java M test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestRelate.java M test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java Log Message: ----------- Merge branch '8.4.x' of https://github.com/teiid/teiid Conflicts: engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java Compare: https://github.com/teiid/teiid/compare/66a4cf5b81f3...cb013e9d8760