[teiid-commits] teiid SVN: r3773 - in trunk: adminshell/src/main/java/groovy and 203 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Wed Jan 4 17:07:20 EST 2012 

Author: rareddy
Date: 2012-01-04 17:07:10 -0500 (Wed, 04 Jan 2012)
New Revision: 3773

Added:
   trunk/client/src/test/java/org/teiid/net/socket/TestHandshake.java
   trunk/client/src/test/resources/handshake.ser
Modified:
   trunk/
   trunk/adminshell/src/main/java/groovy/
   trunk/adminshell/src/main/java/groovy/sql/
   trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/
   trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
   trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java
   trunk/adminshell/src/main/resources/org/
   trunk/adminshell/src/main/resources/org/codehaus/
   trunk/adminshell/src/main/resources/org/codehaus/groovy/
   trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/
   trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/
   trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml
   trunk/adminshell/src/main/resources/org/teiid/
   trunk/adminshell/src/main/resources/org/teiid/adminshell/
   trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties
   trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties
   trunk/adminshell/src/test/java/org/
   trunk/adminshell/src/test/java/org/teiid/
   trunk/adminshell/src/test/java/org/teiid/adminshell/
   trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java
   trunk/adminshell/src/test/resources/foo/
   trunk/adminshell/src/test/resources/foo/bar.txt
   trunk/api/src/main/java/org/teiid/events/
   trunk/api/src/main/java/org/teiid/events/EventDistributor.java
   trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java
   trunk/build/kits/
   trunk/build/kits/adminshell/
   trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/
   trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/README.txt
   trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-ds.xml
   trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-vdb.xml
   trunk/cache-jbosscache/src/main/java/org/
   trunk/cache-jbosscache/src/main/java/org/teiid/
   trunk/cache-jbosscache/src/main/java/org/teiid/cache/
   trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/
   trunk/cache-jbosscache/src/main/java/org/teiid/events/
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
   trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java
   trunk/cache-jbosscache/src/test/java/
   trunk/client/src/main/java/org/teiid/client/security/LogonResult.java
   trunk/client/src/main/java/org/teiid/client/util/
   trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
   trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
   trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
   trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
   trunk/client/src/main/java/org/teiid/jdbc/
   trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
   trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
   trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
   trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
   trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
   trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
   trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
   trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
   trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
   trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
   trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
   trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
   trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
   trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
   trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
   trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
   trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
   trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java
   trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
   trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java
   trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
   trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java
   trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
   trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
   trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java
   trunk/client/src/main/java/org/teiid/net/socket/
   trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java
   trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
   trunk/client/src/main/java/org/teiid/net/socket/Message.java
   trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java
   trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java
   trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
   trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
   trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
   trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
   trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
   trunk/client/src/main/resources/org/
   trunk/client/src/main/resources/org/teiid/
   trunk/client/src/main/resources/org/teiid/jdbc/
   trunk/client/src/main/resources/org/teiid/net/
   trunk/client/src/test/java/org/teiid/client/plan/
   trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java
   trunk/client/src/test/java/org/teiid/client/util/
   trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
   trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java
   trunk/client/src/test/java/org/teiid/jdbc/
   trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
   trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
   trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java
   trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
   trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java
   trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java
   trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java
   trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java
   trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java
   trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
   trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java
   trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java
   trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
   trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
   trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
   trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
   trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
   trunk/client/src/test/java/org/teiid/jdbc/util/
   trunk/client/src/test/java/org/teiid/net/
   trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java
   trunk/client/src/test/java/org/teiid/net/socket/
   trunk/common-core/src/main/java/org/
   trunk/common-core/src/main/java/org/teiid/
   trunk/common-core/src/main/java/org/teiid/core/
   trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java
   trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java
   trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java
   trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
   trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java
   trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
   trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java
   trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
   trunk/common-core/src/main/java/org/teiid/core/crypto/
   trunk/common-core/src/main/java/org/teiid/core/types/
   trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java
   trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java
   trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
   trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java
   trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
   trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
   trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java
   trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java
   trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java
   trunk/common-core/src/main/java/org/teiid/core/types/NullType.java
   trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java
   trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java
   trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java
   trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
   trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
   trunk/common-core/src/main/java/org/teiid/core/types/Transform.java
   trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java
   trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java
   trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
   trunk/common-core/src/main/java/org/teiid/core/types/basic/
   trunk/common-core/src/main/java/org/teiid/core/util/
   trunk/common-core/src/test/java/org/
   trunk/common-core/src/test/java/org/teiid/
   trunk/common-core/src/test/java/org/teiid/core/
   trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
   trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java
   trunk/common-core/src/test/java/org/teiid/core/crypto/
   trunk/common-core/src/test/java/org/teiid/core/types/
   trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java
   trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
   trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java
   trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java
   trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java
   trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java
   trunk/common-core/src/test/java/org/teiid/core/types/basic/
   trunk/common-core/src/test/java/org/teiid/core/util/
   trunk/common-core/src/test/java/org/teiid/query/
   trunk/common-core/src/test/java/org/teiid/query/unittest/
   trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/
   trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/
   trunk/connectors/connector-file/src/main/resources/org/
   trunk/connectors/connector-file/src/main/resources/org/teiid/
   trunk/connectors/connector-file/src/main/resources/org/teiid/resource/
   trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/
   trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/
   trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties
   trunk/connectors/connector-file/src/test/java/org/
   trunk/connectors/connector-file/src/test/java/org/teiid/
   trunk/connectors/connector-file/src/test/java/org/teiid/resource/
   trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/
   trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/
   trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java
   trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/
   trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/
   trunk/connectors/connector-ws/src/main/resources/org/
   trunk/connectors/connector-ws/src/main/resources/org/teiid/
   trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/
   trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/
   trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/
   trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
   trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
   trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java
   trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/
   trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java
   trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java
   trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java
   trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/
   trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/
   trunk/engine/src/main/java/org/teiid/api/
   trunk/engine/src/main/java/org/teiid/api/exception/
   trunk/engine/src/main/java/org/teiid/api/exception/query/
   trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java
   trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java
   trunk/engine/src/main/java/org/teiid/common/
   trunk/engine/src/main/java/org/teiid/common/buffer/
   trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java
   trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java
   trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java
   trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java
   trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java
   trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
   trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java
   trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java
   trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java
   trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java
   trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
   trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
   trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java
   trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java
   trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
   trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java
   trunk/engine/src/main/java/org/teiid/common/buffer/STree.java
   trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java
   trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java
   trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java
   trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
   trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
   trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java
   trunk/engine/src/main/java/org/teiid/common/buffer/impl/
   trunk/engine/src/main/java/org/teiid/core/
   trunk/engine/src/main/java/org/teiid/core/id/
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
   trunk/engine/src/main/java/org/teiid/query/
   trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
   trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
   trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
   trunk/engine/src/main/java/org/teiid/query/analysis/
   trunk/engine/src/main/java/org/teiid/query/eval/
   trunk/engine/src/main/java/org/teiid/query/function/
   trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
   trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
   trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
   trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
   trunk/engine/src/main/java/org/teiid/query/function/aggregate/
   trunk/engine/src/main/java/org/teiid/query/function/metadata/
   trunk/engine/src/main/java/org/teiid/query/function/source/
   trunk/engine/src/main/java/org/teiid/query/mapping/
   trunk/engine/src/main/java/org/teiid/query/mapping/relational/
   trunk/engine/src/main/java/org/teiid/query/mapping/xml/
   trunk/engine/src/main/java/org/teiid/query/metadata/
   trunk/engine/src/main/java/org/teiid/query/optimizer/
   trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/
   trunk/engine/src/main/java/org/teiid/query/optimizer/xml/
   trunk/engine/src/main/java/org/teiid/query/parser/
   trunk/engine/src/main/java/org/teiid/query/processor/
   trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
   trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
   trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
   trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
   trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
   trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java
   trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
   trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
   trunk/engine/src/main/java/org/teiid/query/processor/proc/
   trunk/engine/src/main/java/org/teiid/query/processor/relational/
   trunk/engine/src/main/java/org/teiid/query/processor/xml/
   trunk/engine/src/main/java/org/teiid/query/report/
   trunk/engine/src/main/java/org/teiid/query/resolver/
   trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
   trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java
   trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
   trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
   trunk/engine/src/main/java/org/teiid/query/resolver/command/
   trunk/engine/src/main/java/org/teiid/query/resolver/util/
   trunk/engine/src/main/java/org/teiid/query/rewriter/
   trunk/engine/src/main/java/org/teiid/query/sql/
   trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
   trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
   trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
   trunk/engine/src/main/java/org/teiid/query/sql/lang/
   trunk/engine/src/main/java/org/teiid/query/sql/navigator/
   trunk/engine/src/main/java/org/teiid/query/sql/proc/
   trunk/engine/src/main/java/org/teiid/query/sql/symbol/
   trunk/engine/src/main/java/org/teiid/query/sql/util/
   trunk/engine/src/main/java/org/teiid/query/sql/visitor/
   trunk/engine/src/main/java/org/teiid/query/tempdata/
   trunk/engine/src/main/java/org/teiid/query/util/
   trunk/engine/src/main/java/org/teiid/query/validator/
   trunk/engine/src/main/java/org/teiid/query/xquery/
   trunk/engine/src/main/java/org/teiid/query/xquery/saxon/
   trunk/engine/src/main/java/org/teiid/vdb/
   trunk/engine/src/main/java/org/teiid/vdb/runtime/
   trunk/engine/src/test/java/org/teiid/cache/
   trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
   trunk/engine/src/test/java/org/teiid/common/
   trunk/engine/src/test/java/org/teiid/common/buffer/
   trunk/engine/src/test/java/org/teiid/common/queue/
   trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
   trunk/engine/src/test/java/org/teiid/query/
   trunk/engine/src/test/java/org/teiid/query/analysis/
   trunk/engine/src/test/java/org/teiid/query/function/
   trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
   trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
   trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java
   trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java
   trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
   trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java
   trunk/engine/src/test/java/org/teiid/query/function/metadata/
   trunk/engine/src/test/java/org/teiid/query/function/source/
   trunk/engine/src/test/java/org/teiid/query/mapping/
   trunk/engine/src/test/java/org/teiid/query/mapping/xml/
   trunk/engine/src/test/java/org/teiid/query/metadata/
   trunk/engine/src/test/java/org/teiid/query/optimizer/
   trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/
   trunk/engine/src/test/java/org/teiid/query/optimizer/proc/
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/
   trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/
   trunk/engine/src/test/java/org/teiid/query/optimizer/xml/
   trunk/engine/src/test/java/org/teiid/query/parser/
   trunk/engine/src/test/java/org/teiid/query/processor/
   trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
   trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java
   trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java
   trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java
   trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
   trunk/engine/src/test/java/org/teiid/query/processor/eval/
   trunk/engine/src/test/java/org/teiid/query/processor/proc/
   trunk/engine/src/test/java/org/teiid/query/processor/relational/
   trunk/engine/src/test/java/org/teiid/query/processor/xml/
   trunk/engine/src/test/java/org/teiid/query/resolver/
   trunk/engine/src/test/java/org/teiid/query/rewriter/
   trunk/engine/src/test/java/org/teiid/query/sql/
   trunk/engine/src/test/java/org/teiid/query/sql/lang/
   trunk/engine/src/test/java/org/teiid/query/sql/proc/
   trunk/engine/src/test/java/org/teiid/query/sql/symbol/
   trunk/engine/src/test/java/org/teiid/query/sql/util/
   trunk/engine/src/test/java/org/teiid/query/sql/visitor/
   trunk/engine/src/test/java/org/teiid/query/unittest/
   trunk/engine/src/test/java/org/teiid/query/util/
   trunk/engine/src/test/java/org/teiid/query/validator/
   trunk/engine/src/test/java/org/teiid/vdb/
   trunk/engine/src/test/java/org/teiid/vdb/runtime/
   trunk/engine/src/test/resources/text/
   trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
   trunk/engine/src/test/resources/text/cdm_dos.txt
   trunk/engine/src/test/resources/text/cdm_dos_win.txt
   trunk/engine/src/test/resources/text/test-file.txt.csv
   trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
   trunk/metadata/src/test/java/org/teiid/cdk/
   trunk/metadata/src/test/java/org/teiid/cdk/api/
   trunk/metadata/src/test/java/org/teiid/cdk/unittest/
   trunk/metadata/src/test/java/org/teiid/core/
   trunk/metadata/src/test/java/org/teiid/core/util/
   trunk/metadata/src/test/java/org/teiid/internal/
   trunk/metadata/src/test/java/org/teiid/internal/core/
   trunk/metadata/src/test/java/org/teiid/internal/core/index/
   trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
   trunk/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java
   trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
   trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
   trunk/runtime/src/main/java/org/teiid/transport/pg/
   trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java
   trunk/runtime/src/main/resources/org/teiid/transport/
   trunk/runtime/src/test/java/org/teiid/dqp/
   trunk/runtime/src/test/java/org/teiid/dqp/service/
   trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/
   trunk/test-integration/common/src/test/java/org/teiid/cdk/
   trunk/test-integration/common/src/test/java/org/teiid/cdk/api/
   trunk/test-integration/common/src/test/java/org/teiid/dqp/
   trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/
   trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/
   trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
   trunk/test-integration/common/src/test/java/org/teiid/transport/
   trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
   trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
   trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/
   trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
   trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
   trunk/test-integration/db/src/main/java/org/teiid/internal/
   trunk/test-integration/db/src/main/java/org/teiid/internal/core/
   trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/
   trunk/test-integration/db/src/test/java/com/
   trunk/test-integration/db/src/test/java/org/teiid/internal/
   trunk/test-integration/db/src/test/java/org/teiid/internal/core/
