[teiid-commits] teiid SVN: r3444 - in branches/as7/client/src: test/java/org/teiid/net/socket and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2011-09-02 16:37:43 -0400 (Fri, 02 Sep 2011)
New Revision: 3444

Modified:
   branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
   branches/as7/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java
Log:
TEIID-1720: move the classes to admin module

Modified: branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java
===================================================================
--- branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java	2011-09-02 00:47:26 UTC (rev 3443)
+++ branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java	2011-09-02 20:37:43 UTC (rev 3444)
@@ -24,12 +24,8 @@
 
 import java.lang.reflect.Method;
 
-import org.teiid.adminapi.AdminComponentException;
-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;
 
 
@@ -59,18 +55,11 @@
 				return exception;
 			}
 			canThrowComponentException |= TeiidComponentException.class.isAssignableFrom(exceptionClasses[i]);
-			canThrowAdminException |= AdminException.class.isAssignableFrom(exceptionClasses[i]);
 			canThrowXATransactionException |= XATransactionException.class.isAssignableFrom(exceptionClasses[i]);
         }
         if (canThrowComponentException) {
         	return new TeiidComponentException(exception);
         }
-        if (canThrowAdminException) {
-			if (exception instanceof TeiidProcessingException) {
-				return new AdminProcessingException(exception);
-			}
-        	return new AdminComponentException(exception);
-		}
         if (canThrowXATransactionException) {
         	return new XATransactionException(exception);
         }

Modified: branches/as7/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java
===================================================================
--- branches/as7/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java	2011-09-02 00:47:26 UTC (rev 3443)
+++ branches/as7/client/src/test/java/org/teiid/net/socket/TestSocketServiceRegistry.java	2011-09-02 20:37:43 UTC (rev 3444)
@@ -26,8 +26,6 @@
 
 import junit.framework.TestCase;
 
-import org.teiid.adminapi.Admin;
-import org.teiid.adminapi.AdminException;
 import org.teiid.client.DQP;
 import org.teiid.client.util.ExceptionUtil;
 import org.teiid.client.xa.XATransactionException;
@@ -50,15 +48,6 @@
 		assertTrue(t instanceof TeiidRuntimeException);
 	}
 	
-	public void testAdminExceptionConversion() throws Exception {
-		
-		Method m = Admin.class.getMethod("getCacheStats", new Class[] {String.class});
-		
-		Throwable t = ExceptionUtil.convertException(m, new TeiidComponentException());
-		
-		assertTrue(t instanceof AdminException);
-	}
-	
 	public void testComponentExceptionConversion() throws Exception {
 		
 		Method m = DQP.class.getMethod("getMetadata", new Class[] {Long.TYPE});