[teiid-commits] teiid SVN: r589 - in trunk/server/src: main/java/com/metamatrix/common/comm/platform/socket/server and 7 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed Mar 18 16:09:36 EDT 2009
Author: shawkins
Date: 2009-03-18 16:09:36 -0400 (Wed, 18 Mar 2009)
New Revision: 589
Modified:
trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/AdminAuthorizationInterceptor.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ClientInstance.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminHelper.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SessionAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SubSystemAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerAdminImpl.java
trunk/server/src/test/java/com/metamatrix/common/comm/platform/server/TestAdminAuthInterceptor.java
trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -36,6 +36,7 @@
import javax.xml.parsers.ParserConfigurationException;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import org.xml.sax.SAXException;
import com.metamatrix.admin.api.exception.AdminComponentException;
@@ -64,7 +65,6 @@
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.object.PropertyDefinition;
import com.metamatrix.common.util.LogContextsUtil.PlatformAdminConstants;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.metadata.runtime.RuntimeMetadataCatalog;
import com.metamatrix.metadata.runtime.api.Model;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/AdminAuthorizationInterceptor.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/AdminAuthorizationInterceptor.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/AdminAuthorizationInterceptor.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -26,6 +26,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.admin.util.AdminMethodRoleResolver;
@@ -37,7 +39,6 @@
import com.metamatrix.common.util.LogContextsUtil.PlatformAdminConstants;
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.ArgCheck;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.admin.apiimpl.IAdminHelper;
import com.metamatrix.platform.security.api.SessionToken;
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ClientInstance.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ClientInstance.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ClientInstance.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -24,10 +24,11 @@
import java.io.Serializable;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.common.comm.api.Message;
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.util.crypto.Cryptor;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
/**
* Represents a ClientConnection from the server's point of view. This interface
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -29,6 +29,7 @@
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.CredentialMap;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.ComponentNotFoundException;
@@ -39,7 +40,6 @@
import com.metamatrix.common.api.MMURL;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.dqp.client.ResultsFuture;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.jdbc.api.ConnectionProperties;
import com.metamatrix.platform.security.api.Credentials;
import com.metamatrix.platform.security.api.ILogon;
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/ServerWorkItem.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -32,6 +32,8 @@
import javax.crypto.SealedObject;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.api.exception.ComponentNotFoundException;
@@ -47,7 +49,6 @@
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.ReflectionHelper;
import com.metamatrix.dqp.client.ResultsFuture;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.PlatformPlugin;
import com.metamatrix.platform.security.api.ILogon;
import com.metamatrix.platform.security.api.service.SessionServiceInterface;
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -26,6 +26,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.common.comm.ClientServiceRegistry;
import com.metamatrix.common.comm.api.Message;
import com.metamatrix.common.comm.exception.CommunicationException;
@@ -41,7 +43,6 @@
import com.metamatrix.common.util.crypto.DhKeyGenerator;
import com.metamatrix.common.util.crypto.NullCryptor;
import com.metamatrix.core.log.MessageLevel;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.security.api.service.SessionServiceInterface;
/**
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminHelper.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminHelper.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminHelper.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -22,6 +22,8 @@
package com.metamatrix.platform.admin.apiimpl;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.admin.AdminMessages;
import com.metamatrix.admin.AdminPlugin;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
@@ -31,7 +33,6 @@
import com.metamatrix.api.exception.security.SessionServiceException;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.core.log.MessageLevel;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.admin.api.PlatformAdminLogConstants;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
import com.metamatrix.platform.security.api.SessionToken;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SessionAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SessionAdminAPIImpl.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SessionAdminAPIImpl.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -24,12 +24,13 @@
import java.util.Collection;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.SessionServiceException;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.admin.api.SessionAdminAPI;
import com.metamatrix.platform.security.api.MetaMatrixPrincipal;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SubSystemAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SubSystemAdminAPIImpl.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SubSystemAdminAPIImpl.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -22,7 +22,8 @@
package com.metamatrix.platform.admin.apiimpl;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.platform.admin.api.SubSystemAdminAPI;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
Modified: trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -43,6 +43,9 @@
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.DQPCore;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationEnvironment;
@@ -78,9 +81,6 @@
import com.metamatrix.core.util.ReflectionHelper;
import com.metamatrix.dqp.client.ClientSideDQP;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
-import com.metamatrix.dqp.internal.datamgr.impl.ConnectorManager;
-import com.metamatrix.dqp.internal.process.DQPCore;
-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/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -29,11 +29,11 @@
import java.io.Serializable;
import org.teiid.connector.api.ConnectorException;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.comm.api.ResultsReceiver;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
-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/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -29,6 +29,8 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.google.inject.Inject;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -39,7 +41,6 @@
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.dqp.service.AuthorizationService;
import com.metamatrix.platform.security.api.AuthorizationActions;
import com.metamatrix.platform.security.api.AuthorizationPermission;
Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -32,6 +32,7 @@
import java.util.concurrent.ConcurrentHashMap;
import org.teiid.connector.api.ConnectorException;
+import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -42,7 +43,6 @@
import com.metamatrix.common.config.api.ConnectorBinding;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
-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/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -26,6 +26,8 @@
import java.util.Properties;
+import org.teiid.dqp.internal.transaction.TransactionServerImpl;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import com.metamatrix.common.application.ApplicationEnvironment;
@@ -41,7 +43,6 @@
import com.metamatrix.common.xa.XATransactionException;
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.FileUtils;
-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/server/src/main/java/com/metamatrix/server/query/service/QueryService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -33,6 +33,8 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.dqp.internal.process.DQPCore;
+
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.server.InvalidRequestIDException;
@@ -50,7 +52,6 @@
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.client.ClientSideDQP;
-import com.metamatrix.dqp.internal.process.DQPCore;
import com.metamatrix.dqp.message.RequestID;
import com.metamatrix.platform.security.api.SessionToken;
import com.metamatrix.platform.service.api.CacheAdmin;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerAdminImpl.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerAdminImpl.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -24,10 +24,11 @@
import java.util.Collection;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.extensionmodule.ExtensionModuleManager;
import com.metamatrix.core.util.SimpleMock;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.admin.apiimpl.RuntimeStateAdminAPIHelper;
import com.metamatrix.platform.config.api.service.ConfigurationServiceInterface;
import com.metamatrix.platform.registry.ClusteredRegistryState;
Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/server/TestAdminAuthInterceptor.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/common/comm/platform/server/TestAdminAuthInterceptor.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/server/TestAdminAuthInterceptor.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -26,6 +26,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import junit.framework.TestCase;
import com.metamatrix.admin.api.exception.AdminException;
@@ -35,7 +37,6 @@
import com.metamatrix.common.comm.platform.FakeAdminHelper;
import com.metamatrix.common.comm.platform.socket.server.AdminAuthorizationInterceptor;
import com.metamatrix.core.util.SimpleMock;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.admin.apiimpl.IAdminHelper;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
import com.metamatrix.platform.security.api.SessionToken;
Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java 2009-03-18 20:09:30 UTC (rev 588)
+++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java 2009-03-18 20:09:36 UTC (rev 589)
@@ -29,6 +29,8 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+
import junit.framework.TestCase;
@@ -54,7 +56,6 @@
import com.metamatrix.core.util.SimpleMock;
import com.metamatrix.dqp.client.ClientSideDQP;
import com.metamatrix.dqp.client.ResultsFuture;
-import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.platform.security.api.ILogon;
import com.metamatrix.platform.security.api.LogonResult;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
More information about the teiid-commits
mailing list