Log:
forward merge from 7.6.x (-r 3753:3769)


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711
/trunk:3188-3450,3452-3666
   + /branches/7.4.x:3535-3555
/branches/7.6.x:3673-3711,3754-3769
/trunk:3188-3450,3452-3666


Property changes on: trunk/adminshell/src/main/java/groovy
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*
/trunk/adminshell/src/main/java/groovy:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy:3673-3711*,3754-3769
/trunk/adminshell/src/main/java/groovy:3507-3666


Property changes on: trunk/adminshell/src/main/java/groovy/sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*
/trunk/adminshell/src/main/java/groovy/sql:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555*
/branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711*,3754-3769
/trunk/adminshell/src/main/java/groovy/sql:3507-3666


Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711*,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666
   + /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940
/branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666


Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3673-3711
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666
   + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555
/branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3673-3711,3754-3769
/trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*
/trunk/adminshell/src/main/resources/org:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/codehaus
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/codehaus:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711*
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3673-3711*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3673-3711*
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3673-3711
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3673-3711,3754-3769
/trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*
/trunk/adminshell/src/main/resources/org/teiid:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/teiid:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-3711*
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-3711*,3754-3769
/trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3673-3711
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3673-3711,3754-3769
/trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666


Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3673-3711
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666
   + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555
/branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3673-3711,3754-3769
/trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666


Property changes on: trunk/adminshell/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*
/trunk/adminshell/src/test/java/org:3507-3666
   + /branches/7.4.x/adminshell/src/test/java/org:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org:3673-3711*,3754-3769
/trunk/adminshell/src/test/java/org:3507-3666


Property changes on: trunk/adminshell/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*
/trunk/adminshell/src/test/java/org/teiid:3507-3666
   + /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711*,3754-3769
/trunk/adminshell/src/test/java/org/teiid:3507-3666


Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666
   + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555*
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711*,3754-3769
/trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666


Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3673-3711
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666
   + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555
/branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3673-3711,3754-3769
/trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666


Property changes on: trunk/adminshell/src/test/resources/foo
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*
/trunk/adminshell/src/test/resources/foo:3507-3666
   + /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555*
/branches/7.6.x/adminshell/src/test/resources/foo:3673-3711*,3754-3769
/trunk/adminshell/src/test/resources/foo:3507-3666


Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666
   + /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555
/branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711,3754-3769
/trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666


Property changes on: trunk/api/src/main/java/org/teiid/events
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*
/trunk/api/src/main/java/org/teiid/events:3507-3666
   + /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711*,3754-3769
/trunk/api/src/main/java/org/teiid/events:3507-3666


Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:3673-3711
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666
   + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:3673-3711,3754-3769
/trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666


Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3673-3711
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666
   + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555
/branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3673-3711,3754-3769
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666


Property changes on: trunk/build/kits
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*
/trunk/build/kits:3507-3666
   + /branches/7.4.x/build/kits:3535-3555*
/branches/7.6.x/build/kits:3673-3711*,3754-3769
/trunk/build/kits:3507-3666


Property changes on: trunk/build/kits/adminshell
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711
/trunk/build/kits/adminshell:3507-3666
   + /branches/7.4.x/build/kits/adminshell:3535-3555
/branches/7.6.x/build/kits/adminshell:3673-3711,3754-3769
/trunk/build/kits/adminshell:3507-3666


Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3535-3555
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3673-3711*
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3507-3666
   + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3535-3555
/branches/7.6.x/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather:3754-3769
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3673-3711*
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3507-3666


Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/README.txt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3535-3555
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3507-3666
   + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3535-3555
/branches/7.6.x/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/README.txt:3754-3769
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3507-3666


Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-ds.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3535-3555
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3507-3666
   + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3535-3555
/branches/7.6.x/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-ds.xml:3754-3769
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3507-3666


Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-vdb.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3535-3555
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3507-3666
   + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3535-3555
