[teiid-commits] teiid SVN: r4047 - in trunk: admin/src/main/java/org/teiid/adminapi/impl and 219 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue May 1 15:12:44 EDT 2012
Author: shawkins
Date: 2012-05-01 15:12:27 -0400 (Tue, 01 May 2012)
New Revision: 4047
Added:
trunk/client/src/main/java/org/teiid/client/security/Secure.java
Removed:
trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java
Modified:
trunk/
trunk/admin/src/main/java/org/teiid/adminapi/impl/AdminObjectImpl.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/DataPolicyMetadata.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData.java
trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java
trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
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/FunctionMethod.java
trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java
trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java
trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
trunk/build/kits/
trunk/build/kits/adminshell/
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
trunk/client/src/main/java/org/teiid/client/DQP.java
trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java
trunk/client/src/main/java/org/teiid/client/security/ILogon.java
trunk/client/src/main/java/org/teiid/client/util/
trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java
trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java
trunk/client/src/main/java/org/teiid/jdbc/
trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java
trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java
trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java
trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java
trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java
trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/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/TeiidURL.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/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.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/jdbc/i18n.properties
trunk/client/src/main/resources/org/teiid/net/
trunk/client/src/main/resources/teiid-client-settings.orig.properties
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/main/java/org/teiid/core/util/HashCodeUtil.java
trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.java
trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java
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-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/
trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/
trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java
trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
trunk/documentation/javadocs/
trunk/documentation/javadocs/pom.xml
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/dqp/internal/datamgr/CapabilitiesConverter.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidator.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthorizationValidator.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
trunk/engine/src/main/java/org/teiid/query/
trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java
trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java
trunk/engine/src/main/java/org/teiid/query/analysis/
trunk/engine/src/main/java/org/teiid/query/eval/
trunk/engine/src/main/java/org/teiid/query/function/
trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java
trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java
trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java
trunk/engine/src/main/java/org/teiid/query/function/aggregate/
trunk/engine/src/main/java/org/teiid/query/function/metadata/
trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataReader.java
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/metadata/MetadataValidator.java
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/relational/rules/RulePlanSorts.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/
trunk/engine/src/main/java/org/teiid/query/parser/
trunk/engine/src/main/java/org/teiid/query/processor/
trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java
trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java
trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java
trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
trunk/engine/src/main/java/org/teiid/query/processor/proc/
trunk/engine/src/main/java/org/teiid/query/processor/relational/
trunk/engine/src/main/java/org/teiid/query/processor/xml/
trunk/engine/src/main/java/org/teiid/query/report/
trunk/engine/src/main/java/org/teiid/query/resolver/
trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/command/
trunk/engine/src/main/java/org/teiid/query/resolver/util/
trunk/engine/src/main/java/org/teiid/query/rewriter/
trunk/engine/src/main/java/org/teiid/query/sql/
trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java
trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java
trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java
trunk/engine/src/main/java/org/teiid/query/sql/lang/
trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.java
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/tempdata/GlobalTableStoreImpl.java
trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
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/java/org/teiid/vdb/runtime/VDBKey.java
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
trunk/engine/src/test/java/org/teiid/cache/
trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java
trunk/engine/src/test/java/org/teiid/common/
trunk/engine/src/test/java/org/teiid/common/buffer/
trunk/engine/src/test/java/org/teiid/common/queue/
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java
trunk/engine/src/test/java/org/teiid/query/
trunk/engine/src/test/java/org/teiid/query/analysis/
trunk/engine/src/test/java/org/teiid/query/function/
trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java
trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java
trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java
trunk/engine/src/test/java/org/teiid/query/function/metadata/
trunk/engine/src/test/java/org/teiid/query/function/source/
trunk/engine/src/test/java/org/teiid/query/mapping/
trunk/engine/src/test/java/org/teiid/query/mapping/xml/
trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutputter.java
trunk/engine/src/test/java/org/teiid/query/metadata/
trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.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/TestDependentJoins.java
trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java
trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java
trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java
trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java
trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
trunk/engine/src/test/java/org/teiid/query/processor/eval/
trunk/engine/src/test/java/org/teiid/query/processor/proc/
trunk/engine/src/test/java/org/teiid/query/processor/relational/
trunk/engine/src/test/java/org/teiid/query/processor/xml/
trunk/engine/src/test/java/org/teiid/query/resolver/
trunk/engine/src/test/java/org/teiid/query/rewriter/
trunk/engine/src/test/java/org/teiid/query/sql/
trunk/engine/src/test/java/org/teiid/query/sql/lang/
trunk/engine/src/test/java/org/teiid/query/sql/proc/
trunk/engine/src/test/java/org/teiid/query/sql/symbol/
trunk/engine/src/test/java/org/teiid/query/sql/util/
trunk/engine/src/test/java/org/teiid/query/sql/visitor/
trunk/engine/src/test/java/org/teiid/query/unittest/
trunk/engine/src/test/java/org/teiid/query/util/
trunk/engine/src/test/java/org/teiid/query/validator/
trunk/engine/src/test/java/org/teiid/vdb/
trunk/engine/src/test/java/org/teiid/vdb/runtime/
trunk/engine/src/test/resources/text/
trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv
trunk/engine/src/test/resources/text/cdm_dos.txt
trunk/engine/src/test/resources/text/cdm_dos_win.txt
trunk/engine/src/test/resources/text/test-file.txt.csv
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
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/IndexMetadataStore.java
trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
trunk/metadata/src/test/java/org/teiid/cdk/
trunk/metadata/src/test/java/org/teiid/cdk/api/
trunk/metadata/src/test/java/org/teiid/cdk/unittest/
trunk/metadata/src/test/java/org/teiid/core/
trunk/metadata/src/test/java/org/teiid/core/util/
trunk/metadata/src/test/java/org/teiid/internal/
trunk/metadata/src/test/java/org/teiid/internal/core/
trunk/metadata/src/test/java/org/teiid/internal/core/index/
trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.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/deployers/TestCompositeVDB.java
trunk/runtime/src/test/java/org/teiid/dqp/
trunk/runtime/src/test/java/org/teiid/dqp/service/
trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/
trunk/test-integration/common/src/test/java/org/teiid/cdk/
trunk/test-integration/common/src/test/java/org/teiid/cdk/api/
trunk/test-integration/common/src/test/java/org/teiid/dqp/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/
trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/
trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
trunk/test-integration/common/src/test/java/org/teiid/transport/
trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
trunk/test-integration/db/src/main/java/org/teiid/internal/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/
trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/
trunk/test-integration/db/src/test/java/com/
trunk/test-integration/db/src/test/java/org/teiid/internal/
trunk/test-integration/db/src/test/java/org/teiid/internal/core/
Log:
forward merge from 8.0
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
/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
/trunk:3188-3450,3452-3666
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/AdminObjectImpl.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/AdminObjectImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/AdminObjectImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,12 +28,9 @@
import java.util.Map;
import java.util.Properties;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
import org.teiid.adminapi.AdminObject;
- at XmlAccessorType(XmlAccessType.NONE)
public abstract class AdminObjectImpl implements AdminObject, Serializable {
private static final long serialVersionUID = -6381303538713462682L;
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/DataPolicyMetadata.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/DataPolicyMetadata.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/DataPolicyMetadata.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -25,30 +25,18 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.*;
import org.teiid.adminapi.DataPolicy;
- at XmlAccessorType(XmlAccessType.NONE)
- at XmlType(name = "", propOrder = {
- "description",
- "permissions",
- "mappedRoleNames"
-})
public class DataPolicyMetadata implements DataPolicy, Serializable {
private static final long serialVersionUID = -4119646357275977190L;
- @XmlAttribute(name = "name", required = true)
protected String name;
- @XmlElement(name = "description")
protected String description;
- @XmlAttribute(name = "any-authenticated")
protected boolean anyAuthenticated;
- @XmlAttribute(name = "allow-create-temporary-tables")
protected Boolean allowCreateTemporaryTables;
- @XmlElement(name = "permission")
protected PermissionMap permissions = new PermissionMap(new KeyBuilder<PermissionMetaData>() {
private static final long serialVersionUID = -6992984146431492449L;
@Override
@@ -57,7 +45,6 @@
}
});
- @XmlElement(name = "mapped-role-name")
protected List<String> mappedRoleNames = new ArrayList<String>();
@Override
@@ -129,37 +116,19 @@
return false;
}
-
- @XmlAccessorType(XmlAccessType.NONE)
- @XmlType(name = "", propOrder = {
- "resourceName",
- "allowCreate",
- "allowRead",
- "allowUpdate",
- "allowDelete",
- "allowExecute",
- "allowAlter"
- })
public static class PermissionMetaData implements DataPermission, Serializable {
private static final long serialVersionUID = 7034744531663164277L;
// XML based fields
private String resourceName;
- @XmlElement(name = "allow-create")
protected Boolean allowCreate;
- @XmlElement(name = "allow-read")
protected Boolean allowRead;
- @XmlElement(name = "allow-update")
protected Boolean allowUpdate;
- @XmlElement(name = "allow-delete")
protected Boolean allowDelete;
- @XmlElement(name = "allow-execute")
protected Boolean allowExecute;
- @XmlElement(name = "allow-alter")
protected Boolean allowAlter;
@Override
- @XmlElement(name = "resource-name", required = true)
public String getResourceName() {
return resourceName;
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,26 +28,16 @@
import java.util.LinkedList;
import java.util.List;
-import javax.xml.bind.annotation.*;
-
import org.teiid.adminapi.Model;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
- at XmlAccessorType(XmlAccessType.NONE)
- at XmlType(name = "", propOrder = {
- "description",
- "JAXBProperties",
- "sources",
- "errors"
-})
public class ModelMetaData extends AdminObjectImpl implements Model {
private static final int DEFAULT_ERROR_HISTORY = 10;
private static final String SUPPORTS_MULTI_SOURCE_BINDINGS_KEY = "supports-multi-source-bindings"; //$NON-NLS-1$
private static final long serialVersionUID = 3714234763056162230L;
- @XmlElement(name = "source")
protected ListOverMap<SourceMappingMetadata> sources = new ListOverMap<SourceMappingMetadata>(new KeyBuilder<SourceMappingMetadata>() {
private static final long serialVersionUID = 2273673984691112369L;
@@ -57,26 +47,14 @@
}
});
- @XmlAttribute(name = "type")
protected String modelType = Type.PHYSICAL.name();
-
- @XmlElement(name = "description")
protected String description;
-
- @XmlAttribute(name = "path")
protected String path;
-
- @XmlAttribute(name = "visible")
protected Boolean visible = true;
-
- @XmlElement(name = "validation-error")
protected List<ValidationError> errors;
-
protected String schemaSourceType;
-
protected String schemaText;
-
- @XmlAttribute(name = "name", required = true)
+
public String getName() {
return super.getName();
}
@@ -108,7 +86,7 @@
@Override
public Type getModelType() {
try {
- return Type.valueOf(modelType.toUpperCase());
+ return Type.valueOf(modelType);
} catch(IllegalArgumentException e) {
return Type.OTHER;
}
@@ -129,7 +107,6 @@
}
@Override
- @XmlElement(name = "property", type = PropertyMetadata.class)
public List<PropertyMetadata> getJAXBProperties(){
return super.getJAXBProperties();
}
@@ -143,7 +120,11 @@
}
public void setModelType(String modelType) {
- this.modelType = modelType;
+ if (modelType != null) {
+ this.modelType = modelType.toUpperCase();
+ } else {
+ this.modelType = null;
+ }
}
public String toString() {
@@ -255,22 +236,13 @@
this.errors.clear();
}
- @XmlAccessorType(XmlAccessType.NONE)
- @XmlType(name = "", propOrder = {
- "value"
- })
public static class ValidationError implements Serializable{
private static final long serialVersionUID = 2044197069467559527L;
public enum Severity {ERROR, WARNING};
- @XmlValue
protected String value;
-
- @XmlAttribute(name = "severity", required = true)
protected String severity;
-
- @XmlAttribute(name = "path")
protected String path;
public ValidationError() {};
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/PropertyMetadata.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,11 +24,6 @@
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
/**
* <pre>
* <complexType name="property">
@@ -43,14 +38,10 @@
*
*
*/
- at XmlAccessorType(XmlAccessType.NONE)
- at XmlType(name = "property")
public class PropertyMetadata implements Serializable{
private static final long serialVersionUID = -5040224539939758816L;
- @XmlAttribute(name = "name", required = true)
protected String name;
- @XmlAttribute(name = "value", required = true)
protected String value;
public PropertyMetadata() {
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,23 +24,11 @@
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
- at XmlAccessorType(XmlAccessType.NONE)
- at XmlType(name = "")
public class SourceMappingMetadata implements Serializable {
private static final long serialVersionUID = -4417878417697685794L;
- @XmlAttribute(name = "name", required = true)
private String name;
-
- @XmlAttribute(name = "connection-jndi-name")
private String jndiName;
-
- @XmlAttribute(name = "translator-name",required = true)
private String translatorName;
public SourceMappingMetadata() {}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,8 +24,6 @@
import java.net.URL;
import java.util.*;
-import javax.xml.bind.annotation.*;
-
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
@@ -34,15 +32,6 @@
import org.teiid.core.util.StringUtil;
- at XmlAccessorType(XmlAccessType.NONE)
- at XmlType(name = "", propOrder = {
- "description",
- "JAXBProperties",
- "models",
- "translators",
- "dataPolicies"
-})
- at XmlRootElement(name = "vdb")
public class VDBMetaData extends AdminObjectImpl implements VDB {
private static final String VERSION_DELIM = "."; //$NON-NLS-1$
@@ -53,7 +42,6 @@
* This simulating a list over a map. JAXB requires a list and performance recommends
* map and we would like to keep one variable to represent both.
*/
- @XmlElement(name = "model", required = true, type = ModelMetaData.class)
protected ListOverMap<ModelMetaData> models = new ListOverMap<ModelMetaData>(new KeyBuilder<ModelMetaData>() {
private static final long serialVersionUID = 846247100420118961L;
@@ -63,7 +51,6 @@
}
});
- @XmlElement(name = "translator", required = true, type = VDBTranslatorMetaData.class)
protected ListOverMap<VDBTranslatorMetaData> translators = new ListOverMap<VDBTranslatorMetaData>(new KeyBuilder<VDBTranslatorMetaData>() {
private static final long serialVersionUID = 3890502172003653563L;
@@ -73,7 +60,6 @@
}
});
- @XmlElement(name = "data-role", required = true, type = DataPolicyMetadata.class)
protected ListOverMap<DataPolicyMetadata> dataPolicies = new ListOverMap<DataPolicyMetadata>(new KeyBuilder<DataPolicyMetadata>() {
private static final long serialVersionUID = 4954591545242715254L;
@@ -83,10 +69,8 @@
}
});
- @XmlAttribute(name = "version", required = true)
private int version = 1;
- @XmlElement(name = "description")
protected String description;
private String fileUrl = null;
@@ -96,7 +80,6 @@
private boolean removed;
private long queryTimeout = Long.MIN_VALUE;
- @XmlAttribute(name = "name", required = true)
public String getName() {
return super.getName();
}
@@ -300,7 +283,6 @@
// This one manages the JAXB binding
@Override
- @XmlElement(name = "property", type = PropertyMetadata.class)
public List<PropertyMetadata> getJAXBProperties(){
return super.getJAXBProperties();
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -39,7 +39,6 @@
import org.teiid.adminapi.AdminPlugin;
import org.teiid.adminapi.DataPolicy;
-import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
@@ -219,7 +218,7 @@
private static void parseModel(XMLStreamReader reader, ModelMetaData model) throws XMLStreamException {
Properties props = getAttributes(reader);
model.setName(props.getProperty(Element.NAME.getLocalName()));
- model.setModelType(Model.Type.valueOf(props.getProperty(Element.TYPE.getLocalName(), "PHYSICAL")));
+ model.setModelType(props.getProperty(Element.TYPE.getLocalName(), "PHYSICAL"));
model.setVisible(Boolean.parseBoolean(props.getProperty(Element.VISIBLE.getLocalName(), "true")));
model.setPath(props.getProperty(Element.PATH.getLocalName()));
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBTranslatorMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -23,15 +23,9 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
import org.teiid.adminapi.Translator;
- at XmlAccessorType(XmlAccessType.NONE)
public class VDBTranslatorMetaData extends AdminObjectImpl implements Translator {
private static final long serialVersionUID = -3454161477587996138L;
private String type;
@@ -44,7 +38,6 @@
return super.getName();
}
- @XmlAttribute(name = "name", required = true)
public void setName(String name) {
super.setName(name);
}
@@ -54,13 +47,11 @@
return type;
}
- @XmlAttribute(name = "type",required = true)
public void setType(String type) {
this.type = type;
}
@Override
- @XmlElement(name = "property", type = PropertyMetadata.class)
public List<PropertyMetadata> getJAXBProperties(){
return super.getJAXBProperties();
}
@@ -82,7 +73,6 @@
return this.description;
}
- @XmlAttribute(name = "description")
public void setDescription(String desc) {
this.description = desc;
}
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java
===================================================================
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -34,7 +34,7 @@
public void testModelType() {
ModelMetaData model = new ModelMetaData();
- model.modelType = "physical";
+ model.setModelType("physical");
assertTrue(model.getModelType() == Model.Type.PHYSICAL);
assertTrue(model.isSource());
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
===================================================================
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,13 +30,6 @@
import java.util.Arrays;
import java.util.List;
-import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
import org.jboss.dmr.ModelNode;
import org.junit.Test;
import org.teiid.adminapi.DataPolicy;
@@ -49,33 +42,7 @@
@SuppressWarnings("nls")
public class TestVDBMetaData {
-
- public void testMarshellUnmarshellUsingJaxb() throws Exception {
-
- VDBMetaData vdb = buildVDB();
-
- SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = schemaFactory.newSchema(VDBMetaData.class.getResource("/vdb-deployer.xsd")); //$NON-NLS-1$
- JAXBContext jc = JAXBContext.newInstance(new Class<?>[] {VDBMetaData.class});
- Marshaller marshell = jc.createMarshaller();
- marshell.setSchema(schema);
- marshell.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,new Boolean(true));
-
- StringWriter sw = new StringWriter();
- marshell.marshal(vdb, sw);
-
- //System.out.println(sw.toString());
-
- // UnMarshell
- Unmarshaller un = jc.createUnmarshaller();
- un.setSchema(schema);
- vdb = (VDBMetaData)un.unmarshal(new StringReader(sw.toString()));
-
- validateVDB(vdb);
- }
-
-
@Test
public void testMarshellUnmarshellDirectParsing() throws Exception {
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*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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
/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
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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
/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
/trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionMethod.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -26,9 +26,6 @@
import java.util.Arrays;
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
import org.teiid.core.util.EquivalenceUtil;
import org.teiid.core.util.HashCodeUtil;
@@ -108,7 +105,6 @@
private Determinism determinism = Determinism.DETERMINISTIC;
- @XmlElement(name="inputParameters")
protected List<FunctionParameter> inParameters = new ArrayList<FunctionParameter>(2);
private FunctionParameter outputParameter;
private Schema parent;
@@ -154,7 +150,6 @@
* Return name of method
* @return Name
*/
- @XmlAttribute
public String getName() {
return super.getName();
}
@@ -180,7 +175,6 @@
* Get description of method
* @return Description
*/
- @XmlAttribute
public String getDescription() {
return this.description;
}
@@ -198,7 +192,6 @@
* @return Category
* @see FunctionCategoryConstants
*/
- @XmlAttribute
public String getCategory() {
return this.category;
}
@@ -228,7 +221,6 @@
this.pushdown = pushdown;
}
- @XmlAttribute
public void setPushDown(String pushdown) {
if (pushdown != null) {
if (pushdown.equals(REQUIRED)) {
@@ -247,7 +239,6 @@
* Get invocation class name
* @return Invocation class name
*/
- @XmlAttribute
public String getInvocationClass() {
return this.invocationClass;
}
@@ -264,7 +255,6 @@
* Get invocation method name
* @return Invocation method name
*/
- @XmlAttribute
public String getInvocationMethod() {
return this.invocationMethod;
}
@@ -312,7 +302,6 @@
* Get ouput parameter.
* @return Output parameter or return argument
*/
- @XmlElement(name="returnParameter")
public FunctionParameter getOutputParameter() {
return this.outputParameter;
}
@@ -448,7 +437,6 @@
return this.determinism;
}
- @XmlAttribute(name="deterministic")
public void setDeterministicBoolean(boolean deterministic) {
this.determinism = deterministic ? Determinism.DETERMINISTIC : Determinism.NONDETERMINISTIC;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/FunctionParameter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,9 +24,6 @@
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAttribute;
-
-
/**
* A function parameter defines the name and description of an input or output
* parameter for a function. The name should not be null, but that is not
@@ -81,7 +78,6 @@
* Return name of parameter.
* @return Name
*/
- @XmlAttribute
public String getName() {
return this.name;
}
@@ -98,7 +94,6 @@
* Get description of parameter
* @return Description
*/
- @XmlAttribute
public String getDescription() {
return this.description;
}
@@ -116,7 +111,6 @@
* @return Type name
* @see org.teiid.core.types.DataTypeManager.DefaultDataTypes
*/
- @XmlAttribute
public String getType() {
return this.type;
}
Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -47,11 +47,7 @@
}
public Schema getSchema(String name) {
- Schema s = this.schemas.get(name);
- if (s == null) {
- s = this.schemas.get(name.toUpperCase());
- }
- return s;
+ return this.schemas.get(name);
}
public void addSchema(Schema schema) {
Modified: trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -192,18 +192,10 @@
return delegate.supportsBatchedUpdates();
}
@Override
- public boolean supportsBetweenCriteria() {
- return delegate.supportsBetweenCriteria();
- }
- @Override
public boolean supportsBulkUpdate() {
return delegate.supportsBulkUpdate();
}
@Override
- public boolean supportsCaseExpressions() {
- return delegate.supportsCaseExpressions();
- }
- @Override
public boolean supportsCommonTableExpressions() {
return delegate.supportsCommonTableExpressions();
}
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -377,15 +377,6 @@
}
/**
- * Support indicates connector accepts criteria of form (element BETWEEN constant AND constant)
- * <br>NOT CURRENTLY USED - between is rewritten as compound compare criteria
- * @since 4.0
- */
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
- /**
* Support indicates connector accepts criteria of form (element = constant)
* @since 3.1 SP2
*/
@@ -633,16 +624,6 @@
}
/**
- * Support indicates connector can accept queries with non-searched
- * CASE <expression> WHEN <expression> ... END
- * <br>NOT CURRENTLY USED - case is pushed down as searched case
- * @since 4.0
- */
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- /**
* Support indicates connector can accept queries with searched CASE WHEN <criteria> ... END
* @since 4.0
*/
@@ -685,7 +666,10 @@
/**
* Get list of all supported function names. Arithmetic functions have names like
* "+".
- * @see SourceSystemFunctions
+ * @see SourceSystemFunctions for a listing of system pushdown functions. Note that
+ * not all system functions are listed as some functions will use a common name
+ * such as CONCAT vs. the || operator, and other functions will be rewritten and
+ * not pushed down, such as SPACE.
* @since 3.1 SP3
*/
public List<String> getSupportedFunctions() {
Modified: trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/api/src/main/java/org/teiid/translator/SourceSystemFunctions.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,6 +27,10 @@
* The names and function forms follow the Open Group CLI functions, with a few exceptions
* (such as lpad, rpad, bitand, bitor, etc. which are most notably supported by Oracle).
*
+ * Note that not all system functions are listed as some functions will use a common name
+ * such as CONCAT vs. the || operator, and other functions will be rewritten and
+ * not pushed down, such as SPACE.
+ *
*/
public class SourceSystemFunctions {
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
/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
/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
/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
/trunk/build/kits/adminshell:3507-3666
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-01 19:12:27 UTC (rev 4047)
@@ -48,6 +48,8 @@
<LI><B>Greenplum Translator</B> - for use with the Greenplum database.
<LI><B>Enhanced parse/format pushdown</B> - added more built-in support and extension points for parse/format function pushdown. Added parse/format timestamp handling for SQLServer, Sybase, Oracle, and PostgreSQL.
<LI><B>User Defined Aggregates</B> - user defined aggregate functions can be defined via extension metadata, DDL, or connector metadata.
+ <LI><B>SET PAYLOAD statement</B> - SET PAYLOAD can be used to set a name value pair on a session scoped payload that will be sent with requests.
+ <LI><B>ENCRYPT REQUESTS</B> - encryptRequests may be used as a connection/datasource property when not using SSL to indicate that request messgaes and any associated payload should be encrypted.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
@@ -74,12 +76,15 @@
<li>The translator API facilities for iterator/bulk updates were combined and updated. Multi-valued literals were replaced by the Parameter class with an associated value iterator
available on the BatchedCommand. The IteratorValueSource class was also removed.
<li>VARBINARY, OPTIONS, and OUT were added as reserved words.
- <li>AbstractMetadataRecord and its sub-classes use a case-insensitive map for properties rather than a LinkedHashMap. Thus, property key lookups are now case-insensitive.
+ <li>AbstractMetadataRecord and its sub-classes use a case-insensitive map for properties rather than a LinkedHashMap. Thus, property key lookups are now case-insensitive.
+ <li>Removed the unused ExecutionFactory methods supportsBetweenCriteria and supportsCaseExpression.
</ul>
<h4>from 7.7</h4>
<ul>
<li>parse/formatdate and parse/formattime are no longer pushdown functions. They are converted into parse/formattimestamp.
+ <li>SQLWarning exception chains attached to the ExecutionContext will be returned as a single TeiidSQLWarning rather than as individual TeiidSQLWarnings. See the TeiidSQLWarning javadocs
+for how to access the underlying SQLWarning chains.
</ul>
<h4>from 7.5</h4>
@@ -227,7 +232,279 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-7'>TEIID-7</a>] - Control of BigDecimal precision and scale
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-17'>TEIID-17</a>] - Root criteria with sibling roots
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-32'>TEIID-32</a>] - Support null values in proc relational joins
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-37'>TEIID-37</a>] - Parse function for XSD datatypes for Web service procedures
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-42'>TEIID-42</a>] - Correlated subqueries in XML criteria
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-63'>TEIID-63</a>] - Recursion Editor RECORD Feature When Limit Exceeded Does Not Work
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-69'>TEIID-69</a>] - Fully implement Hash Join
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-102'>TEIID-102</a>] - Metadata search with * or ? may return the wrong results
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-122'>TEIID-122</a>] - Min/Max cardinality should be enforced during document generation
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-987'>TEIID-987</a>] - Problem regarding how often availability is called on the Facet
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1058'>TEIID-1058</a>] - SessionCleanupThread causes deadlocks when server is clustered
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1371'>TEIID-1371</a>] - Translator does not unload correctly
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1465'>TEIID-1465</a>] - Join between char and varchar
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1600'>TEIID-1600</a>] - Exact numeric issues
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1838'>TEIID-1838</a>] - Change to source model connection through AdminApi using assignToModel() does not reflect in jdbc queries to that source model
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1863'>TEIID-1863</a>] - Default Salesforce URL in teiid-connector-salesforce.rar needs update to SF v22
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1864'>TEIID-1864</a>] - TIMESTAMPADD of SQL_TSI_FRAC_SECOND fails for Sybase 15 with JConnect 6.0.5 driver
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1867'>TEIID-1867</a>] - Duplicate metadata for multisource models
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1868'>TEIID-1868</a>] - Internal Materialized View - Load/Refresh and Assertion Failed
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1869'>TEIID-1869</a>] - Simple capabilities with PostgreSQL 8.3 using decodeinteger causes comm failure
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1870'>TEIID-1870</a>] - Querying random number from DB2 v97 does not push down to source
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1871'>TEIID-1871</a>] - Teiid is handling MySQL5.0 returning DAYNAME as a blob
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1872'>TEIID-1872</a>] - Implicit temp table creation fails with insert and explicit columns
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1873'>TEIID-1873</a>] - Security documentation does not provide adequate information to integrate additional domains for authentication
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1876'>TEIID-1876</a>] - Netezza translator using INTNNOT when it should use INT4NOT
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1878'>TEIID-1878</a>] - Problem with accessing custom generated materialized views
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1879'>TEIID-1879</a>] - Teradata Query Testing - Unhandled exception causing SOCKET CLOSED condition
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1882'>TEIID-1882</a>] - EOFException with 7.6 client against a 7.4 server
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1883'>TEIID-1883</a>] - Query timeout is superceded by synch ttl
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1884'>TEIID-1884</a>] - COMMAND Logging incorrectly reporting END USER COMMAND record count in EDS for forward only resultsets
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1895'>TEIID-1895</a>] - Properly escape the column references for Excel based data
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1899'>TEIID-1899</a>] - Getting Assertion when running Inner Merge Join query with SELECT COUNT(*) on top
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1900'>TEIID-1900</a>] - Teiid client jar file is not complete: NoClassDefFoundError: org/jboss/modules/ModuleLoadException
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1904'>TEIID-1904</a>] - Prepared statement for SOURCE_NAME in multi-source mode throws exception Message:Unable to evaluate
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1905'>TEIID-1905</a>] - Dymamic VDB does not work in 8.0
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1906'>TEIID-1906</a>] - Settting a VDB with data roles from Teiid Designer 7.5 iand deploying to Teiid 8 get a parser error
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1907'>TEIID-1907</a>] - SQLStringVisitor should create call visitNode on Select
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1937'>TEIID-1937</a>] - teiid encouters java.io.StreamCorruptedException
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1952'>TEIID-1952</a>] - Oracle native driver preparedstatement char parameters are required to be padded
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1953'>TEIID-1953</a>] - Greenplum DB - BQT correlated subquery failures
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1954'>TEIID-1954</a>] - System Schema does not show metadata for Indexes in the SYS.Keys or SYS.KeyColumns table
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1956'>TEIID-1956</a>] - WHERE clause throws org.teiid.jdbc.TeiidSQLException: Index: 2, Size: 1
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1957'>TEIID-1957</a>] - Resource Adapter's not passing deployment the validation checks in 7.1.0-Final
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1960'>TEIID-1960</a>] - Client recieving java.lang.IndexOutOfBoundsException in
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1961'>TEIID-1961</a>] - A translator override that is not used by a physical model will cause an exception on the server when the vdb is deployed
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1962'>TEIID-1962</a>] - EDS Ingres10 as Source - LOCATE function not returning correct query results
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1964'>TEIID-1964</a>] - Queries which exceed the query timeout value are reported as canceled with no reference to the reason (timed out)
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1966'>TEIID-1966</a>] - supportsInCriteria is ignored
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1968'>TEIID-1968</a>] - NPE in GoupingNode
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1969'>TEIID-1969</a>] - Missing message for key JDBCQueryExecution.Error_executing_query__1
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1972'>TEIID-1972</a>] - Non-stagable cardinality dependent aggregate should prevent the creation of a staged grouping
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1974'>TEIID-1974</a>] - Function RAND() should be RANDOM(int, int) for Teradata
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1975'>TEIID-1975</a>] - Failure description is incomplete
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1976'>TEIID-1976</a>] - Metadata TYPE_NAME value is null for String Columns
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1978'>TEIID-1978</a>] - SalesForce getDeleted function does not return deleted objects list
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1981'>TEIID-1981</a>] - Admin API does not correctly in Domain mode
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1983'>TEIID-1983</a>] - BaseDelegatingTranslator should delegate properties from setSupports* methods
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1986'>TEIID-1986</a>] - Exception on the slave node during materialization table load
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1987'>TEIID-1987</a>] - Exception Processing Web Service Response
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1990'>TEIID-1990</a>] - UNION pushdown
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1994'>TEIID-1994</a>] - Regression in latest 7.7.1 code
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1998'>TEIID-1998</a>] - Deployed translator JAR fails to be loaded when used in the VDB
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2001'>TEIID-2001</a>] - Skip loading of Function/Other models during the Index Based VDBs
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2002'>TEIID-2002</a>] - Dynmamic Metadata load failure with Sales Force data source
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2003'>TEIID-2003</a>] - NPE processing order by in rule collapse source
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2005'>TEIID-2005</a>] - Source query for Oracle sequence adds an alias, which will return "sequence doesn't exist" errors
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2007'>TEIID-2007</a>] - JDBC warnings are not properly handled
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2017'>TEIID-2017</a>] - CLONE - wrong type on model in VDB definition
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2018'>TEIID-2018</a>] - VDB resources are not associated
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2020'>TEIID-2020</a>] - Running Sybase procedure with jconnect driver in Teiid fails
+</li>
+</ul>
+
+<h2> Enhancement
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1809'>TEIID-1809</a>] - Teiid maven build needs to work off of Jboss parent pom
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1859'>TEIID-1859</a>] - Add a capability to restrict comparisons
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1865'>TEIID-1865</a>] - Thread-safe JDBC connection
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1898'>TEIID-1898</a>] - In Version 8, can the Teiid-<version>-client.jar (JDBC driver) be renamed because it causes confusion with the Teiid-client-<version>.jar used in the server
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1916'>TEIID-1916</a>] - Add support for alternate collation
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1959'>TEIID-1959</a>] - Add a way to exclude tables/procedures from JDBC import
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1984'>TEIID-1984</a>] - GetUpdated and GetDeleted SF procedures should be supported in dynamic vdbs
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1985'>TEIID-1985</a>] - Additional avenues for plan information
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2006'>TEIID-2006</a>] - Add a JDBC/ODBC statement to set the command payload
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2009'>TEIID-2009</a>] - Allow for the possiblity of rewriten user commands by the AuthoriztionValidator
+</li>
+</ul>
+
+<h2> Feature Request
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-144'>TEIID-144</a>] - ENHANCEMENT: Entitlements on XML Document Models
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-151'>TEIID-151</a>] - ENHANCEMENT: Need a way to stop building node in a recursive XML document when the node is repeated
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-170'>TEIID-170</a>] - Fully implement joining of parent and child mapping classes
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-174'>TEIID-174</a>] - add support to MMCallableStatement for named parameter methods
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-176'>TEIID-176</a>] - Auto-Staging tables should be shared in some circumstances
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-185'>TEIID-185</a>] - Add Option For MTOM in Web Services
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-223'>TEIID-223</a>] - XML output elements should be minimized
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-417'>TEIID-417</a>] - Add REST Support to Data Services
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-499'>TEIID-499</a>] - pushdown of parsedate, parsetime, parsetimestamp
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1280'>TEIID-1280</a>] - Allow views/procedures to be defined without designer
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1352'>TEIID-1352</a>] - Produce Admin API jar containing only Interfaces.
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1560'>TEIID-1560</a>] - Add support for user defined / pushdown aggregate functions
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1720'>TEIID-1720</a>] - Support for JBoss AS 7.x as host environment
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1801'>TEIID-1801</a>] - Async Event Processing: Reset and Re-run plan
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1819'>TEIID-1819</a>] - Reading multi entity data from a single data file
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1834'>TEIID-1834</a>] - Add support for a comparable binary type
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1850'>TEIID-1850</a>] - Add support for GreenPlum Database as a source
+</li>
+</ul>
+<h2> Quality Risk
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-3'>TEIID-3</a>] - Allow connectors to specify function capability for specific type signature
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1022'>TEIID-1022</a>] - Index metadata should not treat cardinality 0 as unknown
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1604'>TEIID-1604</a>] - Rationalize the context objects
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1837'>TEIID-1837</a>] - Replication should distribute load off of the coordinator
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1841'>TEIID-1841</a>] - week function in teiid not returning expected value
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1842'>TEIID-1842</a>] - Remove translate criteria based update procedures
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1894'>TEIID-1894</a>] - Consolidate bulk/iterator based inserts
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1950'>TEIID-1950</a>] - teiid client settings properties overrides don't work with signed jars
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1995'>TEIID-1995</a>] - Misleading error message
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2008'>TEIID-2008</a>] - Allow client max object size to be settable
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2010'>TEIID-2010</a>] - Remove unused translator supports.
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1839'>TEIID-1839</a>] - Redo the weather example
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1875'>TEIID-1875</a>] - Convert community docs to confluence
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1889'>TEIID-1889</a>] - Standardize logging in Teiid
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1901'>TEIID-1901</a>] - Redo Quick Start guide for Teiid 8.0 changes
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1924'>TEIID-1924</a>] - Update the documents for Teiid 8.0
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1955'>TEIID-1955</a>] - Update to work with JBoss AS 7.1-Final
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1967'>TEIID-1967</a>] - Bind EventDistributor to JNDI tree
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1971'>TEIID-1971</a>] - Provide delegating Metadata Repository implementation class
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2000'>TEIID-2000</a>] - Provide install script for Teiid to be installed in the domain mode
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2004'>TEIID-2004</a>] - Support 1.7 JDBC methods
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2019'>TEIID-2019</a>] - Remove all references to "javax.xml.bind" classes in the Teiid and support stream based xml
+</li>
+</ul>
+
+<h2> Sub-task
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1540'>TEIID-1540</a>] - Add the ability to delegate one shot dependent joins to the translators
+</li>
+</ul>
+
+
+
<h2><a name="Documentation">Documentation and Help</a></h2>
The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org.
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-05-01 19:12:27 UTC (rev 4047)
@@ -15,12 +15,13 @@
<dependencies>
+ <module name="javax.api" />
+ <module name="javax.xml.bind.api" />
+ <module name="javax.resource.api"/>
<module name="org.jboss.teiid.common-core" />
<module name="org.jboss.teiid.api" />
<module name="org.jboss.teiid.client" />
<module name="org.jboss.teiid.admin" />
- <module name="javax.api" />
- <module name="javax.resource.api"/>
<module name="org.jboss.logging" />
<module name="org.jboss.as.controller"/>
<module name="org.jboss.modules"/>
Modified: trunk/client/src/main/java/org/teiid/client/DQP.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/DQP.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/DQP.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -26,6 +26,7 @@
import org.teiid.client.lob.LobChunk;
import org.teiid.client.metadata.MetadataResult;
+import org.teiid.client.security.Secure;
import org.teiid.client.util.ResultsFuture;
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
@@ -35,6 +36,7 @@
public interface DQP {
+ @Secure(optional=true)
ResultsFuture<ResultsMessage> executeRequest(long reqID, RequestMessage message) throws TeiidProcessingException, TeiidComponentException;
ResultsFuture<ResultsMessage> processCursorRequest(long reqID, int batchFirst, int fetchSize) throws TeiidProcessingException;
Modified: trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,24 +28,23 @@
import java.io.ObjectOutput;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Properties;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.XMLType;
import org.teiid.core.util.ExternalizeUtil;
import org.teiid.jdbc.JDBCPlugin;
@@ -56,17 +55,13 @@
* parent. For procedure plans child PlanNodes will be processing instructions,
* which can in turn contain other relational or procedure plans.
*/
- at XmlType
- at XmlRootElement(name="node")
public class PlanNode implements Externalizable {
/**
* A Property is a named value of a {@link PlanNode} that may be
* another {@link PlanNode} or a non-null list of values.
*/
- @XmlType(name = "property")
public static class Property implements Externalizable {
- @XmlAttribute
private String name;
private List<String> values;
private PlanNode planNode;
@@ -83,7 +78,6 @@
return name;
}
- @XmlElement(name="value")
public List<String> getValues() {
return values;
}
@@ -92,7 +86,6 @@
this.values = values;
}
- @XmlElement(name="node")
public PlanNode getPlanNode() {
return planNode;
}
@@ -118,10 +111,8 @@
}
- @XmlElement(name="property")
private List<Property> properties = new LinkedList<Property>();
private PlanNode parent;
- @XmlAttribute
private String name;
public PlanNode() {
@@ -215,34 +206,75 @@
writer.writeEndElement();
}
- private void writeElement(final XMLStreamWriter writer, String name, String value) throws XMLStreamException {
+ private static void writeElement(final XMLStreamWriter writer, String name, String value) throws XMLStreamException {
writer.writeStartElement(name);
writer.writeCharacters(value);
writer.writeEndElement();
}
- public static PlanNode fromXml(String planString) {
- try {
- JAXBContext jc = JAXBContext.newInstance(new Class<?>[] {PlanNode.class});
- Unmarshaller marshaller = jc.createUnmarshaller();
- PlanNode planNode = (PlanNode) marshaller.unmarshal(new StringReader(planString));
- setParents(planNode);
- return planNode;
- } catch (JAXBException e) {
- //shouldn't happen
- throw new TeiidRuntimeException(e);
+ private static Properties getAttributes(XMLStreamReader reader) {
+ Properties props = new Properties();
+ if (reader.getAttributeCount() > 0) {
+ for(int i=0; i<reader.getAttributeCount(); i++) {
+ String attrName = reader.getAttributeLocalName(i);
+ String attrValue = reader.getAttributeValue(i);
+ props.setProperty(attrName, attrValue);
+ }
}
- }
+ return props;
+ }
+
+ public static PlanNode fromXml(String planString) throws XMLStreamException {
+ XMLInputFactory inputFactory = XMLType.getXmlInputFactory();
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(planString));
- private static void setParents(PlanNode planNode) {
- for (Property property : planNode.properties) {
- if (property.planNode != null) {
- property.planNode.parent = planNode;
- setParents(property.planNode);
+ while (reader.hasNext()&& (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) {
+ String element = reader.getLocalName();
+ if (element.equals("node")) { //$NON-NLS-1$
+ Properties props = getAttributes(reader);
+ PlanNode planNode = new PlanNode(props.getProperty("name"));//$NON-NLS-1$
+ planNode.setParent(null);
+ buildNode(reader, planNode);
+ return planNode;
}
+ throw new XMLStreamException(JDBCPlugin.Util.gs("unexpected_element", reader.getName(), "node"),reader.getLocation());//$NON-NLS-1$ //$NON-NLS-2$
}
+ return null;
}
-
+
+ private static PlanNode buildNode(XMLStreamReader reader, PlanNode node) throws XMLStreamException {
+ while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) {
+ String property = reader.getLocalName();
+ if (property.equals("property")) {//$NON-NLS-1$
+ Properties props = getAttributes(reader);
+ ArrayList<String> values = new ArrayList<String>();
+ while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) {
+ String valueNode = reader.getLocalName();
+ if (valueNode.equals("value")) {//$NON-NLS-1$
+ values.add(reader.getElementText());
+ }
+ else if (valueNode.equals("node")) {//$NON-NLS-1$
+ values = null;
+ Properties nodeProps = getAttributes(reader);
+ PlanNode childNode = new PlanNode(nodeProps.getProperty("name"));//$NON-NLS-1$
+ node.addProperty(props.getProperty("name"), buildNode(reader, childNode));//$NON-NLS-1$
+ break;
+ }
+ else {
+ throw new XMLStreamException(JDBCPlugin.Util.gs("unexpected_element", reader.getName(), "value"), reader.getLocation());//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+ if (values != null) {
+ node.addProperty(props.getProperty("name"), values);//$NON-NLS-1$
+ }
+ }
+ else {
+ throw new XMLStreamException(JDBCPlugin.Util.gs("unexpected_element", reader.getName(), "property"), reader.getLocation()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+ return node;
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
Modified: trunk/client/src/main/java/org/teiid/client/security/ILogon.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -37,9 +37,11 @@
static final String KRB5TOKEN = "KRB5TOKEN"; //$NON-NLS-1$
static final String KRB5_ESTABLISHED = "KRB5_CONTEXT_ESTABLISHED"; //$NON-NLS-1$
+ @Secure
LogonResult logon(Properties connectionProperties)
throws LogonException, TeiidComponentException, CommunicationException;
+ @Secure
LogonResult neogitiateGssLogin(Properties connectionProperties, byte[] serviceToken, boolean createSession) throws LogonException;
/**
@@ -60,5 +62,6 @@
*/
ResultsFuture<?> logoff() throws InvalidSessionException, TeiidComponentException;
+ @Secure
void assertIdentity(SessionToken sessionId) throws InvalidSessionException, TeiidComponentException, CommunicationException;
}
Copied: trunk/client/src/main/java/org/teiid/client/security/Secure.java (from rev 4046, branches/8.0.x/client/src/main/java/org/teiid/client/security/Secure.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/Secure.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/client/security/Secure.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.client.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+ at Target({ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+ at Inherited
+ at Documented
+public @interface Secure {
+
+ boolean optional() default false;
+
+}
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*
/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*
/trunk/client/src/main/java/org/teiid/client/util:3507-3666
Modified: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -22,14 +22,8 @@
package org.teiid.client.util;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
+import java.io.*;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -72,23 +66,27 @@
if (this.exception == null) {
Throwable t = buildException(classNames, message, stackTrace, code);
- if (t == null) {
- if (causeHolder != null) {
- this.exception = causeHolder.exception;
- }
+ if (causeHolder != null) {
+ t.initCause(causeHolder.exception);
}
- else {
- if (causeHolder != null) {
- t.initCause(causeHolder.exception);
+ this.exception = t;
+
+ if (this.exception instanceof SQLException) {
+ try {
+ int count = in.readInt();
+ for (int i = 0; i < count; i++) {
+ ExceptionHolder next = (ExceptionHolder)in.readObject();
+ if (next.exception instanceof SQLException) {
+ ((SQLException)this.exception).setNextException((SQLException) next.exception);
+ }
+ }
+ } catch (EOFException e) {
+
+ } catch (OptionalDataException e) {
+
}
- this.exception = t;
}
}
-
- if (this.exception == null) {
- this.exception = new TeiidRuntimeException(message);
- this.exception.setStackTrace(stackTrace);
- }
}
@Override
@@ -126,6 +124,22 @@
else {
out.writeObject(null);
}
+ // handle SQLException chains
+ if (exception instanceof SQLException) {
+ SQLException se = (SQLException)exception;
+ SQLException next = se.getNextException();
+ int count = 0;
+ while (next != null) {
+ count++;
+ next = next.getNextException();
+ }
+ out.writeInt(count);
+ next = se.getNextException();
+ while (next != null) {
+ out.writeObject(new ExceptionHolder(next, true));
+ next = next.getNextException();
+ }
+ }
}
public Throwable getException() {
@@ -133,30 +147,32 @@
}
private Throwable buildException(List<String> classNames, String message, StackTraceElement[] stackTrace, String code) {
- if (classNames.isEmpty()) {
- return null;
+ String originalClass = Exception.class.getName();
+
+ if (!classNames.isEmpty()) {
+ originalClass = classNames.get(0);
}
- String originalClass = classNames.get(0);
-
List<String> args = Arrays.asList(CorePlugin.Util.getString("ExceptionHolder.converted_exception", message, originalClass)); //$NON-NLS-1$
Throwable result = null;
for (String className : classNames) {
try {
result = (Throwable)ReflectionHelper.create(className, args, ExceptionHolder.class.getClassLoader());
- result.setStackTrace(stackTrace);
break;
} catch (TeiidException e1) {
//
}
}
- if (result instanceof TeiidException) {
+ if (result == null) {
+ result = new TeiidRuntimeException(args.get(0));
+ } else if (result instanceof TeiidException) {
((TeiidException)result).setCode(code);
((TeiidException)result).setOriginalType(classNames.get(0));
}
+ result.setStackTrace(stackTrace);
return result;
}
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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/trunk/client/src/main/java/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -350,11 +350,7 @@
* @see javax.sql.XADataSource#getXAConnection(java.lang.String, java.lang.String)
*/
public XAConnection getXAConnection(final String userName, final String password) throws java.sql.SQLException {
- return XAConnectionImpl.newInstance(new XAConnectionImpl.ConnectionSource() {
-
- public ConnectionImpl createConnection() throws SQLException {
- return (ConnectionImpl)getConnection(userName, password);
- }});
+ return new XAConnectionImpl((ConnectionImpl) getConnection(userName, password));
}
public PooledConnection getPooledConnection() throws SQLException {
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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -681,4 +681,13 @@
setObject((Object)parameterName, val);
}
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public <T> T getObject(String columnLabel, Class<T> type)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
}
\ No newline at end of file
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
/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
/trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -32,6 +32,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -99,7 +100,8 @@
private String debugLog;
// the last query annotations
private Collection<Annotation> annotations;
- private Properties connectionProps;
+ private Properties connectionProps;
+ private Properties payload;
public ConnectionImpl(ServerConnection serverConn, Properties info, String url) {
this.connectionProps = info;
@@ -828,6 +830,7 @@
}
public void recycleConnection() {
+ this.payload = null;
try {
//close all open statements
this.closeStatements();
@@ -1005,6 +1008,42 @@
setPassword(oldPassword);
}
}
- }
-
+ }
+
+ public void abort(Executor executor) throws SQLException {
+ if (closed) {
+ return;
+ }
+ //TODO: ensure that threads are released. In theory they will be since close effectively cancels current executions
+ close();
+ }
+
+ public int getNetworkTimeout() throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public String getSchema() throws SQLException {
+ return null;
+ }
+
+ /**
+ * @see query timeouts and the synchronousTtl setting if using socket connections
+ */
+ public void setNetworkTimeout(Executor executor, int milliseconds)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public void setSchema(String schema) throws SQLException {
+
+ }
+
+ public Properties getPayload() {
+ return payload;
+ }
+
+ public void setPayload(Properties payload) {
+ this.payload = payload;
+ }
+
}
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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -446,14 +446,13 @@
/**
* <p>Gets a description of the access rights for a column of the given name.
- * Catalog, schema and table names are not used to narrow down the search,
- * but the schema name should match the virtualdatabasename used to obtain
+ * Catalog name should match the virtualdatabasename used to obtain
* this driver connection.</p>
* @param name of the catalog to which columns belong.
* @param name of the schema to which columns belong.
* @param name of the table to which columns belong.
* @param name pattern to be matched by column names.
- * @return ResultSet containing column privilage information.
+ * @return ResultSet containing column privilege information.
* @throws SQLException if there is an error obtaining server results
*/
public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnName) throws SQLException {
@@ -487,9 +486,8 @@
/**
* <p>Get's the metadata information about the columns whose names match the given
- * columnNamePattern. Catalog, schema and tableNamePattern are not used to
- * narrow down the search, but Catalog and schema names should match the
- * virtualdatabasename and version used to obtain this driver connection.</p>
+ * columnNamePattern. Catalog names should match the
+ * virtualdatabasename used to obtain this driver connection.</p>
* <p> The ResultSet returned by this method contains the following additional
* columns that are not specified in the JDBC specification.</p>
* <OL>
@@ -594,9 +592,8 @@
/**
* <p>Gets the description of the foreign key columns in the table foreignTable.
* These foreign key columns reference primary key columns of primaryTable.
- * Catalog and schema information is not used to narrow down the search, but
- * Catalog and schema names(primary and foreign) should match the
- * virtualdatabasename and version used to obtain this driver connection.
+ * Catalog names(primary and foreign) should match the
+ * virtualdatabasename used to obtain this driver connection.
* @param name of the catalog containing primary keys.
* @param name of the schema containing primary keys.
* @param name of the table containing primary keys.
@@ -1985,7 +1982,7 @@
}
public boolean supportsGroupByUnrelated() throws SQLException {
- return false;
+ return true;
}
public boolean supportsIntegrityEnhancementFacility() throws SQLException {
@@ -2004,22 +2001,10 @@
return true;
}
- /**
- * <p>Checks whether mixed-case unquoted SQL identifiers used in SQL statements are
- * case sensitive</p>
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMixedCaseIdentifiers() throws SQLException {
return false;
}
- /**
- * <p>Checks whether mixed-case quoted SQL identifiers used in SQL statements are
- * case sensitive</p>
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
return false;
}
@@ -2028,36 +2013,20 @@
return false;
}
- /**
- * <p>Are multiple ResultSets from a single execute supported?</p>
- * @return <code>true</code> if so; <code>false</code> otherwise
- * @throws SQLException, should never occur
- */
public boolean supportsMultipleResultSets() throws SQLException {
return false;
}
- /**
- * Retrieves whether it is possible to have multiple ResultSet objects
- * returned from a CallableStatement object simultaneously.
- * @return <code>true</code> if so; <code>false</code> otherwise
- * @throws SQLException, should never occur
- */
public boolean supportsMultipleOpenResults() throws SQLException {
return false;
}
- /**
- * <p>Checks whether multiple transactions open at once on different connectons</p>
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsMultipleTransactions() throws SQLException {
return true;
}
public boolean supportsNamedParameters() throws SQLException {
- return false;
+ return true;
}
public boolean supportsNonNullableColumns() throws SQLException {
@@ -2076,11 +2045,6 @@
return true;
}
- /**
- * <p>Checks whether an ORDER BY clause can use columns that are not in the SELECT clause.</p>
- * @return if so return true, else false.
- * @throws SQLException, should never occur.
- */
public boolean supportsOrderByUnrelated() throws SQLException {
return true;
}
@@ -2115,7 +2079,6 @@
* @param intValue holdability
* @return boolean true if so; false otherwise
* @throws SQLException, should never occur
-
*/
public boolean supportsResultSetHoldability(int holdability) throws SQLException {
return false;
@@ -2354,4 +2317,14 @@
}
}
}
+
+ public boolean generatedKeyAlwaysReturned() throws SQLException {
+ return false;
+ }
+
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
+ String tableNamePattern, String columnNamePattern)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
}
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -66,5 +66,6 @@
TEIID20025,
TEIID20026,
TEIID20027,
+ TEIID20028
}
}
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
/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
/trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -75,7 +75,8 @@
TeiidURL.CONNECTION.DISCOVERY_STRATEGY,
TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION,
TeiidURL.CONNECTION.JAAS_NAME,
- TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME));
+ TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME,
+ TeiidURL.CONNECTION.ENCRYPT_REQUESTS));
props.addAll(EXECUTION_PROPERTIES);
return Collections.unmodifiableSet(props);
}
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/RequestOptions.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -1666,4 +1666,13 @@
throws SQLException {
throw SqlUtil.createFeatureNotSupportedException();
}
+
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public <T> T getObject(String columnLabel, Class<T> type)
+ throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
}
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -156,8 +156,8 @@
protected Map<String, Integer> outParamByName = new TreeMap<String, Integer>(String.CASE_INSENSITIVE_ORDER);
private static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SET_STATEMENT = Pattern.compile("\\s*set\\s+((?:session authorization)|(?:\\w+))\\s+(?:([a-zA-Z](?:\\w|_)*)|((?:'[^']*')+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SET_STATEMENT = Pattern.compile("\\s*set(?:\\s+(payload))?\\s+((?:session authorization)|(?:[a-zA-Z]\\w*))\\s+(?:([a-zA-Z]\\w*)|((?:'[^']*')+));?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+([a-zA-Z]\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
/**
* Factory Constructor
* @param driverConnection
@@ -430,14 +430,22 @@
if (resultsMode == ResultsMode.RESULTSET) {
throw new TeiidSQLException(JDBCPlugin.Util.getString("StatementImpl.set_result_set")); //$NON-NLS-1$
}
- String key = match.group(1);
- String value = match.group(2);
+ String key = match.group(2);
+ String value = match.group(3);
if (value == null) {
- value = match.group(3);
+ value = match.group(4);
value = StringUtil.replaceAll(value, "''", "'"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.substring(1, value.length() - 1);
}
- if ("SESSION AUTHORIZATION".equalsIgnoreCase(key)) { //$NON-NLS-1$
+ if (match.group(1) != null) {
+ //payload case
+ Properties p = this.getMMConnection().getPayload();
+ if (p == null) {
+ p = new Properties();
+ this.getMMConnection().setPayload(p);
+ }
+ p.setProperty(key, value);
+ } else if ("SESSION AUTHORIZATION".equalsIgnoreCase(key)) { //$NON-NLS-1$
this.getMMConnection().changeUser(value, this.getMMConnection().getPassword());
} else if (key.equalsIgnoreCase(TeiidURL.CONNECTION.PASSWORD)) {
this.getMMConnection().setPassword(value);
@@ -589,7 +597,11 @@
this.getConnection().beginLocalTxnIfNeeded();
this.currentRequestID = this.driverConnection.nextRequestID();
// Create a request message
- reqMsg.setExecutionPayload(this.payload);
+ if (this.payload != null) {
+ reqMsg.setExecutionPayload(this.payload);
+ } else {
+ reqMsg.setExecutionPayload(this.getMMConnection().getPayload());
+ }
reqMsg.setCursorType(this.resultSetType);
reqMsg.setFetchSize(this.fetchSize);
reqMsg.setRowLimit(this.maxRows);
@@ -1108,4 +1120,12 @@
return metadataMap;
}
+
+ public void closeOnCompletion() throws SQLException {
+ throw SqlUtil.createFeatureNotSupportedException();
+ }
+
+ public boolean isCloseOnCompletion() throws SQLException {
+ return false;
+ }
}
\ No newline at end of file
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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,7 +24,9 @@
import java.net.MalformedURLException;
import java.sql.Connection;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
+import java.util.logging.Logger;
import org.teiid.net.TeiidURL;
@@ -107,6 +109,10 @@
* Name of Kerberos KDC service principle name
*/
private String kerberosServicePrincipleName;
+ /**
+ * If not using ssl determines whether requests with the associated command payload should be encrypted
+ */
+ private boolean encryptRequests;
public TeiidDataSource() {
}
@@ -517,5 +523,21 @@
public void setKerberosServicePrincipleName(String kerberosServerName) {
this.kerberosServicePrincipleName = kerberosServerName;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ return TeiidDriver.logger;
+ }
+
+ public void setEncryptRequests(boolean encryptRequests) {
+ this.encryptRequests = encryptRequests;
+ }
+
+ public boolean isEncryptRequests() {
+ return encryptRequests;
+ }
+
+ public boolean getEncryptRequests() {
+ return encryptRequests;
+ }
}
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
/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
/trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,6 +27,7 @@
import java.sql.DriverManager;
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
@@ -55,7 +56,7 @@
public class TeiidDriver implements Driver {
- private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
+ static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
static final String DRIVER_NAME = "Teiid JDBC Driver"; //$NON-NLS-1$
private static TeiidDriver INSTANCE = new TeiidDriver();
@@ -235,6 +236,10 @@
public boolean jdbcCompliant() {
return false;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ return logger;
+ }
}
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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -26,11 +26,33 @@
/**
- * Teiid specific SQLWarning
+ * Teiid specific SQLWarning<br>
+ * If the cause was a source SQLWarning, then you may need to consult
+ * the warning chain to get all warnings, see the example below.
+ *
+<code><pre>
+//warning will be an instanceof TeiidSQLWarning to convey model/source information
+SQLWarning warning = stmt.getWarnings();
+
+while (warning != null) {
+ Exception e = warning.getCause();
+ if (cause instanceof SQLWarning) {
+ //childWarning should now be the head of the source warning chain
+ SQLWarning childWarning = (SQLWarning)cause;
+ while (childWarning != null) {
+ //do something with childWarning
+ childWarning = childWarning.getNextWarning();
+ }
+ }
+ warning = warning.getNextWarning();
+}
+</pre></code>
+ *
*/
-
public class TeiidSQLWarning extends SQLWarning {
+ private static final long serialVersionUID = -7080782561220818997L;
+
private String modelName = "UNKNOWN"; // variable stores the name of the model for the atomic query //$NON-NLS-1$
private String sourceName = "UNKNOWN"; // variable stores name of the connector binding //$NON-NLS-1$
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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -32,15 +32,21 @@
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.sql.ConnectionEvent;
import javax.sql.ConnectionEventListener;
import javax.sql.StatementEventListener;
import javax.sql.XAConnection;
+import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.util.ExceptionUtil;
+import org.teiid.client.xa.XATransactionException;
+import org.teiid.client.xa.XidImpl;
import org.teiid.net.CommunicationException;
import org.teiid.net.ServerConnection;
import org.teiid.net.socket.SingleInstanceCommunicationException;
@@ -48,14 +54,8 @@
/**
* Implementation of XAConnection.
*/
-public class XAConnectionImpl implements XAConnection{
+public class XAConnectionImpl implements XAConnection, XAResource {
- interface ConnectionSource {
-
- ConnectionImpl createConnection() throws SQLException;
-
- }
-
private final class CloseInterceptor implements
InvocationHandler {
@@ -69,8 +69,7 @@
Method method,
Object[] args) throws Throwable {
if ("close".equals(method.getName())) { //$NON-NLS-1$
- this.proxiedConnection.recycleConnection();
- XAConnectionImpl.this.notifyListener(null);
+ close();
return null;
}
@@ -99,28 +98,32 @@
throw e.getTargetException();
}
}
+
+ void close() {
+ this.proxiedConnection.recycleConnection();
+ XAConnectionImpl.this.notifyListener(null);
+ }
}
+ private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
+
+ private int timeOut;
private Set<ConnectionEventListener> listeners;
- private XAResource resource;
private ConnectionImpl connection;
- private ConnectionSource cs;
-
+ private CloseInterceptor handler;
private boolean isClosed;
- public static XAConnectionImpl newInstance (ConnectionSource cs){
- return new XAConnectionImpl(cs);
- }
-
- public XAConnectionImpl(ConnectionSource cs){
- this.cs = cs;
+ public XAConnectionImpl(ConnectionImpl conn){
+ this.connection = conn;
}
public Connection getConnection() throws SQLException{
ConnectionImpl conn = getConnectionImpl();
-
- Connection result = (Connection)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {Connection.class}, new CloseInterceptor(conn));
-
+ if (handler != null) {
+ handler.close();
+ }
+ handler = new CloseInterceptor(conn);
+ Connection result = (Connection)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {Connection.class}, handler);
return result;
}
@@ -129,15 +132,6 @@
throw new SQLException(JDBCPlugin.Util.getString("MMXAConnection.connection_is_closed")); //$NON-NLS-1$
}
- if(connection == null){
- try{
- connection = cs.createConnection();
- }catch(SQLException e){
- notifyListener(e);
- throw e;
- }
- }
-
return connection;
}
@@ -156,10 +150,7 @@
}
public XAResource getXAResource() throws SQLException{
- if(resource == null){
- resource = XAResourceImpl.newInstance(this);
- }
- return resource;
+ return this;
}
public void close()throws SQLException{
@@ -195,4 +186,138 @@
public void removeStatementEventListener(StatementEventListener arg0) {
}
+
+ public void commit(Xid xid, boolean onePhase) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ getMMConnection().commitTransaction(mmXid, onePhase);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedCommitTXN", xid, onePhase ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ private XAException handleError(Exception e,String logMsg) {
+ logger.log(Level.SEVERE, logMsg, e);
+
+ if(e instanceof TeiidSQLException){
+ Throwable ex = ((TeiidSQLException)e).getCause();
+ if(ex instanceof XAException){
+ return (XAException)ex;
+ }
+ if (ex instanceof XATransactionException) {
+ return ((XATransactionException)ex).getXAException();
+ }
+ }
+ return new XAException(XAException.XAER_RMERR);
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#end(javax.transaction.xa.Xid, int)
+ */
+ public void end(Xid xid, int flag) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ getMMConnection().endTransaction(mmXid, flag);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedEndTXN", xid, new Integer(flag)); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#forget(javax.transaction.xa.Xid)
+ */
+ public void forget(Xid xid) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ getMMConnection().forgetTransaction(mmXid);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedForgetTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public int getTransactionTimeout() throws XAException {
+ return timeOut;
+ }
+
+ public boolean isSameRM(XAResource arg0) throws XAException {
+ if (arg0 == this) {
+ return true;
+ }
+ if (!(arg0 instanceof XAConnectionImpl)) {
+ return false;
+ }
+ XAConnectionImpl other = (XAConnectionImpl)arg0;
+ try {
+ return this.getMMConnection().isSameProcess(other.getMMConnection());
+ } catch (CommunicationException e) {
+ throw handleError(e, JDBCPlugin.Util.getString("MMXAResource.FailedISSameRM")); //$NON-NLS-1$
+ }
+ }
+
+ public int prepare(Xid xid) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ return getMMConnection().prepareTransaction(mmXid);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedPrepareTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ /**
+ * @see javax.transaction.xa.XAResource#recover(int)
+ */
+ public Xid[] recover(int flag) throws XAException {
+ try{
+ return getMMConnection().recoverTransaction(flag);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedRecoverTXN", flag); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public void rollback(Xid xid) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ getMMConnection().rollbackTransaction(mmXid);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedRollbackTXN", xid); //$NON-NLS-1$
+ throw handleError(e, logMsg);
+ }
+ }
+
+ public boolean setTransactionTimeout(int seconds) throws XAException {
+ timeOut = seconds;
+ return true;
+ }
+
+ public void start(Xid xid, int flag) throws XAException {
+ XidImpl mmXid = getMMXid(xid);
+ try{
+ getMMConnection().startTransaction(mmXid, flag, timeOut);
+ }catch(SQLException e){
+ String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedStartTXN", xid, new Integer(flag)); //$NON-NLS-1$
+ handleError(e, logMsg);
+ }
+ }
+
+ private ConnectionImpl getMMConnection() throws XAException{
+ try{
+ return this.getConnectionImpl();
+ }catch(SQLException e){
+ throw new XAException(XAException.XAER_RMFAIL);
+ }
+ }
+
+ /**
+ * @param xid
+ * @return
+ * @throws XAException
+ */
+ private XidImpl getMMXid(Xid originalXid) {
+ return new XidImpl(originalXid);
+ }
}
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
/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
/trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666
Deleted: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package org.teiid.jdbc;
-
-import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import org.teiid.client.xa.XATransactionException;
-import org.teiid.client.xa.XidImpl;
-import org.teiid.net.CommunicationException;
-
-
-/**
- * Implementation of XAResource.
- */
-public class XAResourceImpl implements XAResource{
- private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
-
- private XAConnectionImpl mmConnection;
- private int timeOut;
-
- public static XAResourceImpl newInstance (XAConnectionImpl mmConnection){
- return new XAResourceImpl(mmConnection);
- }
-
- public XAResourceImpl(XAConnectionImpl mmConnection){
- this.mmConnection = mmConnection;
- }
-
- /**
- * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xid, boolean)
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- getMMConnection().commitTransaction(mmXid, onePhase);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedCommitTXN", xid, onePhase ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- throw handleError(e, logMsg);
- }
- }
-
- private XAException handleError(Exception e,String logMsg) {
- logger.log(Level.SEVERE, logMsg, e);
-
- if(e instanceof TeiidSQLException){
- Throwable ex = ((TeiidSQLException)e).getCause();
- if(ex instanceof XAException){
- return (XAException)ex;
- }
- if (ex instanceof XATransactionException) {
- return ((XATransactionException)ex).getXAException();
- }
- }
- return new XAException(XAException.XAER_RMERR);
- }
-
- /**
- * @see javax.transaction.xa.XAResource#end(javax.transaction.xa.Xid, int)
- */
- public void end(Xid xid, int flag) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- getMMConnection().endTransaction(mmXid, flag);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedEndTXN", xid, new Integer(flag)); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#forget(javax.transaction.xa.Xid)
- */
- public void forget(Xid xid) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- getMMConnection().forgetTransaction(mmXid);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedForgetTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#getTransactionTimeout()
- */
- public int getTransactionTimeout() throws XAException {
- return timeOut;
- }
-
- /**
- * @see javax.transaction.xa.XAResource#isSameRM(javax.transaction.xa.XAResource)
- */
- public boolean isSameRM(XAResource arg0) throws XAException {
- if (arg0 == this) {
- return true;
- }
- if (!(arg0 instanceof XAResourceImpl)) {
- return false;
- }
- XAResourceImpl other = (XAResourceImpl)arg0;
- try {
- return this.getMMConnection().isSameProcess(other.getMMConnection());
- } catch (CommunicationException e) {
- throw handleError(e, JDBCPlugin.Util.getString("MMXAResource.FailedISSameRM")); //$NON-NLS-1$
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#prepare(javax.transaction.xa.Xid)
- */
- public int prepare(Xid xid) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- return getMMConnection().prepareTransaction(mmXid);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedPrepareTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#recover(int)
- */
- public Xid[] recover(int flag) throws XAException {
- try{
- return getMMConnection().recoverTransaction(flag);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedRecoverTXN", flag); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#rollback(javax.transaction.xa.Xid)
- */
- public void rollback(Xid xid) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- getMMConnection().rollbackTransaction(mmXid);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedRollbackTXN", xid); //$NON-NLS-1$
- throw handleError(e, logMsg);
- }
- }
-
- /**
- * @see javax.transaction.xa.XAResource#setTransactionTimeout(int)
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- timeOut = seconds;
- return true;
- }
-
- /**
- * @see javax.transaction.xa.XAResource#start(javax.transaction.xa.Xid, int)
- */
- public void start(Xid xid, int flag) throws XAException {
- XidImpl mmXid = getMMXid(xid);
- try{
- getMMConnection().startTransaction(mmXid, flag, timeOut);
- }catch(SQLException e){
- String logMsg = JDBCPlugin.Util.getString("MMXAResource.FailedStartTXN", xid, new Integer(flag)); //$NON-NLS-1$
- handleError(e, logMsg);
- }
- }
-
- private ConnectionImpl getMMConnection() throws XAException{
- try{
- return this.mmConnection.getConnectionImpl();
- }catch(SQLException e){
- throw new XAException(XAException.XAER_RMFAIL);
- }
- }
-
- /**
- * @param xid
- * @return
- * @throws XAException
- */
- private XidImpl getMMXid(Xid originalXid) {
- return new XidImpl(originalXid);
- }
-}
Modified: trunk/client/src/main/java/org/teiid/net/TeiidURL.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -84,6 +84,8 @@
public static final String JAAS_NAME = "jaasName"; //$NON-NLS-1$
public static final String KERBEROS_SERVICE_PRINCIPLE_NAME = "kerberosServicePrincipleName"; //$NON-NLS-1$;
+
+ public static final String ENCRYPT_REQUESTS = "encryptRequests"; //$NON-NLS-1$;
}
public static final String DOT_DELIMITER = "."; //$NON-NLS-1$
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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,7 +49,7 @@
public final class OioOjbectChannelFactory implements ObjectChannelFactory {
private final static int STREAM_BUFFER_SIZE = 1<<15;
- private final static int MAX_OBJECT_SIZE = 1 << 25;
+ private final static int DEFAULT_MAX_OBJECT_SIZE = 1 << 25;
private static Logger log = Logger.getLogger("org.teiid.client.sockets"); //$NON-NLS-1$
@@ -59,7 +59,7 @@
private ObjectInputStream inputStream;
private Object readLock = new Object();
- private OioObjectChannel(Socket socket) throws IOException {
+ private OioObjectChannel(Socket socket, int maxObjectSize) throws IOException {
log.fine("creating new OioObjectChannel"); //$NON-NLS-1$
this.socket = socket;
BufferedOutputStream bos = new BufferedOutputStream( socket.getOutputStream(), STREAM_BUFFER_SIZE);
@@ -69,7 +69,7 @@
outputStream.flush();
final ClassLoader cl = this.getClass().getClassLoader();
BufferedInputStream bis = new BufferedInputStream(socket.getInputStream(), STREAM_BUFFER_SIZE);
- inputStream = new ObjectDecoderInputStream(new DataInputStream(bis), cl, MAX_OBJECT_SIZE);
+ inputStream = new ObjectDecoderInputStream(new DataInputStream(bis), cl, maxObjectSize);
}
@Override
@@ -145,6 +145,7 @@
private boolean conserveBandwidth;
private int soTimeout = 3000;
private volatile SSLSocketFactory sslSocketFactory;
+ private int maxObjectSize = DEFAULT_MAX_OBJECT_SIZE;
public OioOjbectChannelFactory(Properties props) {
this.props = props;
@@ -176,7 +177,7 @@
socket.setTcpNoDelay(!conserveBandwidth); // enable Nagle's algorithm to conserve bandwidth
socket.connect(address);
socket.setSoTimeout(soTimeout);
- return new OioObjectChannel(socket);
+ return new OioObjectChannel(socket, maxObjectSize);
}
public int getSendBufferSize() {
@@ -206,6 +207,10 @@
public void setSoTimeout(int soTimeout) {
this.soTimeout = soTimeout;
}
+
+ public void setMaxObjectSize(int maxObjectSize) {
+ this.maxObjectSize = maxObjectSize;
+ }
public int getSoTimeout() {
return soTimeout;
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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,6 +49,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidException;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.gss.MakeGSS;
import org.teiid.jdbc.JDBCPlugin;
import org.teiid.net.CommunicationException;
@@ -210,7 +211,7 @@
}
public <T> T getService(Class<T> iface) {
- return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new SocketServerInstanceImpl.RemoteInvocationHandler(iface) {
+ return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new SocketServerInstanceImpl.RemoteInvocationHandler(iface, PropertiesUtils.getBooleanProperty(connProps, TeiidURL.CONNECTION.ENCRYPT_REQUESTS, false)) {
@Override
protected SocketServerInstance getInstance() throws CommunicationException {
if (failOver && System.currentTimeMillis() - lastPing > pingFailOverInterval) {
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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -31,6 +31,7 @@
import java.lang.reflect.Proxy;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -43,7 +44,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.teiid.client.security.ILogon;
+import org.teiid.client.security.Secure;
import org.teiid.client.util.ExceptionHolder;
import org.teiid.client.util.ExceptionUtil;
import org.teiid.client.util.ResultsFuture;
@@ -77,6 +78,7 @@
private Cryptor cryptor;
private String serverVersion;
private AuthenticationType authType = AuthenticationType.CLEARTEXT;
+ private HashMap<Class<?>, Object> serviceMap = new HashMap<Class<?>, Object>();
private boolean hasReader;
@@ -275,15 +277,19 @@
}
}
- @SuppressWarnings("unchecked")
@Override
- public <T> T getService(Class<T> iface) {
- return (T)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new RemoteInvocationHandler(iface) {
- @Override
- protected SocketServerInstanceImpl getInstance() {
- return SocketServerInstanceImpl.this;
- }
- });
+ public synchronized <T> T getService(Class<T> iface) {
+ Object service = this.serviceMap.get(iface);
+ if (service == null) {
+ service = Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new RemoteInvocationHandler(iface, false) {
+ @Override
+ protected SocketServerInstanceImpl getInstance() {
+ return SocketServerInstanceImpl.this;
+ }
+ });
+ this.serviceMap.put(iface, service);
+ }
+ return iface.cast(service);
}
public long getSynchTimeout() {
@@ -292,12 +298,12 @@
public static abstract class RemoteInvocationHandler implements InvocationHandler {
- private boolean secure;
private Class<?> targetClass;
+ private boolean secureOptional;
- public RemoteInvocationHandler(Class<?> targetClass) {
+ public RemoteInvocationHandler(Class<?> targetClass, boolean secureOptional) {
this.targetClass = targetClass;
- this.secure = ILogon.class.isAssignableFrom(targetClass);
+ this.secureOptional = secureOptional;
}
@Override
@@ -309,7 +315,8 @@
Message message = new Message();
message.setContents(new ServiceInvocationStruct(args, method.getName(),
targetClass));
- if (secure) {
+ Secure secure = method.getAnnotation(Secure.class);
+ if (secure != null && (!secure.optional() || secureOptional)) {
message.setContents(instance.getCryptor().sealObject(message.getContents()));
}
ResultsFuture<Object> results = new ResultsFuture<Object>() {
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
/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
/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
/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
/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
/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
/trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666
Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
===================================================================
--- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -22,24 +22,13 @@
*/
package org.teiid.netty.handler.codec.serialization;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.io.StreamCorruptedException;
+import java.io.*;
import java.util.List;
import org.teiid.core.types.InputStreamFactory;
import org.teiid.core.types.InputStreamFactory.StreamFactoryReference;
import org.teiid.core.util.ExternalizeUtil;
+import org.teiid.jdbc.JDBCPlugin;
/**
@@ -83,8 +72,7 @@
throw new StreamCorruptedException("invalid data length: " + dataLen); //$NON-NLS-1$
}
if (dataLen > maxObjectSize) {
- throw new StreamCorruptedException(
- "data length too big: " + dataLen + " (max: " + maxObjectSize + ')'); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new StreamCorruptedException(JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20028, dataLen, maxObjectSize));
}
}
fillBuffer();
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*
/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*
/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*
/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*
/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
/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
/trunk/client/src/main/resources/org/teiid/jdbc:3507-3666
Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-01 19:12:27 UTC (rev 4047)
@@ -171,4 +171,6 @@
</drivers>
TEIID20008=Failed to load "org.jboss.teiid" module.
TEIID20023=connection closed
-TEIID20007=Duplicate Class
\ No newline at end of file
+TEIID20007=Duplicate Class
+TEIID20028=data length too big: {0} > max of {1}. You may need to adjust the maxObjectSize client setting.
+unexpected_element=Unexpected Element {0} encountered, expecting one of {1}
\ No newline at end of file
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*
/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*
/trunk/client/src/main/resources/org/teiid/net:3507-3666
Modified: trunk/client/src/main/resources/teiid-client-settings.orig.properties
===================================================================
--- trunk/client/src/main/resources/teiid-client-settings.orig.properties 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/main/resources/teiid-client-settings.orig.properties 2012-05-01 19:12:27 UTC (rev 4047)
@@ -127,3 +127,10 @@
#
org.teiid.sockets.conserveBandwidth=false
+
+#
+# Maximum number of bytes per server message.
+# May need to be increased when using custom types and/or large batch sizes.
+#
+
+org.teiid.sockets.maxObjectSize=33554432
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*
/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*
/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
/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
/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*
/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*
/trunk/client/src/test/java/org/teiid/client/util:3507-3666
Modified: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
package org.teiid.client.util;
import static org.junit.Assert.*;
@@ -18,7 +40,7 @@
import org.teiid.core.util.ReflectionHelper;
import org.teiid.core.util.UnitTestUtil;
-
+ at SuppressWarnings("nls")
public class TestExceptionHolder {
@SuppressWarnings("all")
@@ -72,12 +94,43 @@
assertTrue(e instanceof BadException2);
assertEquals("Remote org.teiid.client.util.TestExceptionHolder$BadException2: I have foreign exception embedded in me", e.getMessage()); //$NON-NLS-1$
- // now unknown exception is not found, so promote known SQL exception up
e = e.getCause();
+ assertTrue(e instanceof TeiidRuntimeException);
+
+ e = e.getCause();
assertTrue(e instanceof SQLException);
+
assertEquals("Remote java.sql.SQLException: something bad happended", e.getMessage()); //$NON-NLS-1$
- }
+ }
+ @Test public void testSQLExceptionChain() throws Exception {
+ ClassLoader cl = new URLClassLoader(new URL[] {UnitTestUtil.getTestDataFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
+ Exception obj = (Exception)ReflectionHelper.create("test.UnknownException", null, cl); //$NON-NLS-1$
+ SQLException se = new SQLException("something bad happended");
+ se.initCause(obj); //$NON-NLS-1$
+ SQLException se1 = new SQLException("something else bad happended");
+ se1.initCause(obj); //$NON-NLS-1$
+ se.setNextException(se1);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(new ExceptionHolder(se, false)); //$NON-NLS-1$
+ oos.flush();
+
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ ExceptionHolder holder = (ExceptionHolder)ois.readObject();
+ Throwable e = holder.getException();
+ assertTrue(e instanceof SQLException);
+ assertEquals("Remote java.sql.SQLException: something bad happended", e.getMessage()); //$NON-NLS-1$
+
+ assertTrue(e.getCause() instanceof TeiidRuntimeException);
+
+ e = ((SQLException)e).getNextException();
+ assertTrue(e instanceof SQLException);
+
+ assertEquals("Remote java.sql.SQLException: something else bad happended", e.getMessage()); //$NON-NLS-1$
+ }
+
@Test public void testDeserializationUnknownChildException2() throws Exception {
ClassLoader cl = new URLClassLoader(new URL[] {UnitTestUtil.getTestDataFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
ArrayList<String> args = new ArrayList<String>();
@@ -93,7 +146,7 @@
ExceptionHolder holder = (ExceptionHolder)ois.readObject();
Throwable e = holder.getException();
assertTrue(e instanceof TeiidRuntimeException);
- assertEquals("Unknown Exception", e.getMessage()); //$NON-NLS-1$
+ assertEquals("Remote test.UnknownException: Unknown Exception", e.getMessage()); //$NON-NLS-1$
}
private static class NotSerializable {
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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -71,6 +71,14 @@
assertEquals("b'ar", p.get("foo")); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Test public void testSetPayloadStatement() throws Exception {
+ ConnectionImpl conn = Mockito.mock(ConnectionImpl.class);
+ Properties p = new Properties();
+ Mockito.stub(conn.getExecutionProperties()).toReturn(p);
+ StatementImpl statement = new StatementImpl(conn, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ assertFalse(statement.execute("set payload foo bar")); //$NON-NLS-1$
+ }
+
@Test public void testSetAuthorizationStatement() throws Exception {
ConnectionImpl conn = Mockito.mock(ConnectionImpl.class);
Properties p = new Properties();
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
/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
/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
/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
/trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -138,7 +138,7 @@
@Test public void testGetPropertyInfo1() throws Exception {
DriverPropertyInfo info[] = drv.getPropertyInfo("jdbc:teiid:vdb at mm://localhost:12345;applicationName=x", null); //$NON-NLS-1$
- assertEquals(23, info.length);
+ assertEquals(24, info.length);
assertEquals(false, info[0].required);
assertEquals("ApplicationName", info[0].name); //$NON-NLS-1$
assertEquals("x", info[0].value); //$NON-NLS-1$
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
/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
/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
/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
/trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -42,12 +42,7 @@
final ConnectionImpl mmConn = TestConnection.getMMConnection();
- XAConnectionImpl xaConn = new XAConnectionImpl(new XAConnectionImpl.ConnectionSource() {
- @Override
- public ConnectionImpl createConnection() throws SQLException {
- return mmConn;
- }
- });
+ XAConnectionImpl xaConn = new XAConnectionImpl(mmConn);
Connection conn = xaConn.getConnection();
StatementImpl stmt = (StatementImpl)conn.createStatement();
@@ -68,14 +63,9 @@
}
@Test public void testNotification() throws Exception {
- XAConnectionImpl xaConn = new XAConnectionImpl(new XAConnectionImpl.ConnectionSource() {
- @Override
- public ConnectionImpl createConnection() throws SQLException {
- ConnectionImpl c = Mockito.mock(ConnectionImpl.class);
- Mockito.doThrow(new SQLException(new InvalidSessionException())).when(c).commit();
- return c;
- }
- });
+ ConnectionImpl conn = Mockito.mock(ConnectionImpl.class);
+ Mockito.doThrow(new SQLException(new InvalidSessionException())).when(conn).commit();
+ XAConnectionImpl xaConn = new XAConnectionImpl(conn);
ConnectionEventListener cel = Mockito.mock(ConnectionEventListener.class);
xaConn.addConnectionEventListener(cel);
Connection c = xaConn.getConnection();
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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/trunk/client/src/test/java/org/teiid/net/socket:3507-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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/types/BinaryType.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,9 +24,8 @@
import java.util.Arrays;
-import javax.xml.bind.DatatypeConverter;
-
import org.teiid.core.util.Assertion;
+import org.teiid.core.util.PropertiesUtils;
public final class BinaryType implements Comparable<BinaryType> {
@@ -102,7 +101,7 @@
@Override
public String toString() {
- return DatatypeConverter.printHexBinary(bytes);
+ return PropertiesUtils.toHex(bytes);
}
public BlobType toBlob() {
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/common-core/src/main/java/org/teiid/core/util:3507-3666
Modified: trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/HashCodeUtil.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -139,8 +139,12 @@
}
return hc;
}
+
+ public static final int expHashCode(String x) {
+ return expHashCode(x, true);
+ }
- public static final int expHashCode(String x) {
+ public static final int expHashCode(String x, boolean caseSensitive) {
if(x == null) {
return 0;
}
@@ -148,7 +152,11 @@
int index = 1;
int xlen = x.length()+1; // switch to 1-based
while(index < xlen) {
- hc = PRIME * hc + x.charAt(index-1);
+ int charHash = x.charAt(index-1);
+ if (!caseSensitive) {
+ charHash = Character.toUpperCase(charHash);
+ }
+ hc = PRIME * hc + charHash;
index = index << 1; // left shift by 1 to double
}
return hc;
Modified: trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/PropertiesUtils.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -646,6 +646,14 @@
'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
};
+ public static String toHex(byte[] bytes) {
+ StringBuilder sb = new StringBuilder(bytes.length * 2);
+ for (byte b : bytes) {
+ sb.append(toHex(b >>> 4));
+ sb.append(toHex(b));
+ }
+ return sb.toString();
+ }
public static final void copyProperty(Properties srcProperties, String srcPropName, Properties tgtProperties, String tgtPropName) {
if(srcProperties == null || srcPropName == null || tgtProperties == null || tgtPropName == null) {
@@ -724,141 +732,7 @@
return original;
}
- // ======================================================
- /**
- * Returns a boolean indicating whether the string matched the given pattern.
- * A '*' may be
- * given to match the pattern exactly up to the '*', then anything after.
- * We will also support a leading star, and match on anything that ends with
- * the string specified after the star.
- * Note: Should also implement matching with '?' which means match any single
- * char.
- * @param pattern The property name to match which may include a '*'.
- * @param props The properties to search.
- * @return The boolean - passed or failed
- * but never null.
- */
- public static boolean filterTest( String pattern, String sCandidate ) {
-
- // Vars for match strategy
- char chStar = '*';
-
- // Match rule booleans. Please note that 'bLeading'
- // and 'bTrailing' refer to the string we are searching for.
- // For example, if the strategy is bLeading, and the Match frag
- // is "wet", and the candidate string is "wetrust", it will pass.
- // Likewise if the strategy is bTrailing and the Match frag is
- // "rust" and the candidate string is "wetrust", it will pass.
- boolean bLeading = false;
- boolean bTrailing = false;
- boolean bFullMatch = false;
- boolean bAnywhere = false;
- boolean bAllMatch = false;
-
- boolean bPass = false;
-
- String sMatchFrag = ""; //$NON-NLS-1$
-// List propNames = new ArrayList();
-
-
- // 1. Analyze pattern to resolve match strategy
-
- // First ensure the pattern is safe to work with.
- // If the pattern is an empty string, set it to '*',
- // which means anything passes.
- pattern = pattern.trim();
- if ( pattern.length() == 0 )
- pattern = "*"; //$NON-NLS-1$
-
- int iFirstStar = pattern.indexOf( chStar );
- int iLastStar = pattern.lastIndexOf( chStar );
-
- // If there are any stars:
- if( (iFirstStar > -1) && ( iLastStar > -1 ) )
- {
- // and their positions are the same (same star, silly)
- if( iFirstStar == iLastStar )
- {
- // and this star is at the front:
- if( iFirstStar == 0 )
- {
- // and the pattern is only one byte long:
- if( pattern.length() == 1 )
- {
- // Then the pattern is a single '*',
- // and all will pass the match:
- bAllMatch = true;
- }
- else
- {
- // Or the pattern is a leading star followed
- // by a string:
- bTrailing = true;
- sMatchFrag = pattern.substring( 1 );
- }
- }
- else
- {
- // OR the star is NOT at the front, so the
- // pattern is a trailing star preceded by a string:
- bLeading = true;
- sMatchFrag = pattern.substring( 0, iLastStar );
-
- }
- }
- else
- {
- // They are not equal
- //sMatchStrategy = ANYWHERE;
- bAnywhere = true;
- sMatchFrag = pattern.substring( iFirstStar + 1, iLastStar );
- }
- }
- else
- {
- // there are no stars at all
- //sMatchStrategy = FULL_MATCH;
- bFullMatch = true;
- sMatchFrag = pattern;
- }
-
- // Now test the string
- String name = sCandidate;
- bPass = false;
-
- // force the match fragment and the test string to UPPER case
- String sMatchFragUpper = sMatchFrag.toUpperCase();
- String sNameUpper = name.toUpperCase();
-
- // Test all of the booleans. Only one should be true.
- if( bAllMatch ) {
- bPass = true;
- }
- else
- if( bAnywhere ) {
- if( sNameUpper.indexOf( sMatchFragUpper ) > -1 )
- bPass = true;
- }
- else
- if( bFullMatch ) {
- if( sNameUpper.equals( sMatchFragUpper ) )
- bPass = true;
- }
- else
- if( bLeading ) {
- if( sNameUpper.startsWith( sMatchFragUpper ) )
- bPass = true;
- }
- else
- if( bTrailing ) {
- if( sNameUpper.endsWith( sMatchFragUpper ) )
- bPass = true;
- }
-
- return bPass;
- }
-
- public static void setBeanProperties(Object bean, Properties props, String prefix) {
+ public static void setBeanProperties(Object bean, Properties props, String prefix) {
// Move all prop names to lower case so we can use reflection to get
// method names and look them up in the connection props.
final Properties connProps = lowerCaseAllPropNames(props);
Modified: trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/common-core/src/main/java/org/teiid/core/util/SqlUtil.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -87,6 +87,6 @@
public static SQLException createFeatureNotSupportedException() {
StackTraceElement ste = new Exception().getStackTrace()[1];
String methodName = ste.getMethodName();
- return new SQLFeatureNotSupportedException(methodName + " is not supported");
+ return new SQLFeatureNotSupportedException(methodName + " is not supported"); //$NON-NLS-1$
}
}
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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666
Modified: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java
===================================================================
--- trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -128,17 +128,6 @@
}
@Override
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- //https://issues.apache.org/jira/browse/HIVE-164
- return true;
- }
-
- @Override
public boolean supportsCorrelatedSubqueries() {
//https://issues.apache.org/jira/browse/HIVE-784
return false;
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
/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
/trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -53,6 +53,7 @@
protected Connection connection;
protected ExecutionContext context;
protected JDBCExecutionFactory executionFactory;
+ protected Command command;
// Derived from properties
protected boolean trimString;
@@ -65,7 +66,7 @@
// Constructors
// ===========================================================================================================================
- protected JDBCBaseExecution(Connection connection, ExecutionContext context, JDBCExecutionFactory jef) {
+ protected JDBCBaseExecution(Command command, Connection connection, ExecutionContext context, JDBCExecutionFactory jef) {
this.connection = connection;
this.context = context;
@@ -73,6 +74,7 @@
trimString = jef.isTrimStrings();
fetchSize = context.getBatchSize();
+ this.command = command;
}
/**
@@ -143,7 +145,7 @@
protected void setSizeContraints(Statement statement) {
try {
- statement.setFetchSize(fetchSize);
+ executionFactory.setFetchSize(command, context, statement, fetchSize);
} catch (SQLException e) {
if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, MessageLevel.DETAIL)) {
LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequestId(), " could not set fetch size: ", fetchSize); //$NON-NLS-1$
@@ -193,15 +195,15 @@
public void addStatementWarnings() throws SQLException {
SQLWarning warning = this.statement.getWarnings();
- while (warning != null) {
- SQLWarning toAdd = warning;
- warning = toAdd.getNextWarning();
- toAdd.setNextException(null);
- if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, MessageLevel.DETAIL)) {
- LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequestId() + " Warning: ", warning); //$NON-NLS-1$
- }
- context.addWarning(toAdd);
- }
+ if (warning != null) {
+ context.addWarning(warning);
+ if (LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, MessageLevel.DETAIL)) {
+ while (warning != null) {
+ LogManager.logDetail(LogConstants.CTX_CONNECTOR, context.getRequestId() + " Warning: ", warning); //$NON-NLS-1$
+ warning = warning.getNextWarning();
+ }
+ }
+ }
this.statement.clearWarnings();
}
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,6 +30,7 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
import java.text.MessageFormat;
@@ -325,16 +326,6 @@
}
@Override
- public boolean supportsBetweenCriteria() {
- return true;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- return true;
- }
-
- @Override
public boolean supportsCompareCriteriaEquals() {
return true;
}
@@ -1134,8 +1125,24 @@
return nameParts;
}
+ /**
+ * Get the predicate name for LIKE_REGEX
+ * @return
+ */
public String getLikeRegexString() {
return SQLConstants.Reserved.LIKE_REGEX;
}
+
+ /**
+ * Set the fetch size on the given statement.
+ * @param context
+ * @param command
+ * @param statement
+ * @param fetchSize
+ * @throws SQLException
+ */
+ public void setFetchSize(Command command, ExecutionContext context, Statement statement, int fetchSize) throws SQLException {
+ statement.setFetchSize(fetchSize);
+ }
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -52,7 +52,6 @@
// ===========================================================================================================================
protected ResultSet results;
- protected Command command;
protected Class<?>[] columnDataTypes;
// ===========================================================================================================================
@@ -60,8 +59,7 @@
// ===========================================================================================================================
public JDBCQueryExecution(Command command, Connection connection, ExecutionContext context, JDBCExecutionFactory env) {
- super(connection, context, env);
- this.command = command;
+ super(command, connection, context, env);
}
@Override
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -43,7 +43,6 @@
*/
public class JDBCUpdateExecution extends JDBCBaseExecution implements UpdateExecution {
- private Command command;
private int[] result;
/**
@@ -54,8 +53,7 @@
* @param id
*/
public JDBCUpdateExecution(Command command, Connection connection, ExecutionContext context, JDBCExecutionFactory env) {
- super(connection, context, env);
- this.command = command;
+ super(command, connection, context, env);
}
// ===========================================================================================================================
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -85,12 +85,6 @@
}
@Override
- public boolean supportsBetweenCriteria() {
- return false;
- }
-
-
- @Override
public boolean supportsLikeCriteriaEscapeCharacter() {
return false;
}
@@ -161,11 +155,6 @@
}
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- @Override
public boolean supportsSearchedCaseExpressions() {
return false;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -171,16 +171,7 @@
return supportedFunctions;
}
- /**
- * Derby supports only SearchedCaseExpression, not CaseExpression.
- * @since 5.0
- */
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- @Override
public boolean supportsRowLimit() {
return this.getDatabaseVersion().compareTo(TEN_5) >= 0;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -194,11 +194,6 @@
}
@Override
- public boolean supportsCaseExpressions() {
- return false;
- }
-
- @Override
public boolean supportsCorrelatedSubqueries() {
return false;
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -41,6 +41,7 @@
import org.teiid.language.visitor.CollectorVisitor;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.metadata.AbstractMetadataRecord;
import org.teiid.metadata.Column;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.SourceSystemFunctions;
@@ -493,6 +494,34 @@
super.visit(obj);
}
+ public void visit(NamedTable table) {
+ stripDualAlias(table);
+ super.visit(table);
+ }
+
+ private void stripDualAlias(NamedTable table) {
+ if (table.getCorrelationName() != null) {
+ String groupName = null;
+ AbstractMetadataRecord groupID = table.getMetadataObject();
+ if(groupID != null) {
+ groupName = getName(groupID);
+ } else {
+ groupName = table.getName();
+ }
+ if (DUAL.equalsIgnoreCase(groupName)) {
+ table.setCorrelationName(null);
+ }
+ }
+ }
+
+ @Override
+ public void visit(ColumnReference obj) {
+ if (obj.getTable() != null) {
+ stripDualAlias(obj.getTable());
+ }
+ super.visit(obj);
+ }
+
};
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -287,4 +287,9 @@
return true;
}
+ @Override
+ protected boolean setFetchSizeOnCallableStatements() {
+ return true;
+ }
+
}
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -24,7 +24,10 @@
*/
package org.teiid.translator.jdbc.sybase;
+import java.sql.CallableStatement;
import java.sql.Date;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,13 +37,16 @@
import java.util.List;
import java.util.Map;
+import org.teiid.language.Command;
import org.teiid.language.Expression;
import org.teiid.language.Function;
import org.teiid.language.Literal;
import org.teiid.language.SQLConstants;
+import org.teiid.translator.ExecutionContext;
import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.Translator;
import org.teiid.translator.TranslatorException;
+import org.teiid.translator.TranslatorProperty;
import org.teiid.translator.jdbc.AliasModifier;
import org.teiid.translator.jdbc.ConvertModifier;
import org.teiid.translator.jdbc.EscapeSyntaxModifier;
@@ -58,6 +64,7 @@
public static final String FIFTEEN_5 = "15.5"; //$NON-NLS-1$
protected Map<String, Integer> formatMap = new HashMap<String, Integer>();
+ protected boolean jtdsDriver;
public SybaseExecutionFactory() {
setDatabaseVersion(TWELVE_5);
@@ -365,5 +372,27 @@
public boolean supportsRowLimit() {
return getDatabaseVersion().compareTo(FIFTEEN_0_2) >= 0;
}
+
+ @TranslatorProperty(display="JTDS Driver", description="True if the driver is the JTDS driver",advanced=true)
+ public boolean isJtdsDriver() {
+ return jtdsDriver;
+ }
+
+ public void setJtdsDriver(boolean jtdsDriver) {
+ this.jtdsDriver = jtdsDriver;
+ }
+
+ protected boolean setFetchSizeOnCallableStatements() {
+ return false;
+ }
+
+ @Override
+ public void setFetchSize(Command command, ExecutionContext context,
+ Statement statement, int fetchSize) throws SQLException {
+ if (!isJtdsDriver() && !setFetchSizeOnCallableStatements() && statement instanceof CallableStatement) {
+ return;
+ }
+ super.setFetchSize(command, context, statement, fetchSize);
+ }
}
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*
/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*
/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
/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
/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
/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
/trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -655,8 +655,8 @@
* @since 4.3
*/
@Test public void testDUAL() throws Exception {
- String input = "SELECT something FROM DUAL"; //$NON-NLS-1$
- String output = "SELECT something FROM DUAL"; //$NON-NLS-1$
+ String input = "SELECT something FROM DUAL as g0"; //$NON-NLS-1$
+ String output = "SELECT seq.nextval FROM DUAL"; //$NON-NLS-1$
helpTestVisitor(getOracleSpecificMetadata(),
input,
@@ -776,14 +776,15 @@
cols.get(1).setNameInSource("ID:SEQUENCE=MYSEQUENCE.nextVal"); //$NON-NLS-1$
cols.get(2).setNativeType("date"); //$NON-NLS-1$
cols.get(3).setNativeType("CHAR");
- RealMetadataFactory.createElements(dual, new String[] {"something"}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$
+ List<Column> dualCols = RealMetadataFactory.createElements(dual, new String[] {"something"}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$
+ dualCols.get(0).setNameInSource("seq.nextval");
ProcedureParameter in1 = RealMetadataFactory.createParameter("in1", SPParameter.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$
ColumnSet<Procedure> rs3 = RealMetadataFactory.createResultSet("proc.rs1", new String[] { "e1" }, new String[] { DataTypeManager.DefaultDataTypes.INTEGER }); //$NON-NLS-1$ //$NON-NLS-2$
Procedure p = RealMetadataFactory.createStoredProcedure("proc", foo, Arrays.asList(in1));
p.setResultSet(rs3);
p.setProperty(SQLConversionVisitor.TEIID_NATIVE_QUERY, "select x from y where z = $1");
-
+
CompositeMetadataStore store = new CompositeMetadataStore(metadataStore);
return new TransformationMetadata(null, store, null, RealMetadataFactory.SFM.getSystemFunctions(), null);
}
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*
/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*
/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
/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
/trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666
Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java
===================================================================
--- trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,11 +27,11 @@
import org.teiid.language.Command;
import org.teiid.metadata.RuntimeMetadata;
-import org.teiid.translator.Translator;
-import org.teiid.translator.TranslatorException;
import org.teiid.translator.Execution;
import org.teiid.translator.ExecutionContext;
import org.teiid.translator.ExecutionFactory;
+import org.teiid.translator.Translator;
+import org.teiid.translator.TranslatorException;
import org.teiid.translator.TranslatorProperty;
/**
@@ -111,8 +111,8 @@
}
@Override
- public List getSupportedFunctions() {
- List functions = Arrays.asList(new String[] {
+ public List<String> getSupportedFunctions() {
+ List<String> functions = Arrays.asList(new String[] {
"+", "-", "*", "/", "abs", "acos", "asin", "atan", "atan2", "ceiling", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"bitand", "bitnot", "bitor", "bitxor", "cos", "cot", "degrees", "cos", "cot", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
"degrees", "exp", "floor", "log", "log10", "mod", "pi", "power", "radians", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
@@ -174,16 +174,6 @@
}
@Override
- public boolean supportsBetweenCriteria() {
- return true;
- }
-
- @Override
- public boolean supportsCaseExpressions() {
- return true;
- }
-
- @Override
public boolean supportsCompareCriteriaEquals() {
return true;
}
Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
===================================================================
--- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -188,102 +188,102 @@
}
String sfTypeName = fieldType.value();
Column column = null;
- if(sfTypeName.equals(FieldType.STRING) || //string
- sfTypeName.equals(FieldType.COMBOBOX) || //"combobox"
- sfTypeName.equals(FieldType.REFERENCE) || //"reference"
- sfTypeName.equals(FieldType.PHONE) || //"phone"
- sfTypeName.equals(FieldType.ID) || //"id"
- sfTypeName.equals(FieldType.URL) || //"url"
- sfTypeName.equals(FieldType.EMAIL) || //"email"
- sfTypeName.equals(FieldType.ENCRYPTEDSTRING) || //"encryptedstring"
- sfTypeName.equals(FieldType.ANY_TYPE)) { //"anytype"
+ if(sfTypeName.equals(FieldType.STRING.value()) || //string
+ sfTypeName.equals(FieldType.COMBOBOX.value()) || //"combobox"
+ sfTypeName.equals(FieldType.REFERENCE.value()) || //"reference"
+ sfTypeName.equals(FieldType.PHONE.value()) || //"phone"
+ sfTypeName.equals(FieldType.ID.value()) || //"id"
+ sfTypeName.equals(FieldType.URL.value()) || //"url"
+ sfTypeName.equals(FieldType.EMAIL.value()) || //"email"
+ sfTypeName.equals(FieldType.ENCRYPTEDSTRING.value()) || //"encryptedstring"
+ sfTypeName.equals(FieldType.ANY_TYPE.value())) { //"anytype"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
- if(sfTypeName.equals(FieldType.ID)) {
+ if(sfTypeName.equals(FieldType.ID.value())) {
column.setNullType(NullType.No_Nulls);
ArrayList<String> columnNames = new ArrayList<String>();
columnNames.add(field.getName());
- metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table);
+ metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table); //$NON-NLS-1$
}
}
- else if(sfTypeName.equals(FieldType.PICKLIST)) { // "picklist"
+ else if(sfTypeName.equals(FieldType.PICKLIST.value())) { // "picklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedpicklist");
+ column.setNativeType("restrictedpicklist"); //$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.MULTIPICKLIST)) { //"multipicklist"
+ else if(sfTypeName.equals(FieldType.MULTIPICKLIST.value())) { //"multipicklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedmultiselectpicklist");
+ column.setNativeType("restrictedmultiselectpicklist");//$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.BASE_64)) { //"base64"
+ else if(sfTypeName.equals(FieldType.BASE_64.value())) { //"base64"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BLOB, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.BOOLEAN)) { //"boolean"
+ else if(sfTypeName.equals(FieldType.BOOLEAN.value())) { //"boolean"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BOOLEAN, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.CURRENCY)) { //"currency"
+ else if(sfTypeName.equals(FieldType.CURRENCY.value())) { //"currency"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setCurrency(true);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.TEXTAREA)) { //"textarea"
+ else if(sfTypeName.equals(FieldType.TEXTAREA.value())) { //"textarea"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
column.setSearchType(SearchType.Unsearchable);
}
- else if(sfTypeName.equals(FieldType.INT)) { //"int"
+ else if(sfTypeName.equals(FieldType.INT.value())) { //"int"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.INTEGER, table);
column.setNativeType(sfTypeName);
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DOUBLE) || //"double"
- sfTypeName.equals(FieldType.PERCENT)) { //"percent"
+ else if(sfTypeName.equals(FieldType.DOUBLE.value()) || //"double"
+ sfTypeName.equals(FieldType.PERCENT.value())) { //"percent"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DATE)) { //"date"
+ else if(sfTypeName.equals(FieldType.DATE.value())) { //"date"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DATE, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.DATETIME)) { //"datetime"
+ else if(sfTypeName.equals(FieldType.DATETIME.value())) { //"datetime"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIMESTAMP, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.TIME)) { //"time"
+ else if(sfTypeName.equals(FieldType.TIME.value())) { //"time"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIME, table);
column.setNativeType(sfTypeName);
}
- if(null == column) {
+
+ if(column == null) {
LogManager.logError(LogConstants.CTX_CONNECTOR, SalesForcePlugin.Util.gs(SalesForcePlugin.Event.TEIID13001, sfTypeName));
continue;
- } else {
- column.setNameInSource(field.getName());
- column.setLength(field.getLength());
- if(field.isUpdateable()) {
- column.setUpdatable(true);
- hasUpdateableColumn = true;
- }
- column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
- column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
- column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
+ }
+
+ column.setNameInSource(field.getName());
+ column.setLength(field.getLength());
+ if(field.isUpdateable()) {
+ column.setUpdatable(true);
+ hasUpdateableColumn = true;
}
-
+ column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
+ column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
+ column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
}
}
Property changes on: trunk/documentation/javadocs
___________________________________________________________________
Added: svn:ignore
+ .project
.settings
Modified: trunk/documentation/javadocs/pom.xml
===================================================================
--- trunk/documentation/javadocs/pom.xml 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/documentation/javadocs/pom.xml 2012-05-01 19:12:27 UTC (rev 4047)
@@ -10,421 +10,6 @@
<name>Teiid Javadocs</name>
<description>Javadocs for the Teiid project</description>
<dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-adminshell</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-cache-jbosscache</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client-jdk15</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>salesforce-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-file</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-hive</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-ldap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-loopback</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-olap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-salesforce</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-ws</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-hibernate-dialect</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-jboss-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>test-integration-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.teiid-test-integration</groupId>
- <artifactId>test-integration-db</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.2.9</version>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-transformer</artifactId>
- <version>1.2.9</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>org.olap4j</groupId>
- <artifactId>olap4j</artifactId>
- <version>0.9.8.343</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-plugin-api</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-native-system</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>mc4j</groupId>
- <artifactId>org-mc4j-ems</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>1.0.0.Alpha9</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <version>5.1.0.CR2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxonhe</artifactId>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>nux</groupId>
- <artifactId>nux</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.5.2-Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.6.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- <version>2.0.3.SP1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.3.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <version>1.0.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.1.GA</version>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>5.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>5.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-606.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.147</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>cpptasks</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
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*
/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*
/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*
/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*
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3816-3868,3876-3915,3920-3983
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/trunk/engine/src/main/java/org/teiid/core/id:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -81,7 +81,6 @@
tgtCaps.setCapabilitySupport(Capability.QUERY_AGGREGATES_DISTINCT, srcCaps.supportsAggregatesDistinct());
tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, srcCaps.supportsScalarSubqueries());
tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_CORRELATED, srcCaps.supportsCorrelatedSubqueries());
- tgtCaps.setCapabilitySupport(Capability.QUERY_CASE, srcCaps.supportsCaseExpressions());
tgtCaps.setCapabilitySupport(Capability.QUERY_SEARCHED_CASE, srcCaps.supportsSearchedCaseExpressions());
tgtCaps.setCapabilitySupport(Capability.QUERY_UNION, srcCaps.supportsUnions());
tgtCaps.setCapabilitySupport(Capability.QUERY_INTERSECT, srcCaps.supportsIntersect());
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -64,7 +64,7 @@
private AtomicRequestID id;
private ConnectorManager manager;
private AtomicRequestMessage requestMsg;
- private ExecutionFactory connector;
+ private ExecutionFactory<Object, Object> connector;
private QueryMetadataInterface queryMetadata;
/* Created on new request */
@@ -212,6 +212,9 @@
// Translate the command
Command command = this.requestMsg.getCommand();
this.expectedColumns = command.getProjectedSymbols().size();
+ if (command instanceof StoredProcedure) {
+ this.expectedColumns = ((StoredProcedure)command).getResultSetColumns().size();
+ }
LanguageBridgeFactory factory = new LanguageBridgeFactory(queryMetadata);
factory.setConvertIn(!this.connector.supportsInCriteria());
org.teiid.language.Command translatedCommand = factory.translate(command);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -139,10 +139,10 @@
}
this.objectsAccessed.add(id);
} else {
- Schema s = tm.getMetadataStore().getSchema(key.get(0).toUpperCase());
- Modifiable m = s.getTables().get(key.get(1).toUpperCase());
+ Schema s = tm.getMetadataStore().getSchema(key.get(0));
+ Modifiable m = s.getTables().get(key.get(1));
if (m == null) {
- m = s.getProcedures().get(key.get(1).toUpperCase());
+ m = s.getProcedures().get(key.get(1));
}
if (m != null) {
this.objectsAccessed.add(m);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -33,8 +33,34 @@
*/
public interface AuthorizationValidator {
- void validate(Command command, QueryMetadataInterface metadata, CommandContext commandContext) throws QueryValidatorException, TeiidComponentException;
+ enum CommandType {
+ USER,
+ PREPARED,
+ CACHED
+ }
+ /**
+ * Validates the given command. If the command is not a {@link CommandType#USER} command, the command object should not be modified.
+ * Any modification must be fully resolved using the associated {@link QueryMetadataInterface}. Returning true for a
+ * {@link CommandType#PREPARED} or {@link CommandType#CACHED} commands means that the matching prepared plan or cache entry
+ * will not be used.
+ * @param originalSql array of commands will typically contain only a single string, but may have multiple for batched updates.
+ * @param command the parsed and resolved command.
+ * @param metadata
+ * @param commandContext
+ * @param commandType
+ * @return true if the USER command was modified, or if the non-USER command should be modified.
+ * @throws QueryValidatorException
+ * @throws TeiidComponentException
+ */
+ boolean validate(String[] originalSql, Command command, QueryMetadataInterface metadata, CommandContext commandContext, CommandType commandType) throws QueryValidatorException, TeiidComponentException;
+
+ /**
+ *
+ * @param roleName
+ * @param commandContext
+ * @return true if the current user has the given role
+ */
boolean hasRole(String roleName, CommandContext commandContext);
boolean isEnabled();
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -49,6 +49,7 @@
import org.teiid.client.DQP;
import org.teiid.client.RequestMessage;
import org.teiid.client.ResultsMessage;
+import org.teiid.client.RequestMessage.StatementType;
import org.teiid.client.lob.LobChunk;
import org.teiid.client.metadata.MetadataResult;
import org.teiid.client.plan.PlanNode;
@@ -485,21 +486,6 @@
return resultsFuture;
}
-// /**
-// * Cancels a node in the request. (This request is called by the
-// * client directly using the admin API), so if this does not support
-// * partial results then remove the original request.
-// * @throws MetaMatrixComponentException
-// */
-// public void cancelAtomicRequest(AtomicRequestID requestID) throws MetaMatrixComponentException {
-// RequestWorkItem workItem = safeGetWorkItem(requestID.getRequestID());
-// if (workItem == null) {
-// LogManager.logDetail(LogConstants.CTX_DQP, "Could not cancel", requestID, "parent request does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
-// return;
-// }
-// workItem.requestAtomicRequestCancel(requestID);
-// }
-
RequestWorkItem getRequestWorkItem(RequestID reqID) throws TeiidProcessingException {
RequestWorkItem result = this.requests.get(reqID);
if (result == null) {
@@ -695,7 +681,27 @@
DataTierManagerImpl processorDataManager = new DataTierManagerImpl(this, this.bufferManager, this.config.isDetectingChangeEvents());
processorDataManager.setEventDistributor(eventDistributor);
- dataTierMgr = new TempTableDataManager(processorDataManager, this.bufferManager, this.processWorkerPool, this.rsCache);
+ dataTierMgr = new TempTableDataManager(processorDataManager, this.bufferManager, this.rsCache);
+ dataTierMgr.setExecutor(new TempTableDataManager.RequestExecutor() {
+
+ @Override
+ public void execute(String command, List<?> parameters) {
+ final String sessionId = DQPWorkContext.getWorkContext().getSessionId();
+ RequestMessage request = new RequestMessage(command);
+ request.setParameterValues(parameters);
+ request.setStatementType(StatementType.PREPARED);
+ ResultsFuture<ResultsMessage> result = executeRequest(0, request);
+ result.addCompletionListener(new ResultsFuture.CompletionListener<ResultsMessage>() {
+
+ @Override
+ public void onCompletion(
+ ResultsFuture<ResultsMessage> future) {
+ terminateSession(sessionId);
+ }
+
+ });
+ }
+ });
dataTierMgr.setEventDistributor(eventDistributor);
LogManager.logDetail(LogConstants.CTX_DQP, "DQPCore started maxThreads", this.config.getMaxThreads(), "maxActivePlans", this.maxActivePlans, "source concurrency", this.userRequestSourceConcurrency); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -117,6 +117,7 @@
private HashMap<String, DataPolicy> policies;
private boolean useCallingThread;
private Version clientVersion = Version.SEVEN_4;
+ private boolean admin;
public DQPWorkContext() {
}
@@ -141,6 +142,10 @@
public void setSecurityHelper(SecurityHelper securityHelper) {
this.securityHelper = securityHelper;
}
+
+ public SecurityHelper getSecurityHelper() {
+ return securityHelper;
+ }
/**
* @return
@@ -150,10 +155,7 @@
}
public Subject getSubject() {
- if (session.getSubject() != null) {
- return session.getSubject();
- }
- return null;
+ return session.getSubject();
}
/**
@@ -311,4 +313,13 @@
public void setClientVersion(Version clientVersion) {
this.clientVersion = clientVersion;
}
+
+ public void setAdmin(boolean admin) {
+ this.admin = admin;
+ }
+
+ public boolean isAdmin() {
+ return admin;
+ }
+
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -61,19 +61,7 @@
import org.teiid.events.EventDistributor;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.Datatype;
-import org.teiid.metadata.ForeignKey;
-import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.KeyRecord;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.ProcedureParameter;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
+import org.teiid.metadata.*;
import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.CompositeMetadataStore;
import org.teiid.query.metadata.TempMetadataID;
@@ -182,7 +170,7 @@
return processSystemQuery(context, command, workItem.getDqpWorkContext());
}
- AtomicRequestMessage aqr = createRequest(context.getProcessorID(), command, modelName, connectorBindingId, nodeID);
+ AtomicRequestMessage aqr = createRequest(workItem, command, modelName, connectorBindingId, nodeID);
aqr.setCommandContext(context);
SourceHint sh = context.getSourceHint();
if (sh != null) {
@@ -572,11 +560,9 @@
return result;
}
- private AtomicRequestMessage createRequest(Object processorId,
+ private AtomicRequestMessage createRequest(RequestWorkItem workItem,
Command command, String modelName, String connectorBindingId, int nodeID)
- throws TeiidProcessingException, TeiidComponentException {
- RequestWorkItem workItem = requestMgr.getRequestWorkItem((RequestID)processorId);
-
+ throws TeiidComponentException {
RequestMessage request = workItem.requestMsg;
// build the atomic request based on original request + context info
AtomicRequestMessage aqr = new AtomicRequestMessage(request, workItem.getDqpWorkContext(), nodeID);
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthorizationValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthorizationValidator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DefaultAuthorizationValidator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -41,11 +41,15 @@
}
@Override
- public void validate(Command command, QueryMetadataInterface metadata, CommandContext commandContext) throws QueryValidatorException, TeiidComponentException {
+ public boolean validate(String[] originalSql, Command command,
+ QueryMetadataInterface metadata, CommandContext commandContext,
+ CommandType commandType) throws QueryValidatorException,
+ TeiidComponentException {
if (enabled && policyDecider.validateCommand(commandContext)) {
AuthorizationValidationVisitor visitor = new AuthorizationValidationVisitor(this.policyDecider, commandContext);
Request.validateWithVisitor(visitor, metadata, command);
}
+ return false;
}
@Override
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,6 +35,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
@@ -131,6 +132,21 @@
String sqlQuery = requestMsg.getCommands()[0];
CacheID id = new CacheID(this.workContext, Request.createParseInfo(this.requestMsg), sqlQuery);
prepPlan = prepPlanCache.get(id);
+
+ if (prepPlan != null) {
+ ProcessorPlan cachedPlan = prepPlan.getPlan();
+ this.userCommand = prepPlan.getCommand();
+ if (validateAccess(requestMsg.getCommands(), userCommand, CommandType.PREPARED)) {
+ LogManager.logDetail(LogConstants.CTX_DQP, requestId, "AuthorizationValidator indicates that the prepared plan for command will not be used"); //$NON-NLS-1$
+ prepPlan = null;
+ } else {
+ LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query exist in cache: ", sqlQuery }); //$NON-NLS-1$
+ processPlan = cachedPlan.clone();
+ //already in cache. obtain the values from cache
+ analysisRecord = prepPlan.getAnalysisRecord();
+ }
+ }
+
if (prepPlan == null) {
//if prepared plan does not exist, create one
prepPlan = new PreparedPlan();
@@ -149,15 +165,7 @@
}
this.prepPlanCache.put(id, determinismLevel, prepPlan, userCommand.getCacheHint() != null?userCommand.getCacheHint().getTtl():null);
- }
- } else {
- ProcessorPlan cachedPlan = prepPlan.getPlan();
- this.userCommand = prepPlan.getCommand();
- validateAccess(userCommand);
- LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query exist in cache: ", sqlQuery }); //$NON-NLS-1$
- processPlan = cachedPlan.clone();
- //already in cache. obtain the values from cache
- analysisRecord = prepPlan.getAnalysisRecord();
+ }
}
if (requestMsg.isBatchedUpdate()) {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -30,9 +30,7 @@
import java.util.concurrent.Executor;
import org.teiid.adminapi.impl.VDBMetaData;
-import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryParserException;
-import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.api.exception.query.QueryValidatorException;
import org.teiid.client.RequestMessage;
@@ -46,6 +44,7 @@
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.multisource.MultiSourceCapabilitiesFinder;
import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapper;
import org.teiid.dqp.internal.process.multisource.MultiSourcePlanToProcessConverter;
@@ -283,8 +282,6 @@
//ensure that the user command is distinct from the processing command
//rewrite and planning may alter options, symbols, etc.
QueryResolver.resolveCommand(command, metadata);
-
- this.userCommand = (Command)command.clone();
}
private void validateQuery(Command command)
@@ -386,8 +383,10 @@
resolveCommand(command);
- validateAccess(userCommand);
+ validateAccess(requestMsg.getCommands(), command, CommandType.USER);
+ this.userCommand = (Command) command.clone();
+
Collection<GroupSymbol> groups = GroupCollectorVisitor.getGroups(command, true);
for (GroupSymbol groupSymbol : groups) {
if (groupSymbol.isTempTable()) {
@@ -412,36 +411,32 @@
}
}
+ // If using multi-source models, insert a proxy to simplify the supported capabilities. This is
+ // done OUTSIDE the cache (wrapped around the cache) intentionally to avoid caching the simplified
+ // capabilities which may be different for the same model in a different VDB used by this same DQP.
+ CapabilitiesFinder finder = this.capabilitiesFinder;
+ if(this.multiSourceModels != null) {
+ finder = new MultiSourceCapabilitiesFinder(finder, this.multiSourceModels);
+ }
+
+ boolean debug = analysisRecord.recordDebug();
+ if(debug) {
+ analysisRecord.println("\n============================================================================"); //$NON-NLS-1$
+ analysisRecord.println("USER COMMAND:\n" + command); //$NON-NLS-1$
+ }
+ // Run the optimizer
try {
- // If using multi-source models, insert a proxy to simplify the supported capabilities. This is
- // done OUTSIDE the cache (wrapped around the cache) intentionally to avoid caching the simplified
- // capabilities which may be different for the same model in a different VDB used by this same DQP.
- CapabilitiesFinder finder = this.capabilitiesFinder;
- if(this.multiSourceModels != null) {
- finder = new MultiSourceCapabilitiesFinder(finder, this.multiSourceModels);
+ processPlan = QueryOptimizer.optimizePlan(command, metadata, idGenerator, finder, analysisRecord, context);
+ } finally {
+ String debugLog = analysisRecord.getDebugLog();
+ if(debugLog != null && debugLog.length() > 0) {
+ LogManager.log(requestMsg.getShowPlan()==ShowPlan.DEBUG?MessageLevel.INFO:MessageLevel.TRACE, LogConstants.CTX_QUERY_PLANNER, debugLog);
}
-
- boolean debug = analysisRecord.recordDebug();
- if(debug) {
- analysisRecord.println("\n============================================================================"); //$NON-NLS-1$
- analysisRecord.println("USER COMMAND:\n" + command); //$NON-NLS-1$
+ if (analysisRecord.recordAnnotations() && analysisRecord.getAnnotations() != null && !analysisRecord.getAnnotations().isEmpty()) {
+ LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, analysisRecord.getAnnotations());
}
- // Run the optimizer
- try {
- processPlan = QueryOptimizer.optimizePlan(command, metadata, idGenerator, finder, analysisRecord, context);
- } finally {
- String debugLog = analysisRecord.getDebugLog();
- if(debugLog != null && debugLog.length() > 0) {
- LogManager.log(requestMsg.getShowPlan()==ShowPlan.DEBUG?MessageLevel.INFO:MessageLevel.TRACE, LogConstants.CTX_QUERY_PLANNER, debugLog);
- }
- if (analysisRecord.recordAnnotations() && analysisRecord.getAnnotations() != null && !analysisRecord.getAnnotations().isEmpty()) {
- LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, analysisRecord.getAnnotations());
- }
- }
- LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { QueryPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$
- } catch (QueryMetadataException e) {
- throw new QueryPlannerException(QueryPlugin.Event.TEIID30494, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30494, requestId));
}
+ LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { QueryPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$
}
public void processRequest()
@@ -465,11 +460,14 @@
this.context.setValidateXML(requestMsg.getValidationMode());
}
- protected void validateAccess(Command command) throws QueryValidatorException, TeiidComponentException {
- createCommandContext(command);
- if (this.authorizationValidator != null) {
- this.authorizationValidator.validate(command, metadata, context);
+ protected boolean validateAccess(String[] commandStr, Command command, CommandType type) throws QueryValidatorException, TeiidComponentException {
+ if (context == null) {
+ createCommandContext(command);
}
+ if (!this.workContext.isAdmin() && this.authorizationValidator != null) {
+ return this.authorizationValidator.validate(commandStr, command, metadata, context, type);
+ }
+ return false;
}
public void setExecutor(Executor executor) {
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -45,12 +45,12 @@
import org.teiid.common.buffer.TupleBatch;
import org.teiid.common.buffer.TupleBuffer;
import org.teiid.common.buffer.BufferManager.TupleSourceType;
-import org.teiid.core.BundleUtil;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.DQPCore.CompletionListener;
import org.teiid.dqp.internal.process.DQPCore.FutureWork;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
@@ -520,9 +520,11 @@
this.resultsBuffer = cr.getResults();
request.initMetadata();
this.originalCommand = cr.getCommand(requestMsg.getCommandString(), request.metadata, pi);
- request.validateAccess(this.originalCommand);
- this.doneProducingBatches();
- return;
+ if (!request.validateAccess(requestMsg.getCommands(), this.originalCommand, CommandType.CACHED)) {
+ this.doneProducingBatches();
+ return;
+ }
+ LogManager.logDetail(LogConstants.CTX_DQP, requestID, "Cached result command to be modified, will not use the cached results", cacheId); //$NON-NLS-1$
}
} else {
LogManager.logDetail(LogConstants.CTX_DQP, requestID, "Parameters are not serializable - cache cannot be used for", cacheId); //$NON-NLS-1$
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -281,5 +281,11 @@
return command;
}
+
+ @Override
+ protected boolean minimizeProject() {
+ //running minimize twice is not allowed as the original command is modified
+ return false;
+ }
}
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*
/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*
/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
/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
/trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -535,7 +535,6 @@
TEIID30491,
TEIID30492,
TEIID30493,
- TEIID30494,
TEIID30495,
TEIID30496,
TEIID30497,
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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataReader.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataReader.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataReader.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -7,9 +7,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -19,11 +16,8 @@
import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.FunctionParameter;
- at XmlType
- at XmlRootElement(namespace="http://www.omg.org/XMI", name="XMI")
public class FunctionMetadataReader {
- @XmlElement(namespace="http://www.metamatrix.com/metamodels/MetaMatrixFunction", name="ScalarFunction")
List<FunctionMethod> functionMethods = new ArrayList<FunctionMethod>();
public static List<FunctionMethod> loadFunctionMethods(InputStream source) throws XMLStreamException {
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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -145,6 +145,13 @@
ModelMetaData model = vdb.getModel(schema.getName());
for (Table t:schema.getTables().values()) {
+ // no need to verify the transformation of the xml mapping document,
+ // as this is very specific and designer already validates it.
+ if (t.getTableType() == Table.Type.Document
+ || t.getTableType() == Table.Type.XmlMappingClass
+ || t.getTableType() == Table.Type.XmlStagingTable) {
+ continue;
+ }
if (t.isVirtual()) {
if (t.getSelectTransformation() == null) {
log(report, model, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31079, t.getName(), model.getName()));
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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -326,7 +326,7 @@
}
}
aNode.setCommand(command);
- if (!aNode.isShouldEvaluate()) {
+ if (minimizeProject() && !aNode.isShouldEvaluate()) {
aNode.minimizeProject(command);
}
setRoutingName(aNode, node);
@@ -576,5 +576,9 @@
throw new QueryPlannerException(QueryPlugin.Event.TEIID30251, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30251));
}
}
+
+ protected boolean minimizeProject() {
+ return true;
+ }
}
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -80,6 +80,7 @@
switch (node.getType()) {
case NodeConstants.Types.SORT:
parentBlocking = true;
+ boolean raisedAccess = false;
if (node.hasBooleanProperty(NodeConstants.Info.IS_DUP_REMOVAL)) {
break;
}
@@ -87,6 +88,7 @@
node.setProperty(NodeConstants.Info.IS_DUP_REMOVAL, true);
} else {
root = checkForProjectOptimization(node, root, metadata, capFinder, record);
+ raisedAccess = NodeEditor.findParent(node, NodeConstants.Types.ACCESS) != null;
}
OrderBy orderBy = (OrderBy)node.getProperty(NodeConstants.Info.SORT_ORDER);
List<Expression> orderColumns = orderBy.getSortKeys();
@@ -120,8 +122,10 @@
}
possibleSort.setProperty(Info.SORT_ORDER, orderBy);
}
- break;
}
+ if (raisedAccess) {
+ return root;
+ }
break;
case NodeConstants.Types.DUP_REMOVE:
if (parentBlocking) {
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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/proc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc:3816-3868,3876-3915,3920-3983
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/main/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/StoredProcedure.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -192,7 +192,7 @@
if(resultSetParameter != null){
List<ElementSymbol> result = new LinkedList<ElementSymbol>();
for (Iterator<ElementSymbol> i = resultSetParameter.getResultSetColumns().iterator(); i.hasNext();) {
- ElementSymbol symbol = (ElementSymbol)i.next().clone();
+ ElementSymbol symbol = i.next().clone();
symbol.setGroupSymbol(getGroup());
result.add(symbol);
}
@@ -250,13 +250,11 @@
* @return Ordered list of SingleElementSymbol
*/
public List getProjectedSymbols(){
- List<ElementSymbol> result = new ArrayList<ElementSymbol>();
- //add result set columns
- List rsColumns = getResultSetColumns();
- result.addAll(rsColumns);
if (!returnParameters()) {
- return result;
+ return getResultSetColumns();
}
+ //add result set columns
+ List<ElementSymbol> result = new ArrayList<ElementSymbol>(getResultSetColumns());
//add out/inout parameter symbols
for (SPParameter parameter : mapOfParameters.values()) {
if(parameter.getParameterType() == ParameterInfo.RETURN_VALUE){
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableStoreImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableStoreImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/GlobalTableStoreImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -79,6 +79,7 @@
private Serializable loadingAddress;
private long ttl = -1;
private boolean valid;
+ private boolean asynch; //sub state of loading
protected MatTableInfo() {}
@@ -96,7 +97,9 @@
}
return true;
case LOADING:
- if (!firstPass && localAddress instanceof Comparable<?> && ((Comparable)localAddress).compareTo(possibleLoadingAddress) < 0) {
+ if ((!firstPass && localAddress instanceof Comparable<?> && ((Comparable)localAddress).compareTo(possibleLoadingAddress) < 0)
+ || (refresh && asynch)) {
+ this.asynch = false;
this.loadingAddress = possibleLoadingAddress; //ties go to the lowest address
return true;
}
@@ -130,6 +133,11 @@
notifyAll();
}
+ public synchronized void setAsynchLoad() {
+ assert state == MatState.LOADING;
+ asynch = true;
+ }
+
public synchronized void setTtl(long ttl) {
this.ttl = ttl;
}
Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,15 +27,15 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
-import java.util.concurrent.FutureTask;
+import org.teiid.adminapi.impl.SessionMetadata;
+import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.api.exception.query.ExpressionEvaluationException;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryProcessingException;
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.api.exception.query.QueryValidatorException;
+import org.teiid.client.security.SessionToken;
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.TupleBuffer;
@@ -47,13 +47,14 @@
import org.teiid.core.util.Assertion;
import org.teiid.core.util.StringUtil;
import org.teiid.dqp.internal.process.CachedResults;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.events.EventDistributor;
+import org.teiid.language.SQLConstants;
import org.teiid.language.SQLConstants.Reserved;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.metadata.FunctionMethod.Determinism;
import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
@@ -85,25 +86,33 @@
*/
public class TempTableDataManager implements ProcessorDataManager {
- private static final String REFRESHMATVIEWROW = ".refreshmatviewrow"; //$NON-NLS-1$
+ public interface RequestExecutor {
+ void execute(String command, List<?> parameters);
+ }
+
+ private static final String REFRESHMATVIEWROW = ".refreshmatviewrow"; //$NON-NLS-1$
private static final String REFRESHMATVIEW = ".refreshmatview"; //$NON-NLS-1$
public static final String CODE_PREFIX = "#CODE_"; //$NON-NLS-1$
-
+ private static String REFRESH_SQL = SQLConstants.Reserved.CALL + ' ' + CoreConstants.SYSTEM_ADMIN_MODEL + REFRESHMATVIEW + "(?, ?)"; //$NON-NLS-1$
+
private ProcessorDataManager processorDataManager;
private BufferManager bufferManager;
private SessionAwareCache<CachedResults> cache;
- private Executor executor;
+ private RequestExecutor executor;
private EventDistributor eventDistributor;
-
+
public TempTableDataManager(ProcessorDataManager processorDataManager, BufferManager bufferManager,
- Executor executor, SessionAwareCache<CachedResults> cache){
+ SessionAwareCache<CachedResults> cache){
this.processorDataManager = processorDataManager;
this.bufferManager = bufferManager;
- this.executor = executor;
this.cache = cache;
}
+ public void setExecutor(RequestExecutor executor) {
+ this.executor = executor;
+ }
+
public void setEventDistributor(EventDistributor eventDistributor) {
this.eventDistributor = eventDistributor;
}
@@ -396,11 +405,12 @@
}
}
if (load) {
- if (!info.isValid()) {
+ if (!info.isValid() || executor == null) {
//blocking load
loadGlobalTable(context, group, tableName, globalStore);
} else {
- loadAsynch(context, group, tableName, globalStore);
+ info.setAsynchLoad();
+ loadAsynch(context, tableName);
}
}
table = globalStore.getTempTableStore().getOrCreateTempTable(tableName, query, bufferManager, false, false, context);
@@ -417,16 +427,25 @@
return table.createTupleSource(query.getProjectedSymbols(), query.getCriteria(), query.getOrderBy());
}
- private void loadAsynch(final CommandContext context,
- final GroupSymbol group, final String tableName, final GlobalTableStore globalStore) {
- Callable<Integer> toCall = new Callable<Integer>() {
+ private void loadAsynch(final CommandContext context, final String tableName) {
+ SessionMetadata session = createTemporarySession(context.getUserName(), "asynch-mat-view-load", context.getDQPWorkContext().getVDB()); //$NON-NLS-1$
+ session.setSubject(context.getSubject());
+ session.setSecurityDomain(context.getSession().getSecurityDomain());
+ DQPWorkContext workContext = new DQPWorkContext();
+ workContext.setAdmin(true);
+ DQPWorkContext current = context.getDQPWorkContext();
+ workContext.setSession(session);
+ workContext.setPolicies(current.getAllowedDataPolicies());
+ workContext.setSecurityHelper(current.getSecurityHelper());
+ final String viewName = tableName.substring(RelationalPlanner.MAT_PREFIX.length());
+ workContext.runInContext(new Runnable() {
+
@Override
- public Integer call() throws Exception {
- return loadGlobalTable(context, group, tableName, globalStore);
+ public void run() {
+ executor.execute(REFRESH_SQL, Arrays.asList(viewName, Boolean.FALSE.toString()));
}
- };
- FutureTask<Integer> task = new FutureTask<Integer>(toCall);
- executor.execute(task);
+
+ });
}
private int loadGlobalTable(CommandContext context,
@@ -515,4 +534,26 @@
public EventDistributor getEventDistributor() {
return this.eventDistributor;
}
+
+ /**
+ * Create an unauthenticated session
+ * @param userName
+ * @param app
+ * @param vdb
+ * @return
+ */
+ public static SessionMetadata createTemporarySession(String userName, String app, VDBMetaData vdb) {
+ long creationTime = System.currentTimeMillis();
+ SessionMetadata newSession = new SessionMetadata();
+ newSession.setSessionToken(new SessionToken(userName));
+ newSession.setSessionId(newSession.getSessionToken().getSessionID());
+ newSession.setUserName(userName);
+ newSession.setCreatedTime(creationTime);
+ newSession.setApplicationName(app);
+ newSession.setVDBName(vdb.getName());
+ newSession.setVDBVersion(vdb.getVersion());
+ newSession.setVdb(vdb);
+ newSession.setEmbedded(true);
+ return newSession;
+ }
}
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
/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
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666
Modified: trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/java/org/teiid/vdb/runtime/VDBKey.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -32,16 +32,17 @@
private String name;
private int version;
+ private int hashCode;
public VDBKey(String name, String version) {
- this.name = name.toUpperCase();
+ this.name = name;
if (version != null) {
this.version = Integer.parseInt(version);
}
}
public VDBKey(String name, int version) {
- this.name = name.toUpperCase();
+ this.name = name;
this.version = version;
}
@@ -57,7 +58,10 @@
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
- return HashCodeUtil.hashCode(name.hashCode(), version);
+ if (hashCode == 0) {
+ hashCode = HashCodeUtil.hashCode(HashCodeUtil.expHashCode(name, false), version);
+ }
+ return hashCode;
}
/**
@@ -74,8 +78,8 @@
VDBKey other = (VDBKey)obj;
- return other.name.equals(this.name)
- && version == other.version;
+ return version == other.version
+ && other.name.equalsIgnoreCase(this.name);
}
/**
@@ -87,11 +91,11 @@
@Override
public int compareTo(VDBKey o) {
- int compare = name.compareTo(o.name);
+ int compare = String.CASE_INSENSITIVE_ORDER.compare(name, o.name);
if (compare == 0) {
return version - o.version;
}
return compare;
}
-
+
}
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-01 19:12:27 UTC (rev 4047)
@@ -73,6 +73,7 @@
QueryParser.nullSqlCrit=Parser cannot parse a null sql criteria.
QueryParser.lexicalError=Lexical error: {0}
QueryParser.nullSqlExpr=Parser cannot parse a null sql expression.
+TEIID30378=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
TEIID30379=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
# processor (006)
@@ -859,7 +860,6 @@
TEIID30548=Property value length exceeds max of {0}.
TEIID30549=Could not find a metadata record with uuid {0}.
TEIID30489=Unable to load metadata for VDB name
-TEIID30494=Unknown query metadata exception while registering query: {0}.
DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache
DQPCore.Clearing_prepared_plan_cache_for_vdb=Clearing prepared plan cache for vdb {0}.{1}
DQPCore.clearing_resultset_cache=Clearing the resultset cache for vdb {0}.{1}
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*
/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*
/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
/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
/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*
/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*
/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
/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
/trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/common/queue
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/common/queue:3816-3868,3876-3915,3920-3983
/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
/trunk/engine/src/test/java/org/teiid/common/queue:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,6 +35,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.datamgr.FakeTransactionService;
+import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.service.AutoGenDataService;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.parser.QueryParser;
@@ -88,10 +89,9 @@
drpd.setAllowFunctionCallsByDefault(true);
drav.setPolicyDecider(drpd);
request.setAuthorizationValidator(drav);
- request.validateAccess(command);
+ request.validateAccess(new String[] {QUERY}, command, CommandType.USER);
}
-
/**
* Test Request.processRequest().
* Test processing the same query twice, and make sure that doesn't cause problems.
@@ -165,7 +165,7 @@
DQPWorkContext workContext = RealMetadataFactory.buildWorkContext(metadata, RealMetadataFactory.example1VDB());
message.setStatementType(StatementType.PREPARED);
- message.setParameterValues(new ArrayList());
+ message.setParameterValues(new ArrayList<Object>());
helpProcessMessage(message, cache, workContext);
@@ -173,7 +173,7 @@
//If this doesn't throw an exception, assume it was successful.
message = new RequestMessage(QUERY);
message.setStatementType(StatementType.PREPARED);
- message.setParameterValues(new ArrayList());
+ message.setParameterValues(new ArrayList<Object>());
helpProcessMessage(message, cache, workContext);
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -232,6 +232,23 @@
helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, dataMgr, expected, RealMetadataFactory.exampleMultiBindingVDB());
}
+ @Test public void testMultiReplacementWithProjectConstantLimit() throws Exception {
+ final QueryMetadataInterface metadata = RealMetadataFactory.exampleMultiBinding();
+ final String userSql = "SELECT a, b, source_name || a, '1' FROM MultiModel.Phys"; //$NON-NLS-1$
+ final String multiModel = "MultiModel"; //$NON-NLS-1$
+ final int sources = 2;
+ final List<?>[] expected = new List<?>[] {
+ Arrays.asList("x", "z", "ax", "1"),
+ };
+ final HardcodedDataManager dataMgr = new HardcodedDataManager();
+ dataMgr.addData("SELECT g_0.a, g_0.b, concat('a', g_0.a) FROM MultiModel.Phys AS g_0", //$NON-NLS-1$
+ new List<?>[] {
+ Arrays.asList("x", "z", "ax")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ dataMgr.addData("SELECT g_0.a, g_0.b, concat('b', g_0.a) FROM MultiModel.Phys AS g_0", //$NON-NLS-1$
+ new List<?>[] {});
+ helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, dataMgr, expected, RealMetadataFactory.exampleMultiBindingVDB());
+ }
+
@Test public void testMultiDependentJoin() throws Exception {
QueryMetadataInterface metadata = RealMetadataFactory.exampleMultiBinding();
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*
/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*
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutputter.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutputter.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingOutputter.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -29,8 +29,6 @@
import java.io.StringWriter;
import java.util.ArrayList;
-import javax.xml.bind.JAXBException;
-
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingChoiceNode;
import org.teiid.query.mapping.xml.MappingCriteriaNode;
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
/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
/trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666
Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -32,6 +32,7 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Table;
import org.teiid.query.function.SystemFunctionManager;
import org.teiid.query.parser.TestDDLParser;
import org.teiid.query.validator.ValidatorFailure;
@@ -266,4 +267,34 @@
assertEquals("G1", store.getSchema("vm1").getTable("G2").getMaterializedTable().getName());
}
+
+ @Test
+ public void testSkipDocumentModel() throws Exception {
+ ModelMetaData model = new ModelMetaData();
+ model.setName("xmlstuff");
+ model.setModelType(Model.Type.VIRTUAL);
+ vdb.addModel(model);
+
+ MetadataFactory mf = new MetadataFactory("myVDB",1, "xmlstuff", TestDDLParser.getDataTypes(), new Properties(), null);
+ mf.setPhysical(false);
+
+ Table t = mf.addTable("xmldoctable");
+ t.setTableType(Table.Type.Document);
+ mf.addColumn("c1", "string", t);
+ t.setSelectTransformation("some dummy stuff, should not be validated");
+ t.setVirtual(true);
+
+ Table t2 = mf.addTable("xmldoctable2");
+ t2.setTableType(Table.Type.XmlMappingClass);
+ mf.addColumn("c1", "string", t2);
+ t2.setSelectTransformation("some dummy stuff, should not be validated");
+ t2.setVirtual(true);
+ mf.mergeInto(store);
+
+ buildTransformationMetadata();
+
+ ValidatorReport report = new ValidatorReport();
+ report = MetadataValidator.validate(this.vdb, this.store);
+ assertFalse(printError(report), report.hasItems());
+ }
}
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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -286,6 +286,40 @@
helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
new String[] {"SELECT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0 ORDER BY c_0 LIMIT 1"}, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
}
+
+ //TODO this should trigger another view removal and thus the combination of the grouping/dup operation
+ @Test public void testGroupDupCombination1Pushdown() {
+ FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+ BasicSourceCapabilities caps = getTypicalCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_SELECT_DISTINCT, true);
+ caps.setCapabilitySupport(Capability.QUERY_FROM_INLINE_VIEWS, true);
+ caps.setCapabilitySupport(Capability.QUERY_GROUP_BY, true);
+ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+ capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$
+ // Create query
+ String sql = "select e1, (select e1 from pm2.g1 where e2 = x.e2) as z from (select distinct e1, e2 from pm1.g1) as x group by e1, e2 order by e1"; //$NON-NLS-1$
+ ProcessorPlan plan = helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
+ new String[] {"SELECT v_0.c_0, v_0.c_1 FROM (SELECT DISTINCT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0) AS v_0 GROUP BY v_0.c_0, v_0.c_1"}, TestOptimizer.SHOULD_SUCCEED); //$NON-NLS-1$
+
+ checkNodeTypes(plan, new int[] {
+ 1, // Access
+ 0, // DependentAccess
+ 0, // DependentSelect
+ 1, // DependentProject
+ 0, // DupRemove
+ 0, // Grouping
+ 0, // NestedLoopJoinStrategy
+ 0, // MergeJoinStrategy
+ 0, // Null
+ 0, // PlanExecution
+ 0, // Project
+ 0, // Select
+ 0, // Sort
+ 0 // UnionAll
+ });
+ checkNodeTypes(plan, new int[] {0}, new Class[] {DupRemoveSortNode.class});
+ }
+
}
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711,3754-3769,3776-3813
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3816-3868,3876-3915,3920-3983
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -35,7 +35,6 @@
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.QueryProcessorFactoryImpl;
import org.teiid.dqp.internal.process.SessionAwareCache;
@@ -75,7 +74,7 @@
SessionAwareCache<CachedResults> cache = new SessionAwareCache<CachedResults>();
cache.setTupleBufferCache(bm);
- dataManager = new TempTableDataManager(hdm, bm, ExecutorUtils.getDirectExecutor(), cache);
+ dataManager = new TempTableDataManager(hdm, bm, cache);
}
private void execute(String sql, List<?>... expectedResults) throws Exception {
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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -46,7 +46,6 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.XMLType;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.PreparedPlan;
import org.teiid.dqp.internal.process.QueryProcessorFactoryImpl;
@@ -247,7 +246,7 @@
if (!(dataManager instanceof TempTableDataManager)) {
SessionAwareCache<CachedResults> cache = new SessionAwareCache<CachedResults>();
cache.setTupleBufferCache(bufferMgr);
- dataManager = new TempTableDataManager(dataManager, bufferMgr, ExecutorUtils.getDirectExecutor(), cache);
+ dataManager = new TempTableDataManager(dataManager, bufferMgr, cache);
}
if (context.getQueryProcessorFactory() == null) {
context.setQueryProcessorFactory(new QueryProcessorFactoryImpl(bufferMgr, dataManager, new DefaultCapabilitiesFinder(), null, context.getMetadata()));
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -43,7 +43,6 @@
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.core.util.ExecutorUtils;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.service.TransactionContext;
@@ -94,7 +93,7 @@
BufferManager bm = BufferManagerFactory.getStandaloneBufferManager();
SessionAwareCache<CachedResults> cache = new SessionAwareCache<CachedResults>();
cache.setTupleBufferCache(bm);
- dataManager = new TempTableDataManager(fdm, bm, ExecutorUtils.getDirectExecutor(), cache);
+ dataManager = new TempTableDataManager(fdm, bm, cache);
}
@Test public void testRollbackNoExisting() throws Exception {
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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666
Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555
/branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711,3754-3769
/branches/7.7.x/engine/src/test/java/org/teiid/query/processor/xml:3816-3868,3876-3915,3920-3983
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -63,7 +63,6 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.ResultsMessage;
import org.teiid.client.plan.PlanNode;
-import org.teiid.client.security.SessionToken;
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.deployers.ExtendedPropertyMetadata;
@@ -75,6 +74,7 @@
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.tempdata.TempTableDataManager;
abstract class TeiidOperationHandler extends BaseOperationHandler<DQPCore> {
List<TransportService> transports = new ArrayList<TransportService>();
@@ -721,11 +721,16 @@
String user = "CLI ADMIN"; //$NON-NLS-1$
LogManager.logDetail(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("admin_executing", user, command)); //$NON-NLS-1$
- SessionMetadata session = createTemporarySession(vdbName, version, user);
+ VDBMetaData vdb = this.vdbRepo.getVDB(vdbName, version);
+ if (vdb == null) {
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("wrong_vdb")));//$NON-NLS-1$
+ }
+ final SessionMetadata session = TempTableDataManager.createTemporarySession(user, "admin-console", vdb); //$NON-NLS-1$
final long requestID = 0L;
DQPWorkContext context = new DQPWorkContext();
+ context.setUseCallingThread(true);
context.setSession(session);
try {
@@ -735,7 +740,7 @@
long start = System.currentTimeMillis();
RequestMessage request = new RequestMessage(command);
- request.setExecutionId(0L);
+ request.setExecutionId(requestID);
request.setRowLimit(engine.getMaxRowsFetchSize()); // this would limit the number of rows that are returned.
Future<ResultsMessage> message = engine.executeRequest(requestID, request);
ResultsMessage rm = null;
@@ -770,7 +775,19 @@
});
} catch (Throwable t) {
throw new OperationFailedException(new ModelNode().set(t.getMessage()));
- }
+ } finally {
+ try {
+ context.runInContext(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ engine.terminateSession(session.getSessionId());
+ return null;
+ }
+ });
+ } catch (Throwable e) {
+ throw new OperationFailedException(new ModelNode().set(e.getMessage()));
+ }
+ }
}
private void writeResults(ModelNode resultsNode, List<String> columns, List<? extends List<?>> results) throws SQLException {
@@ -826,27 +843,6 @@
}
}
- private SessionMetadata createTemporarySession(final String vdbName, final int version, final String userName) throws OperationFailedException{
-
- long creationTime = System.currentTimeMillis();
-
- // Return a new session info object
- SessionMetadata newSession = new SessionMetadata();
- newSession.setSessionToken(new SessionToken(userName));
- newSession.setSessionId(newSession.getSessionToken().getSessionID());
- newSession.setUserName(userName);
- newSession.setCreatedTime(creationTime);
- newSession.setApplicationName("admin-console"); //$NON-NLS-1$
- newSession.setVDBName(vdbName);
- newSession.setVDBVersion(version);
-
- VDBMetaData vdb = this.vdbRepo.getVDB(vdbName, version);
- if (vdb == null) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("wrong_vdb")));//$NON-NLS-1$
- }
- newSession.setVdb(vdb);
- return newSession;
- }
}
class GetVDB extends BaseOperationHandler<VDBRepository>{
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -21,6 +21,7 @@
*/
package org.teiid.jboss;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.ServiceLoader;
import java.util.StringTokenizer;
@@ -39,14 +40,14 @@
import org.jboss.msc.service.AbstractServiceListener;
import org.jboss.msc.service.Service;
import org.jboss.msc.service.ServiceBuilder;
-import org.jboss.msc.service.ServiceBuilder.DependencyType;
import org.jboss.msc.service.ServiceController;
-import org.jboss.msc.service.ServiceController.Mode;
-import org.jboss.msc.service.ServiceController.State;
import org.jboss.msc.service.ServiceName;
import org.jboss.msc.service.StartContext;
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
+import org.jboss.msc.service.ServiceBuilder.DependencyType;
+import org.jboss.msc.service.ServiceController.Mode;
+import org.jboss.msc.service.ServiceController.State;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.impl.ModelMetaData;
@@ -65,6 +66,7 @@
import org.teiid.query.ObjectReplicator;
import org.teiid.query.metadata.DDLMetadataRepository;
import org.teiid.query.metadata.NativeMetadataRepository;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
class VDBDeployer implements DeploymentUnitProcessor {
@@ -113,6 +115,19 @@
}
}
+ // make sure the translator defined exists in configuration.
+ for (ModelMetaData model:deployment.getModelMetaDatas().values()) {
+ if (model.isSource() && !model.getSourceNames().isEmpty()) {
+ for (String source:model.getSourceNames()) {
+ String translatorName = model.getSourceTranslatorName(source);
+ Translator parent = this.translatorRepository.getTranslatorMetaData(translatorName);
+ if ( parent == null) {
+ throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50077, translatorName, deploymentName));
+ }
+ }
+ }
+ }
+
// check if this is a VDB with index files, if there are then build the TransformationMetadata
UDFMetaData udf = deploymentUnit.removeAttachment(TeiidAttachments.UDF_METADATA);
if (udf != null) {
@@ -126,8 +141,10 @@
// set up the metadata repositories for each models
IndexMetadataRepository indexRepo = null;
IndexMetadataStore indexFactory = deploymentUnit.removeAttachment(TeiidAttachments.INDEX_METADATA);
+ LinkedHashMap<String, Resource> visibilityMap = null;
if (indexFactory != null) {
indexRepo = new IndexMetadataRepository(indexFactory);
+ visibilityMap = indexFactory.getEntriesPlusVisibilities();
}
for (ModelMetaData model:deployment.getModelMetaDatas().values()) {
@@ -139,7 +156,7 @@
}
// build a VDB service
- VDBService vdb = new VDBService(deployment);
+ VDBService vdb = new VDBService(deployment, visibilityMap);
final ServiceBuilder<VDBMetaData> vdbService = context.getServiceTarget().addService(TeiidServiceNames.vdbServiceName(deployment.getName(), deployment.getVersion()), vdb);
// add dependencies to data-sources
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -27,7 +27,11 @@
import javax.xml.stream.XMLStreamException;
-import org.jboss.as.server.deployment.*;
+import org.jboss.as.server.deployment.Attachments;
+import org.jboss.as.server.deployment.DeploymentPhaseContext;
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
+import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.msc.service.ServiceController;
import org.jboss.vfs.VirtualFile;
import org.teiid.adminapi.Model;
@@ -39,7 +43,6 @@
import org.teiid.logging.LogManager;
import org.teiid.metadata.VdbConstants;
import org.teiid.metadata.index.IndexMetadataStore;
-import org.teiid.runtime.RuntimePlugin;
/**
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,6 +28,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -71,6 +72,7 @@
import org.teiid.metadata.index.IndexMetadataRepository;
import org.teiid.query.ObjectReplicator;
import org.teiid.query.metadata.TransformationMetadata;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
import org.teiid.query.tempdata.GlobalTableStore;
import org.teiid.query.tempdata.GlobalTableStoreImpl;
import org.teiid.translator.DelegatingExecutionFactory;
@@ -86,9 +88,11 @@
protected final InjectedValue<BufferManager> bufferManagerInjector = new InjectedValue<BufferManager>();
protected final InjectedValue<ObjectReplicator> objectReplicatorInjector = new InjectedValue<ObjectReplicator>();
private VDBLifeCycleListener vdbListener;
+ private LinkedHashMap<String, Resource> visibilityMap;
- public VDBService(VDBMetaData metadata) {
+ public VDBService(VDBMetaData metadata, LinkedHashMap<String, Resource> visibilityMap) {
this.vdb = metadata;
+ this.visibilityMap = visibilityMap;
}
@Override
@@ -109,6 +113,7 @@
String type = data.getType();
VDBTranslatorMetaData parent = getTranslatorRepository().getTranslatorMetaData(type);
data.setModuleName(parent.getModuleName());
+ data.addAttchment(ClassLoader.class, parent.getAttachment(ClassLoader.class));
Set<String> keys = parent.getProperties().stringPropertyNames();
for (String key:keys) {
@@ -135,12 +140,13 @@
if (!name.equals(VDBService.this.vdb.getName()) || version != VDBService.this.vdb.getVersion()) {
return;
}
+ VDBMetaData vdbInstance = vdb.getVDB();
// add object replication to temp/matview tables
- GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdb.getVDB().getAttachment(TransformationMetadata.class));
+ GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdbInstance.getAttachment(TransformationMetadata.class));
if (objectReplicatorInjector.getValue() != null) {
try {
gts = objectReplicatorInjector.getValue().replicate(name + version, GlobalTableStore.class, gts, 300000);
- vdb.getVDB().addAttchment(GlobalTableStore.class, gts);
+ vdbInstance.addAttchment(GlobalTableStore.class, gts);
} catch (Exception e) {
LogManager.logError(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50023, gts));
}
@@ -156,7 +162,7 @@
try {
// add transformation metadata to the repository.
- getVDBRepository().addVDB(this.vdb, store, udf, cmr);
+ getVDBRepository().addVDB(this.vdb, store, visibilityMap, udf, cmr);
} catch (VirtualDatabaseException e) {
throw new StartException(IntegrationPlugin.Event.TEIID50032.name(), e);
}
@@ -170,8 +176,13 @@
throw new StartException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50086, model.getName(), vdb.getName(), vdb.getVersion()));
}
model.addAttchment(MetadataRepository.class, metadataRepository);
- loadMetadata(this.vdb, model, cmr, metadataRepository, store);
- LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(), "in VDB ", vdb.getName(), " was being loaded from its repository in separate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (model.getModelType() == Model.Type.PHYSICAL || model.getModelType() == Model.Type.VIRTUAL) {
+ loadMetadata(this.vdb, model, cmr, metadataRepository, store);
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(), "in VDB ", vdb.getName(), " was being loaded from its repository in separate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ else {
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(), "in VDB ", vdb.getName(), " skipped being loaded because of its type ", model.getModelType()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
}
synchronized (this.vdb) {
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
/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
/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
/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
/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
/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
/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
/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
/trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -28,7 +28,15 @@
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.Semaphore;
import org.jboss.vfs.VirtualFile;
@@ -375,19 +383,6 @@
List<Table> records = recs;
- //load non-materialized first, so that the uuid->table cache is populated
- Collections.sort(records, new Comparator<Table>() {
- @Override
- public int compare(Table o1, Table o2) {
- if (!o1.isMaterialized()) {
- return -1;
- }
- if (!o2.isMaterialized()) {
- return 1;
- }
- return 0;
- }
- });
for (Table tableRecord : records) {
List<Column> columns = new ArrayList<Column>(getByParent(tableRecord.getUUID(), MetadataConstants.RECORD_TYPE.COLUMN, Column.class, false));
for (Column columnRecordImpl : columns) {
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -806,6 +806,8 @@
case MetadataConstants.PARAMETER_TYPES.RETURN_VALUE:
type = ProcedureParameter.Type.ReturnValue;
break;
+ default:
+ throw new IllegalArgumentException("Invalid parameter type, please ensure all parameter types are valid in Designer."); //$NON-NLS-1$
}
paramRd.setType(type);
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*
/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*
/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
/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
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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
/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
/trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666
Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -36,18 +36,7 @@
import org.teiid.core.CoreConstants;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.DefaultMetadataRepository;
-import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.MetadataStore;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
-import org.teiid.metadata.index.IndexMetadataStore;
+import org.teiid.metadata.*;
import org.teiid.query.function.FunctionTree;
import org.teiid.query.function.UDFSource;
import org.teiid.query.metadata.CompositeMetadataStore;
@@ -68,20 +57,20 @@
private ConnectorManagerRepository cmr;
private FunctionTree systemFunctions;
private boolean metadataloadFinished = false;
+ private boolean modified;
// used as cached item to avoid rebuilding
- private VDBMetaData mergedVDB;
+ private volatile VDBMetaData mergedVDB;
- public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, UDFMetaData udf, FunctionTree systemFunctions, ConnectorManagerRepository cmr, MetadataStore... additionalStores) {
+ public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, FunctionTree systemFunctions, ConnectorManagerRepository cmr, MetadataStore... additionalStores) {
this.vdb = vdb;
this.store = metadataStore;
- if (metadataStore instanceof IndexMetadataStore) {
- this.visibilityMap = ((IndexMetadataStore)metadataStore).getEntriesPlusVisibilities();
- }
+ this.visibilityMap = visibilityMap;
this.udf = udf;
this.systemFunctions = systemFunctions;
this.cmr = cmr;
- this.additionalStores = additionalStores;
+ this.additionalStores = additionalStores;
+ this.mergedVDB = buildVDB();
}
synchronized void addChild(CompositeVDB child) {
@@ -90,35 +79,42 @@
}
VDBMetaData childVDB = child.getVDB();
this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()), child);
- this.mergedVDB = null;
+ modified = true;
+ update();
}
synchronized void removeChild(VDBKey child) {
if (this.children != null) {
this.children.remove(child);
}
- this.mergedVDB = null;
+ modified = true;
+ update();
}
private synchronized void update() {
- if (this.mergedVDB == null && this.metadataloadFinished) {
-
- this.mergedVDB = buildVDB();
-
- MetadataStore mergedStore = getMetadataStore();
-
- for (ModelMetaData model:this.mergedVDB.getModelMetaDatas().values()) {
- MetadataRepository repo = model.getAttachment(MetadataRepository.class);
- if (repo instanceof DefaultMetadataRepository) {
- updateFromMetadataRepository(this.mergedVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
- }
+ if (!this.metadataloadFinished) {
+ return;
+ }
+ VDBMetaData newVDB = mergedVDB;
+ if (modified) {
+ newVDB = buildVDB();
+ }
+
+ MetadataStore mergedStore = getMetadataStore();
+
+ for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
+ MetadataRepository repo = model.getAttachment(MetadataRepository.class);
+ if (repo instanceof DefaultMetadataRepository) {
+ updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
}
-
- TransformationMetadata metadata = buildTransformationMetaData(this.mergedVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
- this.mergedVDB.addAttchment(QueryMetadataInterface.class, metadata);
- this.mergedVDB.addAttchment(TransformationMetadata.class, metadata);
- this.mergedVDB.addAttchment(MetadataStore.class, mergedStore);
}
+
+ TransformationMetadata metadata = buildTransformationMetaData(newVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
+ newVDB.addAttchment(QueryMetadataInterface.class, metadata);
+ newVDB.addAttchment(TransformationMetadata.class, metadata);
+ newVDB.addAttchment(MetadataStore.class, mergedStore);
+ this.mergedVDB = newVDB;
+ this.modified = false;
}
private static TransformationMetadata buildTransformationMetaData(VDBMetaData vdb, LinkedHashMap<String, Resource> visibilityMap, MetadataStore store, UDFMetaData udf, FunctionTree systemFunctions, MetadataStore[] additionalStores) {
@@ -144,10 +140,7 @@
return metadata;
}
- public synchronized VDBMetaData getVDB() {
- if (this.mergedVDB == null && this.metadataloadFinished) {
- update();
- }
+ public VDBMetaData getVDB() {
return this.mergedVDB;
}
@@ -340,11 +333,11 @@
metadataRepository.endLoadVdb(vdbName, vdbVersion);
}
- public void setMetaloadFinished(boolean flag) {
- this.metadataloadFinished = flag;
+ public synchronized void metadataLoadFinished() {
+ if (!this.metadataloadFinished) {
+ this.metadataloadFinished = true;
+ update();
+ }
}
- public boolean isMetadataloadFinished() {
- return this.metadataloadFinished;
- }
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -76,7 +76,7 @@
}
long ts = System.currentTimeMillis();
for (String name:objectNames) {
- Table table = s.getTables().get(name.toUpperCase());
+ Table table = s.getTables().get(name);
if (table == null) {
continue;
}
@@ -122,7 +122,7 @@
if (s == null) {
return null;
}
- return s.getTables().get(tableName.toUpperCase());
+ return s.getTables().get(tableName);
}
private Schema getSchema(String vdbName, int vdbVersion, String schemaName) {
@@ -134,7 +134,7 @@
if (tm == null) {
return null;
}
- return tm.getMetadataStore().getSchemas().get(schemaName.toUpperCase());
+ return tm.getMetadataStore().getSchemas().get(schemaName);
}
@Override
@@ -154,7 +154,7 @@
if (s == null) {
return;
}
- Procedure p = s.getProcedures().get(procName.toUpperCase());
+ Procedure p = s.getProcedures().get(procName);
if (p == null) {
return;
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
@@ -47,6 +48,7 @@
import org.teiid.metadata.MetadataStore;
import org.teiid.query.function.SystemFunctionManager;
import org.teiid.query.metadata.MetadataValidator;
+import org.teiid.query.metadata.TransformationMetadata.Resource;
import org.teiid.query.validator.ValidatorReport;
import org.teiid.runtime.RuntimePlugin;
import org.teiid.translator.TranslatorException;
@@ -68,7 +70,7 @@
private Map<String, Datatype> datatypeMap = new HashMap<String, Datatype>();
- public void addVDB(VDBMetaData vdb, MetadataStore metadataStore, UDFMetaData udf, ConnectorManagerRepository cmr) throws VirtualDatabaseException {
+ public void addVDB(VDBMetaData vdb, MetadataStore metadataStore, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, ConnectorManagerRepository cmr) throws VirtualDatabaseException {
if (getVDB(vdb.getName(), vdb.getVersion()) != null) {
throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40035, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40035, vdb.getName(), vdb.getVersion()));
}
@@ -81,14 +83,14 @@
if (this.odbcEnabled && odbcStore == null) {
this.odbcStore = getODBCMetadataStore();
}
-
- CompositeVDB cvdb = null;
+
+ MetadataStore[] stores = null;
if (this.odbcStore == null) {
- cvdb = new CompositeVDB(vdb, metadataStore, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore);
+ stores = new MetadataStore[] {this.systemStore};
+ } else {
+ stores = new MetadataStore[] {this.systemStore, odbcStore};
}
- else {
- cvdb = new CompositeVDB(vdb, metadataStore, udf, this.systemFunctionManager.getSystemFunctions(), cmr, this.systemStore, odbcStore);
- }
+ CompositeVDB cvdb = new CompositeVDB(vdb, metadataStore, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, stores);
this.vdbRepo.put(vdbId(vdb), cvdb);
notifyAdd(vdb.getName(), vdb.getVersion(), cvdb);
}
@@ -109,50 +111,34 @@
return vdbs;
}
- /**
- * This returns the all the VDBS that loaded and still loading or stalled due to data source unavailability.
- * @return
- */
- public List<VDBMetaData> getAllDeployedVDBs(){
- ArrayList<VDBMetaData> vdbs = new ArrayList<VDBMetaData>();
- for(CompositeVDB cVDB:this.vdbRepo.values()) {
- if (!cVDB.isMetadataloadFinished()) {
- vdbs.add(cVDB.buildVDB());
- }
- else {
- vdbs.add(cVDB.getVDB());
- }
- }
- return vdbs;
- }
-
protected VDBKey vdbId(VDBMetaData vdb) {
return new VDBKey(vdb.getName(), vdb.getVersion());
}
public VDBMetaData getVDB(String vdbName) {
int latestVersion = 0;
- for (VDBKey key:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).keySet()) {
- if(!key.getName().equalsIgnoreCase(vdbName)) {
+ VDBMetaData result = null;
+ for (Map.Entry<VDBKey, CompositeVDB> entry:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).entrySet()) {
+ if(!entry.getKey().getName().equalsIgnoreCase(vdbName)) {
break;
}
- VDBMetaData vdb = this.vdbRepo.get(key).getVDB();
+ VDBMetaData vdb = entry.getValue().getVDB();
switch (vdb.getConnectionType()) {
case ANY:
- latestVersion = Math.max(vdb.getVersion(), latestVersion);
+ if (vdb.getVersion() > latestVersion) {
+ latestVersion = vdb.getVersion();
+ result = vdb;
+ }
break;
case BY_VERSION:
if (latestVersion == 0) {
latestVersion = vdb.getVersion();
+ result = vdb;
}
break;
}
}
- if(latestVersion == 0) {
- return null;
- }
-
- return getVDB(vdbName, latestVersion);
+ return result;
}
public MetadataStore getSystemStore() {
@@ -228,12 +214,14 @@
if (removed != null) {
// if this VDB was part of another VDB; then remove them.
for (CompositeVDB other:this.vdbRepo.values()) {
- if (other.hasChildVdb(key)) {
- notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), other);
-
- other.removeChild(key);
-
- notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), other);
+ synchronized (other) {
+ if (other.hasChildVdb(key)) {
+ notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), other);
+
+ other.removeChild(key);
+
+ notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), other);
+ }
}
}
notifyRemove(key.getName(), key.getVersion(), removed);
@@ -276,7 +264,7 @@
CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
if (v!= null) {
boolean valid = false;
- v.setMetaloadFinished(true);
+ v.metadataLoadFinished();
VDBMetaData metdataAwareVDB = v.getVDB();
ValidatorReport report = MetadataValidator.validate(metdataAwareVDB, metdataAwareVDB.removeAttachment(MetadataStore.class));
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -119,10 +119,7 @@
}
public void resourceAdded(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb == null) {
- continue;
- }
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.getStatus() == VDB.Status.ACTIVE || vdb.isPreview()) {
continue;
}
@@ -178,10 +175,7 @@
}
public void resourceRemoved(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb == null) {
- continue;
- }
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.isPreview()) {
continue;
}
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
/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
/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*
/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*
/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
/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
/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*
/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*
/trunk/runtime/src/main/resources/org/teiid/transport:3507-3666
Modified: trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -65,8 +65,8 @@
cmr.addConnectorManager("source", getConnectorManager("FakeTranslator", "FakeConnection", getFuncsOne()));
cmr.addConnectorManager("source2", getConnectorManager("FakeTranslator2", "FakeConnection2", getFuncsTwo()));
- CompositeVDB cvdb = new CompositeVDB(vdbMetaData, metadataStore, null, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
- cvdb.setMetaloadFinished(true);
+ CompositeVDB cvdb = new CompositeVDB(vdbMetaData, metadataStore, null, null, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
+ cvdb.metadataLoadFinished();
return cvdb;
}
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*
/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*
/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*
/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*
/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
/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
/trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666
Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555*
/branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711*,3754-3769
/branches/7.7.x/test-integration/common/src/test/java/org/teiid/cdk:3816-3868*,3876-3915*,3920-3983*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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
/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
/trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -47,8 +47,8 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.cache.Cache;
import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.DefaultCacheFactory;
import org.teiid.cache.CacheConfiguration.Policy;
-import org.teiid.cache.DefaultCacheFactory;
import org.teiid.client.DQP;
import org.teiid.client.security.ILogon;
import org.teiid.common.buffer.TupleBufferCache;
@@ -412,7 +412,7 @@
udfMetaData.addFunctions(entry.getKey(), entry.getValue());
}
}
- this.repo.addVDB(vdbMetaData, metadata, udfMetaData, cmr);
+ this.repo.addVDB(vdbMetaData, metadata, (metadata instanceof IndexMetadataStore)?((IndexMetadataStore)metadata).getEntriesPlusVisibilities():null, udfMetaData, cmr);
this.repo.finishDeployment(vdbMetaData.getName(), vdbMetaData.getVersion());
this.repo.getVDB(vdbMetaData.getName(), vdbMetaData.getVersion()).setStatus(VDB.Status.ACTIVE);
} catch (VirtualDatabaseException e) {
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2012-05-01 15:19:22 UTC (rev 4046)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2012-05-01 19:12:27 UTC (rev 4047)
@@ -825,7 +825,7 @@
expected.put("supportsGetGeneratedKeys", Boolean.FALSE); //$NON-NLS-1$
expected.put("supportsGroupBy", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsGroupByBeyondSelect", Boolean.TRUE); //$NON-NLS-1$
- expected.put("supportsGroupByUnrelated", Boolean.FALSE); //$NON-NLS-1$
+ expected.put("supportsGroupByUnrelated", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsIntegrityEnhancementFacility", Boolean.FALSE); //$NON-NLS-1$
expected.put("supportsLikeEscapeClause", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsLimitedOuterJoins", Boolean.TRUE); //$NON-NLS-1$
@@ -836,7 +836,7 @@
expected.put("supportsMultipleResultSets", Boolean.FALSE); //$NON-NLS-1$
expected.put("supportsMultipleOpenResults", Boolean.FALSE); //$NON-NLS-1$
expected.put("supportsMultipleTransactions", Boolean.TRUE); //$NON-NLS-1$
- expected.put("supportsNamedParameters", Boolean.FALSE); //$NON-NLS-1$
+ expected.put("supportsNamedParameters", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsNonNullableColumns", Boolean.TRUE); //$NON-NLS-1$
expected.put("supportsOpenCursorsAcrossRollback", Boolean.FALSE); //$NON-NLS-1$
expected.put("supportsOpenStatementsAcrossCommit", Boolean.TRUE); //$NON-NLS-1$
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*
/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*
/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
/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
/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
/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
/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*
/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*
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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*
/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*
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666
Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555
/branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711,3754-3769
/branches/7.7.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3816-3868,3876-3915,3920-3983
/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
/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
/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
/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
/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
/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
/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
/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
/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
/trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666
Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555*
/branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711*,3754-3769
/branches/7.7.x/test-integration/db/src/main/java/org/teiid/internal:3816-3868*,3876-3915*,3920-3983*
/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*
/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*
/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*
/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
/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
/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*
/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*
/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*
/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*
/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*
/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*
/trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666
More information about the teiid-commits
mailing list