[teiid-commits] teiid SVN: r581 - in trunk/connector-metadata/src: test/java/com/metamatrix/connector/metadata and 2 other directories.

Author: shawkins Date: 2009-03-18 16:09:10 -0400 (Wed, 18 Mar 2009) New Revision: 581 Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java Log: TEIID-346 adding in a compatibility layer with 5.5 connectors. Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java =================================================================== --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-03-18 19:52:31 UTC (rev 580) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-03-18 20:09:10 UTC (rev 581) @@ -25,11 +25,11 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.connector.metadata.adapter.ObjectConnector; import com.metamatrix.connector.metadata.internal.IObjectSource; -import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.metadata.IndexSelectorSource; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java =================================================================== --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-03-18 19:52:31 UTC (rev 580) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-03-18 20:09:10 UTC (rev 581) @@ -36,6 +36,8 @@ import org.teiid.connector.api.ResultSetExecution; import org.teiid.connector.language.IQuery; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; +import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; import junit.framework.TestCase; @@ -48,8 +50,6 @@ import com.metamatrix.connector.metadata.internal.TestConnectorHost; import com.metamatrix.connector.metadata.internal.TestObjectQueryProcessor; import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; -import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.metadata.runtime.FakeMetadataService; import com.metamatrix.metadata.runtime.FakeQueryMetadata; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java =================================================================== --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-03-18 19:52:31 UTC (rev 580) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-03-18 20:09:10 UTC (rev 581) @@ -34,13 +34,13 @@ import org.teiid.connector.api.ResultSetExecution; import org.teiid.connector.language.IQuery; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import junit.framework.TestCase; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java =================================================================== --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-03-18 19:52:31 UTC (rev 580) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-03-18 20:09:10 UTC (rev 581) @@ -29,13 +29,13 @@ import org.teiid.connector.language.ICommand; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory; import junit.framework.TestCase; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.connector.metadata.index.MetadataInCriteria; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; -import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; import com.metamatrix.query.parser.QueryParser; import com.metamatrix.query.resolver.QueryResolver; import com.metamatrix.query.sql.lang.Command; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java =================================================================== --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-03-18 19:52:31 UTC (rev 580) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-03-18 20:09:10 UTC (rev 581) @@ -31,13 +31,13 @@ import org.teiid.connector.language.ICommand; import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import junit.framework.TestCase; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.core.util.StringUtil; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.metadata.runtime.FakeMetadataService; import com.metamatrix.metadata.runtime.FakeQueryMetadata;