/branches/7.6.x/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/weather-vdb.xml:3754-3769
/branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3673-3711
/trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org:3673-3711*
/trunk/cache-jbosscache/src/main/java/org:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid:3673-3711*
/trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache:3673-3711*
/trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3673-3711
/trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3673-3711,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/events
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/events:3673-3711*
/trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/events:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication:3673-3711*
/trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3673-3711*
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555*
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666
   + /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3673-3711
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3673-3711,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3673-3711
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3673-3711,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666


Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3673-3711
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555
/branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3673-3711,3754-3769
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666


Property changes on: trunk/cache-jbosscache/src/test/java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555*
/branches/7.6.x/cache-jbosscache/src/test/java:3673-3711*
/trunk/cache-jbosscache/src/test/java:3507-3666
   + /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555*
/branches/7.6.x/cache-jbosscache/src/test/java:3673-3711*,3754-3769
/trunk/cache-jbosscache/src/test/java:3507-3666

Modified: trunk/client/src/main/java/org/teiid/client/security/LogonResult.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/LogonResult.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/client/src/main/java/org/teiid/client/security/LogonResult.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,6 +22,7 @@
 
 package org.teiid.client.security;
 
+import java.io.EOFException;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -119,6 +120,8 @@
 		vdbVersion = in.readInt();
 		try {
 			addtionalProperties = ExternalizeUtil.readMap(in);
+		} catch (EOFException e) {
+			
 		} catch (OptionalDataException e) {
 			
 		}


Property changes on: trunk/client/src/main/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711*,3754-3769
/trunk/client/src/main/java/org/teiid/client/util:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3673-3711
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3673-3711
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3673-3711
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3673-3711
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711*,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666
   + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
   + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666

Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -30,6 +30,8 @@
 import java.sql.SQLWarning;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -554,16 +556,21 @@
 		});
     	if (synch) {
     		try {
-				pendingResult.get();
+				pendingResult.get(queryTimeoutMS==0?Integer.MAX_VALUE:queryTimeoutMS, TimeUnit.MILLISECONDS);
     			result.get(); //throw an exception if needed
     			return result;
     		} catch (ExecutionException e) {
     			if (e.getCause() instanceof SQLException) {
     				throw (SQLException)e.getCause();
     			}
+    			if (e.getCause() != null) {
+        			throw TeiidSQLException.create(e.getCause());
+    			}
     			throw TeiidSQLException.create(e);
     		} catch (InterruptedException e) {
     			timeoutOccurred();
+			} catch (TimeoutException e) {
+    			timeoutOccurred();
 			}
     		throw new TeiidSQLException(JDBCPlugin.Util.getString("MMStatement.Timeout_before_complete")); //$NON-NLS-1$
     	}
@@ -588,7 +595,7 @@
         reqMsg.setExecutionId(this.currentRequestID);
         
         ResultsFuture.CompletionListener<ResultsMessage> compeletionListener = null;
