[teiid-commits] teiid SVN: r2114 - in trunk: cache-jbosscache/src/main/java and 24 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue May 11 17:30:13 EDT 2010
Author: shawkins
Date: 2010-05-11 17:30:12 -0400 (Tue, 11 May 2010)
New Revision: 2114
Added:
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/client/src/main/java/org/teiid/client/security/TeiidSecurityException.java
trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
trunk/client/src/test/resources/test.jar
Removed:
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/
trunk/client/src/main/java/org/teiid/client/security/MetaMatrixSecurityException.java
Modified:
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java
trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheListener.java
trunk/client/src/main/java/org/teiid/adminapi/AdminException.java
trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/client/src/main/java/org/teiid/adminapi/impl/RequestMetadata.java
trunk/client/src/main/java/org/teiid/client/BatchSerializer.java
trunk/client/src/main/java/org/teiid/client/DQP.java
trunk/client/src/main/java/org/teiid/client/ProcedureErrorInstructionException.java
trunk/client/src/main/java/org/teiid/client/RequestMessage.java
trunk/client/src/main/java/org/teiid/client/ResultsMessage.java
trunk/client/src/main/java/org/teiid/client/SourceWarning.java
trunk/client/src/main/java/org/teiid/client/lob/LobChunkInputStream.java
trunk/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java
trunk/client/src/main/java/org/teiid/client/metadata/MetadataResult.java
trunk/client/src/main/java/org/teiid/client/metadata/ResultsMetadataDefaults.java
trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java
trunk/client/src/main/java/org/teiid/client/security/ILogon.java
trunk/client/src/main/java/org/teiid/client/security/InvalidSessionException.java
trunk/client/src/main/java/org/teiid/client/security/LogonException.java
trunk/client/src/main/java/org/teiid/client/security/SessionToken.java
trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
trunk/client/src/main/java/org/teiid/client/xa/XATransactionException.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/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/JDBCPlugin.java
trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.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/SocketProfile.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
trunk/client/src/main/java/org/teiid/net/CommunicationException.java
trunk/client/src/main/java/org/teiid/net/ConnectionException.java
trunk/client/src/main/java/org/teiid/net/HostInfo.java
trunk/client/src/main/java/org/teiid/net/NetPlugin.java
trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.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/SocketServerInstanceImpl.java
trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java
trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java
trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java
trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java
trunk/client/src/test/java/org/teiid/client/lob/TestLobChunkInputStream.java
trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
trunk/client/src/test/java/org/teiid/jdbc/TestMMCallableStatement.java
trunk/client/src/test/java/org/teiid/jdbc/TestMMResultSet.java
trunk/client/src/test/java/org/teiid/jdbc/TestMMSQLException.java
trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java
trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java
trunk/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java
trunk/client/src/test/java/org/teiid/net/socket/TestSocketUtil.java
Log:
TEIID-918 changing package to org.teiid and removing metamatrix from class names
Modified: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -49,9 +49,9 @@
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.WorkerPoolStatistics;
import org.teiid.adminshell.Help.Doc;
+import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.ReaderInputStream;
-import com.metamatrix.common.util.ReaderInputStream;
-import com.metamatrix.core.util.ObjectConverterUtil;
/**
* Contextual shell wrapper around the AdminAPI, see {@link Admin}
Modified: trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java
===================================================================
--- trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -40,10 +40,11 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import com.metamatrix.common.util.ApplicationInfo;
-import com.metamatrix.core.util.FileUtils;
-import com.metamatrix.core.util.ObjectConverterUtil;
+import org.teiid.core.util.ApplicationInfo;
+import org.teiid.core.util.FileUtils;
+import org.teiid.core.util.ObjectConverterUtil;
+
@SuppressWarnings("nls")
public class MigrationUtil {
Copied: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss (from rev 2112, trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss)
Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCache.java 2010-05-11 03:40:11 UTC (rev 2112)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCache.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.cache.jboss;
+package org.teiid.cache.jboss;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,9 +30,9 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.teiid.cache.Cache;
+import org.teiid.cache.CacheListener;
-import com.metamatrix.cache.Cache;
-import com.metamatrix.cache.CacheListener;
/**
* Implementation of Cache using JBoss Cache
Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2010-05-11 03:40:11 UTC (rev 2112)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.cache.jboss;
+package org.teiid.cache.jboss;
import java.io.Serializable;
@@ -39,13 +39,13 @@
import org.jboss.cache.eviction.LFUAlgorithmConfig;
import org.jboss.cache.eviction.LRUAlgorithmConfig;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
+import org.teiid.cache.Cache;
+import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.CacheFactory;
+import org.teiid.cache.Cache.Type;
+import org.teiid.cache.CacheConfiguration.Policy;
+import org.teiid.core.TeiidRuntimeException;
-import com.metamatrix.cache.Cache;
-import com.metamatrix.cache.CacheConfiguration;
-import com.metamatrix.cache.CacheFactory;
-import com.metamatrix.cache.Cache.Type;
-import com.metamatrix.cache.CacheConfiguration.Policy;
-import com.metamatrix.core.MetaMatrixRuntimeException;
public class JBossCacheFactory implements CacheFactory, Serializable{
private transient org.jboss.cache.Cache cacheStore;
@@ -59,7 +59,7 @@
CacheJmxWrapperMBean cacheWrapper = MBeanServerInvocationHandler.newProxyInstance(server, on, CacheJmxWrapperMBean.class, false);
this.cacheStore = cacheWrapper.getCache();
} catch (MalformedObjectNameException e) {
- throw new MetaMatrixRuntimeException(e);
+ throw new TeiidRuntimeException(e);
}
}
@@ -77,7 +77,7 @@
return new JBossCache(this.cacheStore, node.getFqn());
}
- throw new MetaMatrixRuntimeException("Cache system has been shutdown"); //$NON-NLS-1$
+ throw new TeiidRuntimeException("Cache system has been shutdown"); //$NON-NLS-1$
}
private EvictionAlgorithmConfig buildEvictionAlgorithmConfig(CacheConfiguration config) {
Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheListener.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheListener.java 2010-05-11 03:40:11 UTC (rev 2112)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheListener.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package com.metamatrix.cache.jboss;
+package org.teiid.cache.jboss;
import org.jboss.cache.Fqn;
import org.jboss.cache.notifications.annotation.NodeCreated;
@@ -29,8 +29,8 @@
import org.jboss.cache.notifications.annotation.NodeMoved;
import org.jboss.cache.notifications.annotation.NodeRemoved;
import org.jboss.cache.notifications.event.NodeEvent;
+import org.teiid.cache.CacheListener;
-import com.metamatrix.cache.CacheListener;
@org.jboss.cache.notifications.annotation.CacheListener
public class JBossCacheListener {
Modified: trunk/client/src/main/java/org/teiid/adminapi/AdminException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -26,8 +26,9 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.core.MetaMatrixCoreException;
+import org.teiid.core.TeiidException;
+
/**
* <code>AdminException</code> is the base exception for the admin package. Many *Admin methods throw this
* exception. Instances will be one of the concrete subtypes:
@@ -38,7 +39,7 @@
* clients should be aware of this and use the {@link #hasMultiple()} method to
* determine if they need to check the child exceptions.</p>
*/
-public abstract class AdminException extends MetaMatrixCoreException {
+public abstract class AdminException extends TeiidException {
private static final long serialVersionUID = -4446936145500241358L;
// List of Admin exceptions in
Modified: trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -30,6 +30,8 @@
import org.teiid.client.security.LogonException;
import org.teiid.client.util.ExceptionUtil;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.NetPlugin;
@@ -38,8 +40,6 @@
import org.teiid.net.TeiidURL;
import org.teiid.net.socket.SocketServerConnectionFactory;
-import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.core.MetaMatrixRuntimeException;
/**
* Singleton factory for ServerAdmins.
@@ -127,7 +127,7 @@
try {
Thread.sleep(bounceWait);
} catch (InterruptedException e) {
- throw new MetaMatrixRuntimeException(e);
+ throw new TeiidRuntimeException(e);
}
//we'll wait 30 seconds for the server to come back up
@@ -140,7 +140,7 @@
try {
Thread.sleep(bounceWait);
} catch (InterruptedException ex) {
- throw new MetaMatrixRuntimeException(ex);
+ throw new TeiidRuntimeException(ex);
}
}
}
Modified: trunk/client/src/main/java/org/teiid/adminapi/impl/RequestMetadata.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/impl/RequestMetadata.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/adminapi/impl/RequestMetadata.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -27,8 +27,8 @@
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.metatype.api.annotations.MetaMapping;
import org.teiid.adminapi.Request;
+import org.teiid.core.util.HashCodeUtil;
-import com.metamatrix.core.util.HashCodeUtil;
@MetaMapping(RequestMetadataMapper.class)
Modified: trunk/client/src/main/java/org/teiid/client/BatchSerializer.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -34,9 +34,9 @@
import java.util.List;
import java.util.Map;
+import org.teiid.core.types.DataTypeManager;
import org.teiid.net.NetPlugin;
-import com.metamatrix.common.types.DataTypeManager;
/**
Modified: trunk/client/src/main/java/org/teiid/client/DQP.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/DQP.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/DQP.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -29,27 +29,27 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
public interface DQP {
- ResultsFuture<ResultsMessage> executeRequest(long reqID, RequestMessage message) throws MetaMatrixProcessingException, MetaMatrixComponentException;
+ ResultsFuture<ResultsMessage> executeRequest(long reqID, RequestMessage message) throws TeiidProcessingException, TeiidComponentException;
- ResultsFuture<ResultsMessage> processCursorRequest(long reqID, int batchFirst, int fetchSize) throws MetaMatrixProcessingException;
+ ResultsFuture<ResultsMessage> processCursorRequest(long reqID, int batchFirst, int fetchSize) throws TeiidProcessingException;
- ResultsFuture<?> closeRequest(long requestID) throws MetaMatrixProcessingException, MetaMatrixComponentException;
+ ResultsFuture<?> closeRequest(long requestID) throws TeiidProcessingException, TeiidComponentException;
- boolean cancelRequest(long requestID) throws MetaMatrixProcessingException, MetaMatrixComponentException;
+ boolean cancelRequest(long requestID) throws TeiidProcessingException, TeiidComponentException;
- ResultsFuture<?> closeLobChunkStream(int lobRequestId, long requestId, String streamId) throws MetaMatrixProcessingException, MetaMatrixComponentException;
+ ResultsFuture<?> closeLobChunkStream(int lobRequestId, long requestId, String streamId) throws TeiidProcessingException, TeiidComponentException;
- ResultsFuture<LobChunk> requestNextLobChunk(int lobRequestId, long requestId, String streamId) throws MetaMatrixProcessingException, MetaMatrixComponentException;
+ ResultsFuture<LobChunk> requestNextLobChunk(int lobRequestId, long requestId, String streamId) throws TeiidProcessingException, TeiidComponentException;
- MetadataResult getMetadata(long requestID) throws MetaMatrixComponentException, MetaMatrixProcessingException;
+ MetadataResult getMetadata(long requestID) throws TeiidComponentException, TeiidProcessingException;
- MetadataResult getMetadata(long requestID, String preparedSql, boolean allowDoubleQuotedVariable) throws MetaMatrixComponentException, MetaMatrixProcessingException;
+ MetadataResult getMetadata(long requestID, String preparedSql, boolean allowDoubleQuotedVariable) throws TeiidComponentException, TeiidProcessingException;
// local transaction
Modified: trunk/client/src/main/java/org/teiid/client/ProcedureErrorInstructionException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/ProcedureErrorInstructionException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/ProcedureErrorInstructionException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -22,14 +22,14 @@
package org.teiid.client;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
+import org.teiid.core.TeiidProcessingException;
/**
* Used to notify the user that the virtual procedure raised an error.
* @since 4.3
*/
-public class ProcedureErrorInstructionException extends MetaMatrixProcessingException {
+public class ProcedureErrorInstructionException extends TeiidProcessingException {
/**
*
Modified: trunk/client/src/main/java/org/teiid/client/RequestMessage.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/RequestMessage.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/RequestMessage.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -31,10 +31,10 @@
import java.util.Collections;
import java.util.List;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.util.ExternalizeUtil;
import org.teiid.net.NetPlugin;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.util.ExternalizeUtil;
/**
* Request Message, used by MMXStatement for submitting queries.
@@ -213,15 +213,15 @@
/**
* Sets the txnAutoWrapMode.
* @param txnAutoWrapMode The txnAutoWrapMode to set
- * @throws MetaMatrixProcessingException
+ * @throws TeiidProcessingException
*/
- public void setTxnAutoWrapMode(String txnAutoWrapMode) throws MetaMatrixProcessingException {
+ public void setTxnAutoWrapMode(String txnAutoWrapMode) throws TeiidProcessingException {
if (txnAutoWrapMode != null) {
txnAutoWrapMode = txnAutoWrapMode.toUpperCase();
if (!(txnAutoWrapMode.equals(TXN_WRAP_OFF)
|| txnAutoWrapMode.equals(TXN_WRAP_ON)
|| txnAutoWrapMode.equals(TXN_WRAP_DETECT))) {
- throw new MetaMatrixProcessingException(NetPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$
+ throw new TeiidProcessingException(NetPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$
}
}
this.txnAutoWrapMode = txnAutoWrapMode;
Modified: trunk/client/src/main/java/org/teiid/client/ResultsMessage.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/ResultsMessage.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/ResultsMessage.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -33,10 +33,10 @@
import org.teiid.client.metadata.ParameterInfo;
import org.teiid.client.plan.Annotation;
import org.teiid.client.plan.PlanNode;
+import org.teiid.client.util.ExceptionHolder;
+import org.teiid.core.TeiidException;
+import org.teiid.core.util.ExternalizeUtil;
-import com.metamatrix.api.exception.ExceptionHolder;
-import com.metamatrix.api.exception.MetaMatrixException;
-import com.metamatrix.core.util.ExternalizeUtil;
/**
* Results Message, used by MMStatement to get the query results.
@@ -53,7 +53,7 @@
private PlanNode planDescription;
/** An exception that occurred. */
- private MetaMatrixException exception;
+ private TeiidException exception;
/** Warning could be schema validation errors or partial results warnings */
private List<Throwable> warnings;
@@ -128,7 +128,7 @@
/**
* @return
*/
- public MetaMatrixException getException() {
+ public TeiidException getException() {
return exception;
}
@@ -171,10 +171,10 @@
* @param exception
*/
public void setException(Throwable e) {
- if(e instanceof MetaMatrixException) {
- this.exception = (MetaMatrixException)e;
+ if(e instanceof TeiidException) {
+ this.exception = (TeiidException)e;
} else {
- this.exception = new MetaMatrixException(e, e.getMessage());
+ this.exception = new TeiidException(e, e.getMessage());
}
}
@@ -254,7 +254,7 @@
ExceptionHolder holder = (ExceptionHolder)in.readObject();
if (holder != null) {
- this.exception = (MetaMatrixException)holder.getException();
+ this.exception = (TeiidException)holder.getException();
}
List<ExceptionHolder> holderList = (List<ExceptionHolder>)in.readObject();
if (holderList != null) {
Modified: trunk/client/src/main/java/org/teiid/client/SourceWarning.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/SourceWarning.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/SourceWarning.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -22,7 +22,7 @@
package org.teiid.client;
-import com.metamatrix.api.exception.MetaMatrixException;
+import org.teiid.core.TeiidException;
/**
* <p> This class is used to store the details of an atomic query warning.
@@ -32,7 +32,7 @@
* query is executed.</p>
*/
-public class SourceWarning extends MetaMatrixException {
+public class SourceWarning extends TeiidException {
private String modelName = "UNKNOWN"; // variable stores the name of the model for the atomic query //$NON-NLS-1$
private String connectorBindingName = "UNKNOWN"; // variable stores name of the connector binding //$NON-NLS-1$
Modified: trunk/client/src/main/java/org/teiid/client/lob/LobChunkInputStream.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/lob/LobChunkInputStream.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/lob/LobChunkInputStream.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -25,9 +25,10 @@
import java.io.IOException;
import java.io.InputStream;
-import com.metamatrix.core.CorePlugin;
+import org.teiid.core.CorePlugin;
+
/**
* A InputStream wrapper class for a Lob Chunks. Given a stream of Lob Chunks
* this class will convert those chunks into InputStream, which can be used to
Modified: trunk/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -27,10 +27,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.teiid.client.DQP;
+import org.teiid.core.TeiidException;
+import org.teiid.core.types.Streamable;
import org.teiid.net.NetPlugin;
-import com.metamatrix.api.exception.MetaMatrixException;
-import com.metamatrix.common.types.Streamable;
public class StreamingLobChunckProducer implements LobChunkProducer {
@@ -80,7 +80,7 @@
public void close() throws IOException {
try {
dqp.closeLobChunkStream(streamRequestId, requestId, streamable.getReferenceStreamId());
- } catch (MetaMatrixException e) {
+ } catch (TeiidException e) {
IOException ex = new IOException(e.getMessage());
ex.initCause(e);
throw ex;
Modified: trunk/client/src/main/java/org/teiid/client/metadata/MetadataResult.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/metadata/MetadataResult.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/metadata/MetadataResult.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,8 +28,9 @@
import java.io.ObjectOutput;
import java.util.Map;
-import com.metamatrix.core.util.ExternalizeUtil;
+import org.teiid.core.util.ExternalizeUtil;
+
public class MetadataResult implements Externalizable {
private static final long serialVersionUID = -1520482281079030324L;
private Map[] columnMetadata;
Modified: trunk/client/src/main/java/org/teiid/client/metadata/ResultsMetadataDefaults.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/metadata/ResultsMetadataDefaults.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/metadata/ResultsMetadataDefaults.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -25,9 +25,10 @@
import java.util.HashMap;
import java.util.Map;
-import com.metamatrix.common.types.DataTypeManager;
+import org.teiid.core.types.DataTypeManager;
+
/**
* @since 4.2
*/
Modified: trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/plan/PlanNode.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -40,8 +40,9 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import com.metamatrix.core.util.ExternalizeUtil;
+import org.teiid.core.util.ExternalizeUtil;
+
/**
* A PlanNode represents part of processing plan tree. For relational plans
* child PlanNodes may be either subqueries or nodes that feed tuples into the
Modified: trunk/client/src/main/java/org/teiid/client/security/ILogon.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/security/ILogon.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -24,16 +24,16 @@
import java.util.Properties;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.ComponentNotFoundException;
+import org.teiid.core.TeiidComponentException;
-import com.metamatrix.api.exception.ComponentNotFoundException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
/**
* Generic logon interface.
*/
public interface ILogon {
LogonResult logon(Properties connectionProperties)
- throws LogonException, MetaMatrixComponentException;
+ throws LogonException, TeiidComponentException;
/**
* Ping the server to see if the client-server connection is alive.
@@ -41,7 +41,7 @@
* @throws ComponentNotFoundException if can't find the Session service.
*/
ResultsFuture<?> ping()
- throws InvalidSessionException, MetaMatrixComponentException;
+ throws InvalidSessionException, TeiidComponentException;
/**
@@ -49,7 +49,7 @@
* @throws InvalidSessionException If session has expired or doesn't exist
* @throws ComponentNotFoundException If couldn't find needed service component
*/
- ResultsFuture<?> logoff() throws InvalidSessionException, MetaMatrixComponentException;
+ ResultsFuture<?> logoff() throws InvalidSessionException, TeiidComponentException;
- void assertIdentity(SessionToken sessionId) throws InvalidSessionException, MetaMatrixComponentException;
+ void assertIdentity(SessionToken sessionId) throws InvalidSessionException, TeiidComponentException;
}
Modified: trunk/client/src/main/java/org/teiid/client/security/InvalidSessionException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/InvalidSessionException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/security/InvalidSessionException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -22,7 +22,7 @@
package org.teiid.client.security;
-public class InvalidSessionException extends MetaMatrixSecurityException {
+public class InvalidSessionException extends TeiidSecurityException {
/**
Modified: trunk/client/src/main/java/org/teiid/client/security/LogonException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -31,7 +31,7 @@
* <li>An account for the user does not exist, has been frozen or has been removed; and</li>
* <li>The credentials that were supplied did not authenticate the user.</li>
*/
-public class LogonException extends MetaMatrixSecurityException {
+public class LogonException extends TeiidSecurityException {
/**
* No-Arg Constructor
Deleted: trunk/client/src/main/java/org/teiid/client/security/MetaMatrixSecurityException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/MetaMatrixSecurityException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/security/MetaMatrixSecurityException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -1,83 +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.client.security;
-
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-
-public class MetaMatrixSecurityException extends MetaMatrixProcessingException {
-
- /**
- * No-Arg Constructor
- */
- public MetaMatrixSecurityException( ) {
- super( );
- }
-
- /**
- * Construct an instance with a linked exception, and an error code and
- * message, specified.
- *
- * @param e An exception to chain to this exception
- * @param message The error message
- * @param code The error code
- */
- public MetaMatrixSecurityException( Throwable e, String code, String message ) {
- super( e, code, message );
- }
- /**
- * Construct an instance with an error code and message specified.
- *
- * @param message The error message
- * @param code The error code
- */
- public MetaMatrixSecurityException( String code, String message ) {
- super( code, message );
- }
- /**
- * Constructs an instance of the exception with the specified detail message
- * and a single exception. A detail message is a String that describes this
- * particular exception.
- * @param message the detail message
- * @param e the exception that is encapsulated by this exception
- */
- public MetaMatrixSecurityException( Throwable e, String message ) {
- super(e, message);
- }
- /**
- * Constructs an instance of the exception with no detail message but with a
- * single exception.
- * @param e the exception that is encapsulated by this exception
- */
- public MetaMatrixSecurityException(Throwable e) {
- super(e);
- }
- /**
- * Constructs an instance of the exception with the specified detail message. A detail
- * message is a String that describes this particular exception.
- * @param the detail message
- */
- public MetaMatrixSecurityException(String message) {
- super(message);
- }
-}
-
Modified: trunk/client/src/main/java/org/teiid/client/security/SessionToken.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/SessionToken.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/security/SessionToken.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -29,8 +29,9 @@
import java.security.SecureRandom;
import java.util.Arrays;
-import com.metamatrix.core.util.Base64;
+import org.teiid.core.util.Base64;
+
/**
* This class is an immutable identifier for a unique session that also
* maintains the name of the principal for that session.
Copied: trunk/client/src/main/java/org/teiid/client/security/TeiidSecurityException.java (from rev 2112, trunk/client/src/main/java/org/teiid/client/security/MetaMatrixSecurityException.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/TeiidSecurityException.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/client/security/TeiidSecurityException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.client.security;
+
+import org.teiid.core.TeiidProcessingException;
+
+public class TeiidSecurityException extends TeiidProcessingException {
+
+ /**
+ * No-Arg Constructor
+ */
+ public TeiidSecurityException( ) {
+ super( );
+ }
+
+ /**
+ * Construct an instance with a linked exception, and an error code and
+ * message, specified.
+ *
+ * @param e An exception to chain to this exception
+ * @param message The error message
+ * @param code The error code
+ */
+ public TeiidSecurityException( Throwable e, String code, String message ) {
+ super( e, code, message );
+ }
+ /**
+ * Construct an instance with an error code and message specified.
+ *
+ * @param message The error message
+ * @param code The error code
+ */
+ public TeiidSecurityException( String code, String message ) {
+ super( code, message );
+ }
+ /**
+ * Constructs an instance of the exception with the specified detail message
+ * and a single exception. A detail message is a String that describes this
+ * particular exception.
+ * @param message the detail message
+ * @param e the exception that is encapsulated by this exception
+ */
+ public TeiidSecurityException( Throwable e, String message ) {
+ super(e, message);
+ }
+ /**
+ * Constructs an instance of the exception with no detail message but with a
+ * single exception.
+ * @param e the exception that is encapsulated by this exception
+ */
+ public TeiidSecurityException(Throwable e) {
+ super(e);
+ }
+ /**
+ * Constructs an instance of the exception with the specified detail message. A detail
+ * message is a String that describes this particular exception.
+ * @param the detail message
+ */
+ public TeiidSecurityException(String message) {
+ super(message);
+ }
+}
+
Added: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.client.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.teiid.core.CorePlugin;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.ExternalizeUtil;
+import org.teiid.core.util.ObjectInputStreamWithClassloader;
+import org.teiid.core.util.ReflectionHelper;
+
+
+public class ExceptionHolder implements Externalizable {
+
+ private Throwable exception;
+ private boolean nested = false;
+
+ public ExceptionHolder() {
+ }
+
+ public ExceptionHolder(Throwable exception) {
+ this.exception = exception;
+ }
+
+ public ExceptionHolder(Throwable exception, boolean nested) {
+ this.exception = exception;
+ this.nested = nested;
+ }
+
+ //## JDBC4.0-begin ##
+ @Override
+ //## JDBC4.0-end ##
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ List<String> classNames = ExternalizeUtil.readList(in, String.class);
+ String message = (String)in.readObject();
+ StackTraceElement[] stackTrace = (StackTraceElement[])in.readObject();
+ String code = (String)in.readObject();
+ ExceptionHolder causeHolder = (ExceptionHolder)in.readObject();
+ byte[] serializedException = (byte[])in.readObject();
+
+ this.exception = readFromByteArray(serializedException);
+
+ if (this.exception == null) {
+ Throwable t = buildException(classNames, message, stackTrace, code);
+ if (t == null) {
+ if (causeHolder != null) {
+ this.exception = causeHolder.exception;
+ }
+ }
+ else {
+ if (causeHolder != null) {
+ t.initCause(causeHolder.exception);
+ }
+ this.exception = t;
+ }
+ }
+
+ if (this.exception == null) {
+ this.exception = new TeiidRuntimeException(message);
+ this.exception.setStackTrace(stackTrace);
+ }
+ }
+
+ //## JDBC4.0-begin ##
+ @Override
+ //## JDBC4.0-end ##
+ public void writeExternal(ObjectOutput out) throws IOException {
+ List<String> classNames = new ArrayList<String>();
+ Class<?> clazz = exception.getClass();
+ while (clazz != null) {
+ if (clazz == Throwable.class || clazz == Exception.class) {
+ break;
+ }
+ classNames.add(clazz.getName());
+ clazz = clazz.getSuperclass();
+ }
+ ExternalizeUtil.writeList(out, classNames);
+ out.writeObject(exception.getMessage());
+ out.writeObject(exception.getStackTrace());
+ if (exception instanceof TeiidException) {
+ out.writeObject(((TeiidException)exception).getCode());
+ } else {
+ out.writeObject(null);
+ }
+
+ // specify that this cause is nested exception; not top level
+ if (this.exception.getCause() != null && this.exception.getCause() != this.exception) {
+ out.writeObject(new ExceptionHolder(this.exception.getCause(), true));
+ }
+ else {
+ out.writeObject(null);
+ }
+
+ // only for the top level exception write the serialized block for the object
+ if (!nested) {
+ out.writeObject(writeAsByteArray(this.exception));
+ }
+ else {
+ out.writeObject(null);
+ }
+ }
+
+ public Throwable getException() {
+ return exception;
+ }
+
+ private Throwable buildException(List<String> classNames, String message, StackTraceElement[] stackTrace, String code) {
+ List<String> args = Arrays.asList(CorePlugin.Util.getString("ExceptionHolder.converted_exception", message, classNames)); //$NON-NLS-1$
+
+ Throwable result = null;
+ for (String className : classNames) {
+ try {
+ result = (Throwable)ReflectionHelper.create(className, args, Thread.currentThread().getContextClassLoader());
+ result.setStackTrace(stackTrace);
+ break;
+ } catch (TeiidException e1) {
+ //
+ }
+ }
+
+ if (result instanceof TeiidException) {
+ ((TeiidException)result).setCode(code);
+ ((TeiidException)result).setOriginalType(classNames.get(0));
+ }
+
+ return result;
+ }
+
+ private byte[] writeAsByteArray(Throwable t) throws IOException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(t);
+ oos.flush();
+ oos.close();
+ return baos.toByteArray();
+ }
+
+ private Throwable readFromByteArray(byte[] contents) throws IOException {
+ // only for top level we would have the contents as not null.
+ if (contents != null) {
+ ByteArrayInputStream bais = new ByteArrayInputStream(contents);
+ ObjectInputStream ois = new ObjectInputStreamWithClassloader(bais, Thread.currentThread().getContextClassLoader());
+ try {
+ return (Throwable)ois.readObject();
+ } catch (ClassNotFoundException e) {
+ //
+ }
+ }
+ return null;
+ }
+
+ public static List<ExceptionHolder> toExceptionHolders(List<? extends Throwable> throwables){
+ List<ExceptionHolder> list = new ArrayList<ExceptionHolder>();
+ for (Throwable t: throwables) {
+ list.add(new ExceptionHolder(t));
+ }
+ return list;
+ }
+
+ public static List<Throwable> toThrowables(List<ExceptionHolder> exceptionHolders) {
+ List<Throwable> list = new ArrayList<Throwable>();
+ for(ExceptionHolder e: exceptionHolders) {
+ list.add(e.getException());
+ }
+ return list;
+ }
+
+}
Modified: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,10 +28,10 @@
import org.teiid.adminapi.AdminException;
import org.teiid.adminapi.AdminProcessingException;
import org.teiid.client.xa.XATransactionException;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidRuntimeException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.MetaMatrixRuntimeException;
public class ExceptionUtil {
@@ -58,15 +58,15 @@
if (exception.getClass().isAssignableFrom(exceptionClasses[i])) {
return exception;
}
- canThrowComponentException |= MetaMatrixComponentException.class.isAssignableFrom(exceptionClasses[i]);
+ canThrowComponentException |= TeiidComponentException.class.isAssignableFrom(exceptionClasses[i]);
canThrowAdminException |= AdminException.class.isAssignableFrom(exceptionClasses[i]);
canThrowXATransactionException |= XATransactionException.class.isAssignableFrom(exceptionClasses[i]);
}
if (canThrowComponentException) {
- return new MetaMatrixComponentException(exception);
+ return new TeiidComponentException(exception);
}
if (canThrowAdminException) {
- if (exception instanceof MetaMatrixProcessingException) {
+ if (exception instanceof TeiidProcessingException) {
return new AdminProcessingException(exception);
}
return new AdminComponentException(exception);
@@ -77,6 +77,6 @@
if (RuntimeException.class.isAssignableFrom(exception.getClass())) {
return exception;
}
- return new MetaMatrixRuntimeException(exception);
+ return new TeiidRuntimeException(exception);
}
}
Modified: trunk/client/src/main/java/org/teiid/client/xa/XATransactionException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/xa/XATransactionException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/client/xa/XATransactionException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -24,13 +24,14 @@
import javax.transaction.xa.XAException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
+import org.teiid.core.TeiidProcessingException;
+
/**
* Exception which occurs if an error occurs within the server that is
* XA transaction-related.
*/
-public class XATransactionException extends MetaMatrixProcessingException {
+public class XATransactionException extends TeiidProcessingException {
private static final long serialVersionUID = 5685144848609237877L;
private int errorCode = XAException.XAER_RMERR;
Modified: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -26,8 +26,9 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.core.util.Assertion;
+import org.teiid.core.util.Assertion;
+
/**
* @since 4.3
*/
Modified: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -51,9 +51,9 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.ResultsMode;
import org.teiid.client.RequestMessage.StatementType;
+import org.teiid.core.util.SqlUtil;
+import org.teiid.core.util.TimestampWithTimezone;
-import com.metamatrix.common.util.SqlUtil;
-import com.metamatrix.common.util.TimestampWithTimezone;
/**
* <p> This class inherits Statement methods, which deal with SQL statements in
Modified: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -61,6 +61,7 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
+import org.teiid.core.util.SqlUtil;
import org.teiid.net.CommunicationException;
import org.teiid.net.TeiidURL;
import org.teiid.net.ServerConnection;
@@ -68,7 +69,6 @@
-import com.metamatrix.common.util.SqlUtil;
public class ConnectionImpl extends WrapperImpl implements Connection {
private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
Modified: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -38,10 +38,11 @@
import java.sql.Time;
import java.sql.Timestamp;
-import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.common.types.TransformationException;
-import com.metamatrix.common.types.DataTypeManager.DefaultDataClasses;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.TransformationException;
+import org.teiid.core.types.DataTypeManager.DefaultDataClasses;
+
/**
* <p>This class is used to transform objects into desired data types. The static
* method on this class are used by Metadatresults, ResultsWrapper and
Modified: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -40,12 +40,12 @@
import org.teiid.client.ResultsMessage;
import org.teiid.client.metadata.ResultsMetadataConstants;
import org.teiid.client.metadata.ResultsMetadataDefaults;
+import org.teiid.core.CoreConstants;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.JDBCSQLTypeInfo;
+import org.teiid.core.util.SqlUtil;
-import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
-import com.metamatrix.common.util.SqlUtil;
-import com.metamatrix.core.CoreConstants;
-import com.metamatrix.core.MetaMatrixRuntimeException;
public class DatabaseMetaDataImpl extends WrapperImpl implements DatabaseMetaData {
private static final String DATA_TYPES = "DataTypes"; //$NON-NLS-1$
@@ -473,7 +473,7 @@
stmt.setFetchSize(500);
} catch(SQLException e) {
// will never happen but throw a runtime if it does
- throw new MetaMatrixRuntimeException(e);
+ throw new TeiidRuntimeException(e);
}
Map[] metadata = new Map[columnNames.length];
for (int i = 0; i < columnNames.length; i++) {
Modified: trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,10 +28,10 @@
import org.teiid.client.metadata.MetadataResult;
import org.teiid.client.metadata.ResultsMetadataConstants;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.util.StringUtil;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.util.StringUtil;
/**
* This metadata provider starts with just column names and types (provided in the response)
@@ -68,9 +68,9 @@
MetadataResult results;
try {
results = this.statement.getDQP().getMetadata(this.requestID);
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
}
this.metadata = results.getColumnMetadata();
Modified: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -31,14 +31,14 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.PropertiesUtils;
+import org.teiid.core.util.ReflectionHelper;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.ServerConnection;
-import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.core.MetaMatrixCoreException;
-import com.metamatrix.core.MetaMatrixRuntimeException;
-import com.metamatrix.core.util.ReflectionHelper;
final class EmbeddedProfile {
@@ -84,13 +84,13 @@
try {
ServerConnection sc = (ServerConnection)ReflectionHelper.create("org.teiid.transport.LocalServerConnection", Arrays.asList(info), Thread.currentThread().getContextClassLoader()); //$NON-NLS-1$
return new ConnectionImpl(sc, info, url);
- } catch (MetaMatrixRuntimeException e) {
+ } catch (TeiidRuntimeException e) {
throw TeiidSQLException.create(e);
} catch (ConnectionException e) {
throw TeiidSQLException.create(e);
} catch (CommunicationException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixCoreException e) {
+ } catch (TeiidException e) {
throw TeiidSQLException.create(e);
}
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -23,8 +23,9 @@
package org.teiid.jdbc;
import java.util.ResourceBundle;
-import com.metamatrix.core.BundleUtil;
+import org.teiid.core.BundleUtil;
+
/**
* JDBCPlugin
* <p>Used here in <code>jdbc</code> to have access to the new
Modified: trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -27,8 +27,9 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
+import org.teiid.core.types.JDBCSQLTypeInfo;
+
/**
* Note: this is currently only accurate for {@link PreparedStatement}s.
* Only the basic type information will be accurate for {@link CallableStatement}s.
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -54,17 +54,17 @@
import org.teiid.client.RequestMessage.ResultsMode;
import org.teiid.client.RequestMessage.StatementType;
import org.teiid.client.metadata.MetadataResult;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.types.BlobImpl;
+import org.teiid.core.types.ClobImpl;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.JDBCSQLTypeInfo;
+import org.teiid.core.util.ArgCheck;
+import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.SqlUtil;
+import org.teiid.core.util.TimestampWithTimezone;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.common.types.BlobImpl;
-import com.metamatrix.common.types.ClobImpl;
-import com.metamatrix.common.types.InputStreamFactory;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
-import com.metamatrix.common.util.SqlUtil;
-import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.core.util.ArgCheck;
-import com.metamatrix.core.util.ObjectConverterUtil;
/**
* <p> Instances of PreparedStatement contain a SQL statement that has already been
@@ -269,9 +269,9 @@
if (metadataResults == null) {
try {
metadataResults = this.getDQP().getMetadata(this.currentRequestID, prepareSql, Boolean.valueOf(getExecutionProperty(ExecutionProperties.ANSI_QUOTED_IDENTIFIERS)).booleanValue());
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
}
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -55,21 +55,21 @@
import org.teiid.client.lob.StreamingLobChunckProducer;
import org.teiid.client.plan.PlanNode;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.types.BlobImpl;
+import org.teiid.core.types.BlobType;
+import org.teiid.core.types.ClobImpl;
+import org.teiid.core.types.ClobType;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.SQLXMLImpl;
+import org.teiid.core.types.Streamable;
+import org.teiid.core.types.XMLType;
+import org.teiid.core.util.SqlUtil;
+import org.teiid.core.util.TimestampWithTimezone;
import org.teiid.jdbc.BatchResults.Batch;
import org.teiid.jdbc.BatchResults.BatchFetcher;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.common.types.BlobImpl;
-import com.metamatrix.common.types.BlobType;
-import com.metamatrix.common.types.ClobImpl;
-import com.metamatrix.common.types.ClobType;
-import com.metamatrix.common.types.InputStreamFactory;
-import com.metamatrix.common.types.SQLXMLImpl;
-import com.metamatrix.common.types.Streamable;
-import com.metamatrix.common.types.XMLType;
-import com.metamatrix.common.util.SqlUtil;
-import com.metamatrix.common.util.TimestampWithTimezone;
/**
* <p>
@@ -161,9 +161,9 @@
if(this.requestID >= 0){
try {
this.statement.getDQP().closeRequest(requestID);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
throw TeiidSQLException.create(e);
}
}
@@ -372,7 +372,7 @@
ResultsMessage currentResultMsg = results.get(timeoutSeconds, TimeUnit.SECONDS);
this.accumulateWarnings(currentResultMsg);
return getCurrentBatch(currentResultMsg);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
} catch (InterruptedException e) {
throw TeiidSQLException.create(e);
Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -26,8 +26,8 @@
import java.sql.SQLException;
import org.teiid.client.metadata.ResultsMetadataConstants;
+import org.teiid.core.types.JDBCSQLTypeInfo;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
/**
*/
Modified: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -31,14 +31,14 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.teiid.core.TeiidException;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.TeiidURL;
import org.teiid.net.ServerConnection;
import org.teiid.net.socket.SocketServerConnectionFactory;
-import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.core.MetaMatrixCoreException;
/**
* <p> The java.sql.DriverManager class uses this class to connect to Teiid Server or Teiid Embedded.
@@ -86,7 +86,7 @@
parseURL(url, info);
myConnection = createConnection(url, info);
- } catch (MetaMatrixCoreException e) {
+ } catch (TeiidException e) {
logger.log(Level.SEVERE, "Could not create connection", e); //$NON-NLS-1$
throw TeiidSQLException.create(e, e.getMessage());
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -55,12 +55,12 @@
import org.teiid.client.metadata.ParameterInfo;
import org.teiid.client.plan.Annotation;
import org.teiid.client.plan.PlanNode;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidException;
+import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.SqlUtil;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.common.util.SqlUtil;
-import com.metamatrix.core.util.ObjectConverterUtil;
public class StatementImpl extends WrapperImpl implements TeiidStatement {
private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$
@@ -441,9 +441,9 @@
// In update scenarios close the statement implicitly
try {
getDQP().closeRequest(getCurrentRequestID());
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
throw TeiidSQLException.create(e);
}
} else {
@@ -730,7 +730,7 @@
String txnAutoWrapMode = getExecutionProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP);
try {
res.setTxnAutoWrapMode(txnAutoWrapMode);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
}
@@ -778,9 +778,9 @@
try {
this.getDQP().cancelRequest(currentRequestID);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw TeiidSQLException.create(e);
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
throw TeiidSQLException.create(e);
}
}
@@ -833,7 +833,7 @@
Future<ResultsMessage> pendingResult = null;
try {
pendingResult = this.getDQP().executeRequest(this.currentRequestID, reqMsg);
- } catch (MetaMatrixException e) {
+ } catch (TeiidException e) {
throw TeiidSQLException.create(e);
}
long timeoutMillis = queryTimeout * 1000;
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -33,9 +33,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.metamatrix.common.util.ApplicationInfo;
-import com.metamatrix.common.util.PropertiesUtils;
+import org.teiid.core.util.ApplicationInfo;
+import org.teiid.core.util.PropertiesUtils;
+
/**
* JDBC Driver class for Teiid Embedded and Teiid Server. This class automatically registers with the
* {@link DriverManager}
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -32,12 +32,12 @@
import org.teiid.client.ProcedureErrorInstructionException;
import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.security.LogonException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidRuntimeException;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.MetaMatrixCoreException;
-import com.metamatrix.core.MetaMatrixRuntimeException;
/**
* Teiid specific SQLException
@@ -122,7 +122,7 @@
sqlState = SQLStates.INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBCLASS;
} else if (exception instanceof ProcedureErrorInstructionException) {
sqlState = SQLStates.VIRTUAL_PROCEDURE_ERROR;
- } else if (exception instanceof MetaMatrixProcessingException) {
+ } else if (exception instanceof TeiidProcessingException) {
sqlState = SQLStates.USAGE_ERROR;
} else if (exception instanceof UnknownHostException
|| exception instanceof ConnectException
@@ -132,7 +132,7 @@
sqlState = SQLStates.CONNECTION_EXCEPTION_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION;
} else if (exception instanceof IOException) {
sqlState = SQLStates.CONNECTION_EXCEPTION_STALE_CONNECTION;
- } else if (exception instanceof MetaMatrixCoreException) {
+ } else if (exception instanceof TeiidException) {
if (exception instanceof CommunicationException) {
sqlState = SQLStates.CONNECTION_EXCEPTION_STALE_CONNECTION;
}
@@ -158,17 +158,17 @@
* @return
*/
private static Throwable findRootException(Throwable exception) {
- if (exception instanceof MetaMatrixRuntimeException) {
+ if (exception instanceof TeiidRuntimeException) {
while (exception.getCause() != exception
&& exception.getCause() != null) {
exception = exception.getCause();
}
- if (exception instanceof MetaMatrixRuntimeException) {
- MetaMatrixRuntimeException runtimeException = (MetaMatrixRuntimeException) exception;
+ if (exception instanceof TeiidRuntimeException) {
+ TeiidRuntimeException runtimeException = (TeiidRuntimeException) exception;
while (runtimeException.getChild() != exception
&& runtimeException.getChild() != null) {
- if (runtimeException.getChild() instanceof MetaMatrixRuntimeException) {
- runtimeException = (MetaMatrixRuntimeException) runtimeException
+ if (runtimeException.getChild() instanceof TeiidRuntimeException) {
+ runtimeException = (TeiidRuntimeException) runtimeException
.getChild();
} else {
exception = runtimeException.getChild();
Modified: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -25,10 +25,10 @@
import java.sql.SQLException;
//## JDBC4.0-begin ##
import java.sql.Wrapper;
-//## JDBC4.0-end ##
-import com.metamatrix.core.util.ArgCheck;
+import org.teiid.core.util.ArgCheck;
+
public class WrapperImpl
//## JDBC4.0-begin ##
implements Wrapper
Modified: trunk/client/src/main/java/org/teiid/net/CommunicationException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/CommunicationException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/CommunicationException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -22,14 +22,14 @@
package org.teiid.net;
-import com.metamatrix.core.MetaMatrixCoreException;
+import org.teiid.core.TeiidException;
/**
* An error occurred in communication between client and server. This
* error may or may not be recoverable. Generally the communication
* transport should be able to tell the difference and recover if possible.
*/
-public class CommunicationException extends MetaMatrixCoreException {
+public class CommunicationException extends TeiidException {
/**
* No-Arg Constructor
*/
Modified: trunk/client/src/main/java/org/teiid/net/ConnectionException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/ConnectionException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/ConnectionException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -22,14 +22,14 @@
package org.teiid.net;
-import com.metamatrix.core.MetaMatrixCoreException;
+import org.teiid.core.TeiidException;
/**
* This exception indicates that an error has occurred during connection. There
* are many possible reasons for this, but the most likely is a problem with
* connection parameters.
*/
-public class ConnectionException extends MetaMatrixCoreException {
+public class ConnectionException extends TeiidException {
/**
* No-Arg Constructor
*/
Modified: trunk/client/src/main/java/org/teiid/net/HostInfo.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/HostInfo.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/HostInfo.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -25,9 +25,10 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import com.metamatrix.core.util.ArgCheck;
-import com.metamatrix.core.util.HashCodeUtil;
+import org.teiid.core.util.ArgCheck;
+import org.teiid.core.util.HashCodeUtil;
+
/**
* Defines the hostname/port or {@link InetAddress} to connect to a host.
* @since 4.2
Modified: trunk/client/src/main/java/org/teiid/net/NetPlugin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/NetPlugin.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/NetPlugin.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -23,8 +23,9 @@
package org.teiid.net;
import java.util.ResourceBundle;
-import com.metamatrix.core.BundleUtil;
+import org.teiid.core.BundleUtil;
+
public class NetPlugin {
public static final String PLUGIN_ID = NetPlugin.class.getPackage().getName();
Modified: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -27,8 +27,9 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import com.metamatrix.common.util.ApplicationInfo;
+import org.teiid.core.util.ApplicationInfo;
+
/**
* Represents the information needed in a socket connection handshake
*/
Modified: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -38,12 +38,12 @@
import java.util.logging.Logger;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.net.CommunicationException;
import org.teiid.net.socket.SocketUtil.SSLSocketFactory;
import org.teiid.netty.handler.codec.serialization.ObjectDecoderInputStream;
import org.teiid.netty.handler.codec.serialization.ObjectEncoderOutputStream;
-import com.metamatrix.common.util.PropertiesUtils;
public final class OioOjbectChannelFactory implements ObjectChannelFactory {
Modified: trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -30,9 +30,10 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import com.metamatrix.core.util.ArgCheck;
-import com.metamatrix.core.util.ExternalizeUtil;
+import org.teiid.core.util.ArgCheck;
+import org.teiid.core.util.ExternalizeUtil;
+
public final class ServiceInvocationStruct implements Externalizable {
private static final long serialVersionUID = 1207674062670068350L;
public Class<?> targetClass;
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -49,6 +49,7 @@
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
import org.teiid.client.util.ExceptionUtil;
+import org.teiid.core.TeiidComponentException;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
@@ -56,7 +57,6 @@
import org.teiid.net.ServerConnection;
import org.teiid.net.TeiidURL;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
/**
* Represents a client connection that maintains session state and allows for service fail over.
@@ -109,7 +109,7 @@
}
} catch (InvalidSessionException e) {
shutdown(false);
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
close();
}
this.cancel();
@@ -157,7 +157,7 @@
throw new CommunicationException(e,NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), e.getMessage())); //$NON-NLS-1$
} catch (SingleInstanceCommunicationException e) {
ex = e;
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
ex = e;
}
this.serverDiscovery.markInstanceAsBad(hostInfo);
@@ -186,7 +186,7 @@
// Propagate the original message as it contains the message we want
// to give to the user
throw new ConnectionException(e, e.getMessage());
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
if (e.getCause() instanceof CommunicationException) {
throw (CommunicationException)e.getCause();
}
@@ -265,7 +265,7 @@
//ignore
} catch (TimeoutException e) {
//ignore
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
//ignore
}
}
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -42,15 +42,15 @@
import java.util.logging.Logger;
import org.teiid.client.security.ILogon;
+import org.teiid.core.TeiidException;
+import org.teiid.core.util.PropertiesUtils;
+import org.teiid.core.util.ReflectionHelper;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
import org.teiid.net.ServerConnectionFactory;
import org.teiid.net.TeiidURL;
-import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.core.MetaMatrixCoreException;
-import com.metamatrix.core.util.ReflectionHelper;
/**
* Responsible for creating socket based connections
@@ -251,7 +251,7 @@
} else {
try {
discovery = (ServerDiscovery)ReflectionHelper.create(discoveryStrategyName, null, this.getClass().getClassLoader());
- } catch (MetaMatrixCoreException e) {
+ } catch (TeiidException e) {
throw new ConnectionException(e);
}
}
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -24,9 +24,9 @@
import java.net.SocketAddress;
+import org.teiid.core.crypto.Cryptor;
import org.teiid.net.HostInfo;
-import com.metamatrix.common.util.crypto.Cryptor;
public interface SocketServerInstance {
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -45,19 +45,19 @@
import java.util.logging.Logger;
import org.teiid.client.security.ILogon;
+import org.teiid.client.util.ExceptionHolder;
import org.teiid.client.util.ExceptionUtil;
import org.teiid.client.util.ResultsFuture;
import org.teiid.client.util.ResultsReceiver;
+import org.teiid.core.crypto.CryptoException;
+import org.teiid.core.crypto.Cryptor;
+import org.teiid.core.crypto.DhKeyGenerator;
+import org.teiid.core.crypto.NullCryptor;
+import org.teiid.core.util.ApplicationInfo;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
import org.teiid.net.NetPlugin;
-import com.metamatrix.api.exception.ExceptionHolder;
-import com.metamatrix.common.util.ApplicationInfo;
-import com.metamatrix.common.util.crypto.CryptoException;
-import com.metamatrix.common.util.crypto.Cryptor;
-import com.metamatrix.common.util.crypto.DhKeyGenerator;
-import com.metamatrix.common.util.crypto.NullCryptor;
/**
* Client view of a socket server connection that exposes remote services
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -42,9 +42,9 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
+import org.teiid.core.util.Assertion;
import org.teiid.net.NetPlugin;
-import com.metamatrix.core.util.Assertion;
/**
Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java
===================================================================
--- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -54,29 +54,30 @@
import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
-import org.teiid.client.security.MetaMatrixSecurityException;
+import org.teiid.client.security.TeiidSecurityException;
import org.teiid.client.security.SessionToken;
+import org.teiid.client.util.ExceptionHolder;
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
+import org.teiid.core.ComponentNotFoundException;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.types.BlobImpl;
+import org.teiid.core.types.BlobType;
+import org.teiid.core.types.ClobImpl;
+import org.teiid.core.types.ClobType;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.SQLXMLImpl;
+import org.teiid.core.types.Streamable;
+import org.teiid.core.types.XMLType;
+import org.teiid.core.types.InputStreamFactory.StreamFactoryReference;
+import org.teiid.core.util.ReaderInputStream;
import org.teiid.net.socket.Handshake;
import org.teiid.net.socket.Message;
import org.teiid.net.socket.ServiceInvocationStruct;
-import com.metamatrix.api.exception.ExceptionHolder;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.common.types.BlobImpl;
-import com.metamatrix.common.types.BlobType;
-import com.metamatrix.common.types.ClobImpl;
-import com.metamatrix.common.types.ClobType;
-import com.metamatrix.common.types.InputStreamFactory;
-import com.metamatrix.common.types.SQLXMLImpl;
-import com.metamatrix.common.types.Streamable;
-import com.metamatrix.common.types.XMLType;
-import com.metamatrix.common.types.InputStreamFactory.StreamFactoryReference;
-import com.metamatrix.common.util.ReaderInputStream;
-import com.metamatrix.core.MetaMatrixRuntimeException;
/**
* @author The Netty Project (netty-dev at lists.jboss.org)
@@ -99,7 +100,7 @@
public static void addKnownClass(Class<?> clazz, byte code) {
KNOWN_CLASSES.put(clazz, Integer.valueOf(code));
if (KNOWN_CODES.put(Integer.valueOf(code), clazz) != null) {
- throw new MetaMatrixRuntimeException("Duplicate class"); //$NON-NLS-1$
+ throw new TeiidRuntimeException("Duplicate class"); //$NON-NLS-1$
}
}
@@ -132,14 +133,15 @@
addKnownClass(LogonResult.class, (byte)31);
addKnownClass(SessionToken.class, (byte)32);
addKnownClass(LogonException.class, (byte)33);
- addKnownClass(MetaMatrixSecurityException.class, (byte)34);
+ addKnownClass(TeiidSecurityException.class, (byte)34);
addKnownClass(InvalidSessionException.class, (byte)35);
addKnownClass(ExceptionHolder.class, (byte)40);
- addKnownClass(MetaMatrixRuntimeException.class, (byte)41);
- addKnownClass(MetaMatrixComponentException.class, (byte)42);
- addKnownClass(MetaMatrixException.class, (byte)43);
- addKnownClass(MetaMatrixProcessingException.class, (byte)44);
+ addKnownClass(TeiidRuntimeException.class, (byte)41);
+ addKnownClass(TeiidComponentException.class, (byte)42);
+ addKnownClass(TeiidException.class, (byte)43);
+ addKnownClass(TeiidProcessingException.class, (byte)44);
+ addKnownClass(ComponentNotFoundException.class, (byte)45);
}
public CompactObjectOutputStream(OutputStream out) throws IOException {
Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
===================================================================
--- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -37,11 +37,12 @@
import java.io.StreamCorruptedException;
import java.util.List;
-import com.metamatrix.common.types.InputStreamFactory;
-import com.metamatrix.common.types.Streamable;
-import com.metamatrix.common.types.InputStreamFactory.StreamFactoryReference;
-import com.metamatrix.core.util.ExternalizeUtil;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.Streamable;
+import org.teiid.core.types.InputStreamFactory.StreamFactoryReference;
+import org.teiid.core.util.ExternalizeUtil;
+
/**
* An {@link ObjectInput} which is interoperable with {@link ObjectEncoder}
* and {@link ObjectEncoderOutputStream}.
Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
===================================================================
--- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,9 +28,10 @@
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
-import com.metamatrix.core.util.AccessibleByteArrayOutputStream;
-import com.metamatrix.core.util.ExternalizeUtil;
+import org.teiid.core.util.AccessibleByteArrayOutputStream;
+import org.teiid.core.util.ExternalizeUtil;
+
/**
* An {@link ObjectOutput} which is interoperable with {@link ObjectDecoder}
* and {@link ObjectDecoderInputStream}.
Modified: trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -36,10 +36,10 @@
import java.util.List;
import org.teiid.client.BatchSerializer;
+import org.teiid.core.types.DataTypeManager;
import junit.framework.TestCase;
-import com.metamatrix.common.types.DataTypeManager;
/**
Modified: trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,11 +28,11 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.ShowPlan;
import org.teiid.client.RequestMessage.StatementType;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.util.UnitTestUtil;
import junit.framework.TestCase;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.util.UnitTestUtil;
public class TestRequestMessage extends TestCase {
@@ -60,7 +60,7 @@
message.setExecutionPayload("myExecutionPayload"); //$NON-NLS-1$
try {
message.setTxnAutoWrapMode(RequestMessage.TXN_WRAP_ON);
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
throw new RuntimeException(e);
}
@@ -99,7 +99,7 @@
try {
rm.setTxnAutoWrapMode("foo"); //$NON-NLS-1$
fail("exception expected"); //$NON-NLS-1$
- } catch (MetaMatrixProcessingException e) {
+ } catch (TeiidProcessingException e) {
assertEquals("'FOO' is an invalid transaction autowrap mode.", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -25,10 +25,10 @@
import java.util.Arrays;
import org.teiid.client.lob.LobChunk;
+import org.teiid.core.util.UnitTestUtil;
import junit.framework.TestCase;
-import com.metamatrix.core.util.UnitTestUtil;
public class TestByteLobChunk extends TestCase {
Modified: trunk/client/src/test/java/org/teiid/client/lob/TestLobChunkInputStream.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/lob/TestLobChunkInputStream.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/client/lob/TestLobChunkInputStream.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -29,10 +29,10 @@
import org.teiid.client.lob.LobChunk;
import org.teiid.client.lob.LobChunkInputStream;
import org.teiid.client.lob.LobChunkProducer;
+import org.teiid.core.util.ObjectConverterUtil;
import junit.framework.TestCase;
-import com.metamatrix.core.util.ObjectConverterUtil;
public class TestLobChunkInputStream extends TestCase {
Added: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java (rev 0)
+++ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -0,0 +1,106 @@
+package org.teiid.client.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+import org.teiid.client.util.ExceptionHolder;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.ReflectionHelper;
+import org.teiid.core.util.UnitTestUtil;
+
+
+public class TestExceptionHolder extends TestCase {
+
+ //## JDBC4.0-begin ##
+ @SuppressWarnings("all")
+ public static class BadException extends TeiidProcessingException {
+ private Object obj;
+ public BadException(String msg) {super(msg);}
+ public BadException(Object obj) {
+ this.obj = obj;
+ }
+ }
+
+ @Test public void testDeserializationUnknownException() throws Exception {
+ ClassLoader cl = new URLClassLoader(new URL[] {UnitTestUtil.getTestDataFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
+ Object obj = ReflectionHelper.create("test.Test", null, cl); //$NON-NLS-1$
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(new ExceptionHolder(new BadException(obj)));
+ oos.flush();
+
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ ExceptionHolder holder = (ExceptionHolder)ois.readObject();
+ assertTrue(holder.getException() instanceof BadException);
+ assertEquals("Remote exception: null ... Original type hierarchy [org.teiid.client.util.TestExceptionHolder$BadException, org.teiid.core.TeiidProcessingException, org.teiid.core.TeiidException].", holder.getException().getMessage()); //$NON-NLS-1$
+ }
+
+
+ @SuppressWarnings("all")
+ public static class BadException2 extends TeiidProcessingException {
+ public BadException2(String msg) {
+ super(msg);
+ }
+ public BadException2(Throwable e, String msg) {
+ super(e, msg);
+ }
+ }
+
+ @Test public void testDeserializationUnknownChildException() throws Exception {
+ ClassLoader cl = new URLClassLoader(new URL[] {UnitTestUtil.getTestDataFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
+ Exception obj = (Exception)ReflectionHelper.create("test.UnknownException", null, cl); //$NON-NLS-1$
+ obj.initCause(new SQLException("something bad happended")); //$NON-NLS-1$
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(new ExceptionHolder(new BadException2(obj, "I have foreign exception embedded in me"))); //$NON-NLS-1$
+ oos.flush();
+
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ ExceptionHolder holder = (ExceptionHolder)ois.readObject();
+ Throwable e = holder.getException();
+ assertTrue(e instanceof BadException2);
+ assertEquals("Remote exception: I have foreign exception embedded in me ... Original type hierarchy [org.teiid.client.util.TestExceptionHolder$BadException2, org.teiid.core.TeiidProcessingException, org.teiid.core.TeiidException].", e.getMessage()); //$NON-NLS-1$
+
+ // now unknown exception is not found, so promote known SQL exception up
+ e = e.getCause();
+ assertTrue(e instanceof SQLException);
+ assertEquals("Remote exception: something bad happended ... Original type hierarchy [java.sql.SQLException].", e.getMessage()); //$NON-NLS-1$
+ }
+
+ @Test public void testDeserializationUnknownChildException2() throws Exception {
+ ClassLoader cl = new URLClassLoader(new URL[] {UnitTestUtil.getTestDataFile("test.jar").toURI().toURL()}); //$NON-NLS-1$
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("Unknown Exception"); //$NON-NLS-1$
+ Exception obj = (Exception)ReflectionHelper.create("test.UnknownException", args, cl); //$NON-NLS-1$
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(new ExceptionHolder(obj));
+ oos.flush();
+
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ ExceptionHolder holder = (ExceptionHolder)ois.readObject();
+ Throwable e = holder.getException();
+ assertTrue(e instanceof TeiidRuntimeException);
+ assertEquals("Unknown Exception", e.getMessage()); //$NON-NLS-1$
+ }
+ //## JDBC4.0-end ##
+
+ /*## JDBC3.0-JDK1.5-begin ##
+ public void testPass(){
+ // since the jar files required are built with 1.6, it will always fail, so just comment the test for 1.5
+ }
+ ## JDBC3.0-JDK1.5-end ##*/
+}
Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -45,13 +45,13 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.ResultsMessage;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.types.JDBCSQLTypeInfo;
+import org.teiid.core.util.TimestampWithTimezone;
import org.teiid.jdbc.ResultSetImpl;
import org.teiid.jdbc.StatementImpl;
+import org.teiid.query.unittest.TimestampUtil;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
-import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.query.unittest.TimestampUtil;
public class TestAllResultsImpl {
@@ -699,7 +699,7 @@
static ResultSetImpl helpTestBatching(StatementImpl statement, int fetchSize, int batchLength,
int totalLength) throws InterruptedException, ExecutionException,
- MetaMatrixProcessingException, SQLException, TimeoutException {
+ TeiidProcessingException, SQLException, TimeoutException {
DQP dqp = mock(DQP.class);
stub(statement.getDQP()).toReturn(dqp);
stub(statement.getFetchSize()).toReturn(fetchSize);
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestMMCallableStatement.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestMMCallableStatement.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestMMCallableStatement.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -37,12 +37,12 @@
import org.teiid.client.ResultsMessage;
import org.teiid.client.metadata.ParameterInfo;
import org.teiid.client.security.LogonResult;
+import org.teiid.core.types.JDBCSQLTypeInfo;
import org.teiid.jdbc.CallableStatementImpl;
import org.teiid.jdbc.ConnectionImpl;
import org.teiid.jdbc.ResultSetImpl;
import org.teiid.net.ServerConnection;
-import com.metamatrix.common.types.JDBCSQLTypeInfo;
public class TestMMCallableStatement extends TestCase {
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestMMResultSet.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestMMResultSet.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestMMResultSet.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -40,8 +40,8 @@
import org.junit.Test;
import org.teiid.client.DQP;
import org.teiid.client.ResultsMessage;
+import org.teiid.core.TeiidProcessingException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
public class TestMMResultSet {
@@ -713,7 +713,7 @@
}
}
- private ResultSetImpl helpExecuteQuery(int fetchSize, int totalResults, int cursorType) throws SQLException, MetaMatrixProcessingException, InterruptedException, ExecutionException, TimeoutException {
+ private ResultSetImpl helpExecuteQuery(int fetchSize, int totalResults, int cursorType) throws SQLException, TeiidProcessingException, InterruptedException, ExecutionException, TimeoutException {
StatementImpl statement = createMockStatement(cursorType);
return TestAllResultsImpl.helpTestBatching(statement, fetchSize, Math.min(fetchSize, totalResults), totalResults);
}
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestMMSQLException.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestMMSQLException.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestMMSQLException.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -34,13 +34,13 @@
import junit.framework.TestCase;
import org.teiid.client.ProcedureErrorInstructionException;
+import org.teiid.core.TeiidProcessingException;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidRuntimeException;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
-import com.metamatrix.api.exception.MetaMatrixException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
-import com.metamatrix.core.MetaMatrixCoreException;
-import com.metamatrix.core.MetaMatrixRuntimeException;
public class TestMMSQLException extends TestCase {
@@ -99,14 +99,14 @@
new MalformedURLException(
"A test java.net.MalformedURLException"), //$NON-NLS-1$
SQLStates.CONNECTION_EXCEPTION_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION);
- testCreateThrowable(new MetaMatrixCoreException(
+ testCreateThrowable(new TeiidException(
"A test Generic MM Core Exception"), SQLStates.DEFAULT); //$NON-NLS-1$
- testCreateThrowable(new MetaMatrixException("A test MM Exception"), //$NON-NLS-1$
+ testCreateThrowable(new TeiidException("A test MM Exception"), //$NON-NLS-1$
SQLStates.DEFAULT);
- testCreateThrowable(new MetaMatrixProcessingException(
+ testCreateThrowable(new TeiidProcessingException(
"A test Generic MM Query Processing Exception"), //$NON-NLS-1$
SQLStates.USAGE_ERROR);
- testCreateThrowable(new MetaMatrixRuntimeException(
+ testCreateThrowable(new TeiidRuntimeException(
"A test MM Runtime Exception"), SQLStates.DEFAULT); //$NON-NLS-1$
testCreateThrowable(new TeiidSQLException(
"A test Generic MM SQL Exception"), SQLStates.DEFAULT); //$NON-NLS-1$
@@ -144,7 +144,7 @@
"Test Communication Exception with a SocketException in it"), //$NON-NLS-1$
SQLStates.CONNECTION_EXCEPTION_STALE_CONNECTION);
testCreateThrowable(
- new MetaMatrixException(new SocketTimeoutException(
+ new TeiidException(new SocketTimeoutException(
"A test java.net.SocketTimeoutException"), //$NON-NLS-1$
"Test MetaMatrixException with a SocketTimeoutException in it"), //$NON-NLS-1$
SQLStates.CONNECTION_EXCEPTION_STALE_CONNECTION);
@@ -152,8 +152,8 @@
public void testCreateThrowable3() {
TeiidSQLException e = testCreateThrowable(
- new MetaMatrixCoreException(
- new MetaMatrixRuntimeException(
+ new TeiidException(
+ new TeiidRuntimeException(
new SocketTimeoutException(
"A test MM Invalid Session Exception"), //$NON-NLS-1$
"Test MetaMatrixRuntimeException with a InvalidSessionException in it"), //$NON-NLS-1$
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -28,12 +28,12 @@
import java.sql.SQLException;
import org.teiid.client.RequestMessage.ShowPlan;
+import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.BaseDataSource;
import org.teiid.jdbc.TeiidDataSource;
import junit.framework.TestCase;
-import com.metamatrix.core.util.UnitTestUtil;
public class TestTeiidDataSource extends TestCase {
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -24,11 +24,11 @@
import java.util.Arrays;
+import org.teiid.core.util.UnitTestUtil;
import org.teiid.net.socket.ServiceInvocationStruct;
import junit.framework.TestCase;
-import com.metamatrix.core.util.UnitTestUtil;
public class TestServiceInvocationStruct extends TestCase {
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -38,6 +38,8 @@
import org.teiid.client.security.LogonResult;
import org.teiid.client.security.SessionToken;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.crypto.NullCryptor;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
@@ -47,8 +49,6 @@
import org.teiid.net.socket.SocketServerInstance;
import org.teiid.net.socket.SocketServerInstanceFactory;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.common.util.crypto.NullCryptor;
/**
* <code>TestCase</case> for <code>SocketServerConnection</code>
@@ -65,7 +65,7 @@
@Override
//## JDBC4.0-end ##
public void assertIdentity(SessionToken sessionId)
- throws InvalidSessionException, MetaMatrixComponentException {
+ throws InvalidSessionException, TeiidComponentException {
}
@@ -83,7 +83,7 @@
public LogonResult logon(
Properties connectionProperties)
throws LogonException,
- MetaMatrixComponentException {
+ TeiidComponentException {
return new LogonResult(new SessionToken(1, "fooUser"), "foo", 1, "fake"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -92,9 +92,9 @@
//## JDBC4.0-end ##
public ResultsFuture<?> ping()
throws InvalidSessionException,
- MetaMatrixComponentException {
+ TeiidComponentException {
if (t != null) {
- MetaMatrixComponentException e = new MetaMatrixComponentException(t);
+ TeiidComponentException e = new TeiidComponentException(t);
t = null;
throw e;
}
@@ -167,7 +167,7 @@
try {
logon.ping();
fail("expected exception"); //$NON-NLS-1$
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
}
}
@@ -179,7 +179,7 @@
try {
logon.ping();
fail("expected exception"); //$NON-NLS-1$
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
}
}
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -37,12 +37,12 @@
import org.junit.Test;
import org.teiid.client.security.ILogon;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.core.TeiidComponentException;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
import org.teiid.net.socket.ObjectChannelFactory;
import org.teiid.net.socket.SocketServerInstanceImpl;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
public class TestSocketServerInstanceImpl {
@@ -155,7 +155,7 @@
try {
logon.logon(new Properties());
fail("Exception expected"); //$NON-NLS-1$
- } catch (MetaMatrixComponentException e) {
+ } catch (TeiidComponentException e) {
assertTrue(e.getCause().getCause() instanceof TimeoutException);
}
}
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -32,9 +32,9 @@
import org.teiid.client.security.ILogon;
import org.teiid.client.util.ExceptionUtil;
import org.teiid.client.xa.XATransactionException;
+import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidRuntimeException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.core.MetaMatrixRuntimeException;
public class TestSocketServiceRegistry extends TestCase {
@@ -46,16 +46,16 @@
Method m = Foo.class.getMethod("somemethod", new Class[] {});
- Throwable t = ExceptionUtil.convertException(m, new MetaMatrixComponentException());
+ Throwable t = ExceptionUtil.convertException(m, new TeiidComponentException());
- assertTrue(t instanceof MetaMatrixRuntimeException);
+ assertTrue(t instanceof TeiidRuntimeException);
}
public void testAdminExceptionConversion() throws Exception {
Method m = Admin.class.getMethod("getProcesses", new Class[] {String.class});
- Throwable t = ExceptionUtil.convertException(m, new MetaMatrixComponentException());
+ Throwable t = ExceptionUtil.convertException(m, new TeiidComponentException());
assertTrue(t instanceof AdminException);
}
@@ -66,14 +66,14 @@
Throwable t = ExceptionUtil.convertException(m, new NullPointerException());
- assertTrue(t instanceof MetaMatrixComponentException);
+ assertTrue(t instanceof TeiidComponentException);
}
public void testXATransactionExceptionConversion() throws Exception {
Method m = DQP.class.getMethod("recover", new Class[] {Integer.TYPE});
- Throwable t = ExceptionUtil.convertException(m, new MetaMatrixComponentException());
+ Throwable t = ExceptionUtil.convertException(m, new TeiidComponentException());
assertTrue(t instanceof XATransactionException);
}
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestSocketUtil.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestSocketUtil.java 2010-05-11 16:40:58 UTC (rev 2113)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestSocketUtil.java 2010-05-11 21:30:12 UTC (rev 2114)
@@ -24,11 +24,11 @@
import java.io.IOException;
+import org.teiid.core.util.UnitTestUtil;
import org.teiid.net.socket.SocketUtil;
import junit.framework.TestCase;
-import com.metamatrix.core.util.UnitTestUtil;
public class TestSocketUtil extends TestCase {
Copied: trunk/client/src/test/resources/test.jar (from rev 2113, trunk/common-core/src/test/resources/test.jar)
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/test/resources/test.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the teiid-commits
mailing list