Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: e795658479c4727b3cb4160b0677ea85e3cd81f2 https://github.com/teiid/teiid/commit/e795658479c4727b3cb4160b0677ea85e3c... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java M jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java M jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java M jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties Log Message: ----------- TEIID-2602 better hanlding for invalid jndi names Commit: b674007d5916947efdf89bd15489f5e0660524e3 https://github.com/teiid/teiid/commit/b674007d5916947efdf89bd15489f5e0660... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M client/src/main/java/org/teiid/client/util/ResultsFuture.java M client/src/main/java/org/teiid/jdbc/JDBCPlugin.java M client/src/main/resources/org/teiid/jdbc/i18n.properties M runtime/src/main/java/org/teiid/transport/SocketClientInstance.java Log Message: ----------- TEIID-2608 misc. cleanups for odbc handling Commit: 9dfae5ded5770deb3b59380bac00d556f9b712b5 https://github.com/teiid/teiid/commit/9dfae5ded5770deb3b59380bac00d556f9b... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java Log Message: ----------- TEIID-2609: restricting the auto deployment of odata war to standalone server only; domain mode will need to install separaely through script Commit: 7985f286b75a1a2c4f497c4b3f1c3d33e4ec397f https://github.com/teiid/teiid/commit/7985f286b75a1a2c4f497c4b3f1c3d33e4e... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java Log Message: ----------- Merge pull request #94 from rareddy/TEIID-2609 TEIID-2609: restricting the auto deployment of odata war to standalone s... Commit: 70ab09c59d24fa7eefe207bf03d0d667d89d451d https://github.com/teiid/teiid/commit/70ab09c59d24fa7eefe207bf03d0d667d89... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M client/src/main/java/org/teiid/jdbc/MetadataProvider.java M client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java M client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java M runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java M runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java M runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java M runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java M runtime/src/main/resources/org/teiid/runtime/i18n.properties M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java Log Message: ----------- TEIID-2610 fixing various protocol issues Commit: 3a02d6b40f4d144f25fbe4f38f1d3388328fa6bd https://github.com/teiid/teiid/commit/3a02d6b40f4d144f25fbe4f38f1d3388328... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M client/src/main/java/org/teiid/client/util/ResultsFuture.java M client/src/main/java/org/teiid/jdbc/JDBCPlugin.java M client/src/main/java/org/teiid/jdbc/MetadataProvider.java M client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java M client/src/main/resources/org/teiid/jdbc/i18n.properties M client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java M jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java M jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java M jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties M runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java M runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java M runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java M runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java M runtime/src/main/java/org/teiid/transport/SocketClientInstance.java M runtime/src/main/resources/org/teiid/runtime/i18n.properties M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java Log Message: ----------- Merge branch '8.4.x' of https://github.com/teiid/teiid Conflicts: jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java runtime/src/main/resources/org/teiid/runtime/i18n.properties Compare: https://github.com/teiid/teiid/compare/15683368f8d7...3a02d6b40f4d