-		if (queryTimeoutMS > 0) {
+		if (queryTimeoutMS > 0 && !synch) {
 			final Task c = cancellationTimer.add(cancelTask, queryTimeoutMS);
 			compeletionListener = new ResultsFuture.CompletionListener<ResultsMessage>() {
 				@Override


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666

Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -70,7 +70,7 @@
         }
     }
     
-    private static SocketProfile SOCKET_PROFILE = new SocketProfile();
+    private ConnectionProfile socketProfile = new SocketProfile();
     private ConnectionProfile embeddedProfile = new EmbeddedProfile();
 
     public static TeiidDriver getInstance() {
@@ -104,7 +104,7 @@
         	if (conn == ConnectionType.Embedded) {
         		myConnection = embeddedProfile.connect(url, info);
         	} else { 
-        		myConnection = SOCKET_PROFILE.connect(url, info);
+        		myConnection = socketProfile.connect(url, info);
         	}
         } catch (TeiidSQLException e) {
             logger.log(Level.SEVERE, "Could not create connection", e); //$NON-NLS-1$
@@ -122,6 +122,10 @@
 		this.embeddedProfile = embeddedProfile;
 	}
     
+    public void setSocketProfile(ConnectionProfile socketProfile) {
+		this.socketProfile = socketProfile;
+	}
+    
     /**
      * Returns true if the driver thinks that it can open a connection to the given URL.
      * Expected URL format for server mode is


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666
   + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666
   + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555*
/branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711*,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666
   + /branches/7.6.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666

Modified: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/Handshake.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/client/src/main/java/org/teiid/net/socket/Handshake.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,11 +22,11 @@
 
 package org.teiid.net.socket;
 
+import java.io.EOFException;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.OptionalDataException;
 
 import org.teiid.core.util.ApplicationInfo;
 
@@ -85,7 +85,7 @@
     	publicKey = (byte[])in.readObject();
     	try {
     		authType = AuthenticationType.values()[in.readByte()];
-    	} catch (OptionalDataException e) {
+    	} catch (EOFException e) {
     		
     	}
     }


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Message.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666

Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -269,7 +269,7 @@
 				timeoutMillis -= now - start;
 				start = now;
 				if (timeoutMillis <= 0) {
-					throw new TimeoutException();
+					throw new TimeoutException("Read timeout after " + timeout + " milliseconds."); //$NON-NLS-1$ //$NON-NLS-2$
 				}
 			}
 		}
@@ -332,7 +332,7 @@
 					@Override
 					public Object get() throws InterruptedException, ExecutionException {
 						try {
-							return this.get(SocketServerConnectionFactory.getInstance().getSynchronousTtl(), TimeUnit.MILLISECONDS);
+							return this.get(instance.getSynchTimeout(), TimeUnit.MILLISECONDS);
 						} catch (TimeoutException e) {
 							throw new ExecutionException(e);
 						} 


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666


Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3673-3711
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666
   + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555
/branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3673-3711,3754-3769
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666


Property changes on: trunk/client/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*
/trunk/client/src/main/resources/org:3507-3666
   + /branches/7.4.x/client/src/main/resources/org:3535-3555*
/branches/7.6.x/client/src/main/resources/org:3673-3711*,3754-3769
/trunk/client/src/main/resources/org:3507-3666


Property changes on: trunk/client/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*
/trunk/client/src/main/resources/org/teiid:3507-3666
   + /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid:3673-3711*,3754-3769
/trunk/client/src/main/resources/org/teiid:3507-3666


Property changes on: trunk/client/src/main/resources/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
   + /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555
/branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711,3754-3769
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666


Property changes on: trunk/client/src/main/resources/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
   + /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711*,3754-3769
/trunk/client/src/main/resources/org/teiid/net:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/client/plan
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711*,3754-3769
/trunk/client/src/test/java/org/teiid/client/plan:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3673-3711
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/client/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711*,3754-3769
/trunk/client/src/test/java/org/teiid/client/util:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3673-3711
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3673-3711
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711*,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/net
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*
/trunk/client/src/test/java/org/teiid/net:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555*
/branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711*,3754-3769
/trunk/client/src/test/java/org/teiid/net:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3711
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666


Property changes on: trunk/client/src/test/java/org/teiid/net/socket
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666
   + /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555
/branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711,3754-3769
/trunk/client/src/test/java/org/teiid/net/socket:3507-3666

Copied: trunk/client/src/test/java/org/teiid/net/socket/TestHandshake.java (from rev 3769, branches/7.6.x/client/src/test/java/org/teiid/net/socket/TestHandshake.java)
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestHandshake.java	                        (rev 0)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestHandshake.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.net.socket;
+
+import static org.junit.Assert.*;
+
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
+
+import org.junit.Test;
+import org.teiid.core.util.UnitTestUtil;
+
+ at SuppressWarnings("nls")
+public class TestHandshake {
+
+	@Test public void testCompatibility() throws Exception {
+		ObjectInputStream ois = new ObjectInputStream(new FileInputStream(UnitTestUtil.getTestDataFile("handshake.ser")));
+		Handshake hs = (Handshake)ois.readObject();
+		assertEquals(AuthenticationType.CLEARTEXT, hs.getAuthType());
+	}
+	
+}

Copied: trunk/client/src/test/resources/handshake.ser (from rev 3769, branches/7.6.x/client/src/test/resources/handshake.ser)
===================================================================
(Binary files differ)


Property changes on: trunk/common-core/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*
/trunk/common-core/src/main/java/org:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org:3535-3555*
/branches/7.6.x/common-core/src/main/java/org:3673-3711*,3754-3769
/trunk/common-core/src/main/java/org:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*
/trunk/common-core/src/main/java/org/teiid:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711*,3754-3769
/trunk/common-core/src/main/java/org/teiid:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*
/trunk/common-core/src/main/java/org/teiid/core:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711*,3754-3769
/trunk/common-core/src/main/java/org/teiid/core:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711*,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666

Modified: trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,6 +22,7 @@
 
 package org.teiid.core.types;
 
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInput;
@@ -147,7 +148,7 @@
 	}
 	
 	@Override
-	protected void writeReference(final ObjectOutput out) throws IOException {
+	protected void writeReference(final DataOutput out) throws IOException {
 		try {
 			writeBinary(out, getBinaryStream(), (int)length);
 		} catch (SQLException e) {
@@ -155,7 +156,7 @@
 		}
 	}
 
-	static void writeBinary(final ObjectOutput out, InputStream is, int length) throws IOException {
+	static void writeBinary(final DataOutput out, InputStream is, int length) throws IOException {
 		OutputStream os = new OutputStream() {
 			
 			@Override


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666

Modified: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,10 +22,10 @@
 
 package org.teiid.core.types;
 
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringWriter;
@@ -230,7 +230,7 @@
 	 * These clobs should be small, so the wasted space should be minimal.
 	 */
 	@Override
-	protected void writeReference(final ObjectOutput out) throws IOException {
+	protected void writeReference(final DataOutput out) throws IOException {
 		Writer w = new Writer() {
 			
 			@Override


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/NullType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666

Modified: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,6 +22,8 @@
 
 package org.teiid.core.types;
 
+import java.io.DataOutput;
+import java.io.DataOutputStream;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -29,8 +31,11 @@
 import java.nio.charset.Charset;
 import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.teiid.core.CorePlugin;
+import org.teiid.core.util.AccessibleByteArrayOutputStream;
 
 
 
@@ -42,6 +47,8 @@
  * this is the ID that client needs to reference to get the chunk of data.
  */
 public abstract class Streamable<T> implements Externalizable {
+	
+	private static final Logger logger = Logger.getLogger(Streamable.class.getName());
 
 	private static final long serialVersionUID = -8252488562134729374L;
 	
@@ -112,7 +119,7 @@
     public void readExternal(ObjectInput in) throws IOException,
     		ClassNotFoundException {
     	length = in.readLong();
-    	referenceStreamId = (String)in.readObject();
+    	this.referenceStreamId = (String)in.readObject();
     	if (referenceStreamId == null) {
     		//we expect the data inline
     		readReference(in);
@@ -128,12 +135,27 @@
 		} catch (SQLException e) {
 		}
     	out.writeLong(length);
-    	out.writeObject(referenceStreamId);
+    	boolean writeBuffer = false;
+    	AccessibleByteArrayOutputStream baos = null;
     	if (referenceStreamId == null) {
-    		writeReference(out);
+    		//TODO: detect when this buffering is not necessary
+    		baos = new AccessibleByteArrayOutputStream();
+    		DataOutputStream dataOutput = new DataOutputStream(baos);
+    		try {
+    			writeReference(dataOutput);
+    			dataOutput.close();
+    			writeBuffer = true;
+    		} catch (IOException e) {
+    			logger.log(Level.WARNING, e.getMessage());
+    			referenceStreamId = "error"; //$NON-NLS-1$
+    		}
     	}
+    	out.writeObject(referenceStreamId);
+		if (writeBuffer) {
+			out.write(baos.getBuffer(), 0, baos.getCount());
+		}
     }
     
-    protected abstract void writeReference(ObjectOutput out) throws IOException;
+    protected abstract void writeReference(DataOutput out) throws IOException;
     
 }


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Transform.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666

Modified: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -22,6 +22,7 @@
 
 package org.teiid.core.types;
 
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInput;
@@ -228,7 +229,7 @@
 	}
 	
 	@Override
-	protected void writeReference(final ObjectOutput out) throws IOException {
+	protected void writeReference(final DataOutput out) throws IOException {
 		try {
 			BlobType.writeBinary(out, getBinaryStream(), (int)length);
 		} catch (SQLException e) {


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/basic
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666


Property changes on: trunk/common-core/src/main/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
   + /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711,3754-3769
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666


Property changes on: trunk/common-core/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*
/trunk/common-core/src/test/java/org:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org:3535-3555*
/branches/7.6.x/common-core/src/test/java/org:3673-3711*,3754-3769
/trunk/common-core/src/test/java/org:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*
/trunk/common-core/src/test/java/org/teiid:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711*,3754-3769
/trunk/common-core/src/test/java/org/teiid:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*
/trunk/common-core/src/test/java/org/teiid/core:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711*,3754-3769
/trunk/common-core/src/test/java/org/teiid/core:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711*,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666

Modified: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -28,6 +28,7 @@
 import java.io.Reader;
 
 import javax.sql.rowset.serial.SerialClob;
+import javax.sql.rowset.serial.SerialException;
 
 import org.junit.Test;
 import org.teiid.core.util.UnitTestUtil;
@@ -77,6 +78,27 @@
         assertEquals(testString, read.getSubString(1, testString.length()));
     }
     
+    @SuppressWarnings("serial")
+	@Test public void testReferencePersistenceError() throws Exception {
+    	String testString = "this is test clob"; //$NON-NLS-1$
+        SerialClob clob = new SerialClob(testString.toCharArray()) {
+        	@Override
+        	public Reader getCharacterStream() throws SerialException {
+        		throw new SerialException();
+        	}
+        };
+        
+        ClobType cv = new ClobType(clob);
+        cv.setReferenceStreamId(null);
+        
+        // now force to serialize
+        ClobType read = UnitTestUtil.helpSerialize(cv);
+        
+        assertTrue(read.length() > 0);
+        assertNotNull(read.getReferenceStreamId());
+        assertNull(read.getReference());
+    }
+    
     @Test public void testClobSubstring() throws Exception {
     	ClobImpl clob = new ClobImpl() {
     		public java.io.Reader getCharacterStream() throws java.sql.SQLException {


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/basic
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/core/util:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*
/trunk/common-core/src/test/java/org/teiid/query:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711*,3754-3769
/trunk/common-core/src/test/java/org/teiid/query:3507-3666


Property changes on: trunk/common-core/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-3711
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666
   + /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3673-3711*
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3673-3711
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3673-3711,3754-3769
/trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*
/trunk/connectors/connector-file/src/main/resources/org:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/resources/org:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673-3711*
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource:3673-3711*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3673-3711*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3673-3711*
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666


Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3673-3711
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3673-3711,3754-3769
/trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*
/trunk/connectors/connector-file/src/test/java/org:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/test/java/org:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711*
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:3673-3711*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3673-3711*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3673-3711*
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555*
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3673-3711*,3754-3769
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666


Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3673-3711
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666
   + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555
/branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3673-3711,3754-3769
/trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666


Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3673-3711*
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666
   + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3673-3711*,3754-3769
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666


Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3673-3711
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666
   + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555
/branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3673-3711,3754-3769
/trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711*,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3711*
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3711*,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3673-3711*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3673-3711*,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3673-3711*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3673-3711*,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3673-3711*
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555*
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3673-3711*,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666


Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3673-3711
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666
   + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555
/branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3673-3711,3754-3769
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666


Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3673-3711
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666
   + /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3673-3711,3754-3769
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666

Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -44,10 +44,10 @@
 @Translator(name = "netezza", description = "A translator for Netezza Database")
 public class NetezzaExecutionFactory extends JDBCExecutionFactory {
 
-	private static final String TIME_FORMAT = "HH24:MI:SS"; 
-	private static final String DATE_FORMAT = "YYYY-MM-DD"; 
-	private static final String DATETIME_FORMAT = DATE_FORMAT + " " + TIME_FORMAT; 
-	private static final String TIMESTAMP_FORMAT = DATETIME_FORMAT + ".MS";  
+	private static final String TIME_FORMAT = "HH24:MI:SS";  //$NON-NLS-1$
+	private static final String DATE_FORMAT = "YYYY-MM-DD";  //$NON-NLS-1$
+	private static final String DATETIME_FORMAT = DATE_FORMAT + " " + TIME_FORMAT;  //$NON-NLS-1$
+	private static final String TIMESTAMP_FORMAT = DATETIME_FORMAT + ".MS";   //$NON-NLS-1$
 
 	public NetezzaExecutionFactory() {
 		setSupportsFullOuterJoins(true);
@@ -62,51 +62,51 @@
 
 		//STRING FUNCTION MODIFIERS
 		////////////////////////////////////
-		registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModifier("chr"));  
-		registerFunctionModifier(SourceSystemFunctions.LCASE,new AliasModifier("lower"));  
-		registerFunctionModifier(SourceSystemFunctions.UCASE,new AliasModifier("upper"));  
-		registerFunctionModifier(SourceSystemFunctions.LOCATE, new  LocateFunctionModifier(getLanguageFactory(), "INSTR", true));	  
-       	registerFunctionModifier(SourceSystemFunctions.CONCAT, new AliasModifier("||")); 
+		registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModifier("chr"));   //$NON-NLS-1$
+		registerFunctionModifier(SourceSystemFunctions.LCASE,new AliasModifier("lower"));   //$NON-NLS-1$
+		registerFunctionModifier(SourceSystemFunctions.UCASE,new AliasModifier("upper"));   //$NON-NLS-1$
+		registerFunctionModifier(SourceSystemFunctions.LOCATE, new  LocateFunctionModifier(getLanguageFactory(), "INSTR", true));	   //$NON-NLS-1$
+       	registerFunctionModifier(SourceSystemFunctions.CONCAT, new AliasModifier("||"));  //$NON-NLS-1$
 		///NUMERIC FUNCTION MODIFIERS
         ////////////////////////////////////
-		registerFunctionModifier(SourceSystemFunctions.CEILING,	new AliasModifier("ceil"));  
-		registerFunctionModifier(SourceSystemFunctions.POWER,	new AliasModifier("pow"));  
-		registerFunctionModifier(SourceSystemFunctions.LOG,	new AliasModifier("LN"));
+		registerFunctionModifier(SourceSystemFunctions.CEILING,	new AliasModifier("ceil"));   //$NON-NLS-1$
+		registerFunctionModifier(SourceSystemFunctions.POWER,	new AliasModifier("pow"));   //$NON-NLS-1$
+		registerFunctionModifier(SourceSystemFunctions.LOG,	new AliasModifier("LN")); //$NON-NLS-1$
 		///BIT FUNCTION MODIFIERS
 		////////////////////////////////////
-        registerFunctionModifier(SourceSystemFunctions.BITAND, new AliasModifier("intNand")); 
-        registerFunctionModifier(SourceSystemFunctions.BITNOT, new AliasModifier("intNnot")); 
-        registerFunctionModifier(SourceSystemFunctions.BITOR, new AliasModifier("intNor")); 
-        registerFunctionModifier(SourceSystemFunctions.BITXOR, new AliasModifier("intNxor")); 
+        registerFunctionModifier(SourceSystemFunctions.BITAND, new AliasModifier("int4and"));  //$NON-NLS-1$
+        registerFunctionModifier(SourceSystemFunctions.BITNOT, new AliasModifier("int4not"));  //$NON-NLS-1$
+        registerFunctionModifier(SourceSystemFunctions.BITOR, new AliasModifier("int4or"));  //$NON-NLS-1$
+        registerFunctionModifier(SourceSystemFunctions.BITXOR, new AliasModifier("int4xor"));  //$NON-NLS-1$
 		//DATE FUNCTION MODIFIERS
         //////////////////////////////////////////
 		 registerFunctionModifier(SourceSystemFunctions.YEAR, new ExtractFunctionModifier());
-		 registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new	ExtractModifier("DOY"));
+		 registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new	ExtractModifier("DOY")); //$NON-NLS-1$
 		 registerFunctionModifier(SourceSystemFunctions.QUARTER, new  ExtractFunctionModifier());
 		 registerFunctionModifier(SourceSystemFunctions.MONTH, new ExtractFunctionModifier());
-		 registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new  ExtractModifier("DAY"));
+		 registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new  ExtractModifier("DAY")); //$NON-NLS-1$
 		 registerFunctionModifier(SourceSystemFunctions.WEEK, new ExtractFunctionModifier());
-		 registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new  ExtractModifier("DOW"));
+		 registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new  ExtractModifier("DOW")); //$NON-NLS-1$
          registerFunctionModifier(SourceSystemFunctions.HOUR, new	ExtractFunctionModifier());
 		 registerFunctionModifier(SourceSystemFunctions.MINUTE, new  ExtractFunctionModifier());
 		 registerFunctionModifier(SourceSystemFunctions.SECOND, new ExtractFunctionModifier());
-		 registerFunctionModifier(SourceSystemFunctions.CURDATE, new AliasModifier("CURRENT_DATE")); 
-		 registerFunctionModifier(SourceSystemFunctions.CURTIME, new AliasModifier("CURRENT_TIME")); 
+		 registerFunctionModifier(SourceSystemFunctions.CURDATE, new AliasModifier("CURRENT_DATE"));  //$NON-NLS-1$
+		 registerFunctionModifier(SourceSystemFunctions.CURTIME, new AliasModifier("CURRENT_TIME"));  //$NON-NLS-1$
        //SYSTEM FUNCTIONS
        ////////////////////////////////////
-		registerFunctionModifier(SourceSystemFunctions.IFNULL,new AliasModifier("NVL"));  
+		registerFunctionModifier(SourceSystemFunctions.IFNULL,new AliasModifier("NVL"));   //$NON-NLS-1$
         
 
 		// DATA TYPE CONVERSION
 		///////////////////////////////////////////
 		ConvertModifier convertModifier = new ConvertModifier();
-		convertModifier.addTypeMapping("char(1)", FunctionModifier.CHAR); 
-		convertModifier.addTypeMapping("byteint", FunctionModifier.BYTE); 
-		convertModifier.addTypeMapping("smallint", FunctionModifier.SHORT); 
-		convertModifier.addTypeMapping("bigint", FunctionModifier.LONG); 
-    	convertModifier.addTypeMapping("numeric(38)", FunctionModifier.BIGINTEGER); 
-    	convertModifier.addTypeMapping("numeric(38,18)", FunctionModifier.BIGDECIMAL); 
-		convertModifier.addTypeMapping("varchar(4000)", FunctionModifier.STRING); 
+		convertModifier.addTypeMapping("char(1)", FunctionModifier.CHAR);  //$NON-NLS-1$
+		convertModifier.addTypeMapping("byteint", FunctionModifier.BYTE);  //$NON-NLS-1$
+		convertModifier.addTypeMapping("smallint", FunctionModifier.SHORT);  //$NON-NLS-1$
+		convertModifier.addTypeMapping("bigint", FunctionModifier.LONG);  //$NON-NLS-1$
+    	convertModifier.addTypeMapping("numeric(38)", FunctionModifier.BIGINTEGER);  //$NON-NLS-1$
+    	convertModifier.addTypeMapping("numeric(38,18)", FunctionModifier.BIGDECIMAL);  //$NON-NLS-1$
+		convertModifier.addTypeMapping("varchar(4000)", FunctionModifier.STRING);  //$NON-NLS-1$
 		//convertModifier.addTypeMapping("nvarchar(5)", FunctionModifier.BOOLEAN);
 
  		///NO BOOLEAN, INTEGER, FLOAT, DATE, TIME, TIMESTAMP, as they are directly available in netezza
@@ -128,14 +128,14 @@
 			@Override
 			public List<?> translate(Function function) {
 				Expression stringValue = function.getParameters().get(0);
-				return Arrays.asList("CASE WHEN ", stringValue, " IN ('false', '0') THEN '0' WHEN ", stringValue, " IS NOT NULL THEN '1' END"); 
+				return Arrays.asList("CASE WHEN ", stringValue, " IN ('false', '0') THEN '0' WHEN ", stringValue, " IS NOT NULL THEN '1' END");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 		});
 		convertModifier.addTypeConversion(new FunctionModifier() {
 			@Override
 			public List<?> translate(Function function) {
 				Expression stringValue = function.getParameters().get(0);
-				return Arrays.asList("CASE WHEN ", stringValue, " = 0 THEN '0' WHEN ", stringValue, " IS NOT NULL THEN '1' END"); 
+				return Arrays.asList("CASE WHEN ", stringValue, " = 0 THEN '0' WHEN ", stringValue, " IS NOT NULL THEN '1' END");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 		}, FunctionModifier.BOOLEAN);
 		
@@ -143,25 +143,25 @@
 		
 
 		////////STRING TO DATATYPE CONVERSION OTHER THAN DATE/TIME
-		convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.INTEGER, new CastModifier("integer")); 
-		convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.FLOAT, new CastModifier("float"));
-    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.DOUBLE, new CastModifier("double"));
+		convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.INTEGER, new CastModifier("integer"));  //$NON-NLS-1$
+		convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.FLOAT, new CastModifier("float")); //$NON-NLS-1$
+    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.DOUBLE, new CastModifier("double")); //$NON-NLS-1$
     	///// STRING --> CHAR, BYTE, SHORT, LONG, BIGI, BIGD, BOOLEAN is taken care by Type Mapping
     	///// NO conversion support for NULL, CLOB, BLOB, OBJECT, XML
 		////STRING TO DATE/TIME CONVERSION////
 		//////////////////////////////////////
