[teiid-commits] teiid SVN: r590 - in trunk/embedded/src/main/java/com/metamatrix: jdbc and 1 other directories.

Author: shawkins Date: 2009-03-18 16:09:39 -0400 (Wed, 18 Mar 2009) New Revision: 590 Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTransactionService.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerConnection.java Log: TEIID-346 adding in a compatibility layer with 5.5 connectors. Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-18 20:09:36 UTC (rev 589) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-03-18 20:09:39 UTC (rev 590) @@ -35,6 +35,8 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.dqp.internal.datamgr.impl.ConnectorManager; +import org.teiid.dqp.internal.process.DQPWorkContext; import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -56,8 +58,6 @@ import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader; import com.metamatrix.dqp.internal.datamgr.ConnectorID; -import com.metamatrix.dqp.internal.datamgr.impl.ConnectorManager; -import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.dqp.message.AtomicRequestID; import com.metamatrix.dqp.message.AtomicRequestMessage; import com.metamatrix.dqp.message.AtomicResultsMessage; Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTransactionService.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTransactionService.java 2009-03-18 20:09:36 UTC (rev 589) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTransactionService.java 2009-03-18 20:09:39 UTC (rev 590) @@ -24,6 +24,8 @@ import java.util.Properties; +import org.teiid.dqp.internal.transaction.TransactionServerImpl; + import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.exception.ApplicationInitializationException; import com.metamatrix.common.application.exception.ApplicationLifecycleException; @@ -32,7 +34,6 @@ import com.metamatrix.common.xa.XATransactionException; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; -import com.metamatrix.dqp.internal.transaction.TransactionServerImpl; import com.metamatrix.dqp.service.TransactionService; import com.metamatrix.dqp.transaction.TransactionServer; import com.metamatrix.dqp.transaction.XAServer; Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-03-18 20:09:36 UTC (rev 589) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-03-18 20:09:39 UTC (rev 590) @@ -30,6 +30,8 @@ import java.util.List; import java.util.Properties; +import org.teiid.dqp.internal.process.DQPCore; + import com.google.inject.Guice; import com.google.inject.Injector; import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -44,7 +46,6 @@ import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.ResourceFinder; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; -import com.metamatrix.dqp.internal.process.DQPCore; import com.metamatrix.dqp.service.ConfigurationService; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.VDBService; Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerConnection.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerConnection.java 2009-03-18 20:09:36 UTC (rev 589) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerConnection.java 2009-03-18 20:09:39 UTC (rev 590) @@ -28,13 +28,14 @@ import java.lang.reflect.Proxy; import java.util.Properties; +import org.teiid.dqp.internal.process.DQPWorkContext; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.client.ExceptionUtil; import com.metamatrix.common.api.MMURL; import com.metamatrix.common.comm.api.ServerConnection; import com.metamatrix.common.comm.api.ServerConnectionListener; import com.metamatrix.dqp.client.ClientSideDQP; -import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.jdbc.JDBCPlugin; import com.metamatrix.platform.security.api.LogonResult; import com.metamatrix.platform.security.api.MetaMatrixSessionID;