Author: shawkins Date: 2012-08-20 12:53:29 -0400 (Mon, 20 Aug 2012) New Revision: 4343 Added: trunk/build/kits/embedded/examples/embedded-portfolio/accounts.h2.db 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/api/src/main/java/org/teiid/metadata/MetadataFactory.java trunk/api/src/main/java/org/teiid/util/ trunk/api/src/main/java/org/teiid/util/StAXSQLXML.java trunk/api/src/main/java/org/teiid/util/XMLInputStream.java trunk/api/src/test/java/org/teiid/util/ trunk/api/src/test/java/org/teiid/util/TestXMLInputStream.java trunk/build/kits/ trunk/build/kits/adminshell/ trunk/build/kits/jboss-as7/ trunk/client-jdk15/src/main/java/retroruntime/ trunk/client-jdk15/src/main/java/retroruntime/java/ trunk/client-jdk15/src/main/java/retroruntime/java/io/ trunk/client-jdk15/src/main/java/retroruntime/java/net/ trunk/client-jdk15/src/main/java/retroruntime/java/sql/ trunk/client-jdk15/src/main/java/retroruntime/java/util/ trunk/client-jdk15/src/main/java/retroruntime/javax/ trunk/client-jdk15/src/main/java/retroruntime/javax/net/ trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl/ trunk/client-jdk15/src/main/java/retroruntime/javax/xml/ trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream/ trunk/client-jdk15/src/main/java/retroruntime/org/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic/ trunk/client-jdk15/src/main/resources/ trunk/client-jdk15/src/main/resources/net/ trunk/client-jdk15/src/main/resources/net/sf/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties 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/RequestOptions.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/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/BinaryType.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/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-ldap/src/main/java/org/teiid/translator/ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/ trunk/documentation/javadocs/ 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/TupleBufferCache.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/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/RegisterRequestParameter.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/relational/DependentCriteriaProcessor.java trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java trunk/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 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/main/resources/META-INF/ trunk/engine/src/main/resources/META-INF/services/ trunk/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider 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/buffer/TestLobManager.java trunk/engine/src/test/java/org/teiid/common/queue/ 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/metadata/TestTransformationMetadata.java 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/TestCommonTableOptimizations.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/relational/TestJoinNode.java trunk/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 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/VDBService.java trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.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/runtime/EmbeddedServer.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/runtime/src/test/java/org/teiid/runtime/ trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java 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/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/testProperties.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/common/src/test/resources/TestVirtualDocWithVirtualProc/ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.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 8.1 Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x:3535-3555 /branches/7.6.x:3673-3711,3754-3769 /branches/7.7.x:3816-3868,3876-3915,3920-3983 /branches/8.0.x:4002-4046,4048-4051 /trunk:3188-3450,3452-3666 + /branches/7.4.x:3535-3555 /branches/7.6.x:3673-3711,3754-3769 /branches/7.7.x:3816-3868,3876-3915,3920-3983 /branches/8.0.x:4002-4046,4048-4051 /branches/8.1.x:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/java/groovy:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/groovy:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/java/groovy:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/java/groovy/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/groovy/sql:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/java/groovy/sql:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/codehaus:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/codehaus:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/codehaus/groovy:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/codehaus/groovy/tools:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/main/resources/org/teiid/adminshell:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:4319-4342 /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,3754-3769 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/test/java/org:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/test/java/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/test/java/org/teiid/adminshell:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:4319-4342 /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*,3754-3769 /branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*,4048-4051* /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 /branches/7.7.x/adminshell/src/test/resources/foo:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/adminshell/src/test/resources/foo:4002-4046*,4048-4051* /branches/8.1.x/adminshell/src/test/resources/foo:4319-4342* /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,3754-3769 /branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046,4048-4051 /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 /branches/7.7.x/adminshell/src/test/resources/foo/bar.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/adminshell/src/test/resources/foo/bar.txt:4002-4046,4048-4051 /branches/8.1.x/adminshell/src/test/resources/foo/bar.txt:4319-4342 /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*,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*,4048-4051* /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 /branches/7.7.x/api/src/main/java/org/teiid/events:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/api/src/main/java/org/teiid/events:4002-4046*,4048-4051* /branches/8.1.x/api/src/main/java/org/teiid/events:4319-4342* /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,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:4002-4046,4048-4051 /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 /branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributor.java:4002-4046,4048-4051 /branches/8.1.x/api/src/main/java/org/teiid/events/EventDistributor.java:4319-4342 /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,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:4002-4046,4048-4051 /branches/8.1.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:4319-4342 /trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666 Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -24,7 +24,6 @@ import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -48,6 +47,7 @@ private String vdbName; private int vdbVersion; private Map<String, Datatype> dataTypes; + private Map<String, Datatype> builtinDataTypes; private boolean autoCorrectColumnNames = true; private Map<String, String> namespaces = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); private String rawMetadata; @@ -56,10 +56,11 @@ private String idPrefix; private int count; - public MetadataFactory(String vdbName, int vdbVersion, String schemaName, Map<String, Datatype> dataTypes, Properties importProperties, String rawMetadata) { + public MetadataFactory(String vdbName, int vdbVersion, String schemaName, Map<String, Datatype> runtimeTypes, Properties importProperties, String rawMetadata) { this.vdbName = vdbName; this.vdbVersion = vdbVersion; - this.dataTypes = dataTypes; + this.dataTypes = runtimeTypes; + this.builtinDataTypes = runtimeTypes; schema.setName(schemaName); long msb = longHash(vdbName, 0); msb = 31*msb + vdbVersion; @@ -359,7 +360,7 @@ public void mergeInto (MetadataStore store) { store.addSchema(this.schema); - store.addDataTypes(this.dataTypes.values()); + store.addDataTypes(this.builtinDataTypes.values()); } public MetadataStore asMetadataStore() { @@ -372,21 +373,56 @@ this.schema = schema; } + /** + * get runtime types keyed by runtime name, which is + * a type name known to the Teiid engine + * @return + */ public Map<String, Datatype> getDataTypes() { return dataTypes; } - void addDataTypes(Collection<Datatype> types) { - for (Datatype type: types) { - addDatatype(type); + /** + * To be called if the MetadataFactory is deserialized to set the canonical system + * type value. + * @param dt + * @param builtin + */ + public void correctDatatypes(Map<String, Datatype> dt, Map<String, Datatype> builtin) { + this.dataTypes = dt; + this.builtinDataTypes = builtin; + for (Table t : this.schema.getTables().values()) { + correctDataTypes(t.getColumns()); } + for (Procedure p : this.schema.getProcedures().values()) { + correctDataTypes(p.getParameters()); + if (p.getResultSet() != null) { + correctDataTypes(p.getResultSet().getColumns()); + } + } } + + private void correctDataTypes(List<? extends BaseColumn> cols) { + if (cols == null) { + return; + } + for (BaseColumn c : cols) { + if (c.getDatatype() == null) { + continue; + } + Datatype dt = this.builtinDataTypes.get(c.getDatatype().getName()); + if (dt != null) { + c.setDatatype(dt); + } else { + //must be an enterprise type + //if it's used in a single schema, we're ok, but when used in multiple there's an issue + addDatatype(dt); + } + } + } public void addDatatype(Datatype datatype) { - if (this.dataTypes == null) { - this.dataTypes = new TreeMap<String, Datatype>(); - } - this.dataTypes.put(datatype.getName(), datatype); + this.builtinDataTypes.put(datatype.getName(), datatype); } public String getVdbName() { @@ -400,4 +436,18 @@ public Map<String, String> getNamespaces() { return namespaces; } + + public void setBuiltinDataTypes(Map<String, Datatype> builtinDataTypes) { + this.builtinDataTypes = builtinDataTypes; + } + + /** + * get all built-in types, known to Designer and defined in the system metadata. + * The entries are keyed by type name, which is typically the xsd type name. + * @see #getDataTypes() for run-time types + * @return + */ + public Map<String, Datatype> getBuiltinDataTypes() { + return builtinDataTypes; + } } Property changes on: trunk/api/src/main/java/org/teiid/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/util:3535-3555 /branches/7.6.x/api/src/main/java/org/teiid/util:3673-3711,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/util:4002-4046,4048-4051 /branches/8.1.x/api/src/main/java/org/teiid/util:4319-4342* /trunk/api/src/main/java/org/teiid/util:3188-3450,3452-3666 Property changes on: trunk/api/src/main/java/org/teiid/util/StAXSQLXML.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/util/StAXSQLXML.java:3535-3555 /branches/7.6.x/api/src/main/java/org/teiid/util/StAXSQLXML.java:3673-3711,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/util/StAXSQLXML.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/util/StAXSQLXML.java:4002-4046,4048-4051 /branches/8.1.x/api/src/main/java/org/teiid/util/StAXSQLXML.java:4319-4342 /trunk/api/src/main/java/org/teiid/util/StAXSQLXML.java:3188-3450,3452-3666 Property changes on: trunk/api/src/main/java/org/teiid/util/XMLInputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/util/XMLInputStream.java:3535-3555 /branches/7.6.x/api/src/main/java/org/teiid/util/XMLInputStream.java:3673-3711,3754-3769 /branches/7.7.x/api/src/main/java/org/teiid/util/XMLInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/main/java/org/teiid/util/XMLInputStream.java:4002-4046,4048-4051 /branches/8.1.x/api/src/main/java/org/teiid/util/XMLInputStream.java:4319-4342 /trunk/api/src/main/java/org/teiid/util/XMLInputStream.java:3188-3450,3452-3666 Property changes on: trunk/api/src/test/java/org/teiid/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/test/java/org/teiid/util:3535-3555 /branches/7.6.x/api/src/test/java/org/teiid/util:3673-3711,3754-3769 /branches/7.7.x/api/src/test/java/org/teiid/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/test/java/org/teiid/util:4002-4046,4048-4051 /branches/8.1.x/api/src/test/java/org/teiid/util:4319-4342* /trunk/api/src/test/java/org/teiid/util:3188-3450,3452-3666 Property changes on: trunk/api/src/test/java/org/teiid/util/TestXMLInputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/test/java/org/teiid/util/TestXMLInputStream.java:3535-3555 /branches/7.6.x/api/src/test/java/org/teiid/util/TestXMLInputStream.java:3673-3711,3754-3769 /branches/7.7.x/api/src/test/java/org/teiid/util/TestXMLInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/api/src/test/java/org/teiid/util/TestXMLInputStream.java:4002-4046,4048-4051 /branches/8.1.x/api/src/test/java/org/teiid/util/TestXMLInputStream.java:4319-4342 /trunk/api/src/test/java/org/teiid/util/TestXMLInputStream.java:3188-3450,3452-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*,3754-3769 /branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983 /branches/8.0.x/build/kits:4002-4046,4048-4051 /trunk/build/kits:3507-3666 + /branches/7.4.x/build/kits:3535-3555* /branches/7.6.x/build/kits:3673-3711*,3754-3769 /branches/7.7.x/build/kits:3816-3868,3876-3915,3920-3983 /branches/8.0.x/build/kits:4002-4046,4048-4051 /branches/8.1.x/build/kits:4319-4342 /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,3754-3769 /branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983 /branches/8.0.x/build/kits/adminshell:4002-4046,4048-4051 /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 /branches/7.7.x/build/kits/adminshell:3816-3868,3876-3915,3920-3983 /branches/8.0.x/build/kits/adminshell:4002-4046,4048-4051 /branches/8.1.x/build/kits/adminshell:4319-4342 /trunk/build/kits/adminshell:3507-3666 Added: trunk/build/kits/embedded/examples/embedded-portfolio/accounts.h2.db =================================================================== (Binary files differ) Property changes on: trunk/build/kits/embedded/examples/embedded-portfolio/accounts.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/build/kits/jboss-as7 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/8.0.x/build/kits/jboss-as7:4048-4051 + /branches/8.0.x/build/kits/jboss-as7:4048-4051 /branches/8.1.x/build/kits/jboss-as7:4319-4342 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*,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/client/util:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/java/org/teiid/client/util:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/jdbc:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/java/org/teiid/jdbc:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:4319-4342 /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 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:4319-4342 /trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:4002-4046,4048-4051 /trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666 + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/RequestOptions.java:4319-4342 /trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:4319-4342 /trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666 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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:4319-4342 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666 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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:4319-4342 /trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.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*,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/java/org/teiid/net/socket:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/java/org/teiid/net/socket:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:4319-4342 /trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666 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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/Handshake.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/Message.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/Message.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/Message.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:4319-4342 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666 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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:4002-4046,4048-4051 /branches/8.1.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/resources/org:4319-4342* /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*,3754-3769 /branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/resources/org/teiid:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/main/resources/org/teiid/jdbc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/main/resources/org/teiid/jdbc:4002-4046,4048-4051 /branches/8.1.x/client/src/main/resources/org/teiid/jdbc:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/main/resources/org/teiid/net:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/main/resources/org/teiid/net:4002-4046*,4048-4051* /branches/8.1.x/client/src/main/resources/org/teiid/net:4319-4342* /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*,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/test/java/org/teiid/client/plan:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/client/plan:4002-4046*,4048-4051* /branches/8.1.x/client/src/test/java/org/teiid/client/plan:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/test/java/org/teiid/client/util:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/client/util:4002-4046*,4048-4051* /branches/8.1.x/client/src/test/java/org/teiid/client/util:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/jdbc:4002-4046*,4048-4051* /branches/8.1.x/client/src/test/java/org/teiid/jdbc:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/jdbc/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/jdbc/util:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/jdbc/util:4319-4342 /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*,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*,4048-4051* /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 /branches/7.7.x/client/src/test/java/org/teiid/net:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/client/src/test/java/org/teiid/net:4002-4046*,4048-4051* /branches/8.1.x/client/src/test/java/org/teiid/net:4319-4342* /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:4319-4342 /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,3754-3769 /branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046,4048-4051 /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 /branches/7.7.x/client/src/test/java/org/teiid/net/socket:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client/src/test/java/org/teiid/net/socket:4002-4046,4048-4051 /branches/8.1.x/client/src/test/java/org/teiid/net/socket:4319-4342 /trunk/client/src/test/java/org/teiid/net/socket:3507-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/java:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/java:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/java:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/java:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/java:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/java/io ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/java/io:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/java/io:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/java/io:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/java/io:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/java/io:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/java/io:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/java/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/java/net:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/java/net:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/java/net:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/java/net:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/java/net:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/java/net:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/java/sql ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/java/sql:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/java/sql:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/java/sql:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/java/sql:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/java/sql:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/java/sql:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/java/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/java/util:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/java/util:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/java/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/java/util:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/java/util:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/java/util:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/javax ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/javax:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/javax:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/javax:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/javax:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/javax:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/javax:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/javax/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/javax/net:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/javax/net:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/javax/net:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/javax/net:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/javax/net:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/javax/net:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/javax/net/ssl:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/javax/net/ssl:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/javax/net/ssl:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/javax/net/ssl:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/javax/net/ssl:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/javax/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/javax/xml:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/javax/xml:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/javax/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/javax/xml:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/javax/xml:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/javax/xml:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/javax/xml/stream:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/javax/xml/stream:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/javax/xml/stream:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/javax/xml/stream:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/javax/xml/stream:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org/teiid:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/client:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/client:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/client:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/client:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/client:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/client/plan/_PlanNode.java:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/core:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/core:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/core:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/core:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/core:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:4319-4342* /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:3535-3555 /branches/7.6.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:4319-4342 /trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources:4319-4342* /trunk/client-jdk15/src/main/resources:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net:4319-4342* /trunk/client-jdk15/src/main/resources/net:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf:4319-4342* /trunk/client-jdk15/src/main/resources/net/sf:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator:4319-4342* /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:4319-4342* /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:4319-4342 /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:4319-4342 /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:4319-4342 /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties:3188-3450,3452-3666 Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:3535-3555 /branches/7.6.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:3673-3711,3754-3769 /branches/7.7.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:4002-4046,4048-4051 /branches/8.1.x/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:4319-4342 /trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties:3188-3450,3452-3666 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*,3754-3769 /branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/main/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/main/java/org:4319-4342* /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*,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/main/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/main/java/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid/core:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/main/java/org/teiid/core:4319-4342* /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/TeiidException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/crypto:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/crypto:4319-4342 /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*,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/main/java/org/teiid/core/types:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/main/java/org/teiid/core/types:4319-4342* /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:4319-4342 /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/BinaryType.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:4002-4046,4048-4051 /trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3507-3666 + /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/BinaryType.java:4319-4342 /trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:4319-4342 /trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666 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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:4319-4342 /trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666 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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/NullType.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/NullType.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:4319-4342 /trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666 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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/Transform.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/Transform.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:4319-4342 /trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666 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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/types/basic:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/main/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/main/java/org/teiid/core/util:4002-4046,4048-4051 /branches/8.1.x/common-core/src/main/java/org/teiid/core/util:4319-4342 /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*,3754-3769 /branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/test/java/org:4319-4342* /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*,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/test/java/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/core:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/test/java/org/teiid/core:4319-4342* /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/crypto:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/crypto:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/crypto:4319-4342 /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*,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/core/types:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/test/java/org/teiid/core/types:4319-4342* /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:4319-4342 /trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666 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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/types/basic:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/types/basic:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/types/basic:4319-4342 /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/core/util:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/core/util:4319-4342 /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*,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*,4048-4051* /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 /branches/7.7.x/common-core/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/common-core/src/test/java/org/teiid/query:4002-4046*,4048-4051* /branches/8.1.x/common-core/src/test/java/org/teiid/query:4319-4342* /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,3754-3769 /branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051 /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 /branches/7.7.x/common-core/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/common-core/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051 /branches/8.1.x/common-core/src/test/java/org/teiid/query/unittest:4319-4342 /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:4002-4046,4048-4051 /branches/8.1.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:4319-4342 /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/resources/org:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/resources/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/resources/org/teiid/resource:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:4002-4046,4048-4051 /branches/8.1.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:4319-4342 /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/test/java/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/test/java/org:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/test/java/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/test/java/org/teiid/resource:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:4002-4046,4048-4051 /branches/8.1.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:4319-4342 /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*,3754-3769 /branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:4002-4046,4048-4051 /branches/8.1.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:4319-4342 /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*,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ws/src/main/resources/org:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ws/src/main/resources/org/teiid:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ws/src/main/resources/org/teiid/resource:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:4319-4342* /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*,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:4002-4046*,4048-4051* /branches/8.1.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:4002-4046,4048-4051 /branches/8.1.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:4319-4342 /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,3754-3769 /branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:4002-4046,4048-4051 /branches/8.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:4319-4342 /trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666 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*,3754-3769 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:4002-4046*,4048-4051* /branches/8.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:4002-4046,4048-4051 /branches/8.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:4319-4342 /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,3754-3769 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:4002-4046,4048-4051 /branches/8.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:4319-4342 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666 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*,3754-3769 /branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator:4002-4046*,4048-4051* /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 /branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator:4002-4046*,4048-4051* /branches/8.1.x/connectors/translator-ldap/src/main/java/org/teiid/translator:4319-4342* /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,3754-3769 /branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:4002-4046,4048-4051 /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 /branches/7.7.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3816-3868,3876-3915,3920-3983 /branches/8.0.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:4002-4046,4048-4051 /branches/8.1.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:4319-4342 /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666 Property changes on: trunk/documentation/javadocs ___________________________________________________________________ Modified: svn:ignore - .project .settings bin + .project .settings bin target .classpath 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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/api:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/api:4319-4342* /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api/exception:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/api/exception:4319-4342* /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/common:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/common:4319-4342* /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:4319-4342 /trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -98,12 +98,13 @@ @Override public void free() { + fsos = null; lobBuffer.remove(); } @Override public StorageMode getStorageMode() { - if (fsos == null) { + if (fsos == null || fsos.bytesWritten()) { return StorageMode.PERSISTENT; } return StorageMode.MEMORY; 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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/STree.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/STree.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:4319-4342 /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/TupleBufferCache.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:4002-4046,4048-4051 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3507-3666 + /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:4319-4342 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBufferCache.java:3507-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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/impl:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/core:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/core:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/core/id:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/core/id:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/core/id:4319-4342 /trunk/engine/src/main/java/org/teiid/core/id:3507-3666 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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/analysis:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/analysis:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/eval:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/eval:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/eval:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/function:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/function:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/aggregate:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/aggregate:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/aggregate:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/metadata:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/metadata:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/function/source:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/function/source:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/mapping:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/relational:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/mapping/relational:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/mapping/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/mapping/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/metadata:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/metadata:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:4319-4342 /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,3754-3769,3776-3813 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:4002-4046,4048-4051 /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,3776-3813 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/optimizer/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/parser:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/parser:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/processor:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/processor:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:4319-4342 /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/RegisterRequestParameter.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/RegisterRequestParameter.java:3754-3769 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/RegisterRequestParameter.java:4319-4342 /trunk/engine/src/main/java/org/teiid/query/processor/RegisterRequestParameter.java:3507-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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/proc:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/proc:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/relational:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational:4319-4342 /trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -117,10 +117,10 @@ if (setState.maxNdv <= 0 || setState.maxNdv >= distinctCount) { continue; } - if (dvs.getTupleBuffer().getSchema().size() > 1) { + if (dvs.getTupleBuffer().getSchema().size() > 1 && dependentSetStates.size() > 1) { distinctCount = 0; ValueIterator vi = dvs.getValueIterator(setState.valueExpression); - if (dvs.getTupleBuffer().getSchema().indexOf(setState.valueExpression) == 0) { + if (setState.valueExpression.equals(dependentSetStates.get(0).valueExpression)) { Object last = null; while (vi.hasNext()) { Object next = vi.next(); Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -208,7 +208,7 @@ } its.closeSource(); this.reverseIndexes = new int[elements.size()]; - for (int i = 0; i < reverseIndexes.length; i++) { + for (int i = 0; i < reorderedSortIndex.length; i++) { int oldIndex = reorderedSortIndex[i]; this.reverseIndexes[oldIndex] = i + (!state.isDistinct()&&i>=keyLength-1?1:0); } Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -128,7 +128,7 @@ sortTypes.add(orderByItem.isAscending()); nullOrderings.add(orderByItem.getNullOrdering()); } - if (items.size() < schema.size() && mode != Mode.SORT) { + if (items.size() < schema.size() && mode == Mode.DUP_REMOVE_SORT) { List<Expression> toAdd = new ArrayList<Expression>(schema); toAdd.removeAll(sortElements); sortElements.addAll(toAdd); 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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/processor/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/processor/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/report:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/report:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/report:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/command:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/command:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/command:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/resolver/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/resolver/util:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/resolver/util:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/rewriter:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/rewriter:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/sql:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/sql:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/lang:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/lang:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/navigator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/navigator:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/navigator:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/proc:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/proc:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/symbol:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/symbol:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/util:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/util:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/sql/visitor:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/sql/visitor:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/tempdata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/tempdata:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/tempdata:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/util:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/util:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/validator:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/validator:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/xquery:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/query/xquery:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/query/xquery:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/query/xquery/saxon:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/query/xquery/saxon:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/main/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/main/java/org/teiid/vdb:4002-4046*,4048-4051* /branches/8.1.x/engine/src/main/java/org/teiid/vdb:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/main/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/java/org/teiid/vdb/runtime:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/java/org/teiid/vdb/runtime:4319-4342 /trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666 Property changes on: trunk/engine/src/main/resources/META-INF ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/resources/META-INF:3535-3555 /branches/7.6.x/engine/src/main/resources/META-INF:3673-3711,3754-3769 /branches/7.7.x/engine/src/main/resources/META-INF:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/resources/META-INF:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/resources/META-INF:4319-4342* /trunk/engine/src/main/resources/META-INF:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/resources/META-INF/services ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/resources/META-INF/services:3535-3555 /branches/7.6.x/engine/src/main/resources/META-INF/services:3673-3711,3754-3769 /branches/7.7.x/engine/src/main/resources/META-INF/services:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/resources/META-INF/services:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/resources/META-INF/services:4319-4342* /trunk/engine/src/main/resources/META-INF/services:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:3535-3555 /branches/7.6.x/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:3673-3711,3754-3769 /branches/7.7.x/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:4002-4046,4048-4051 /branches/8.1.x/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:4319-4342 /trunk/engine/src/main/resources/META-INF/services/org.teiid.PolicyDecider:3188-3450,3452-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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/cache:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/cache:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/cache:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/common:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/common:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/common:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/common/buffer:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/common/buffer:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/common/buffer:4319-4342 /trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -31,12 +31,14 @@ import java.util.List; import org.junit.Test; +import org.teiid.common.buffer.FileStore.FileStoreOutputStream; import org.teiid.common.buffer.LobManager.ReferenceMode; import org.teiid.common.buffer.impl.BufferManagerImpl; import org.teiid.core.types.BlobImpl; import org.teiid.core.types.BlobType; import org.teiid.core.types.ClobImpl; import org.teiid.core.types.ClobType; +import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.InputStreamFactory; import org.teiid.core.types.Streamable; import org.teiid.core.util.ObjectConverterUtil; @@ -65,12 +67,25 @@ return new ReaderInputStream(new StringReader("Blob contents Two"), Charset.forName(Streamable.ENCODING)); } - })); + })); - LobManager lobManager = new LobManager(new int[] {0, 1}, fs); + FileStore fs1 = buffMgr.createFileStore("blob"); + FileStoreInputStreamFactory fsisf = new FileStoreInputStreamFactory(fs1, Streamable.ENCODING); + FileStoreOutputStream fsos = fsisf.getOuputStream(); + byte[] b = new byte[DataTypeManager.MAX_LOB_MEMORY_BYTES + 1]; + fsos.write(b); + fsos.close(); + BlobType blob1 = new BlobType(new BlobImpl(fsisf)); + + assertNotNull(blob1.getReferenceStreamId()); + + LobManager lobManager = new LobManager(new int[] {0, 1, 2}, fs); lobManager.setMaxMemoryBytes(4); - List<?> tuple = Arrays.asList(clob, blob); + List<?> tuple = Arrays.asList(clob, blob, blob1); lobManager.updateReferences(tuple, ReferenceMode.CREATE); + + assertNotNull(blob1.getReferenceStreamId()); + lobManager.persist(); Streamable<?>lob = lobManager.getLobReference(clob.getReferenceStreamId()); 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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/common/queue:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/common/queue:4319-4342 /trunk/engine/src/test/java/org/teiid/common/queue:3507-3666 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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/analysis:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/analysis:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/analysis:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/function:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/function:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/metadata:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/metadata:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/function/source:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/function/source:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/function/source:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/mapping:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/mapping:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/mapping:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/mapping/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/mapping/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/mapping/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/metadata:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/metadata:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/metadata:4319-4342 /trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -37,6 +37,8 @@ import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.core.types.DataTypeManager; +import org.teiid.core.util.UnitTestUtil; +import org.teiid.metadata.Column; import org.teiid.metadata.Datatype; import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.Table; @@ -160,4 +162,23 @@ assertEquals(1, tm.getXMLSchemas(tm.getGroupID("x1.doc")).size()); } + @Test public void testTypeCorrection() throws Exception { + MetadataFactory mf = new MetadataFactory(null, 1, "x", SystemMetadata.getInstance().getBuiltinTypeMap(), new Properties(), null); //$NON-NLS-1$ + mf.setBuiltinDataTypes(SystemMetadata.getInstance().getSystemStore().getDatatypes()); + + Table t = mf.addTable("y"); //$NON-NLS-1$ + mf.addColumn("test", "string", t); + + MetadataFactory mf1 = UnitTestUtil.helpSerialize(mf); + + Column column = mf1.getSchema().getTable("y").getColumns().get(0); + Datatype dt = column.getDatatype(); + + assertNotSame(mf.getBuiltinDataTypes().get(dt.getName()), column.getDatatype()); + + mf1.correctDatatypes(mf.getDataTypes(), mf.getBuiltinDataTypes()); + + assertSame(mf.getBuiltinDataTypes().get(dt.getName()), column.getDatatype()); + } + } 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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:4319-4342 /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,3754-3769,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:4002-4046,4048-4051 /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,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/proc:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/proc:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/optimizer/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/parser:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/parser:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/parser:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/processor:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/processor:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3816-3868,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:4319-4342 /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/TestCommonTableOptimizations.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCommonTableOptimizations.java:3754-3769 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestCommonTableOptimizations.java:4319-4342 /trunk/engine/src/test/java/org/teiid/query/processor/TestCommonTableOptimizations.java:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -1097,5 +1097,33 @@ List<? extends List<?>> vals = s.getDependentValues().values().iterator().next(); assertEquals(1, vals.size()); } + + @Test public void testIndependentDupRemoval() { + // Create query + String sql = "SELECT pm1.g1.e1, pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE pm2.g1.e1=pm1.g1.e1 AND pm1.g1.e2<pm2.g1.e2 order by pm1.g1.e1 option makedep pm1.g1"; //$NON-NLS-1$ + + // Create expected results + List[] expected = new List[] { + Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$ + Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$ + }; + + BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities(); + caps.setSourceProperty(Capability.MAX_IN_CRITERIA_SIZE, 1); + caps.setSourceProperty(Capability.MAX_DEPENDENT_PREDICATES, 1); + caps.setCapabilitySupport(Capability.QUERY_ORDERBY, false); + + QueryMetadataInterface fakeMetadata = RealMetadataFactory.example1Cached(); + + Command command = TestProcessor.helpParse(sql); + ProcessorPlan plan = TestProcessor.helpGetPlan(command, fakeMetadata, new DefaultCapabilitiesFinder(caps)); + + // Construct data manager with data + FakeDataManager dataManager = new FakeDataManager(); + TestProcessor.sampleData1(dataManager); + + // Run query + TestProcessor.helpProcess(plan, dataManager, expected); + } } 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,3754-3769,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:4002-4046,4048-4051 /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,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:4319-4342 /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,3754-3769,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:4002-4046,4048-4051 /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,3776-3813 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/eval:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/eval:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/eval:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/proc:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/proc:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/relational:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational:4319-4342 /trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -599,6 +599,64 @@ helpTestJoin(); } + @Test public void testMergeJoinOptimizationRepeatedElements() throws Exception { + this.joinType = JoinType.JOIN_INNER; + this.leftTuples = createMultiColTuples(9, 2); + this.rightTuples = new List[100]; + for (int i = 0; i < rightTuples.length; i++) { + rightTuples[i] = new ArrayList(this.leftTuples[i%this.leftTuples.length]); + if (i == 0) { + rightTuples[i].add(1, rightTuples[i].get(0)); + } else { + rightTuples[i].add(1, (Integer)rightTuples[i].get(0) + 1); + } + } + + expected = new List[] { + Arrays.asList(new Object[] { 0, 17, 0, 0, 17 }), + }; + ElementSymbol es1 = new ElementSymbol("e1"); //$NON-NLS-1$ + es1.setType(DataTypeManager.DefaultDataClasses.INTEGER); + ElementSymbol es2 = new ElementSymbol("e2"); //$NON-NLS-1$ + es2.setType(DataTypeManager.DefaultDataClasses.INTEGER); + ElementSymbol es3 = new ElementSymbol("e3"); //$NON-NLS-1$ + es1.setType(DataTypeManager.DefaultDataClasses.INTEGER); + ElementSymbol es4 = new ElementSymbol("e4"); //$NON-NLS-1$ + es2.setType(DataTypeManager.DefaultDataClasses.INTEGER); + ElementSymbol es5 = new ElementSymbol("e5"); //$NON-NLS-1$ + es2.setType(DataTypeManager.DefaultDataClasses.INTEGER); + + leftNode = new FakeRelationalNode(1, leftTuples); + leftNode.setElements(Arrays.asList(es1, es2)); + + rightNode = new FakeRelationalNode(2, rightTuples); + rightNode.setElements(Arrays.asList(es3, es4, es5)); + + List joinElements = new ArrayList(); + joinElements.addAll(leftNode.getElements()); + joinElements.addAll(rightNode.getElements()); + + join = new JoinNode(3); + join.setElements(joinElements); + join.setJoinType(joinType); + join.setJoinExpressions(Arrays.asList(es1, es1, es2), Arrays.asList(es3, es4, es5)); + join.setJoinStrategy(joinStrategy); + this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT); + this.join.setJoinStrategy(joinStrategy); + helpTestJoinDirect(expected, 10, 1); + } + + private List[] createMultiColTuples(int rows, int cols) { + List[] data = new List[rows]; + for(int i=0; i<rows; i++) { + data[i] = new ArrayList(); + for (int j = 0; j < cols; j++) { + data[i].add(((i+j)*17) % 47); + } + } + return data; + } + @Test public void testMergeJoinOptimization() throws Exception { helpTestEnhancedSortMergeJoin(99); } Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -245,24 +245,16 @@ @Test public void testBasicSortRemoveDup() throws Exception { List[] expected = new List[] { Arrays.asList(new Object[] { new Integer(0), "0" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(0), "3" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(1), "2" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(1), "5" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(2), "1" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(2), "4" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(3), "3" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(3), "6" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(4), "3" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(5), "2" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(5), "5" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(6), "1" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(6), "4" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(7), "3" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(8), "2" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(9), "1" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(9), "5" }), //$NON-NLS-1$ Arrays.asList(new Object[] { new Integer(10), "4" }), //$NON-NLS-1$ - Arrays.asList(new Object[] { new Integer(10), "9" }) //$NON-NLS-1$ }; helpTestBasicSort(expected, Mode.DUP_REMOVE); 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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/processor/xml:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/processor/xml:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/resolver:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/resolver:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/resolver:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/rewriter:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/rewriter:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/rewriter:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/query/sql:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/query/sql:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/lang:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/lang:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/sql/lang:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/proc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/proc:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/sql/proc:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/symbol:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/symbol:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/sql/symbol:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/util:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/sql/util:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/sql/visitor:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/sql/visitor:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/sql/visitor:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/unittest:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/unittest:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/util:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/util:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/query/validator:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/query/validator:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/query/validator:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/java/org/teiid/vdb:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/java/org/teiid/vdb:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/java/org/teiid/vdb:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/java/org/teiid/vdb/runtime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/java/org/teiid/vdb/runtime:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/java/org/teiid/vdb/runtime:4319-4342 /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*,3754-3769 /branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/resources/text:4002-4046*,4048-4051* /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 /branches/7.7.x/engine/src/test/resources/text:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/engine/src/test/resources/text:4002-4046*,4048-4051* /branches/8.1.x/engine/src/test/resources/text:4319-4342* /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,3754-3769 /branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/resources/text/cdm_dos.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/cdm_dos.txt:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/resources/text/cdm_dos.txt:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/resources/text/cdm_dos_win.txt:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/cdm_dos_win.txt:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/resources/text/cdm_dos_win.txt:4319-4342 /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,3754-3769 /branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046,4048-4051 /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 /branches/7.7.x/engine/src/test/resources/text/test-file.txt.csv:3816-3868,3876-3915,3920-3983 /branches/8.0.x/engine/src/test/resources/text/test-file.txt.csv:4002-4046,4048-4051 /branches/8.1.x/engine/src/test/resources/text/test-file.txt.csv:4319-4342 /trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666 Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -76,7 +76,6 @@ import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.MetadataRepository; import org.teiid.metadata.MetadataStore; -import org.teiid.metadata.index.IndexMetadataRepository; import org.teiid.query.ObjectReplicator; import org.teiid.query.metadata.TransformationMetadata; import org.teiid.query.metadata.TransformationMetadata.Resource; @@ -340,23 +339,20 @@ @Override public void run() { - boolean metadataLoaded = false; boolean cached = false; Exception ex = null; - + // designer based models define data types based on their built in data types, which are system vdb data types + Map<String, Datatype> datatypes = getVDBRepository().getBuiltinDatatypes(); + Map<String, Datatype> builtin = getVDBRepository().getSystemStore().getDatatypes(); final File cachedFile = getSerializer().buildModelFile(vdb, model.getName()); MetadataFactory factory = getSerializer().loadSafe(cachedFile, MetadataFactory.class); if (factory != null) { - metadataLoaded = true; + factory.correctDatatypes(datatypes, builtin); cached = true; LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(), "in VDB ", vdb.getName(), " was loaded from cached metadata"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - if (!metadataLoaded) { - boolean indexStore = (metadataRepo instanceof IndexMetadataRepository); - // designer based models define data types based on their built in data types, which are system vdb data types - Map<String, Datatype> datatypes = indexStore?getVDBRepository().getSystemStore().getDatatypes():getVDBRepository().getBuiltinDatatypes(); + } else { factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(), datatypes, model.getProperties(), model.getSchemaText()); + factory.setBuiltinDataTypes(builtin); factory.getSchema().setPhysical(model.isSource()); ExecutionFactory ef = null; @@ -374,14 +370,13 @@ try { metadataRepo.loadMetadata(factory, ef, cf); LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50030,vdb.getName(), vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date()))); - metadataLoaded = true; } catch (Exception e) { ex = e; } } synchronized (vdb) { - if (metadataLoaded) { + if (ex == null) { if (!cached) { // cache the schema to disk cacheMetadataStore(model, factory); Property changes on: trunk/jboss-integration/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,3754-3769 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:4002-4046,4048-4051 /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 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:4002-4046,4048-4051 /branches/8.1.x/jboss-integration/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:4319-4342 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666 Property changes on: trunk/jboss-integration/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,3754-3769 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:4002-4046,4048-4051 /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 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:4002-4046,4048-4051 /branches/8.1.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:4319-4342 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666 Property changes on: trunk/jboss-integration/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,3754-3769 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:4002-4046,4048-4051 /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 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:4002-4046,4048-4051 /branches/8.1.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:4319-4342 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666 Property changes on: trunk/jboss-integration/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,3754-3769 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:4002-4046,4048-4051 /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 /branches/7.7.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:4002-4046,4048-4051 /branches/8.1.x/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:4319-4342 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666 Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -41,7 +41,7 @@ throws TranslatorException { try { if (this.idxStore.getSchema(factory.getName()) == null) { - this.idxStore.load(factory.getName(), factory.getDataTypes() == null?null:factory.getDataTypes().values()); + this.idxStore.load(factory.getName(), factory.getBuiltinDataTypes().values()); } if (this.idxStore.getSchema(factory.getName()) == null) { throw new TranslatorException(RuntimeMetadataPlugin.Util.gs(RuntimeMetadataPlugin.Event.TEIID80004, factory.getName())); 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*,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*,4048-4051* /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 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/cdk:4002-4046*,4048-4051* /branches/8.1.x/metadata/src/test/java/org/teiid/cdk:4319-4342* /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,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051 /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 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051 /branches/8.1.x/metadata/src/test/java/org/teiid/cdk/api:4319-4342 /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,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046,4048-4051 /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 /branches/7.7.x/metadata/src/test/java/org/teiid/cdk/unittest:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/cdk/unittest:4002-4046,4048-4051 /branches/8.1.x/metadata/src/test/java/org/teiid/cdk/unittest:4319-4342 /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*,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*,4048-4051* /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 /branches/7.7.x/metadata/src/test/java/org/teiid/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/core:4002-4046*,4048-4051* /branches/8.1.x/metadata/src/test/java/org/teiid/core:4319-4342* /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,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046,4048-4051 /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 /branches/7.7.x/metadata/src/test/java/org/teiid/core/util:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/core/util:4002-4046,4048-4051 /branches/8.1.x/metadata/src/test/java/org/teiid/core/util:4319-4342 /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*,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*,4048-4051* /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 /branches/7.7.x/metadata/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/internal:4002-4046*,4048-4051* /branches/8.1.x/metadata/src/test/java/org/teiid/internal:4319-4342* /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*,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051* /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 /branches/7.7.x/metadata/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/metadata/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051* /branches/8.1.x/metadata/src/test/java/org/teiid/internal/core:4319-4342* /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,3754-3769 /branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4046,4048-4051 /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 /branches/7.7.x/metadata/src/test/java/org/teiid/internal/core/index:3816-3868,3876-3915,3920-3983 /branches/8.0.x/metadata/src/test/java/org/teiid/internal/core/index:4002-4046,4048-4051 /branches/8.1.x/metadata/src/test/java/org/teiid/internal/core/index:4319-4342 /trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666 Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-20 14:50:35 UTC (rev 4342) +++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-20 16:53:29 UTC (rev 4343) @@ -537,6 +537,7 @@ AtomicInteger loadCount) throws TranslatorException { Map<String, Datatype> datatypes = this.repo.getBuiltinDatatypes(); MetadataFactory factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(), datatypes, model.getProperties(), model.getSchemaText()); + factory.setBuiltinDataTypes(this.repo.getSystemStore().getDatatypes()); factory.getSchema().setPhysical(model.isSource()); ExecutionFactory ef = null; 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,3754-3769 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:4002-4046,4048-4051 /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 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:4002-4046,4048-4051 /branches/8.1.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:4319-4342 /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*,3754-3769 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*,4048-4051* /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 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg:4002-4046*,4048-4051* /branches/8.1.x/runtime/src/main/java/org/teiid/transport/pg:4319-4342* /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,3754-3769 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4002-4046,4048-4051 /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 /branches/7.7.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4002-4046,4048-4051 /branches/8.1.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:4319-4342 /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*,3754-3769 /branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*,4048-4051* /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 /branches/7.7.x/runtime/src/main/resources/org/teiid/transport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/main/resources/org/teiid/transport:4002-4046*,4048-4051* /branches/8.1.x/runtime/src/main/resources/org/teiid/transport:4319-4342* /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*,3754-3769 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*,4048-4051* /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 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/test/java/org/teiid/dqp:4002-4046*,4048-4051* /branches/8.1.x/runtime/src/test/java/org/teiid/dqp:4319-4342* /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*,3754-3769 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*,4048-4051* /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 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service:4002-4046*,4048-4051* /branches/8.1.x/runtime/src/test/java/org/teiid/dqp/service:4319-4342* /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,3754-3769 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046,4048-4051 /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 /branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4002-4046,4048-4051 /branches/8.1.x/runtime/src/test/java/org/teiid/dqp/service/buffer:4319-4342 /trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666 Property changes on: trunk/runtime/src/test/java/org/teiid/runtime ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/test/java/org/teiid/runtime:3535-3555 /branches/7.6.x/runtime/src/test/java/org/teiid/runtime:3673-3711,3754-3769 /branches/7.7.x/runtime/src/test/java/org/teiid/runtime:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/test/java/org/teiid/runtime:4002-4046,4048-4051 /branches/8.1.x/runtime/src/test/java/org/teiid/runtime:4319-4342* /trunk/runtime/src/test/java/org/teiid/runtime:3188-3450,3452-3666 Property changes on: trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:3535-3555 /branches/7.6.x/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:3673-3711,3754-3769 /branches/7.7.x/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:4002-4046,4048-4051 /branches/8.1.x/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:4319-4342 /trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java:3188-3450,3452-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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/java/org/teiid/cdk:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk/api:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/cdk/api:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/java/org/teiid/cdk/api:4319-4342 /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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/java/org/teiid/dqp:4319-4342* /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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/java/org/teiid/dqp/internal:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:4319-4342 /trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666 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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/java/org/teiid/transport:4319-4342* /trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666 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,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3816-3868,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3816-3868,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:4319-4342 /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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:4319-4342 /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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/resources/TestODBCSocketTransport:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:4319-4342 /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*,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel:4002-4046*,4048-4051* /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:4319-4342 /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/testProperties.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected:3754-3769 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected:4319-4342 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected:3507-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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:4319-4342 /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,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:4319-4342 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:3673-3711,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:4319-4342* /trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:3673-3711,3754-3769 /branches/7.7.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:4002-4046,4048-4051 /branches/8.1.x/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:4319-4342 /trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected:3188-3450,3452-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*,3754-3769 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal:4002-4046*,4048-4051* /branches/8.1.x/test-integration/db/src/main/java/org/teiid/internal:4319-4342* /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*,3754-3769 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core:4002-4046*,4048-4051* /branches/8.1.x/test-integration/db/src/main/java/org/teiid/internal/core:4319-4342* /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,3754-3769 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:4002-4046,4048-4051 /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 /branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3816-3868,3876-3915,3920-3983 /branches/8.0.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:4002-4046,4048-4051 /branches/8.1.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:4319-4342 /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*,3754-3769 /branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/db/src/test/java/com:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/com:4002-4046*,4048-4051* /branches/8.1.x/test-integration/db/src/test/java/com:4319-4342* /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*,3754-3769 /branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal:4002-4046*,4048-4051* /branches/8.1.x/test-integration/db/src/test/java/org/teiid/internal:4319-4342* /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*,3754-3769 /branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051* /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 /branches/7.7.x/test-integration/db/src/test/java/org/teiid/internal/core:3816-3868*,3876-3915*,3920-3983* /branches/8.0.x/test-integration/db/src/test/java/org/teiid/internal/core:4002-4046*,4048-4051* /branches/8.1.x/test-integration/db/src/test/java/org/teiid/internal/core:4319-4342* /trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666