-    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.DATE, new ConvertModifier.FormatModifier("to_date", DATE_FORMAT));  
-    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.TIME, new ConvertModifier.FormatModifier("to_timestamp", TIME_FORMAT));  
-    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.TIMESTAMP, new ConvertModifier.FormatModifier("to_timestamp", TIMESTAMP_FORMAT));  
+    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.DATE, new ConvertModifier.FormatModifier("to_date", DATE_FORMAT));   //$NON-NLS-1$
+    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.TIME, new ConvertModifier.FormatModifier("to_timestamp", TIME_FORMAT));   //$NON-NLS-1$
+    	convertModifier.addConvert(FunctionModifier.STRING, FunctionModifier.TIMESTAMP, new ConvertModifier.FormatModifier("to_timestamp", TIMESTAMP_FORMAT));   //$NON-NLS-1$
 		//////DATE/TIME INTERNAL CONVERSION/////////
-		convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.TIME, new CastModifier("TIME")); 
-		convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.DATE,  new CastModifier("DATE"));  
-		convertModifier.addConvert(FunctionModifier.DATE, FunctionModifier.TIMESTAMP,  new CastModifier("TIMESTAMP")); 
+		convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.TIME, new CastModifier("TIME"));  //$NON-NLS-1$
+		convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.DATE,  new CastModifier("DATE"));   //$NON-NLS-1$
+		convertModifier.addConvert(FunctionModifier.DATE, FunctionModifier.TIMESTAMP,  new CastModifier("TIMESTAMP"));  //$NON-NLS-1$
 		//convertModifier.addConvert(FunctionModifier.TIME, FunctionModifier.TIMESTAMP, new CastModifier("TIMESTAMP")); //TIME --> TIMESTAMP --DOESN't WORK IN NETEZZA-NO FUNCTION SUPPORT
 				
 		////DATE/TIME to STRING CONVERION////
 		/////////////////////////////////////
