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

Author: shawkins Date: 2011-12-01 12:33:11 -0500 (Thu, 01 Dec 2011) New Revision: 3713 Added: trunk/connectors/connector-ws/src/test/ trunk/connectors/connector-ws/src/test/java/ trunk/connectors/connector-ws/src/test/java/org/ trunk/connectors/connector-ws/src/test/java/org/teiid/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java Removed: trunk/connectors/connector-ws/src/test/java/ trunk/connectors/connector-ws/src/test/java/org/ trunk/connectors/connector-ws/src/test/java/org/teiid/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java Modified: trunk/ trunk/adminshell/src/main/java/groovy/ trunk/adminshell/src/main/java/groovy/sql/ trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java trunk/adminshell/src/main/java/org/teiid/adminshell/ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java trunk/adminshell/src/main/resources/org/ trunk/adminshell/src/main/resources/org/codehaus/ trunk/adminshell/src/main/resources/org/codehaus/groovy/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml trunk/adminshell/src/main/resources/org/teiid/ trunk/adminshell/src/main/resources/org/teiid/adminshell/ trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties trunk/adminshell/src/test/java/org/ trunk/adminshell/src/test/java/org/teiid/ trunk/adminshell/src/test/java/org/teiid/adminshell/ trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java trunk/adminshell/src/test/resources/foo/ trunk/adminshell/src/test/resources/foo/bar.txt trunk/api/src/main/java/org/teiid/events/ trunk/api/src/main/java/org/teiid/events/EventDistributor.java trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java trunk/build/kits/ trunk/build/kits/adminshell/ trunk/build/kits/jboss-container/ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat trunk/cache-jbosscache/pom.xml trunk/cache-jbosscache/src/main/java/org/ trunk/cache-jbosscache/src/main/java/org/teiid/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/events/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java trunk/cache-jbosscache/src/test/java/ trunk/client/src/main/java/org/teiid/client/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/gss/MakeGSS.java trunk/client/src/main/java/org/teiid/jdbc/ trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java trunk/client/src/main/java/org/teiid/net/socket/ trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java trunk/client/src/main/java/org/teiid/net/socket/Handshake.java trunk/client/src/main/java/org/teiid/net/socket/Message.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java trunk/client/src/main/resources/org/ trunk/client/src/main/resources/org/teiid/ trunk/client/src/main/resources/org/teiid/jdbc/ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties trunk/client/src/main/resources/org/teiid/net/ trunk/client/src/test/java/org/teiid/client/plan/ trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java trunk/client/src/test/java/org/teiid/client/util/ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java trunk/client/src/test/java/org/teiid/jdbc/ trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java trunk/client/src/test/java/org/teiid/jdbc/util/ trunk/client/src/test/java/org/teiid/net/ trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java trunk/client/src/test/java/org/teiid/net/socket/ trunk/common-core/src/main/java/org/ trunk/common-core/src/main/java/org/teiid/ trunk/common-core/src/main/java/org/teiid/core/ trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java trunk/common-core/src/main/java/org/teiid/core/TeiidException.java trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java trunk/common-core/src/main/java/org/teiid/core/crypto/ trunk/common-core/src/main/java/org/teiid/core/types/ trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java trunk/common-core/src/main/java/org/teiid/core/types/NullType.java trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java trunk/common-core/src/main/java/org/teiid/core/types/Transform.java trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java trunk/common-core/src/main/java/org/teiid/core/types/basic/ trunk/common-core/src/main/java/org/teiid/core/util/ trunk/common-core/src/test/java/org/ trunk/common-core/src/test/java/org/teiid/ trunk/common-core/src/test/java/org/teiid/core/ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java trunk/common-core/src/test/java/org/teiid/core/crypto/ trunk/common-core/src/test/java/org/teiid/core/types/ trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java trunk/common-core/src/test/java/org/teiid/core/types/basic/ trunk/common-core/src/test/java/org/teiid/core/util/ trunk/common-core/src/test/java/org/teiid/query/ trunk/common-core/src/test/java/org/teiid/query/unittest/ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/ trunk/connectors/connector-file/src/main/resources/org/teiid/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties trunk/connectors/connector-file/src/test/java/org/ trunk/connectors/connector-file/src/test/java/org/teiid/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/ trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java trunk/connectors/connector-ws/src/main/resources/org/ trunk/connectors/connector-ws/src/main/resources/org/teiid/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.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-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java trunk/console/src/main/resources/META-INF/rhq-plugin.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/TupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/impl/ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 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/ConnectorManager.java trunk/engine/src/main/java/org/teiid/query/ trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java trunk/engine/src/main/java/org/teiid/query/analysis/ trunk/engine/src/main/java/org/teiid/query/eval/ trunk/engine/src/main/java/org/teiid/query/function/ trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java trunk/engine/src/main/java/org/teiid/query/function/aggregate/ trunk/engine/src/main/java/org/teiid/query/function/metadata/ trunk/engine/src/main/java/org/teiid/query/function/source/ trunk/engine/src/main/java/org/teiid/query/mapping/ trunk/engine/src/main/java/org/teiid/query/mapping/relational/ trunk/engine/src/main/java/org/teiid/query/mapping/xml/ trunk/engine/src/main/java/org/teiid/query/metadata/ trunk/engine/src/main/java/org/teiid/query/optimizer/ trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ trunk/engine/src/main/java/org/teiid/query/parser/ trunk/engine/src/main/java/org/teiid/query/processor/ trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ trunk/engine/src/main/java/org/teiid/query/processor/relational/ trunk/engine/src/main/java/org/teiid/query/processor/xml/ trunk/engine/src/main/java/org/teiid/query/report/ trunk/engine/src/main/java/org/teiid/query/resolver/ trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/command/ trunk/engine/src/main/java/org/teiid/query/resolver/util/ trunk/engine/src/main/java/org/teiid/query/rewriter/ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 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/Command.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/sql/visitor/SQLStringVisitor.java trunk/engine/src/main/java/org/teiid/query/tempdata/ trunk/engine/src/main/java/org/teiid/query/util/ trunk/engine/src/main/java/org/teiid/query/validator/ trunk/engine/src/main/java/org/teiid/query/xquery/ trunk/engine/src/main/java/org/teiid/query/xquery/saxon/ trunk/engine/src/main/java/org/teiid/vdb/ trunk/engine/src/main/java/org/teiid/vdb/runtime/ trunk/engine/src/main/resources/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/datamgr/TestConnectorManager.java trunk/engine/src/test/java/org/teiid/query/ trunk/engine/src/test/java/org/teiid/query/analysis/ trunk/engine/src/test/java/org/teiid/query/function/ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java trunk/engine/src/test/java/org/teiid/query/function/metadata/ trunk/engine/src/test/java/org/teiid/query/function/source/ trunk/engine/src/test/java/org/teiid/query/mapping/ trunk/engine/src/test/java/org/teiid/query/mapping/xml/ trunk/engine/src/test/java/org/teiid/query/metadata/ trunk/engine/src/test/java/org/teiid/query/optimizer/ trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/test/java/org/teiid/query/optimizer/proc/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/test/java/org/teiid/query/optimizer/xml/ trunk/engine/src/test/java/org/teiid/query/parser/ trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java 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/TeiidAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java trunk/metadata/src/test/java/org/teiid/cdk/ trunk/metadata/src/test/java/org/teiid/cdk/api/ trunk/metadata/src/test/java/org/teiid/cdk/unittest/ trunk/metadata/src/test/java/org/teiid/core/ trunk/metadata/src/test/java/org/teiid/core/util/ trunk/metadata/src/test/java/org/teiid/internal/ trunk/metadata/src/test/java/org/teiid/internal/core/ trunk/metadata/src/test/java/org/teiid/internal/core/index/ trunk/pom.xml trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.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/runtime/i18n.properties 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/runtime/src/test/java/org/teiid/transport/TestCommSockets.java trunk/test-integration/common/src/test/java/org/teiid/cdk/ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/ trunk/test-integration/common/src/test/java/org/teiid/dqp/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.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 of 7.6.1 Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x:3535-3555 /trunk:3188-3450,3452-3666 + /branches/7.4.x:3535-3555 /branches/7.6.x:3673-3711 /trunk:3188-3450,3452-3666 Property changes on: trunk/adminshell/src/main/java/groovy ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555* /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* /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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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* /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* /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* /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* /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* /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* /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* /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* /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 /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 /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* /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* /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* /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* /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 /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 /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 /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 /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* /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* /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* /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* /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* /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* /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 /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 /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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666 Property changes on: trunk/build/kits ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits:3535-3555* /trunk/build/kits:3507-3666 + /branches/7.4.x/build/kits:3535-3555* /branches/7.6.x/build/kits:3673-3711* /trunk/build/kits:3507-3666 Property changes on: trunk/build/kits/adminshell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits/adminshell:3535-3555 /trunk/build/kits/adminshell:3507-3666 + /branches/7.4.x/build/kits/adminshell:3535-3555 /branches/7.6.x/build/kits/adminshell:3673-3711 /trunk/build/kits/adminshell:3507-3666 Property changes on: trunk/build/kits/jboss-container ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits/jboss-container:3535-3555 /trunk/build/kits/jboss-container:3507-3666 + /branches/7.4.x/build/kits/jboss-container:3535-3555 /branches/7.6.x/build/kits/jboss-container:3673-3711 /trunk/build/kits/jboss-container:3507-3666 Modified: trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml =================================================================== --- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -88,6 +88,7 @@ <bean name="VDBStatusChecker" class="org.teiid.deployers.VDBStatusChecker"> <property name="VDBRepository"><inject bean="VDBRepository"/></property> <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property> + <property name="translatorRepository"><inject bean="translatorRepository"/></property> </bean> <!-- Persistence class for the VDB deployment file --> Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3673-3711* /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt 2011-12-01 17:33:11 UTC (rev 3713) @@ -38,18 +38,20 @@ 2. SOAP11 RPC call providing all of the parameter values for the invoke procedure. With a SOAP invocation, the action is used to convey the SOAPAction header value if needed. Also note the use of the endpoint here with an absolute URL, which will be used instead of the default -on the datasource. +on the datasource. We are also using the DefaultServiceMode of MESSAGE (see the weather-vdb.xml file) +to use the full SOAP message request and response. select xmlserialize(document w.result as string) from - (call weather.invoke(action=>'http://www.weather.gov/forecasts/xml/DWMLg...;, - endpoint=>'http://www.weather.gov/forecasts/xml/SOAP_server/ndfdXM...;, + (call weather.invoke(action=>'http://graphical.weather.gov/xml/SOAP_serv...;, + endpoint=>'http://graphical.weather.gov/xml/SOAP_server/ndfdXMLser...;, binding=>'SOAP11', request=>' - <ns1:LatLonListZipCode xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:ns1="http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML... - <zipCodeList xsi:type="ns2:zipCodeListType" xmlns:ns2="http://www.weather.gov/forecasts/xml/DWMLgen/schema/DWML.... - </ns1:LatLonListZipCode>')) as w + <SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"> + <SOAP-ENV:Body> + <ns8077:LatLonListZipCode xmlns:ns8077="uri:DWMLgen"> + <listZipCodeList xsi:type="xsd:string">20910 25414</listZipCodeList> + </ns8077:LatLonListZipCode> + </SOAP-ENV:Body> + </SOAP-ENV:Envelope>')) as w -See the DatabaseMetadata on the invoke procedure for a full description of the parameters. - +See the Reference or retrieve the JDBC DatabaseMetadata on the invoke procedure for a full description of the parameters. Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -7,7 +7,7 @@ <rar-name>teiid-connector-ws.rar</rar-name> <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition> - <config-property name="EndPoint">http://www.weather.gov/forecasts/xml/sample_... + <config-property name="EndPoint">http://graphical.weather.gov/xml/sample_prod... <max-pool-size>20</max-pool-size> Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -2,7 +2,7 @@ <vdb name="weather" version="1"> <!-- - See the dynamicvdb Portfolio example, or http://community.jboss.org/wiki/DynamicVDBinTeiid70 + See the dynamicvdb Portfolio example, or the Reference for more information on the format of a vdb.xml file. --> @@ -16,6 +16,7 @@ <translator name="MessageWeather" type="ws"> <property name="DefaultBinding" value="HTTP"/> + <property name="DefaultServiceMode" value="MESSAGE"/> </translator> </vdb> \ No newline at end of file Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat 2011-12-01 17:33:11 UTC (rev 3713) @@ -2,7 +2,7 @@ set CLIENT_PATH=. rem Second one adds the Teiid client -set TEIID_PATH=../lib/teiid-${pom.version}-client.jar +set TEIID_PATH=../../lib/teiid-${pom.version}-client.jar java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient %* Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/cache-jbosscache/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -34,6 +34,11 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-clustering-jgroups</artifactId> <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file Property changes on: trunk/cache-jbosscache/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* /trunk/cache-jbosscache/src/main/java/org:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org:3673-3711* /trunk/cache-jbosscache/src/main/java/org:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/events ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/events:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555 /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 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555 /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 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555 /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 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/test/java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* /trunk/cache-jbosscache/src/test/java:3507-3666 + /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* /branches/7.6.x/cache-jbosscache/src/test/java:3673-3711* /trunk/cache-jbosscache/src/test/java:3507-3666 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* /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* /trunk/client/src/main/java/org/teiid/client/util:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666 Modified: trunk/client/src/main/java/org/teiid/gss/MakeGSS.java =================================================================== --- trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -67,8 +67,42 @@ Object result = null; - String jaasApplicationName = props.getProperty(TeiidURL.CONNECTION.JAAS_NAME, "teiid"); //$NON-NLS-1$ - String kerberosPrincipalName = props.getProperty(TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME, "teiid"); //$NON-NLS-1$ + StringBuilder errors = new StringBuilder(); + String jaasApplicationName = props.getProperty(TeiidURL.CONNECTION.JAAS_NAME); + String nl = System.getProperty("line.separator");//$NON-NLS-1$ + if (jaasApplicationName == null) { + errors.append(JDBCPlugin.Util.getString("client_prop_missing", TeiidURL.CONNECTION.JAAS_NAME)); //$NON-NLS-1$ + errors.append(nl); + } + + String kerberosPrincipalName = props.getProperty(TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME); + if (kerberosPrincipalName == null) { + errors.append(JDBCPlugin.Util.getString("client_prop_missing", TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME)); //$NON-NLS-1$ + errors.append(nl); + } + + String realm = System.getProperty("java.security.krb5.realm"); //$NON-NLS-1$ + if (realm == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.krb5.realm")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + String kdc = System.getProperty("java.security.krb5.kdc"); //$NON-NLS-1$ + if (kdc == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.krb5.kdc")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + String config = System.getProperty("java.security.auth.login.config"); //$NON-NLS-1$ + if (config == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.auth.login.config")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + if (errors.length() > 0) { + throw new LogonException(errors.toString()); + } + String user = props.getProperty(TeiidURL.CONNECTION.USER_NAME); String password = props.getProperty(TeiidURL.CONNECTION.PASSWORD); 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* /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* /trunk/client/src/main/java/org/teiid/jdbc:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555 /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 /trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3673-3711 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555 /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 /trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555 /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 /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 /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 /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 - /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /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 - /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 /trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555 /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 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555 /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 /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 - /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java ___________________________________________________________________ Modified: svn:mergeinfo - /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555 /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 /trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555* /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* /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 - /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555 /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 /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 /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 /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 /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 /trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666 Property changes on: trunk/client/src/main/resources/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/resources/org:3535-3555* /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* /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* /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* /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 /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 /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 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -155,3 +155,5 @@ no_krb_ticket=No cached kerberos ticket found and/or no password supplied gss_auth_failed=GSS Authentication failed setup_failed=Protocol error. Session setup failed. +client_prop_missing=Client URL connection property missing "{0}". Please add the property to connection URL. +system_prop_missing=System property "{0}" missing, please add using -D option on the VM startup script. \ 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* /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* /trunk/client/src/main/resources/org/teiid/net:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/plan ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555* /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* /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 /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 /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* /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* /trunk/client/src/test/java/org/teiid/client/util:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555 /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 /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 /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 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555 /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 /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 /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 /trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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* /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* /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* /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* /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/common-core/src/main/java/org/teiid/core/util:3507-3666 Property changes on: trunk/common-core/src/test/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org:3535-3555* /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* /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* /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* /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* /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* /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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* /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* /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 /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 /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* /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* /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* /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* /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* /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* /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* /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* /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* /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* /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 /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 /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* /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* /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* /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* /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* /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* /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* /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* /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* /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* /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 /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 /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* /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* /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 /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 /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666 Modified: trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java =================================================================== --- trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -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.resource.adapter.ws; import java.io.IOException; @@ -188,6 +210,9 @@ String defaultEndpoint = mcf.getEndPoint(); String defaultQueryString = null; String defaultFragment = null; + if (defaultEndpoint == null) { + throw new WebServiceException(WSManagedConnectionFactory.UTIL.getString("null_default_endpoint")); //$NON-NLS-1$ + } String[] parts = defaultEndpoint.split("\\?", 2); //$NON-NLS-1$ defaultEndpoint = parts[0]; if (parts.length > 1) { @@ -212,6 +237,9 @@ } } else { endpoint = mcf.getEndPoint(); + if (endpoint == null) { + throw new WebServiceException(WSManagedConnectionFactory.UTIL.getString("null_endpoint")); //$NON-NLS-1$ + } } Dispatch<T> dispatch = null; if (HTTPBinding.HTTP_BINDING.equals(binding) && type == DataSource.class) { 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* /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* /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* /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* /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* /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* /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* /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* /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* /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* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666 Modified: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties =================================================================== --- trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -20,3 +20,5 @@ # 02110-1301 USA. # +null_endpoint=An endpoint must be specified by the procedure call or have a default value set by the EndPoint datasource property. +null_default_endpoint=The use of a relative endpoint in a procedure call requires a a default endpoint on the datasource. \ No newline at end of file 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 /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 /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666 Deleted: trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java =================================================================== --- branches/7.6.x/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 02:03:44 UTC (rev 3711) +++ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -1,49 +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.resource.adapter.ws; - -import javax.resource.ResourceException; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.http.HTTPBinding; - -import org.junit.Test; - -public class TestWSAdapter { - - @Test(expected=WebServiceException.class) public void testMissingEndpoint() throws ResourceException { - WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); - - WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); - conn.createDispatch(HTTPBinding.HTTP_BINDING, null, StreamSource.class, Mode.PAYLOAD); - } - - @Test(expected=WebServiceException.class) public void testMissingEndpoint1() throws ResourceException { - WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); - - WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); - conn.createDispatch(HTTPBinding.HTTP_BINDING, "/x", StreamSource.class, Mode.PAYLOAD); //$NON-NLS-1$ - } - -} Copied: trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java (from rev 3711, branches/7.6.x/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java) =================================================================== --- trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java (rev 0) +++ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -0,0 +1,49 @@ +/* + * 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.resource.adapter.ws; + +import javax.resource.ResourceException; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.http.HTTPBinding; + +import org.junit.Test; + +public class TestWSAdapter { + + @Test(expected=WebServiceException.class) public void testMissingEndpoint() throws ResourceException { + WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); + + WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); + conn.createDispatch(HTTPBinding.HTTP_BINDING, null, StreamSource.class, Mode.PAYLOAD); + } + + @Test(expected=WebServiceException.class) public void testMissingEndpoint1() throws ResourceException { + WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); + + WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); + conn.createDispatch(HTTPBinding.HTTP_BINDING, "/x", StreamSource.class, Mode.PAYLOAD); //$NON-NLS-1$ + } + +} 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 /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 /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/SQLConversionVisitor.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -211,9 +211,9 @@ if (obj.getArguments().get(i).getDirection() != Direction.IN) { throw new IllegalArgumentException(JDBCPlugin.Util.getString("SQLConversionVisitor.not_in_parameter", i+1)); //$NON-NLS-1$ } - visit(obj.getArguments().get(i)); + buffer.append('?'); if (this.prepared) { - this.preparedValues.add(obj.getArguments()); + this.preparedValues = obj.getArguments(); } } } 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 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -70,6 +70,7 @@ import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.JDBCPlugin; import org.teiid.translator.jdbc.LocateFunctionModifier; +import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TranslatedCommand; @@ -606,8 +607,8 @@ public List<?> translate(LanguageObject obj, ExecutionContext context) { if (oracleSuppliedDriver && obj instanceof Call) { Call call = (Call)obj; - //oracle returns the resultset as a parameter - if (call.getReturnType() == null) { + if (call.getReturnType() == null && call.getMetadataObject() != null && call.getMetadataObject().getProperties().get(SQLConversionVisitor.TEIID_NATIVE_QUERY) == null) { + //oracle returns the resultset as a parameter call.setReturnType(RefCursorType.class); } } 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* /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* /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 /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 /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 /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 /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 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -27,6 +27,7 @@ import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; +import java.sql.Types; import java.util.Arrays; import java.util.List; @@ -875,11 +876,30 @@ @Test public void testNativeQueryProc() throws Exception { String input = "call proc(2)"; //$NON-NLS-1$ - String output = "select x from y where z = 2"; //$NON-NLS-1$ + String output = "select x from y where z = ?"; //$NON-NLS-1$ QueryMetadataInterface metadata = getOracleSpecificMetadata(); helpTestVisitor(metadata, input, EMPTY_CONTEXT, null, output); } + + @Test public void testNativeQueryProcPreparedExecution() throws Exception { + CommandBuilder commandBuilder = new CommandBuilder(getOracleSpecificMetadata()); + Command command = commandBuilder.getCommand("call proc(2)"); + Connection connection = Mockito.mock(Connection.class); + CallableStatement cs = Mockito.mock(CallableStatement.class); + Mockito.stub(cs.getUpdateCount()).toReturn(-1); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.stub(cs.getObject(1)).toReturn(rs); + Mockito.stub(cs.getInt(3)).toReturn(4); + Mockito.stub(connection.prepareCall("select x from y where z = ?")).toReturn(cs); //$NON-NLS-1$ + OracleExecutionFactory ef = new OracleExecutionFactory(); + + JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), ef); + procedureExecution.execute(); + Mockito.verify(cs, Mockito.never()).registerOutParameter(1, OracleExecutionFactory.CURSOR_TYPE); + Mockito.verify(cs, Mockito.never()).getObject(1); + Mockito.verify(cs, Mockito.times(1)).setObject(1, 2, Types.INTEGER); + } } 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* /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* /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 /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 /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666 Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -167,5 +167,10 @@ public boolean supportsCompareCriteriaOrdered() { return true; } + + @Override + public boolean supportsIsNullCriteria() { + return true; + } } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,8 +21,8 @@ */ package org.teiid.translator.salesforce; -import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Date; import org.teiid.translator.TranslatorException; @@ -56,16 +56,14 @@ } } - public static SimpleDateFormat getSalesforceDateTimeFormat() { - return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); //$NON-NLS-1$ - } + private static String timeZone; - public static SimpleDateFormat getTimeZoneOffsetFormat() { - return new SimpleDateFormat("Z"); //$NON-NLS-1$ + public static String getDefaultTimeZoneString() { + if (timeZone == null) { + String s = new SimpleDateFormat("Z").format(new Date(0)); //$NON-NLS-1$ + timeZone = s.substring(0, 3) + ':' + s.substring(3, 5); + } + return timeZone; } - public static DateFormat getSalesforceDateFormat() { - return new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$ - } - } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,18 +21,23 @@ */ package org.teiid.translator.salesforce.execution; +import java.sql.Time; import java.sql.Timestamp; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.resource.ResourceException; +import org.teiid.core.util.TimestampWithTimezone; import org.teiid.language.AggregateFunction; import org.teiid.language.Join; import org.teiid.language.QueryExpression; @@ -51,7 +56,6 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.salesforce.SalesForcePlugin; import org.teiid.translator.salesforce.SalesforceConnection; -import org.teiid.translator.salesforce.Util; import org.teiid.translator.salesforce.execution.visitors.JoinQueryVisitor; import org.teiid.translator.salesforce.execution.visitors.SelectVisitor; import org.w3c.dom.Element; @@ -63,6 +67,8 @@ public class QueryExecutionImpl implements ResultSetExecution { + private static final Pattern dateTimePattern = Pattern.compile("^(?:(\\d{4}-\\d{2}-\\d{2})T)?(\\d{2}:\\d{2}:\\d{2}(?:.\\d+)?)(.*)"); //$NON-NLS-1$ + private static final String SF_ID = "sf:Id"; //$NON-NLS-1$ private static final String SF_TYPE = "sf:type"; //$NON-NLS-1$ @@ -78,7 +84,6 @@ private RuntimeMetadata metadata; private ExecutionContext context; - private SelectVisitor visitor; @@ -103,6 +108,8 @@ private int topResultIndex = 0; + private Calendar cal; + public QueryExecutionImpl(QueryExpression command, SalesforceConnection connection, RuntimeMetadata metadata, ExecutionContext context) { this.connection = connection; this.metadata = metadata; @@ -355,7 +362,7 @@ } } - private void logFields(String sObjectName, List<Object> fields) throws TranslatorException { + private void logFields(String sObjectName, List<Object> fields) { if (!LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, MessageLevel.DETAIL)) { return; } @@ -369,53 +376,75 @@ } + /** + * TODO: the logic here should be aware of xsi:type information and use a standard conversion + * library. Conversion to teiid types should then be a secondary effort - and will be automatically handled above here. + */ @SuppressWarnings("unchecked") private Object getCellDatum(Column element, Element elem) throws TranslatorException { if(!element.getNameInSource().equals(elem.getLocalName())) { throw new TranslatorException(SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.column.mismatch1") + element.getNameInSource() + SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.column.mismatch2") + elem.getLocalName()); //$NON-NLS-1$ //$NON-NLS-2$ } + if (Boolean.parseBoolean(elem.getAttribute(XSI_NIL))) { + return null; + } String value = elem.getTextContent(); - Object result = null; + Object result = value; Class type = element.getJavaType(); if(type.equals(String.class)) { result = value; - } - else if (type.equals(Boolean.class)) { - result = Boolean.valueOf(value); - } else if (type.equals(Double.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = Double.valueOf(value); + } else if (!value.isEmpty()) { + result = value; + if (type.equals(java.sql.Timestamp.class) || type.equals(java.sql.Time.class)) { + if (cal == null) { + cal = Calendar.getInstance(); } + result = parseDateTime(value, type, cal); } - } else if (type.equals(Integer.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = Integer.valueOf(value); + } + return result; + } + + static Object parseDateTime(String value, Class<?> type, Calendar cal) + throws TranslatorException { + try { + Matcher m = dateTimePattern.matcher(value); + if (m.matches()) { + String date = m.group(1); + String time = m.group(2); + String timeZone = m.group(3); + Date d = null; + if (date == null) { + //sql times don't care about fractional seconds + int milli = time.lastIndexOf('.'); + if (milli > 0) { + time = time.substring(0, milli); + } + d = Time.valueOf(time); + } else { + d = Timestamp.valueOf(date + " " + time); //$NON-NLS-1$ } - } - } else if (type.equals(java.sql.Date.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = java.sql.Date.valueOf(value); - } - } - } else if (type.equals(java.sql.Timestamp.class)) { - if (null != value) { - if(!value.isEmpty()) { - try { - Date date = Util.getSalesforceDateTimeFormat().parse(value); - result = new Timestamp(date.getTime()); - } catch (ParseException e) { - throw new TranslatorException(e, SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ + TimeZone tz = null; + if (timeZone != null) { + if (timeZone.equals("Z")) { //$NON-NLS-1$ + tz = TimeZone.getTimeZone("GMT"); //$NON-NLS-1$ + } else if (timeZone.contains(":")) { //$NON-NLS-1$ + tz = TimeZone.getTimeZone("GMT" + timeZone); //$NON-NLS-1$ + } else { + //this is probably an exceptional case + tz = TimeZone.getTimeZone(timeZone); } + cal.setTimeZone(tz); + } else { + cal = null; } + return TimestampWithTimezone.create(d, TimeZone.getDefault(), cal, type); } - } else { - result = value; + throw new TranslatorException(SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { + throw new TranslatorException(e, SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ } - return result; } private boolean isSObject(Element element) { Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -24,18 +24,21 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.teiid.core.util.TimestampWithTimezone; import org.teiid.language.AndOr; import org.teiid.language.ColumnReference; import org.teiid.language.Comparison; import org.teiid.language.Expression; import org.teiid.language.Function; import org.teiid.language.In; +import org.teiid.language.IsNull; import org.teiid.language.Like; import org.teiid.language.Literal; import org.teiid.language.NamedTable; @@ -80,7 +83,7 @@ protected Table table; boolean onlyIDCriteria; protected Boolean queryAll = Boolean.FALSE; - + // support for invoking a retrieve when possible. protected In idInCriteria = null; @@ -98,33 +101,28 @@ @Override public void visit( Comparison criteria ) { - super.visit(criteria); - try { - addCompareCriteria(criteriaList, criteria); - boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); - setHasCriteria(true, isAcceptableID); - if (isAcceptableID) { - this.idInCriteria = new In(criteria.getLeftExpression(), Arrays.asList(criteria.getRightExpression()), false); - } - } catch (TranslatorException e) { - exceptions.add(e); + addCompareCriteria(criteria); + boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); + setHasCriteria(true, isAcceptableID); + if (isAcceptableID) { + this.idInCriteria = new In(criteria.getLeftExpression(), Arrays.asList(criteria.getRightExpression()), false); } } - + + public void visit(IsNull obj) { + visit(new Comparison(obj.getExpression(), new Literal(null, obj.getExpression().getType()), obj.isNegated()?Comparison.Operator.NE:Comparison.Operator.EQ)); + } + @Override public void visit( Like criteria ) { - try { - if (isIdColumn(criteria.getLeftExpression())) { - TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.Id")); //$NON-NLS-1$ - exceptions.add(e); - } - if (isMultiSelectColumn(criteria.getLeftExpression())) { - TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); //$NON-NLS-1$ - exceptions.add(e); - } - } catch (TranslatorException e) { + if (isIdColumn(criteria.getLeftExpression())) { + TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.Id")); //$NON-NLS-1$ exceptions.add(e); } + if (isMultiSelectColumn(criteria.getLeftExpression())) { + TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); //$NON-NLS-1$ + exceptions.add(e); + } boolean negated = criteria.isNegated(); criteria.setNegated(false); criteriaList.add(criteria.toString()); @@ -135,7 +133,7 @@ // don't check if it's ID, Id LIKE '123%' still requires a query setHasCriteria(true, false); } - + @Override public void visit(AndOr obj) { List<String> savedCriteria = new LinkedList<String>(); @@ -170,23 +168,19 @@ @Override public void visit( In criteria ) { - try { - Expression lExpr = criteria.getLeftExpression(); - if (lExpr instanceof ColumnReference) { - ColumnReference cr = (ColumnReference)lExpr; - Column column = cr.getMetadataObject(); - if (column != null && (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) || RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))) { - appendMultiselectIn(column, criteria); - } else { - appendCriteria(criteria); - } + Expression lExpr = criteria.getLeftExpression(); + if (lExpr instanceof ColumnReference) { + ColumnReference cr = (ColumnReference)lExpr; + Column column = cr.getMetadataObject(); + if (column != null && (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) || RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))) { + appendMultiselectIn(column, criteria); } else { - appendCriteria(criteria); + appendCriteria(criteria); } - setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); - } catch (TranslatorException e) { - exceptions.add(e); + } else { + appendCriteria(criteria); } + setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); } public void parseFunction( Function func ) { @@ -215,7 +209,7 @@ } private void appendMultiselectIn( Column column, - In criteria ) throws TranslatorException { + In criteria ) { StringBuffer result = new StringBuffer(); result.append(column.getNameInSource()).append(SPACE); if (criteria.isNegated()) { @@ -270,9 +264,8 @@ } criterion.append(CLOSE); } - - protected void addCompareCriteria( List criteriaList, - Comparison compCriteria ) throws TranslatorException { + + protected void addCompareCriteria(Comparison compCriteria ) { Expression lExpr = compCriteria.getLeftExpression(); if (lExpr instanceof Function) { parseFunction((Function)lExpr); @@ -280,38 +273,13 @@ ColumnReference left = (ColumnReference)lExpr; Column column = left.getMetadataObject(); String columnName = column.getNameInSource(); - StringBuffer queryString = new StringBuffer(); - queryString.append(column.getParent().getNameInSource()); - queryString.append('.'); - queryString.append(columnName).append(SPACE); + StringBuilder queryString = new StringBuilder(); + appendColumnReference(queryString, left); + queryString.append(SPACE); queryString.append(comparisonOperators.get(compCriteria.getOperator())); queryString.append(' '); Expression rExp = compCriteria.getRightExpression(); - if(rExp instanceof Literal) { - Literal literal = (Literal)rExp; - if (column.getJavaType().equals(Boolean.class)) { - queryString.append(((Boolean)literal.getValue()).toString()); - } else if (column.getJavaType().equals(java.sql.Timestamp.class)) { - Timestamp datetime = (java.sql.Timestamp)literal.getValue(); - String value = Util.getSalesforceDateTimeFormat().format(datetime); - String zoneValue = Util.getTimeZoneOffsetFormat().format(datetime); - queryString.append(value).append(zoneValue.subSequence(0, 3)).append(':').append(zoneValue.subSequence(3, 5)); - } else if (column.getJavaType().equals(java.sql.Time.class)) { - String value = Util.getSalesforceDateTimeFormat().format((java.sql.Time)literal.getValue()); - queryString.append(value); - } else if (column.getJavaType().equals(java.sql.Date.class)) { - String value = Util.getSalesforceDateFormat().format((java.sql.Date)literal.getValue()); - queryString.append(value); - } else { - queryString.append(compCriteria.getRightExpression().toString()); - } - } else if(rExp instanceof ColumnReference) { - ColumnReference right = (ColumnReference)lExpr; - column = left.getMetadataObject(); - columnName = column.getNameInSource(); - queryString.append(columnName); - } - + queryString.append(getValue(rExp, false)); criteriaList.add(queryString.toString()); if (columnName.equals("IsDeleted")) { //$NON-NLS-1$ @@ -324,56 +292,86 @@ } } - private void appendCriteria( In criteria ) throws TranslatorException { + private void appendColumnReference(StringBuilder queryString, + ColumnReference ref) { + queryString.append(ref.getMetadataObject().getParent().getNameInSource()); + queryString.append('.'); + queryString.append(ref.getMetadataObject().getNameInSource()); + } + + private void appendCriteria( In criteria ) { StringBuffer queryString = new StringBuffer(); Expression leftExp = criteria.getLeftExpression(); if(isIdColumn(leftExp)) { idInCriteria = criteria; } - queryString.append(getValue(leftExp)); + queryString.append(getValue(leftExp, false)); queryString.append(' '); if (criteria.isNegated()) { queryString.append("NOT "); //$NON-NLS-1$ } queryString.append("IN"); //$NON-NLS-1$ queryString.append('('); - Column column = ((ColumnReference)criteria.getLeftExpression()).getMetadataObject(); - boolean timeColumn = isTimeColumn(column); - boolean first = true; - Iterator iter = criteria.getRightExpressions().iterator(); + Iterator<Expression> iter = criteria.getRightExpressions().iterator(); while (iter.hasNext()) { - if (!first) queryString.append(','); - if (!timeColumn) queryString.append('\''); - queryString.append(getValue((Expression)iter.next())); - if (!timeColumn) queryString.append('\''); - first = false; + queryString.append(getValue(iter.next(), false)); + if (iter.hasNext()) { + queryString.append(','); + } } queryString.append(')'); criteriaList.add(queryString.toString()); } - - private boolean isTimeColumn( Column column ) throws TranslatorException { - boolean result = false; - if (column.getJavaType().equals(java.sql.Timestamp.class) || column.getJavaType().equals(java.sql.Time.class) - || column.getJavaType().equals(java.sql.Date.class)) { - result = true; - } - return result; - } - - protected String getValue( Expression expr ) throws TranslatorException { - String result; + + protected String getValue( Expression expr, boolean raw) { + StringBuilder result = new StringBuilder(); if (expr instanceof ColumnReference) { - ColumnReference element = (ColumnReference)expr; - Column element2 = element.getMetadataObject(); - result = element2.getNameInSource(); + appendColumnReference(result, (ColumnReference)expr); } else if (expr instanceof Literal) { - Literal literal = (Literal)expr; - result = literal.getValue().toString(); + Literal literal = (Literal)expr; + if (literal.getValue() == null) { + if (raw) { + return null; + } + return "NULL"; //$NON-NLS-1$ + } + if (raw) { + return literal.getValue().toString(); + } + if (literal.getValue().getClass().equals(Boolean.class)) { + result.append(((Boolean)literal.getValue()).toString()); + } else if (literal.getValue().getClass().equals(java.sql.Timestamp.class)) { + Timestamp datetime = (java.sql.Timestamp)literal.getValue(); + String value = datetime.toString(); + int fractionalPlace = value.lastIndexOf('.'); + int fractionalLength = value.length() - fractionalPlace - 1; + if (fractionalLength > 3) { + value = value.substring(0, fractionalPlace + 3); + } else if (fractionalLength < 3) { + value += "00".substring(fractionalLength - 1); //$NON-NLS-1$ + } + result.append(value).setCharAt(result.length()-value.length()+10, 'T'); + Calendar c = TimestampWithTimezone.getCalendar(); + c.setTime(datetime); + int minutes = (c.get(Calendar.ZONE_OFFSET) + + c.get(Calendar.DST_OFFSET)) / 60000; + int val = minutes/60; + result.append(String.format("%1$+03d", val)); //$NON-NLS-1$ + result.append(':'); + val = minutes%60; + result.append(val/10); + result.append(val%10); + } else if (literal.getValue().getClass().equals(java.sql.Time.class)) { + result.append(literal.getValue()).append(".000").append(Util.getDefaultTimeZoneString()); //$NON-NLS-1$ + } else if (literal.getValue().getClass().equals(java.sql.Date.class)) { + result.append(literal.getValue()); + } else { + result.append(expr.toString()); + } } else { throw new RuntimeException("unknown type in SalesforceQueryExecution.getValue(): " + expr.toString()); //$NON-NLS-1$ } - return result; + return result.toString(); } protected void loadColumnMetadata( NamedTable group ) throws TranslatorException { @@ -394,7 +392,7 @@ } } - protected boolean isIdColumn( Expression expression ) throws TranslatorException { + protected boolean isIdColumn( Expression expression ) { boolean result = false; if (expression instanceof ColumnReference) { Column element = ((ColumnReference)expression).getMetadataObject(); @@ -406,7 +404,7 @@ return result; } - protected boolean isMultiSelectColumn( Expression expression ) throws TranslatorException { + protected boolean isMultiSelectColumn( Expression expression ) { boolean result = false; if (expression instanceof ColumnReference) { Column element = ((ColumnReference)expression).getMetadataObject(); Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -63,39 +63,34 @@ @Override public void visit(Comparison criteria) { - // Find the criteria that joins the two tables - try { - Expression rExp = criteria.getRightExpression(); - if (rExp instanceof ColumnReference) { - Expression lExp = criteria.getLeftExpression(); - if (isIdColumn(rExp) || isIdColumn(lExp)) { + Expression rExp = criteria.getRightExpression(); + if (rExp instanceof ColumnReference) { + Expression lExp = criteria.getLeftExpression(); + if (isIdColumn(rExp) || isIdColumn(lExp)) { - Column rColumn = ((ColumnReference) rExp).getMetadataObject(); - String rTableName = rColumn.getParent().getNameInSource(); + Column rColumn = ((ColumnReference) rExp).getMetadataObject(); + String rTableName = rColumn.getParent().getNameInSource(); - Column lColumn = ((ColumnReference) lExp).getMetadataObject(); - String lTableName = lColumn.getParent().getNameInSource(); + Column lColumn = ((ColumnReference) lExp).getMetadataObject(); + String lTableName = lColumn.getParent().getNameInSource(); - if (leftTableInJoin.getNameInSource().equals(rTableName) - || leftTableInJoin.getNameInSource().equals(lTableName) - && rightTableInJoin.getNameInSource().equals(rTableName) - || rightTableInJoin.getNameInSource().equals(lTableName) - && !rTableName.equals(lTableName)) { - // This is the join criteria, the one that is the ID is the parent. - Expression fKey = !isIdColumn(lExp) ? lExp : rExp; - table = childTable = (Table)((ColumnReference) fKey).getMetadataObject().getParent(); - } else { - // Only add the criteria to the query if it is not the join criteria. - // The join criteria is implicit in the salesforce syntax. - super.visit(criteria); - } + if (leftTableInJoin.getNameInSource().equals(rTableName) + || leftTableInJoin.getNameInSource().equals(lTableName) + && rightTableInJoin.getNameInSource().equals(rTableName) + || rightTableInJoin.getNameInSource().equals(lTableName) + && !rTableName.equals(lTableName)) { + // This is the join criteria, the one that is the ID is the parent. + Expression fKey = !isIdColumn(lExp) ? lExp : rExp; + table = childTable = (Table)((ColumnReference) fKey).getMetadataObject().getParent(); + } else { + // Only add the criteria to the query if it is not the join criteria. + // The join criteria is implicit in the salesforce syntax. + super.visit(criteria); } - } else { - super.visit(criteria); } - } catch (TranslatorException e) { - exceptions.add(e); + } else { + super.visit(criteria); } } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -61,7 +61,7 @@ public void visit(Select query) { super.visit(query); if (query.isDistinct()) { - exceptions.add(new TranslatorException(SalesForcePlugin.Util.getString("SelectVisitor.distinct.not.supported"))); + exceptions.add(new TranslatorException(SalesForcePlugin.Util.getString("SelectVisitor.distinct.not.supported"))); //$NON-NLS-1$ } selectSymbols = query.getDerivedColumns(); selectSymbolCount = selectSymbols.size(); @@ -78,10 +78,10 @@ selectSymbolNameToIndex .put(qualifiedName, index); String nameInSource = element.getNameInSource(); if (null == nameInSource || nameInSource.length() == 0) { - exceptions.add(new TranslatorException("name in source is null or empty for column "+ symbol.toString())); + exceptions.add(new TranslatorException("name in source is null or empty for column "+ symbol.toString())); //$NON-NLS-1$ continue; } - if (nameInSource.equalsIgnoreCase("id")) { + if (nameInSource.equalsIgnoreCase("id")) { //$NON-NLS-1$ idIndex = index; } } @@ -96,7 +96,7 @@ String supportsQuery = table.getProperties().get(Constants.SUPPORTS_QUERY); objectSupportsRetrieve = Boolean.valueOf(table.getProperties().get(Constants.SUPPORTS_RETRIEVE)); if (!Boolean.valueOf(supportsQuery)) { - throw new TranslatorException(table.getNameInSource() + " " + SalesForcePlugin.Util.getString("CriteriaVisitor.query.not.supported")); + throw new TranslatorException(table.getNameInSource() + " " + SalesForcePlugin.Util.getString("CriteriaVisitor.query.not.supported")); //$NON-NLS-1$ //$NON-NLS-2$ } loadColumnMetadata(obj); } catch (TranslatorException ce) { @@ -118,7 +118,7 @@ public String getQuery() throws TranslatorException { if (!exceptions.isEmpty()) { - throw ((TranslatorException) exceptions.get(0)); + throw exceptions.get(0); } StringBuffer result = new StringBuffer(); result.append(SELECT).append(SPACE); @@ -137,9 +137,9 @@ boolean firstTime = true; for (DerivedColumn symbol : selectSymbols) { if (!firstTime) { - result.append(", "); + result.append(", "); //$NON-NLS-1$ } else { - firstTime = false; + firstTime = false; } Expression expression = symbol.getExpression(); if (expression instanceof ColumnReference) { @@ -153,7 +153,7 @@ if(parent instanceof Table) { table = (Table)parent; } else { - throw new TranslatorException("Could not resolve Table for column " + element.getName()); + throw new TranslatorException("Could not resolve Table for column " + element.getName()); //$NON-NLS-1$ } } result.append(table.getNameInSource()); @@ -209,19 +209,19 @@ } - public List<String> getIdInCriteria() throws TranslatorException { + public List<String> getIdInCriteria() { assertRetrieveValidated(); List<Expression> expressions = this.idInCriteria.getRightExpressions(); List<String> result = new ArrayList<String>(expressions.size()); for(int i = 0; i < expressions.size(); i++) { - result.add(getValue(expressions.get(i))); + result.add(getValue(expressions.get(i), true)); } return result; } private void assertRetrieveValidated() throws AssertionError { if(!hasOnlyIDCriteria()) { - throw new AssertionError("Must call hasOnlyIdInCriteria() before this method"); + throw new AssertionError("Must call hasOnlyIdInCriteria() before this method"); //$NON-NLS-1$ } } Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java =================================================================== --- trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -24,11 +24,19 @@ import static org.junit.Assert.*; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.TimeZone; + +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.teiid.cdk.api.TranslationUtility; import org.teiid.language.Select; import org.teiid.metadata.RuntimeMetadata; +import org.teiid.query.unittest.TimestampUtil; import org.teiid.translator.ExecutionContext; import org.teiid.translator.salesforce.SalesforceConnection; import org.teiid.translator.salesforce.execution.visitors.TestVisitors; @@ -66,4 +74,20 @@ assertNull(qei.next()); } + @BeforeClass static public void oneTimeSetup() { + TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); + } + + @AfterClass static public void oneTimeTearDown() { + TimeZone.setDefault(null); + } + + @Test public void testValueParsing() throws Exception { + assertEquals(TimestampUtil.createTime(2, 0, 0), QueryExecutionImpl.parseDateTime("08:00:00.000Z", Time.class, Calendar.getInstance())); + } + + @Test public void testValueParsing1() throws Exception { + assertEquals(TimestampUtil.createTimestamp(101, 0, 1, 2, 0, 0, 1000000), QueryExecutionImpl.parseDateTime("2001-01-01T08:00:00.001Z", Timestamp.class, Calendar.getInstance())); + } + } Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java =================================================================== --- trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -28,6 +28,8 @@ import java.util.List; import java.util.TimeZone; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.teiid.cdk.api.TranslationUtility; @@ -90,16 +92,16 @@ contactTable.setProperty("Supports Query", Boolean.TRUE.toString()); //$NON-NLS-1$ // Create Contact Columns String[] elemNames = new String[] { - "ContactID", "Name", "AccountId", "InitialContact" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "ContactID", "Name", "AccountId", "InitialContact", "LastTime" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; String[] elemTypes = new String[] { - DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.TIMESTAMP + DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.TIMESTAMP, DataTypeManager.DefaultDataTypes.TIME }; List<Column> contactCols = RealMetadataFactory.createElements(contactTable, elemNames, elemTypes); // Set name in source on each column String[] contactNameInSource = new String[] { - "id", "ContactName", "accountid", "InitialContact" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "id", "ContactName", "accountid", "InitialContact", "LastTime" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; for(int i=0; i<2; i++) { Column obj = contactCols.get(i); @@ -154,7 +156,7 @@ SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); visitor.visit(command); assertFalse(visitor.hasOnlyIDCriteria()); - assertEquals("SELECT Account.id, Account.AccountName, Account.Stuff, Account.Industry FROM Account WHERE Industry IN('1','2','3')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + assertEquals("SELECT Account.id, Account.AccountName, Account.Stuff, Account.Industry FROM Account WHERE Account.Industry IN('1','2','3')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ } @@ -194,9 +196,23 @@ Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name in ('x', 'y')"); //$NON-NLS-1$ SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); visitor.visit(command); - assertEquals("SELECT Contact.ContactName FROM Contact WHERE ContactName IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ } + @Test public void testEqualsElement() throws Exception { + Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name = Contacts.AccountId"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName = Contact.AccountId", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testIsNull() throws Exception { + Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name is not null"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName != NULL", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + @Test public void testIDCriteria() throws Exception { Select command = (Select)translationUtility.parseCommand("select id, name from Account where id = 'bar'"); //$NON-NLS-1$ SalesforceConnection sfc = Mockito.mock(SalesforceConnection.class); @@ -205,16 +221,33 @@ Mockito.verify(sfc).retrieve("Account.id, Account.AccountName", "Account", Arrays.asList("bar")); } - @Test public void testDateTimeFormating() throws Exception { + @BeforeClass static public void oneTimeSetup() { TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); - try { - Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact = {ts'2003-03-11 11:42:10.5'}"); //$NON-NLS-1$ - SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); - visitor.visit(command); - assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact = 2003-03-11T11:42:10.500-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ - } finally { - TimeZone.setDefault(null); - } } + + @AfterClass static public void oneTimeTearDown() { + TimeZone.setDefault(null); + } + + @Test public void testDateTimeFormating() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact = {ts'2003-03-11 11:42:10.5'}"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact = 2003-03-11T11:42:10.500-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testDateTimeFormating1() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact in ({ts'2003-03-11 11:42:10.506'}, {ts'2003-03-11 11:42:10.8088'})"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact IN(2003-03-11T11:42:10.506-06:00,2003-03-11T11:42:10.80-06:00)", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testTimeFormatting() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where lasttime = {t'11:42:10'}"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.LastTime = 11:42:10.000-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } } Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -394,7 +394,7 @@ <c:simple-property name="JdbcSocketConfiguration.enabled" displayName="Enable" description="Enable Socket based JDBC access" required="false" readOnly="false" /> <c:simple-property name="JdbcSocketConfiguration.hostName" displayName="Host Name" - description="Host Name" required="false" readOnly="false" /> + description="Host Name" required="false" readOnly="true" /> <c:simple-property name="JdbcSocketConfiguration.portNumber" displayName="Port Number" description="Port Number" required="false" readOnly="false" /> <c:simple-property name="JdbcSocketConfiguration.sslEnabled" displayName="SSL Enabled" 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* /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* /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* /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* /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666 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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -193,7 +193,7 @@ position = BYTES_PER_BLOCK_ADDRESS*index; } if (mode == Mode.ALLOCATE) { - dataBlock = nextBlock(true); + dataBlock = nextBlock(info, true); info.putInt(position, dataBlock); if (mode == Mode.ALLOCATE && position + BYTES_PER_BLOCK_ADDRESS < info.limit()) { //maintain the invariant that the next pointer is empty @@ -212,7 +212,7 @@ int sib_index = buf.getInt(position); if (index == cutOff) { if (mode == Mode.ALLOCATE) { - sib_index = nextBlock(false); + sib_index = nextBlock(buf, false); buf.putInt(position, sib_index); } else if (mode == Mode.UPDATE && value == EMPTY_ADDRESS) { freeDataBlock(sib_index); @@ -225,9 +225,12 @@ /** * Get the next dataBlock. When the memory buffer is full we have some * book keeping to do. + * @param reading * @return */ - private int nextBlock(boolean data) { + private int nextBlock(ByteBuffer reading, boolean data) { + int limit = reading.limit(); + int position = reading.position(); int next = EMPTY_ADDRESS; memoryEvictionLock.readLock().lock(); boolean readLocked = true; @@ -245,6 +248,12 @@ if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, "Allocating", data?"data":"index", "block", next, "to", gid, oid); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } + //restore the reading buffer + if (reading.limit() != limit) { + reading.rewind(); + reading.limit(limit); + reading.position(position); + } return next; } 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* /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* /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 /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 /trunk/engine/src/main/java/org/teiid/core/id:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -232,7 +232,7 @@ * Get the <code>Translator</code> object managed by this manager. * @return the <code>ExecutionFactory</code>. */ - protected ExecutionFactory<Object, Object> getExecutionFactory() { + public ExecutionFactory<Object, Object> getExecutionFactory() { return this.executionFactory; } 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* /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* /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 /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 /trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/source ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555 /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 /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* /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* /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555 /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 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -109,6 +109,11 @@ private PlanHints hints = new PlanHints(); private Option option; private SourceHint sourceHint; + private static ThreadLocal<Boolean> planningLoop = new ThreadLocal<Boolean>() { + protected Boolean initialValue() { + return Boolean.FALSE; + } + }; public ProcessorPlan optimize( Command command) @@ -264,18 +269,23 @@ CorrelatedReferenceCollectorVisitor.collectReferences(subCommand, localGroupSymbols, correlatedReferences); ProcessorPlan procPlan = QueryOptimizer.optimizePlan(subCommand, metadata, idGenerator, capFinder, analysisRecord, context); container.getCommand().setProcessorPlan(procPlan); - if (!correlatedReferences.isEmpty()) { - SymbolMap map = new SymbolMap(); - for (Reference reference : correlatedReferences) { - map.addMapping(reference.getExpression(), reference.getExpression()); - } - container.getCommand().setCorrelatedReferences(map); - } + setCorrelatedReferences(container, correlatedReferences); } node.addGroups(GroupsUsedByElementsVisitor.getGroups(node.getCorrelatedReferenceElements())); } } + private void setCorrelatedReferences(SubqueryContainer<?> container, + List<Reference> correlatedReferences) { + if (!correlatedReferences.isEmpty()) { + SymbolMap map = new SymbolMap(); + for (Reference reference : correlatedReferences) { + map.addMapping(reference.getExpression(), reference.getExpression()); + } + container.getCommand().setCorrelatedReferences(map); + } + } + private static Set<GroupSymbol> getGroupSymbols(PlanNode plan) { Set<GroupSymbol> groupSymbols = new HashSet<GroupSymbol>(); for (PlanNode source : NodeEditor.findAllNodes(plan, NodeConstants.Types.SOURCE)) { @@ -538,6 +548,14 @@ context.accessedPlanningObject(sp.getProcedureID()); } } + for (SubqueryContainer<?> subqueryContainer : ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(container)) { + if (subqueryContainer.getCommand().getCorrelatedReferences() != null) { + continue; + } + List<Reference> correlatedReferences = new ArrayList<Reference>(); + CorrelatedReferenceCollectorVisitor.collectReferences(subqueryContainer.getCommand(), Arrays.asList(container.getGroup()), correlatedReferences); + setCorrelatedReferences(subqueryContainer, correlatedReferences); + } String cacheString = "transformation/" + container.getClass().getSimpleName().toUpperCase(); //$NON-NLS-1$ Command c = (Command)metadata.getFromMetadataCache(metadataId, cacheString); if (c == null) { @@ -588,13 +606,22 @@ throw new QueryPlannerException(QueryPlugin.Util.getString("RelationalPlanner.nonpushdown_command", container)); //$NON-NLS-1$ } - //treat this as an update procedure - if (container instanceof Update) { - c = QueryRewriter.createUpdateProcedure((Update)container, metadata, context); - } else { - c = QueryRewriter.createDeleteProcedure((Delete)container, metadata, context); + try { + if (planningLoop.get()) { + throw new QueryPlannerException(QueryPlugin.Util.getString("RelationalPlanner.nonpushdown_expression", container)); //$NON-NLS-1$ + } + planningLoop.set(Boolean.TRUE); + + //treat this as an update procedure + if (container instanceof Update) { + c = QueryRewriter.createUpdateProcedure((Update)container, metadata, context); + } else { + c = QueryRewriter.createDeleteProcedure((Delete)container, metadata, context); + } + addNestedCommand(sourceNode, container.getGroup(), container, c, false); + } finally { + planningLoop.set(Boolean.FALSE); } - addNestedCommand(sourceNode, container.getGroup(), container, c, false); return false; } 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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -800,7 +800,7 @@ } else if (criteria instanceof DependentSetCriteria) { criteria = rewriteDependentSetCriteria((DependentSetCriteria)criteria); } else if (criteria instanceof ExpressionCriteria) { - return new CompareCriteria(((ExpressionCriteria) criteria).getExpression(), CompareCriteria.EQ, new Constant(Boolean.TRUE)); + return rewriteCriteria(new CompareCriteria(((ExpressionCriteria) criteria).getExpression(), CompareCriteria.EQ, new Constant(Boolean.TRUE))); } return evaluateCriteria(criteria); 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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -344,7 +344,6 @@ protected boolean sameOptionAndHint(Command cmd) { return EquivalenceUtil.areEqual(this.cacheHint, cmd.cacheHint) && - EquivalenceUtil.areEqual(this.cacheHint, cmd.cacheHint) && EquivalenceUtil.areEqual(this.option, cmd.option); } 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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -1374,6 +1374,7 @@ } public void visit( CreateProcedureCommand obj ) { + addCacheHint(obj.getCacheHint()); append(CREATE); append(SPACE); append(VIRTUAL); 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 /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 /trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555 /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 /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 /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 /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* /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* /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 /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 /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* /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* /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 /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 /trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666 Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -920,6 +920,7 @@ connection_factory_not_found=Failed to find the Connection Factory with JNDI name {0}. Please check the name or deploy the Connection Factory with specified name. RelationalPlanner.nonpushdown_command=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates. +RelationalPlanner.nonpushdown_expression=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs that cannot be simplified into a compensating action. Translate.error=Cannot translate criteria "{0}", it is not matched by selector "{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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /trunk/engine/src/test/java/org/teiid/common/queue:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -46,7 +46,7 @@ static ConnectorManager getConnectorManager() throws Exception { final FakeConnector c = new FakeConnector(); ConnectorManager cm = new ConnectorManager("FakeConnector","FakeConnector") { //$NON-NLS-1$ //$NON-NLS-2$ - protected ExecutionFactory getExecutionFactory() { + public ExecutionFactory getExecutionFactory() { return c; } protected Object getConnectionFactory(){ 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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555 /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 /trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/test/java/org/teiid/query/parser:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -30,26 +30,10 @@ import org.junit.Test; import org.teiid.api.exception.query.QueryParserException; -import org.teiid.query.sql.lang.AbstractCompareCriteria; -import org.teiid.query.sql.lang.CacheHint; -import org.teiid.query.sql.lang.CompareCriteria; -import org.teiid.query.sql.lang.Criteria; -import org.teiid.query.sql.lang.Delete; -import org.teiid.query.sql.lang.From; -import org.teiid.query.sql.lang.FromClause; -import org.teiid.query.sql.lang.Insert; -import org.teiid.query.sql.lang.JoinPredicate; -import org.teiid.query.sql.lang.JoinType; -import org.teiid.query.sql.lang.Option; -import org.teiid.query.sql.lang.Query; -import org.teiid.query.sql.lang.SPParameter; -import org.teiid.query.sql.lang.Select; -import org.teiid.query.sql.lang.SetQuery; -import org.teiid.query.sql.lang.StoredProcedure; -import org.teiid.query.sql.lang.SubqueryFromClause; -import org.teiid.query.sql.lang.UnaryFromClause; -import org.teiid.query.sql.lang.Update; +import org.teiid.query.sql.lang.*; import org.teiid.query.sql.lang.SetQuery.Operation; +import org.teiid.query.sql.proc.Block; +import org.teiid.query.sql.proc.CreateProcedureCommand; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.Function; @@ -962,6 +946,13 @@ TestParser.helpTest(sql, "/*+ cache */ SELECT * FROM t1", query); //$NON-NLS-1$ } + @Test public void testCacheProc() { + String sql = "/*+ cache */ CREATE VIRTUAL PROCEDURE BEGIN END"; //$NON-NLS-1$ + CreateProcedureCommand command = new CreateProcedureCommand(new Block()); + command.setCacheHint(new CacheHint()); + TestParser.helpTest(sql, "/*+ cache */ CREATE VIRTUAL PROCEDURE\nBEGIN\nEND", command); //$NON-NLS-1$ + } + @Test public void testCacheScope() { String sql = "/*+ cache(pref_mem scope:session) */ SELECT * FROM t1"; //$NON-NLS-1$ 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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666 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 /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 /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 /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 /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 /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 /trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555 /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 /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 /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 /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 /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 /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 /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 /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 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -32,6 +32,7 @@ import java.util.*; import org.junit.Test; +import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.client.metadata.ParameterInfo; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.BufferManager; @@ -7543,6 +7544,17 @@ helpProcess(plan, dataManager, expected); } + @Test(expected=QueryPlannerException.class) public void testUpdateCompensationNotPossible() throws Exception { + String sql = "update pm1.g1 set e4 = (select e4 from pm1.g2 where pm1.g2.e2 = pm1.g1.e2) where e1 = 'a'"; //$NON-NLS-1$ + + FakeDataManager dataManager = new FakeDataManager(); + sampleData1(dataManager); + + BasicSourceCapabilities caps = getTypicalCapabilities(); + caps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, false); + helpGetPlan(helpParse(sql), RealMetadataFactory.example4(), new DefaultCapabilitiesFinder(caps), createCommandContext()); + } + @Test public void testDupSelect() throws Exception { String sql = "select e1, e1 from pm1.g1"; 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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 - /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 /trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555 /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 /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 /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 /trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -124,6 +124,27 @@ assertEquals("UPDATE pm1.g1 SET e2 = 5 WHERE e2 = 2", dm.getQueries().get(0)); } + @Test public void testUpdateWithChanging() throws Exception { + TransformationMetadata metadata = TestUpdateValidator.example1(); + TestUpdateValidator.createView("select 1 as x, 2 as y", metadata, GX); + Table t = metadata.getMetadataStore().getSchemas().get(VM1).getTables().get(GX); + t.setDeletePlan(""); + t.setUpdatePlan("FOR EACH ROW BEGIN update pm1.g1 set e2 = case when changing.y then new.y end where e2 = old.y; END"); + t.setInsertPlan(""); + + String sql = "update gx set y = 5"; + + FakeDataManager dm = new FakeDataManager(); + FakeDataStore.addTable("pm1.g1", dm, metadata); + + CommandContext context = createCommandContext(); + BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities(); + ProcessorPlan plan = TestProcessor.helpGetPlan(TestResolver.helpResolve(sql, metadata), metadata, new DefaultCapabilitiesFinder(caps), context); + List<?>[] expected = new List[] {Arrays.asList(1)}; + helpProcess(plan, context, dm, expected); + assertEquals("UPDATE pm1.g1 SET e2 = 5 WHERE e2 = 2", dm.getQueries().get(0)); + } + @Test public void testUpdateWithNonConstant() throws Exception { TransformationMetadata metadata = TestUpdateValidator.example1(); TestUpdateValidator.createView("select 1 as x, 2 as y", metadata, GX); 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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666 Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -208,6 +208,7 @@ // VDB Status manager final VDBStatusCheckerExecutorService statusChecker = new VDBStatusCheckerExecutorService(vdbRepository); + statusChecker.setTranslatorRepository(translatorRepo); ValueService<VDBStatusChecker> statusService = new ValueService<VDBStatusChecker>(new org.jboss.msc.value.Value<VDBStatusChecker>() { @Override public VDBStatusChecker getValue() throws IllegalStateException, IllegalArgumentException { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,14 +21,7 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOWED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEFAULT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ONLY; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; import java.io.IOException; import java.math.BigDecimal; @@ -1190,6 +1183,10 @@ source.setTranslatorName(translatorName); source.setConnectionJndiName(dsName); save(vdb); + ServiceController<?> sc = context.getServiceRegistry(false).getRequiredService(TeiidServiceNames.VDB_STATUS_CHECKER); + VDBStatusChecker vsc = VDBStatusChecker.class.cast(sc.getValue()); + // enforce the changes in the engine. + vsc.dataSourceReplaced(vdb.getName(), vdb.getVersion(), modelName, sourceName, translatorName, dsName); } catch (AdminProcessingException e) { throw new OperationFailedException(new ModelNode().set(e.getMessage())); } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -96,7 +96,7 @@ public void start(StartContext context) throws StartException { ConnectorManagerRepository cmr = new ConnectorManagerRepository(); TranslatorRepository repo = new TranslatorRepository(); - + this.vdb.addAttchment(TranslatorRepository.class, repo); // check if this is a VDB with index files, if there are then build the TransformationMetadata UDFMetaData udf = this.vdb.getAttachment(UDFMetaData.class); IndexMetadataFactory indexFactory = this.vdb.getAttachment(IndexMetadataFactory.class); 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* /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* /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 /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 /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 /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 /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* /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* /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 /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 /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* /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* /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* /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* /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 /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 /trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -486,6 +486,11 @@ <version>${jbossas-version}</version> </dependency> <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>3.0.0.Final</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-subsystem-test</artifactId> <version>${jbossas-version}</version> Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -23,24 +23,27 @@ import java.util.LinkedList; import java.util.concurrent.Executor; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.Model; import org.teiid.adminapi.VDB; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.adminapi.impl.VDBTranslatorMetaData; +import org.teiid.core.TeiidException; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; +import org.teiid.dqp.internal.datamgr.TranslatorRepository; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.runtime.RuntimePlugin; +import org.teiid.translator.ExecutionFactory; -public class VDBStatusChecker { +public abstract class VDBStatusChecker { private static final String JAVA_CONTEXT = "java:/"; //$NON-NLS-1$ private VDBRepository vdbRepository; + private TranslatorRepository translatorRepository; public VDBStatusChecker(VDBRepository vdbRepository) { this.vdbRepository = vdbRepository; @@ -67,7 +70,64 @@ } resourceremoved(dataSourceName, false); } + + public void dataSourceReplaced(String vdbName, int vdbVersion, + String modelName, String sourceName, String translatorName, + String dsName) throws AdminProcessingException { + if (dsName.startsWith(JAVA_CONTEXT)) { + dsName = dsName.substring(5); + } + + VDBMetaData vdb = this.vdbRepository.getVDB(vdbName, vdbVersion); + ModelMetaData model = vdb.getModel(modelName); + + synchronized (vdb) { + ConnectorManagerRepository cmr = vdb.getAttachment(ConnectorManagerRepository.class); + ConnectorManager cm = cmr.getConnectorManager(sourceName); + ExecutionFactory<Object, Object> ef = cm.getExecutionFactory(); + + boolean dsReplaced = false; + if (!cm.getConnectionName().equals(dsName)){ + vdb.setStatus(VDB.Status.INACTIVE); + String msg = RuntimePlugin.Util.getString("datasource_replaced", vdb.getName(), vdb.getVersion(), model.getSourceTranslatorName(sourceName), dsName); //$NON-NLS-1$ + model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), msg); + cm = new ConnectorManager(translatorName, dsName); + cm.setExecutionFactory(ef); + cm.setModelName(modelName); + cmr.addConnectorManager(sourceName, cm); + dsReplaced = true; + } + + if (!cm.getTranslatorName().equals(translatorName)) { + try { + TranslatorRepository repo = vdb.getAttachment(TranslatorRepository.class); + VDBTranslatorMetaData t = null; + if (repo != null) { + t = repo.getTranslatorMetaData(translatorName); + } + if (t == null) { + t = this.translatorRepository.getTranslatorMetaData(translatorName); + } + if (t == null) { + throw new AdminProcessingException(RuntimePlugin.Util.getString("translator_not_found", vdb.getName(), vdb.getVersion(), translatorName)); //$NON-NLS-1$ + } + ef = TranslatorUtil.buildExecutionFactory(t, Thread.currentThread().getContextClassLoader()); + cm.setExecutionFactory(ef); + } catch (TeiidException e) { + throw new AdminProcessingException(e.getCause()); + } + } + + if (dsReplaced) { + resourceAdded(dsName, false); + } + } + } + public void setVDBRepository(VDBRepository repo) { + this.vdbRepository = repo; + } + public void resourceAdded(String resourceName, boolean translator) { for (VDBMetaData vdb:this.vdbRepository.getVDBs()) { if (vdb.getStatus() == VDB.Status.ACTIVE || vdb.isPreview()) { @@ -172,8 +232,9 @@ return null; } + public abstract Executor getExecutor(); - public Executor getExecutor() { - return new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new SynchronousQueue<Runnable>()); + public void setTranslatorRepository(TranslatorRepository repo) { + this.translatorRepository = repo; } } Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -201,7 +201,6 @@ info.put("user", user); //$NON-NLS-1$ String password = null; - String passthroughAuthentication = ""; //$NON-NLS-1$ if (authType.equals(AuthenticationType.CLEARTEXT)) { password = data.readString(); } @@ -210,7 +209,6 @@ LogonResult result = this.logon.neogitiateGssLogin(this.props, serviceToken, false); serviceToken = (byte[])result.getProperty(ILogon.KRB5TOKEN); if (Boolean.TRUE.equals(result.getProperty(ILogon.KRB5_ESTABLISHED))) { - passthroughAuthentication = ";PassthroughAuthentication=true;authenticationType=KRB5"; //$NON-NLS-1$ info.put(ILogon.KRB5TOKEN, serviceToken); } else { @@ -220,7 +218,7 @@ } // this is local connection - String url = "jdbc:teiid:"+databaseName+";ApplicationName=ODBC"+passthroughAuthentication; //$NON-NLS-1$ //$NON-NLS-2$ + String url = "jdbc:teiid:"+databaseName+";ApplicationName=ODBC"; //$NON-NLS-1$ //$NON-NLS-2$ if (password != null) { info.put("password", password); //$NON-NLS-1$ Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -151,7 +151,7 @@ this.enabledCipherSuites = enabledCipherSuites.split(","); //$NON-NLS-1$ } - public String[] getEnabledCipherSuites() { + public String[] getEnabledCipherSuitesAsArray() { return enabledCipherSuites; } } 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 /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 /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* /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* /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 /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 /trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666 Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -70,6 +70,7 @@ translator_not_found=For {0}.{1} VDB, Translator "{2}" not found. recursive_delegation=For {0}.{1} VDB, recursive delegation {2} found. datasource_not_found=For {0}.{1} VDB, Data Source "{2}" not found. +datasource_replaced=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}" vdb_activated={0}.{1} status has been changed to active vdb_inactivated={0}.{1} status has been changed to inactive. Check the required translators and data sources! translator_added=Teiid translator "{0}" has been added. 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* /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* /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 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -78,7 +78,7 @@ Mockito.stub(ef.getPushDownFunctions()).toReturn(funcs); ConnectorManager cm = new ConnectorManager(translatorName,connectionName) { - protected ExecutionFactory getExecutionFactory() { + public ExecutionFactory getExecutionFactory() { return ef; } }; 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* /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* /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* /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* /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 /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 /trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666 Modified: trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -259,7 +259,7 @@ @Test public void testEnableCipherSuites() throws Exception { SSLConfiguration config = new SSLConfiguration(); config.setEnabledCipherSuites("x,y,z"); - assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuites()); + assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuitesAsArray()); } } 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* /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* /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 /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 /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* /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* /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* /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* /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 /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 /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/TestLocalConnections.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -103,7 +103,7 @@ public ConnectorManager getConnectorManager(String connectorName) { return new ConnectorManager(connectorName, connectorName) { @Override - protected ExecutionFactory<Object, Object> getExecutionFactory() { + public ExecutionFactory<Object, Object> getExecutionFactory() { return new ExecutionFactory<Object, Object>() { @Override public Execution createExecution(Command command, 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* /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* /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 /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 /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 /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 /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* /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* /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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* /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* /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* /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* /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 /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 /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* /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* /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* /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* /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* /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* /trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666