-    	convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.STRING, new ConvertModifier.FormatModifier("to_char", TIMESTAMP_FORMAT));
+    	convertModifier.addConvert(FunctionModifier.TIMESTAMP, FunctionModifier.STRING, new ConvertModifier.FormatModifier("to_char", TIMESTAMP_FORMAT)); //$NON-NLS-1$
     	///NO NETEZAA FUNCTION for DATE, TIME to STRING
 		
 
@@ -290,7 +290,7 @@
     	}
 		@Override
 		public List<?> translate(Function function) {
-			return Arrays.asList("extract(",this.type," from ",function.getParameters().get(0) ,")");    				
+			return Arrays.asList("extract(",this.type," from ",function.getParameters().get(0) ,")");    				 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 	}
 
@@ -300,11 +300,11 @@
 			Expression booleanValue = function.getParameters().get(0);
 			if (booleanValue instanceof Function) {
 				Function nested = (Function)booleanValue;
-				if (nested.getName().equalsIgnoreCase("convert") && Number.class.isAssignableFrom(nested.getParameters().get(0).getType())) { 
+				if (nested.getName().equalsIgnoreCase("convert") && Number.class.isAssignableFrom(nested.getParameters().get(0).getType())) {  //$NON-NLS-1$
 					booleanValue = nested.getParameters().get(0);
 				}
 			}
-			return Arrays.asList("(CASE WHEN ", booleanValue, " IN ( '0', 'FALSE') THEN 0 WHEN ", booleanValue, " IS NOT NULL THEN 1 END)");
+			return Arrays.asList("(CASE WHEN ", booleanValue, " IN ( '0', 'FALSE') THEN 0 WHEN ", booleanValue, " IS NOT NULL THEN 1 END)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 	}
@@ -314,11 +314,11 @@
 			Expression booleanValue = function.getParameters().get(0);
 			if (booleanValue instanceof Function) {
 				Function nested = (Function)booleanValue;
-				if (nested.getName().equalsIgnoreCase("convert") && Number.class.isAssignableFrom(nested.getParameters().get(0).getType())) { 
+				if (nested.getName().equalsIgnoreCase("convert") && Number.class.isAssignableFrom(nested.getParameters().get(0).getType())) {  //$NON-NLS-1$
 					booleanValue = nested.getParameters().get(0);
 				}
 			}
-			return Arrays.asList("CASE WHEN ", booleanValue, " = '0' THEN 'false' WHEN ", booleanValue, " IS NOT NULL THEN 'true' END"); 
+			return Arrays.asList("CASE WHEN ", booleanValue, " = '0' THEN 'false' WHEN ", booleanValue, " IS NOT NULL THEN 'true' END");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 	}
@@ -331,7 +331,7 @@
     	}
 		@Override
 		public List<?> translate(Function function) {
-			return Arrays.asList("cast(", function.getParameters().get(0), " AS "+this.target+")");   
+			return Arrays.asList("cast(", function.getParameters().get(0), " AS "+this.target+")");    //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 	}
     
@@ -339,7 +339,7 @@
 	@Override
     public List<?> translateLimit(Limit limit, ExecutionContext context) {
     	if (limit.getRowOffset() > 0) {
-    		return Arrays.asList("LIMIT ", limit.getRowLimit(), " OFFSET ", limit.getRowOffset());   
+    		return Arrays.asList("LIMIT ", limit.getRowLimit(), " OFFSET ", limit.getRowOffset());    //$NON-NLS-1$ //$NON-NLS-2$
     	}
         return null;
     }


Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3673-3711*
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666
   + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555*
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3673-3711*,3754-3769
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666


Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3673-3711
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666
   + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3673-3711,3754-3769
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666


Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666
   + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555
/branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711,3754-3769
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666

Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -206,7 +206,7 @@
    
    @Test public void testBitAnd() throws Exception {
        String input = "select bitand(intkey, intnum) from bqt1.smalla"; 
-       String output = "SELECT intNand(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
+       String output = "SELECT int4and(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
               
        TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB,
            input, 
@@ -214,7 +214,7 @@
    }
    @Test public void testBitNot() throws Exception {
        String input = "select bitnot(intkey) from bqt1.smalla"; 
-       String output = "SELECT intNnot(SmallA.IntKey) FROM SmallA"; 
+       String output = "SELECT int4not(SmallA.IntKey) FROM SmallA"; 
               
        TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB,
            input, 
@@ -222,7 +222,7 @@
    }
    @Test public void testBitOr() throws Exception {
        String input = "select bitor(intkey, intnum) from bqt1.smalla"; 
-       String output = "SELECT intNor(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
+       String output = "SELECT int4or(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
               
        TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB,
            input, 
@@ -230,7 +230,7 @@
    }
    @Test public void testBitXor() throws Exception {
        String input = "select bitxor(intkey, intnum) from bqt1.smalla"; 
-       String output = "SELECT intNxor(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
+       String output = "SELECT int4xor(SmallA.IntKey, SmallA.IntNum) FROM SmallA"; 
               
        TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB,
            input, 


Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3673-3711*
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666
   + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555*
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3673-3711*,3754-3769
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666


Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3673-3711
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666
   + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555
/branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3673-3711,3754-3769
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*
/trunk/engine/src/main/java/org/teiid/api:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/api:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-3711*
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3673-3711
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*
/trunk/engine/src/main/java/org/teiid/common:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/common:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666
   + /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STree.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*
/trunk/engine/src/main/java/org/teiid/core:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/core:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/core/id
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -376,6 +376,12 @@
 			this.resultsBuffer = collector.collectTuples();
 			if (!doneProducingBatches) {
 				doneProducingBatches();
+				//TODO: we could perform more tracking to know what source lobs are in use
+				if (this.resultsBuffer.getLobCount() == 0) {
+					for (DataTierTupleSource connectorRequest : getConnectorRequests()) {
+						connectorRequest.fullyCloseSource();
+				    }
+				}
 				addToCache();
 			}
 		}
@@ -535,8 +541,8 @@
 				}
 				if (batch.getTerminationFlag()) {
 					doneProducingBatches();
+					addToCache();
 				}
-				addToCache();
 				synchronized (lobStreams) {
 					if (resultsBuffer.isLobs()) {
 						super.flushBatchDirect(batch, false);
@@ -546,8 +552,9 @@
 						return;
 					}
 					super.flushBatchDirect(batch, add);
-					//restrict the buffer size for forward only results
-					if (add && !processor.hasFinalBuffer()
+					if (!add && !processor.hasFinalBuffer()) {
+						 resultsBuffer.setRowCount(batch.getEndRow());
+					} else if (!processor.hasFinalBuffer() //restrict the buffer size for forward only results
 							&& !batch.getTerminationFlag() 
 							&& transactionState != TransactionState.ACTIVE
 							&& this.getTupleBuffer().getManagedRowCount() >= OUTPUT_BUFFER_MAX_BATCHES * this.getTupleBuffer().getBatchSize()) {
@@ -941,12 +948,6 @@
 
 	private void doneProducingBatches() {
 		this.doneProducingBatches = true;
-		//TODO: we could perform more tracking to know what source lobs are in use
-		if (this.resultsBuffer.getLobCount() == 0) {
-			for (DataTierTupleSource connectorRequest : getConnectorRequests()) {
-				connectorRequest.fullyCloseSource();
-		    }
-		}
 		dqpCore.finishProcessing(this);
 	}
 	


Property changes on: trunk/engine/src/main/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*
/trunk/engine/src/main/java/org/teiid/query:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/eval
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/eval:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/metadata
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/function/source
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3711
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/relational
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:3673-3711
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-3711
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/parser:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/proc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/relational
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/report
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/report:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/command
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-3711
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigator
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/util:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/validator:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711*,3754-3769
/trunk/engine/src/main/java/org/teiid/vdb:3507-3666


Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
   + /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/cache
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*
/trunk/engine/src/test/java/org/teiid/cache:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/cache:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3673-3711
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/common
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*
/trunk/engine/src/test/java/org/teiid/common:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/common:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/common/queue
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666

Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -340,6 +340,24 @@
         assertEquals(100, item.resultsBuffer.getRowCount());
     }
     
+    @Test public void testFinalRow() throws Exception {
+        String sql = "SELECT A.IntKey FROM BQT1.SmallA as A"; //$NON-NLS-1$
+        String userName = "1"; //$NON-NLS-1$
+        String sessionid = "1"; //$NON-NLS-1$
+        
+        RequestMessage reqMsg = exampleRequestMessage(sql);
+        reqMsg.setCursorType(ResultSet.TYPE_FORWARD_ONLY);
+        DQPWorkContext.getWorkContext().getSession().setSessionId(sessionid);
+        DQPWorkContext.getWorkContext().getSession().setUserName(userName);
+        ((BufferManagerImpl)core.getBufferManager()).setProcessorBatchSize(10);
+        Future<ResultsMessage> message = core.executeRequest(reqMsg.getExecutionId(), reqMsg);
+        ResultsMessage rm = message.get(500000, TimeUnit.MILLISECONDS);
+        assertNull(rm.getException());
+        assertEquals(10, rm.getResultsList().size());
+        RequestWorkItem item = core.getRequestWorkItem(DQPWorkContext.getWorkContext().getRequestID(reqMsg.getExecutionId()));
+        assertEquals(10, item.resultsBuffer.getRowCount());
+    }
+    
     @Test public void testBufferReuse1() throws Exception {
     	//the sql should return 100 rows
         String sql = "SELECT IntKey FROM texttable('1112131415' columns intkey integer width 2 no row delimiter) t " +


Property changes on: trunk/engine/src/test/java/org/teiid/query
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*
/trunk/engine/src/test/java/org/teiid/query:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/metadata
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/function/source
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3711
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/proc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-3711
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/parser
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/parser:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666
   + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3673-3711,3714-3752
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3673-3711,3714-3752,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666
   + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/eval
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/proc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/relational
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/util:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/query/validator
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/query/validator:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/vdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555*
/branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711*,3754-3769
/trunk/engine/src/test/java/org/teiid/vdb:3507-3666


Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666
   + /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711,3754-3769
/trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666


Property changes on: trunk/engine/src/test/resources/text
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*
/trunk/engine/src/test/resources/text:3507-3666
   + /branches/7.4.x/engine/src/test/resources/text:3535-3555*
/branches/7.6.x/engine/src/test/resources/text:3673-3711*,3754-3769
/trunk/engine/src/test/resources/text:3507-3666


Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3673-3711
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666
   + /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3673-3711,3754-3769
/trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666


Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666
   + /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711,3754-3769
/trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666


Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666
   + /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555
/branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711,3754-3769
/trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666


Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
   + /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555
/branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711,3754-3769
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -133,6 +133,10 @@
 		        if (getPreparedPlanCacheInjector().getValue() != null) {
 		        	getPreparedPlanCacheInjector().getValue().clearForVDB(name, version);
 		        }
+			}
+
+			@Override
+			public void finishedDeployment(String name, int version, CompositeVDB vdb) {
 			}			
 		}); 		
 

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -55,10 +55,12 @@
 import org.teiid.adminapi.impl.VDBTranslatorMetaData;
 import org.teiid.common.buffer.BufferManager;
 import org.teiid.core.TeiidException;
+import org.teiid.deployers.CompositeVDB;
 import org.teiid.deployers.ContainerLifeCycleListener;
 import org.teiid.deployers.MetadataStoreGroup;
 import org.teiid.deployers.TranslatorUtil;
 import org.teiid.deployers.UDFMetaData;
+import org.teiid.deployers.VDBLifeCycleListener;
 import org.teiid.deployers.VDBRepository;
 import org.teiid.deployers.VirtualDatabaseException;
 import org.teiid.dqp.internal.datamgr.ConnectorManager;
@@ -88,6 +90,7 @@
 	private final InjectedValue<BufferServiceImpl> bufferServiceInjector = new InjectedValue<BufferServiceImpl>();
 	private final InjectedValue<ObjectReplicator> objectReplicatorInjector = new InjectedValue<ObjectReplicator>();
 	private ContainerLifeCycleListener shutdownListener;
+	private VDBLifeCycleListener vdbListener;
 	
 	public VDBService(VDBMetaData metadata, ContainerLifeCycleListener shutdownListener) {
 		this.vdb = metadata;
@@ -121,6 +124,32 @@
 		}
 
 		createConnectorManagers(cmr, repo, this.vdb);
+		
+		this.vdbListener = new VDBLifeCycleListener() {
+			@Override
+			public void added(String name, int version, CompositeVDB vdb) {
+			}
+
+			@Override
+			public void removed(String name, int version, CompositeVDB vdb) {
+			}
+
+			@Override
+			public void finishedDeployment(String name, int version,CompositeVDB vdb) {
+				// add object replication to temp/matview tables
+				GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdb.getVDB().getAttachment(TransformationMetadata.class));
+				if (getObjectReplicatorInjector().getValue() != null) {
+					try {
+						gts = getObjectReplicatorInjector().getValue().replicate(name + version, GlobalTableStore.class, gts, 300000);
+					} catch (Exception e) {
+						LogManager.logError(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.getString("replication_failed", gts)); //$NON-NLS-1$
+					}
+				}
+				vdb.getVDB().addAttchment(GlobalTableStore.class, gts);
+			}
+		};
+		
+		getVDBRepository().addListener(this.vdbListener);
 				
 		// check to see if the vdb has been modified when server is down; if it is then clear the old files
 		// This is no longer required as VDB can not modified in place in deployment directory as they held inside the data dir
@@ -205,18 +234,7 @@
 		this.vdb.removeAttachment(UDFMetaData.class);
 		this.vdb.removeAttachment(MetadataStoreGroup.class);
 		this.vdb.removeAttachment(IndexMetadataFactory.class);	
-		
-		// add object replication to temp/matview tables
-		GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdb.getAttachment(TransformationMetadata.class));
-		if (getObjectReplicatorInjector().getValue() != null) {
-			try {
-				gts = getObjectReplicatorInjector().getValue().replicate(vdb.getName() + vdb.getVersion(), GlobalTableStore.class, gts, 300000);
-			} catch (Exception e) {
-				LogManager.logError(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.getString("replication_failed", gts)); //$NON-NLS-1$
-			}
-		}
-		vdb.addAttchment(GlobalTableStore.class, gts);		
-		
+				
 		LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_deployed",vdb, valid?"active":"inactive")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$		
 	}
 
@@ -228,7 +246,7 @@
 			GlobalTableStore gts = vdb.getAttachment(GlobalTableStore.class);
 			getObjectReplicatorInjector().getValue().stop(gts);
 		}		
-		
+		getVDBRepository().removeListener(this.vdbListener);
 		getVDBRepository().removeVDB(this.vdb.getName(), this.vdb.getVersion());
 		this.vdb.setRemoved(true);
 


Property changes on: trunk/metadata/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/trunk/metadata/src/test/java/org/teiid/cdk:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711,3754-3769
/trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*
/trunk/metadata/src/test/java/org/teiid/core:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711*,3754-3769
/trunk/metadata/src/test/java/org/teiid/core:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/core/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711,3754-3769
/trunk/metadata/src/test/java/org/teiid/core/util:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/trunk/metadata/src/test/java/org/teiid/internal:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666


Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/index
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3711
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
   + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555
/branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3711,3754-3769
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666

Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -74,7 +74,7 @@
 		update();
 	}
 	
-	public void addChild(CompositeVDB child) {
+	public synchronized void addChild(CompositeVDB child) {
 		if (this.children == null) {
 			this.children = new LinkedHashMap<VDBKey, CompositeVDB>();
 		}
@@ -83,14 +83,14 @@
 		this.mergedVDB = null;
 	}
 	
-	public void removeChild(VDBKey child) {
+	public synchronized void removeChild(VDBKey child) {
 		if (this.children != null) {
 			this.children.remove(child);
 		}
 		this.mergedVDB = null;
 	}	
 	
-	void update() {
+	synchronized void update() {
 		TransformationMetadata metadata = buildTransformationMetaData(mergedVDB, getVisibilityMap(), getMetadataStores(), getUDF(), systemFunctions, this.additionalStores);
 		mergedVDB.addAttchment(QueryMetadataInterface.class, metadata);
 		mergedVDB.addAttchment(TransformationMetadata.class, metadata);	
@@ -123,7 +123,7 @@
 		return additionalStores;
 	}
 	
-	public VDBMetaData getVDB() {
+	public synchronized VDBMetaData getVDB() {
 		if (this.mergedVDB == null) {
 			this.mergedVDB = buildVDB();
 			update();
@@ -131,7 +131,7 @@
 		return this.mergedVDB;
 	}
 	
-	public boolean hasChildVdb(VDBKey child) {
+	public synchronized boolean hasChildVdb(VDBKey child) {
 		if (this.children != null) {
 			return this.children.containsKey(child);
 		}
@@ -201,7 +201,7 @@
 		return mergedUDF;
 	}
 	
-	private LinkedHashMap<String, Resource> getVisibilityMap() {
+	private synchronized LinkedHashMap<String, Resource> getVisibilityMap() {
 		if (this.children == null || this.children.isEmpty()) {
 			return this.visibilityMap;
 		}
@@ -219,7 +219,7 @@
 		return mergedvisibilityMap;
 	}
 	
-	public MetadataStoreGroup getMetadataStores() {
+	public synchronized MetadataStoreGroup getMetadataStores() {
 		if (this.children == null || this.children.isEmpty()) {
 			return this.stores;
 		}		

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -24,4 +24,5 @@
 public interface VDBLifeCycleListener {
 	void added(String name, int version, CompositeVDB vdb);
 	void removed(String name, int version, CompositeVDB vdb);
+	void finishedDeployment(String name, int version, CompositeVDB vdb);
 }

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -294,6 +294,7 @@
 		target.addChild(source);
 		
 		notifyAdd(targetVDBName, targetVDBVersion, target);
+		notifyFinished(targetVDBName, targetVDBVersion, target);
 	}
 	
 	// this is called by mc
@@ -308,8 +309,15 @@
 		if (v!= null) {
 			updateFromMetadataRepository(v);
 			v.update();
+			notifyFinished(name, version, v);
 		}
 	}
+
+	private void notifyFinished(String name, int version, CompositeVDB v) {
+		for(VDBLifeCycleListener l:this.listeners) {
+			l.finishedDeployment(name, version, v);
+		}
+	}
 	
 	public void addListener(VDBLifeCycleListener listener) {
 		this.listeners.add(listener);


Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3673-3711
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666
   + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3673-3711,3754-3769
/trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666


Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666
   + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555*
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711*,3754-3769
/trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666


Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3673-3711
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666
   + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555
/branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3673-3711,3754-3769
/trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666


Property changes on: trunk/runtime/src/main/resources/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
   + /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555*
/branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711*,3754-3769
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666


Property changes on: trunk/runtime/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666
   + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/trunk/runtime/src/test/java/org/teiid/dqp:3507-3666


Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666
   + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555*
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711*,3754-3769
/trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666


Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-3711
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
   + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555
/branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-3711,3754-3769
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711*
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk/api
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:3673-3711
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:3673-3711,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-3711*
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3673-3711*
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3673-3711
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3673-3711,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666

Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -48,8 +48,8 @@
 import org.teiid.adminapi.impl.VDBMetaData;
 import org.teiid.cache.Cache;
 import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.CacheConfiguration.Policy;
 import org.teiid.cache.DefaultCacheFactory;
-import org.teiid.cache.CacheConfiguration.Policy;
 import org.teiid.client.DQP;
 import org.teiid.client.security.ILogon;
 import org.teiid.common.buffer.TupleBufferCache;
@@ -244,12 +244,18 @@
 		this.repo.addListener(new VDBLifeCycleListener() {
 			
 			@Override
+			public void added(String name, int version,
+					CompositeVDB vdb) {
+				
+			}
+			
+			@Override
 			public void removed(String name, int version, CompositeVDB vdb) {
 				
 			}
 			
 			@Override
-			public void added(String name, int version, CompositeVDB vdb) {
+			public void finishedDeployment(String name, int version, CompositeVDB vdb) {
 				GlobalTableStore gts = new GlobalTableStoreImpl(dqp.getBufferManager(), vdb.getVDB().getAttachment(TransformationMetadata.class));
 				if (replicator != null) {
 					try {
@@ -316,13 +322,24 @@
         
         this.dqp.setTransactionService(new FakeTransactionService());
         
-        cmr = Mockito.mock(ConnectorManagerRepository.class);
-        Mockito.stub(cmr.getConnectorManager("source")).toReturn(new ConnectorManager("x", "x") {
+        cmr = new ConnectorManagerRepository() {
         	@Override
-        	public SourceCapabilities getCapabilities() {
-        		return new BasicSourceCapabilities();
+        	public ConnectorManager getConnectorManager(String connectorName) {
+        		ConnectorManager cm = super.getConnectorManager(connectorName);
+        		if (cm != null) {
+        			return cm;
+        		}
+        		if (connectorName.equalsIgnoreCase("source")) {
+        			return new ConnectorManager("x", "x") {
+        	        	@Override
+        	        	public SourceCapabilities getCapabilities() {
+        	        		return new BasicSourceCapabilities();
+        	        	}
+        			};
+        		}
+        		return null;
         	}
-        });
+        };
         
         this.dqp.start(config);
         this.sessionService.setDqp(this.dqp);
@@ -335,6 +352,10 @@
 		return dqp;
 	}
 	
+	public ConnectorManagerRepository getConnectorManagerRepository() {
+		return cmr;
+	}
+	
 	public void setConnectorManagerRepository(ConnectorManagerRepository cmr) {
 		this.cmr = cmr;
 	}


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3673-3711*
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666

Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java	2012-01-04 21:48:27 UTC (rev 3772)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java	2012-01-04 22:07:10 UTC (rev 3773)
@@ -37,16 +37,26 @@
 import org.junit.Test;
 import org.teiid.common.buffer.BufferManagerFactory;
 import org.teiid.core.util.UnitTestUtil;
+import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
 import org.teiid.dqp.internal.process.DQPConfiguration;
+import org.teiid.dqp.service.AutoGenDataService;
+import org.teiid.jdbc.ConnectionImpl;
+import org.teiid.jdbc.ConnectionProfile;
 import org.teiid.jdbc.FakeServer;
 import org.teiid.jdbc.TeiidDriver;
+import org.teiid.jdbc.TeiidSQLException;
 import org.teiid.jdbc.TestMMDatabaseMetaData;
+import org.teiid.net.CommunicationException;
+import org.teiid.net.ConnectionException;
+import org.teiid.net.socket.SocketServerConnectionFactory;
+import org.teiid.translator.TranslatorException;
 
 @SuppressWarnings("nls")
 public class TestJDBCSocketTransport {
 
 	static InetSocketAddress addr;
 	static SocketListener jdbcTransport;
+	static FakeServer server;
 	
 	@BeforeClass public static void oneTimeSetup() throws Exception {
 		SocketConfiguration config = new SocketConfiguration();
@@ -57,7 +67,7 @@
 		
 		DQPConfiguration dqpConfig = new DQPConfiguration();
 		dqpConfig.setMaxActivePlans(2);
-		FakeServer server = new FakeServer(dqpConfig);
+		server = new FakeServer(dqpConfig);
 		server.setUseCallingThread(false);
 		server.deployVDB("parts", UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb");
 		
@@ -68,6 +78,7 @@
 		if (jdbcTransport != null) {
 			jdbcTransport.stop();
 		}
+		server.stop();
 	}
 	
 	Connection conn;
@@ -127,4 +138,46 @@
 		}
 	}
 	
+	@Test public void testSyncTimeout() throws Exception {
+		TeiidDriver td = new TeiidDriver();
+		td.setSocketProfile(new ConnectionProfile() {
+			
+			@Override
+			public ConnectionImpl connect(String url, Properties info)
+					throws TeiidSQLException {
+				SocketServerConnectionFactory sscf = new SocketServerConnectionFactory();
+				sscf.initialize(info);
+				try {
+					return new ConnectionImpl(sscf.getConnection(info), info, url);
+				} catch (CommunicationException e) {
+					throw TeiidSQLException.create(e);
+				} catch (ConnectionException e) {
+					throw TeiidSQLException.create(e);
+				}
+			}
+		});
+		Properties p = new Properties();
+		p.setProperty("user", "testuser");
+		p.setProperty("password", "testpassword");
+		p.setProperty("org.teiid.sockets.soTimeout", "50");
+		p.setProperty("org.teiid.sockets.SynchronousTtl", "50");
+		ConnectorManagerRepository cmr = server.getConnectorManagerRepository();
+		AutoGenDataService agds = new AutoGenDataService() {
+			@Override
+			protected Object getConnectionFactory()
+					throws TranslatorException {
+				return null;
+			}
+		};
+		agds.setSleep(100);
+		cmr.addConnectorManager("source", agds);
+		try {
+			conn = td.connect("jdbc:teiid:parts at mm://"+addr.getHostName()+":" +jdbcTransport.getPort(), p);
+			Statement s = conn.createStatement();
+			assertTrue(s.execute("select * from parts"));
+		} finally {
+			server.setConnectorManagerRepository(cmr);
+		}
+	}
+	
 }


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3673-3711
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3673-3711,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666


Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3673-3711
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666
   + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3673-3711,3754-3769
/trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3673-3711*
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3673-3711*
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3673-3711*
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555*
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3673-3711*,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666


Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3673-3711
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666
   + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3673-3711,3754-3769
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666


Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711*
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666
   + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711*,3754-3769
/trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666


Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3673-3711*
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666
   + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3673-3711*,3754-3769
/trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666


Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3673-3711
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666
   + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3673-3711,3754-3769
/trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666


Property changes on: trunk/test-integration/db/src/test/java/com
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*
/trunk/test-integration/db/src/test/java/com:3507-3666
   + /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/com:3673-3711*,3754-3769
/trunk/test-integration/db/src/test/java/com:3507-3666


Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3711*
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666
   + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3711*,3754-3769
/trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666


Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal/core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3673-3711*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
   + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555*
/branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3673-3711*,3754-3769
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666

More information about the teiid-commits mailing list